acl: use common top-level variable for easier maintenance

PATCH In review Andre Muezerie 3 participants 5 messages Feb 28, 2025 – Mar 6, 2025 Arm/Amlogic Meson SoC support

lore

Share & tools

lore

Andre Muezerie

author

2025-02-28 18:46 UTC #0 lore raw

PATCH 1/1 acl: use common top-level variable for easier maintenance

Updated meson.build to use common variable cc_avx512_flags.

Signed-off-by Andre Muezerie <[email protected]>

---
 config/x86/meson.build | 2 +-
 lib/acl/meson.build    | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

config/x86/meson.build +1 -1

index 47a5b0c04a..12befd4d73 100644
@@ -14,7 +14,7 @@ if is_linux or cc.get_id() == 'gcc'
     endif
 endif
 
-cc_avx512_flags = ['-mavx512f', '-mavx512vl', '-mavx512dq', '-mavx512bw']
+cc_avx512_flags = ['-mavx512f', '-mavx512vl', '-mavx512dq', '-mavx512bw', '-mavx512cd']
 cc_has_avx512 = false
 target_has_avx512 = false
 if (binutils_ok and cc.has_multi_arguments(cc_avx512_flags)

lib/acl/meson.build +2 -6

index fefe131a48..6ba53fbba4 100644
@@ -55,15 +55,11 @@ if dpdk_conf.has('RTE_ARCH_X86')
             sources += files('acl_run_avx512.c')
             cflags += '-DCC_AVX512_SUPPORT'
 
-        elif cc.has_multi_arguments('-mavx512f', '-mavx512vl',
-                    '-mavx512cd', '-mavx512bw')
-
+        elif cc.has_multi_arguments(cc_avx512_flags)
             avx512_tmplib = static_library('avx512_tmp',
                 'acl_run_avx512.c',
                 dependencies: static_rte_eal,
-                c_args: cflags +
-                    ['-mavx512f', '-mavx512vl',
-                     '-mavx512cd', '-mavx512bw'])
+                c_args: cflags + cc_avx512_flags)
             objs += avx512_tmplib.extract_objects(
                     'acl_run_avx512.c')
             cflags += '-DCC_AVX512_SUPPORT'

Signature · 1 line

2.48.1.vfs.0.0

Bruce Richardson

Acked-by on v1 1/1

2025-03-03 15:20 UTC #1 lore raw

Quoted 8 lines · Andre Muezerie

Updated meson.build to use common variable cc_avx512_flags.
Signed-off-by Andre Muezerie <[email protected]>
---
 config/x86/meson.build | 2 +-
 lib/acl/meson.build    | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

One suggested improvement below.

Acked-by Bruce Richardson <[email protected]>

Quoted 18 lines

config/x86/meson.build +1 -1

index 47a5b0c04a..12befd4d73 100644
@@ -14,7 +14,7 @@ if is_linux or cc.get_id() == 'gcc'
     endif
 endif
 
-cc_avx512_flags = ['-mavx512f', '-mavx512vl', '-mavx512dq', '-mavx512bw']
+cc_avx512_flags = ['-mavx512f', '-mavx512vl', '-mavx512dq', '-mavx512bw', '-mavx512cd']
 cc_has_avx512 = false
 target_has_avx512 = false
 if (binutils_ok and cc.has_multi_arguments(cc_avx512_flags)

lib/acl/meson.build +0 -0

index fefe131a48..6ba53fbba4 100644

lib/acl/meson.build if dpdk_conf.has('RTE_ARCH_X86') · line 58

Quoted 7 lines

lib/acl/meson.build +1 -3

@@ -55,15 +55,11 @@ if dpdk_conf.has('RTE_ARCH_X86')
             sources += files('acl_run_avx512.c')
             cflags += '-DCC_AVX512_SUPPORT'
 
-        elif cc.has_multi_arguments('-mavx512f', '-mavx512vl',
-                    '-mavx512cd', '-mavx512bw')
-
+        elif cc.has_multi_arguments(cc_avx512_flags)

existing variable "cc_has_avx512"?

Quoted 13 lines

lib/acl/meson.build +1 -3

             avx512_tmplib = static_library('avx512_tmp',
                 'acl_run_avx512.c',
                 dependencies: static_rte_eal,
-                c_args: cflags +
-                    ['-mavx512f', '-mavx512vl',
-                     '-mavx512cd', '-mavx512bw'])
+                c_args: cflags + cc_avx512_flags)
             objs += avx512_tmplib.extract_objects(
                     'acl_run_avx512.c')
             cflags += '-DCC_AVX512_SUPPORT'

Signature · 1 line

2.48.1.vfs.0.0

Andre Muezerie

author

2025-03-03 20:26 UTC #2 lore raw

Quoted 35 lines · Bruce Richardson

Quoted 8 lines · Andre Muezerie

