remove custom logic for building AVX2 and AVX-512 files.
Signed-off-by: Bruce Richardson <bruce.richard...@intel.com>
---
lib/acl/meson.build | 54 ++++-----------------------------------------
1 file changed, 4 insertions(+), 50 deletions(-)
diff --git a/lib/acl/meson.build b/lib/acl/meson.build
index a80c172812..87e9f25f8e 100644
--- a/lib/acl/meson.build
+++ b/lib/acl/meson.build
@@ -15,57 +15,11 @@ headers = files('rte_acl.h', 'rte_acl_osdep.h')
if dpdk_conf.has('RTE_ARCH_X86')
sources += files('acl_run_sse.c')
-
- avx2_tmplib = static_library('avx2_tmp',
- 'acl_run_avx2.c',
- dependencies: static_rte_eal,
- c_args: [cflags, cc_avx2_flags])
- objs += avx2_tmplib.extract_objects('acl_run_avx2.c')
-
- # compile AVX512 version if:
- # we are building 64-bit binary AND binutils can generate proper code
-
- if dpdk_conf.has('RTE_ARCH_X86_64') and binutils_ok
-
- # compile AVX512 version if either:
- # a. we have AVX512 supported in minimum instruction set
- # baseline
- # b. it's not minimum instruction set, but supported by
- # compiler
- #
- # in former case, just add avx512 C file to files list
- # in latter case, compile c file to static lib, using correct
- # compiler flags, and then have the .o file from static lib
- # linked into main lib.
-
- # check if all required flags already enabled (variant a).
- acl_avx512_flags = ['__AVX512F__', '__AVX512VL__',
- '__AVX512CD__', '__AVX512BW__']
-
- acl_avx512_on = true
- foreach f:acl_avx512_flags
-
- if cc.get_define(f, args: machine_args) == ''
- acl_avx512_on = false
- endif
- endforeach
-
- if acl_avx512_on == true
-
- sources += files('acl_run_avx512.c')
- cflags += '-DCC_AVX512_SUPPORT'
-
- elif cc_has_avx512
- avx512_tmplib = static_library('avx512_tmp',
- 'acl_run_avx512.c',
- dependencies: static_rte_eal,
- c_args: cflags + cc_avx512_flags)
- objs += avx512_tmplib.extract_objects(
- 'acl_run_avx512.c')
- cflags += '-DCC_AVX512_SUPPORT'
- endif
+ sources_avx2 += files('acl_run_avx2.c')
+ # AVX512 is only supported on 64-bit builds
+ if dpdk_conf.has('RTE_ARCH_X86_64')
+ sources_avx512 += files('acl_run_avx512.c')
endif
-
elif dpdk_conf.has('RTE_ARCH_ARM')
cflags += '-flax-vector-conversions'
sources += files('acl_run_neon.c')
--
2.43.0
