member: use common top-level variable for easier maintenance
Checks
Commit Message
Updated meson.build to use common variable cc_avx512_flags for
msvc and avoiding code duplication for other compilers.
Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
---
lib/member/meson.build | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
Comments
On Fri, Feb 28, 2025 at 11:01:01AM -0800, Andre Muezerie wrote:
> Updated meson.build to use common variable cc_avx512_flags for
> msvc and avoiding code duplication for other compilers.
>
> Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
> ---
> lib/member/meson.build | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/lib/member/meson.build b/lib/member/meson.build
> index f92cbb7f25..8416dc6f8a 100644
> --- a/lib/member/meson.build
> +++ b/lib/member/meson.build
> @@ -33,6 +33,12 @@ if dpdk_conf.has('RTE_ARCH_X86_64') and binutils_ok
> # compiler flags, and then have the .o file from static lib
> # linked into main lib.
>
> + if is_ms_compiler
> + member_avx512_args = cc_avx512_flags
> + else
> + member_avx512_args = ['-mavx512f', '-mavx512dq', '-mavx512ifma']
> + endif
> +
Would this be better as:
member_avx512_args = cc_avx512_flags
if not is_ms_compiler
member_avx512_args += '-mavx512ifma'
endif
WDYT?
> # check if all required flags already enabled
> sketch_avx512_flags = ['__AVX512F__', '__AVX512DQ__', '__AVX512IFMA__']
>
> @@ -46,13 +52,12 @@ if dpdk_conf.has('RTE_ARCH_X86_64') and binutils_ok
> if sketch_avx512_on == true
> cflags += ['-DCC_AVX512_SUPPORT']
> sources += files('rte_member_sketch_avx512.c')
> - elif cc.has_multi_arguments('-mavx512f', '-mavx512dq', '-mavx512ifma')
> + elif cc.has_multi_arguments(member_avx512_args)
> sketch_avx512_tmp = static_library('sketch_avx512_tmp',
> 'rte_member_sketch_avx512.c',
> include_directories: includes,
> dependencies: [static_rte_eal, static_rte_hash],
> - c_args: cflags +
> - ['-mavx512f', '-mavx512dq', '-mavx512ifma'])
> + c_args: cflags + member_avx512_args)
> objs += sketch_avx512_tmp.extract_objects('rte_member_sketch_avx512.c')
> cflags += ['-DCC_AVX512_SUPPORT']
> endif
> --
> 2.48.1.vfs.0.0
>
On Mon, Mar 03, 2025 at 03:21:40PM +0000, Bruce Richardson wrote:
> On Fri, Feb 28, 2025 at 11:01:01AM -0800, Andre Muezerie wrote:
> > Updated meson.build to use common variable cc_avx512_flags for
> > msvc and avoiding code duplication for other compilers.
> >
> > Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
> > ---
> > lib/member/meson.build | 11 ++++++++---
> > 1 file changed, 8 insertions(+), 3 deletions(-)
> >
> > diff --git a/lib/member/meson.build b/lib/member/meson.build
> > index f92cbb7f25..8416dc6f8a 100644
> > --- a/lib/member/meson.build
> > +++ b/lib/member/meson.build
> > @@ -33,6 +33,12 @@ if dpdk_conf.has('RTE_ARCH_X86_64') and binutils_ok
> > # compiler flags, and then have the .o file from static lib
> > # linked into main lib.
> >
> > + if is_ms_compiler
> > + member_avx512_args = cc_avx512_flags
> > + else
> > + member_avx512_args = ['-mavx512f', '-mavx512dq', '-mavx512ifma']
> > + endif
> > +
>
> Would this be better as:
>
> member_avx512_args = cc_avx512_flags
> if not is_ms_compiler
> member_avx512_args += '-mavx512ifma'
> endif
>
> WDYT?
That is slightly simpler. I updated the patch accordingly.
>
> > # check if all required flags already enabled
> > sketch_avx512_flags = ['__AVX512F__', '__AVX512DQ__', '__AVX512IFMA__']
> >
> > @@ -46,13 +52,12 @@ if dpdk_conf.has('RTE_ARCH_X86_64') and binutils_ok
> > if sketch_avx512_on == true
> > cflags += ['-DCC_AVX512_SUPPORT']
> > sources += files('rte_member_sketch_avx512.c')
> > - elif cc.has_multi_arguments('-mavx512f', '-mavx512dq', '-mavx512ifma')
> > + elif cc.has_multi_arguments(member_avx512_args)
> > sketch_avx512_tmp = static_library('sketch_avx512_tmp',
> > 'rte_member_sketch_avx512.c',
> > include_directories: includes,
> > dependencies: [static_rte_eal, static_rte_hash],
> > - c_args: cflags +
> > - ['-mavx512f', '-mavx512dq', '-mavx512ifma'])
> > + c_args: cflags + member_avx512_args)
> > objs += sketch_avx512_tmp.extract_objects('rte_member_sketch_avx512.c')
> > cflags += ['-DCC_AVX512_SUPPORT']
> > endif
> > --
> > 2.48.1.vfs.0.0
> >
@@ -33,6 +33,12 @@ if dpdk_conf.has('RTE_ARCH_X86_64') and binutils_ok
# compiler flags, and then have the .o file from static lib
# linked into main lib.
+ if is_ms_compiler
+ member_avx512_args = cc_avx512_flags
+ else
+ member_avx512_args = ['-mavx512f', '-mavx512dq', '-mavx512ifma']
+ endif
+
# check if all required flags already enabled
sketch_avx512_flags = ['__AVX512F__', '__AVX512DQ__', '__AVX512IFMA__']
@@ -46,13 +52,12 @@ if dpdk_conf.has('RTE_ARCH_X86_64') and binutils_ok
if sketch_avx512_on == true
cflags += ['-DCC_AVX512_SUPPORT']
sources += files('rte_member_sketch_avx512.c')
- elif cc.has_multi_arguments('-mavx512f', '-mavx512dq', '-mavx512ifma')
+ elif cc.has_multi_arguments(member_avx512_args)
sketch_avx512_tmp = static_library('sketch_avx512_tmp',
'rte_member_sketch_avx512.c',
include_directories: includes,
dependencies: [static_rte_eal, static_rte_hash],
- c_args: cflags +
- ['-mavx512f', '-mavx512dq', '-mavx512ifma'])
+ c_args: cflags + member_avx512_args)
objs += sketch_avx512_tmp.extract_objects('rte_member_sketch_avx512.c')
cflags += ['-DCC_AVX512_SUPPORT']
endif