Updated meson.build to use common variable cc_avx512_flags.
Signed-off-by Andre Muezerie <[email protected]>
---
 config/x86/meson.build | 2 +-
 lib/acl/meson.build    | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

One suggested improvement below.

Acked-by Bruce Richardson <[email protected]>

Quoted 21 lines

config/x86/meson.build +1 -1

index 47a5b0c04a..12befd4d73 100644
@@ -14,7 +14,7 @@ if is_linux or cc.get_id() == 'gcc'
     endif
 endif
 
-cc_avx512_flags = ['-mavx512f', '-mavx512vl', '-mavx512dq', '-mavx512bw']
+cc_avx512_flags = ['-mavx512f', '-mavx512vl', '-mavx512dq', '-mavx512bw', '-mavx512cd']
 cc_has_avx512 = false
 target_has_avx512 = false
 if (binutils_ok and cc.has_multi_arguments(cc_avx512_flags)

lib/acl/meson.build +0 -0

index fefe131a48..6ba53fbba4 100644
@@ -55,15 +55,11 @@ if dpdk_conf.has('RTE_ARCH_X86')
             sources += files('acl_run_avx512.c')
             cflags += '-DCC_AVX512_SUPPORT'

Quoted 6 lines

lib/acl/meson.build if dpdk_conf.has('RTE_ARCH_X86') · line 58
Quoted 4 lines
lib/acl/meson.build +1 -3
-        elif cc.has_multi_arguments('-mavx512f', '-mavx512vl',
-                    '-mavx512cd', '-mavx512bw')
-
+        elif cc.has_multi_arguments(cc_avx512_flags)
existing variable "cc_has_avx512"?

Indeed, that is even better. I sent out an updated patch.

Quoted 14 lines

lib/acl/meson.build +1 -3

             avx512_tmplib = static_library('avx512_tmp',
                 'acl_run_avx512.c',
                 dependencies: static_rte_eal,
-                c_args: cflags +
-                    ['-mavx512f', '-mavx512vl',
-                     '-mavx512cd', '-mavx512bw'])
+                c_args: cflags + cc_avx512_flags)
             objs += avx512_tmplib.extract_objects(
                     'acl_run_avx512.c')
             cflags += '-DCC_AVX512_SUPPORT'

Signature · 1 line

2.48.1.vfs.0.0

Andre Muezerie

author

2025-03-03 20:25 UTC #3 lore raw

PATCH v2 1/1 acl: use common top-level variable for easier maintenance

In reply to Andre Muezerie

Updated meson.build to use common variables cc_has_avx512 and cc_avx512_flags.

Signed-off-by Andre Muezerie <[email protected]>

Acked-by Bruce Richardson <[email protected]>

---
 config/x86/meson.build | 2 +-
 lib/acl/meson.build    | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

config/x86/meson.build +1 -1

index 47a5b0c04a..12befd4d73 100644
@@ -14,7 +14,7 @@ if is_linux or cc.get_id() == 'gcc'
     endif
 endif
 
-cc_avx512_flags = ['-mavx512f', '-mavx512vl', '-mavx512dq', '-mavx512bw']
+cc_avx512_flags = ['-mavx512f', '-mavx512vl', '-mavx512dq', '-mavx512bw', '-mavx512cd']
 cc_has_avx512 = false
 target_has_avx512 = false
 if (binutils_ok and cc.has_multi_arguments(cc_avx512_flags)

lib/acl/meson.build +2 -6

index fefe131a48..17c693e269 100644
@@ -55,15 +55,11 @@ if dpdk_conf.has('RTE_ARCH_X86')
             sources += files('acl_run_avx512.c')
             cflags += '-DCC_AVX512_SUPPORT'
 
-        elif cc.has_multi_arguments('-mavx512f', '-mavx512vl',
-                    '-mavx512cd', '-mavx512bw')
-
+        elif cc_has_avx512
             avx512_tmplib = static_library('avx512_tmp',
                 'acl_run_avx512.c',
                 dependencies: static_rte_eal,
-                c_args: cflags +
-                    ['-mavx512f', '-mavx512vl',
-                     '-mavx512cd', '-mavx512bw'])
+                c_args: cflags + cc_avx512_flags)
             objs += avx512_tmplib.extract_objects(
                     'acl_run_avx512.c')
             cflags += '-DCC_AVX512_SUPPORT'

Signature · 1 line

2.48.1.vfs.0.0

David Marchand

Applied

2025-03-06 13:48 UTC #4 lore raw

Quoted 6 lines · Andre Muezerie

Updated meson.build to use common variables cc_has_avx512 and cc_avx512_flags.
Signed-off-by Andre Muezerie <[email protected]>
Acked-by Bruce Richardson <[email protected]>

Applied, thanks.

Signature · 1 line

David Marchand