build: shorten code for instruction set detection
PATCH 1/2 build: shorten code for instruction set detection
Rather than checking flag by flag individually, use a loop to make it easier to check new flags.
--- config/x86/meson.build | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-)
config/x86/meson.build +13 -21
@@ -28,6 +28,19 @@ foreach f:base_flags compile_time_cpuflags += ['RTE_CPUFLAG_' + f] endforeach +optional_flags = ['AES', 'PCLMUL', + 'AVX', 'AVX2', 'AVX512F'] +foreach f:optional_flags + if cc.get_define('__@0@__'.format(f), args: machine_args) == '1' + if f == 'PCLMUL' # special case flags with different defines + f = 'PCLMULQDQ' + endif + dpdk_conf.set('RTE_MACHINE_CPUFLAG_' + f, 1) + compile_time_cpuflags += ['RTE_CPUFLAG_' + f] + endif +endforeach + + dpdk_conf.set('RTE_ARCH_X86', 1) if dpdk_conf.get('RTE_ARCH_64') dpdk_conf.set('RTE_ARCH_X86_64', 1)
@@ -37,25 +50,4 @@ else dpdk_conf.set('RTE_ARCH', 'i686') endif -if cc.get_define('__AES__', args: machine_args) != '' - dpdk_conf.set('RTE_MACHINE_CPUFLAG_AES', 1) - compile_time_cpuflags += ['RTE_CPUFLAG_AES'] -endif -if cc.get_define('__PCLMUL__', args: machine_args) != '' - dpdk_conf.set('RTE_MACHINE_CPUFLAG_PCLMULQDQ', 1) - compile_time_cpuflags += ['RTE_CPUFLAG_PCLMULQDQ'] -endif -if cc.get_define('__AVX__', args: machine_args) != '' - dpdk_conf.set('RTE_MACHINE_CPUFLAG_AVX', 1) - compile_time_cpuflags += ['RTE_CPUFLAG_AVX'] -endif -if cc.get_define('__AVX2__', args: machine_args) != '' - dpdk_conf.set('RTE_MACHINE_CPUFLAG_AVX2', 1) - compile_time_cpuflags += ['RTE_CPUFLAG_AVX2'] -endif -if cc.get_define('__AVX512F__', args: machine_args) != '' - dpdk_conf.set('RTE_MACHINE_CPUFLAG_AVX512F', 1) - compile_time_cpuflags += ['RTE_CPUFLAG_AVX512F'] -endif - dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)
Signature · 1 line
2.21.0
PATCH 2/2 build: add rdrand and rdseed checks to build
The meson build never checked for the presence of rdrand and rdseed instructions, while make build never checked for rdseed. Ensure builds always have the appropriate checks - and therefore defines - for these instructions. For runtime, we also add in rdseed to the list of known bits returned from cpuid() instruction, so we can confirm its presence at application init time.
--- config/x86/meson.build | 5 ++++- lib/librte_eal/common/arch/x86/rte_cpuflags.c | 1 + lib/librte_eal/common/include/arch/x86/rte_cpuflags.h | 1 + mk/rte.cpuflags.mk | 4 ++++ 4 files changed, 10 insertions(+), 1 deletion(-)
config/x86/meson.build +4 -1
@@ -29,11 +29,14 @@ foreach f:base_flags endforeach optional_flags = ['AES', 'PCLMUL', - 'AVX', 'AVX2', 'AVX512F'] + 'AVX', 'AVX2', 'AVX512F', + 'RDRND', 'RDSEED'] foreach f:optional_flags if cc.get_define('__@0@__'.format(f), args: machine_args) == '1' if f == 'PCLMUL' # special case flags with different defines f = 'PCLMULQDQ' + elif f == 'RDRND' + f = 'RDRAND' endif dpdk_conf.set('RTE_MACHINE_CPUFLAG_' + f, 1) compile_time_cpuflags += ['RTE_CPUFLAG_' + f]
lib/librte_eal/common/arch/x86/rte_cpuflags.c +1 -0
@@ -108,6 +108,7 @@ const struct feature_entry rte_cpu_feature_table[] = { FEAT_DEF(INVPCID, 0x00000007, 0, RTE_REG_EBX, 10) FEAT_DEF(RTM, 0x00000007, 0, RTE_REG_EBX, 11) FEAT_DEF(AVX512F, 0x00000007, 0, RTE_REG_EBX, 16) + FEAT_DEF(RDSEED, 0x00000007, 0, RTE_REG_EBX, 18) FEAT_DEF(LAHF_SAHF, 0x80000001, 0, RTE_REG_ECX, 0)FEAT_DEF (LZCNT ,0x80000001 ,0 ,RTE_REG_ECX ,4 )
lib/librte_eal/common/include/arch/x86/rte_cpuflags.h +1 -0
@@ -97,6 +97,7 @@ enum rte_cpu_flag_t {RTE_CPUFLAG_INVPCID ,/**< INVPCID */ RTE_CPUFLAG_RTM ,/**< Transactional memory */ RTE_CPUFLAG_AVX512F ,/**< AVX512F */ +RTE_CPUFLAG_RDSEED ,/**< RDSEED instruction */ /* (EAX 80000001h) ECX features */ RTE_CPUFLAG_LAHF_SAHF, /**< LAHF_SAHF */
mk/rte.cpuflags.mk +4 -0
@@ -51,6 +51,10 @@ ifneq ($(filter $(AUTO_CPUFLAGS),__RDRND__),) CPUFLAGS += RDRAND endif +ifneq ($(filter $(AUTO_CPUFLAGS),__RDSEED__),) +CPUFLAGS += RDSEED +endif + ifneq ($(filter $(AUTO_CPUFLAGS),__FSGSBASE__),) CPUFLAGS += FSGSBASE endif
Signature · 1 line
2.21.0
Re: [dpdk-dev] [PATCH 2/2] build: add rdrand and rdseed checks to build
Quoted 9 lines · Bruce Richardson
The meson build never checked for the presence of rdrand and rdseed instructions, while make build never checked for rdseed. Ensure builds always have the appropriate checks - and therefore defines - for these instructions. For runtime, we also add in rdseed to the list of known bits returned from
cpuid()instruction, so we can confirm its presence at application init time.Signed-off-by Bruce Richardson <[email protected]>---
Thomas Monjalon
AppliedRe: [dpdk-dev] [PATCH 2/2] build: add rdrand and rdseed checks to build
15/05/2019 18:53, Mattias Rönnblom:
Quoted 11 lines · Bruce Richardson
Quoted 8 lines
The meson build never checked for the presence of rdrand and rdseed instructions, while make build never checked for rdseed. Ensure builds always have the appropriate checks - and therefore defines - for these instructions. For runtime, we also add in rdseed to the list of known bits returned from
cpuid()instruction, so we can confirm its presence at application init time.Signed-off-by Bruce Richardson <[email protected]>Tested-by Mattias Rönnblom <[email protected]>
Applied, thanks