From 9f8faed95640466d901530600361e2f2a98493ac Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Tue, 2 Feb 2016 23:59:49 +0100 Subject: [PATCH] eal: get CPU flag name The new function rte_cpu_get_flag_name() is added to the EAL API. It is implemented (duplicated) in each arch because the next patch will remove the public exposure of the feature tables. Signed-off-by: Thomas Monjalon --- lib/librte_eal/bsdapp/eal/rte_eal_version.map | 1 + lib/librte_eal/common/arch/arm/rte_cpuflags.c | 7 +++++++ lib/librte_eal/common/arch/ppc_64/rte_cpuflags.c | 8 ++++++++ lib/librte_eal/common/arch/x86/rte_cpuflags.c | 8 ++++++++ lib/librte_eal/common/eal_common_cpuflags.c | 2 +- .../common/include/generic/rte_cpuflags.h | 14 ++++++++++++-- lib/librte_eal/linuxapp/eal/rte_eal_version.map | 1 + 7 files changed, 38 insertions(+), 3 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map b/lib/librte_eal/bsdapp/eal/rte_eal_version.map index d8ac7f7cd0..9bea0e273c 100644 --- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map +++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map @@ -139,6 +139,7 @@ DPDK_2.2 { DPDK_2.3 { global: + rte_cpu_get_flag_name; rte_eal_pci_map_device; rte_eal_pci_unmap_device; rte_cpu_feature_table; diff --git a/lib/librte_eal/common/arch/arm/rte_cpuflags.c b/lib/librte_eal/common/arch/arm/rte_cpuflags.c index 4348574093..62e079186d 100644 --- a/lib/librte_eal/common/arch/arm/rte_cpuflags.c +++ b/lib/librte_eal/common/arch/arm/rte_cpuflags.c @@ -77,3 +77,10 @@ const struct feature_entry rte_cpu_feature_table[] = { }; #endif +const char * +rte_cpu_get_flag_name(enum rte_cpu_flag_t feature) +{ + if (feature >= RTE_CPUFLAG_NUMFLAGS) + return NULL; + return rte_cpu_feature_table[feature].name; +} diff --git a/lib/librte_eal/common/arch/ppc_64/rte_cpuflags.c b/lib/librte_eal/common/arch/ppc_64/rte_cpuflags.c index 7f4e6dd10b..a270ccc019 100644 --- a/lib/librte_eal/common/arch/ppc_64/rte_cpuflags.c +++ b/lib/librte_eal/common/arch/ppc_64/rte_cpuflags.c @@ -68,3 +68,11 @@ const struct feature_entry rte_cpu_feature_table[] = { FEAT_DEF(HTM, 0x00000001, 0, REG_HWCAP2, 30) FEAT_DEF(ARCH_2_07, 0x00000001, 0, REG_HWCAP2, 31) }; + +const char * +rte_cpu_get_flag_name(enum rte_cpu_flag_t feature) +{ + if (feature >= RTE_CPUFLAG_NUMFLAGS) + return NULL; + return rte_cpu_feature_table[feature].name; +} diff --git a/lib/librte_eal/common/arch/x86/rte_cpuflags.c b/lib/librte_eal/common/arch/x86/rte_cpuflags.c index 22dc57213f..3346fde249 100644 --- a/lib/librte_eal/common/arch/x86/rte_cpuflags.c +++ b/lib/librte_eal/common/arch/x86/rte_cpuflags.c @@ -127,3 +127,11 @@ const struct feature_entry rte_cpu_feature_table[] = { FEAT_DEF(INVTSC, 0x80000007, 0, RTE_REG_EDX, 8) }; + +const char * +rte_cpu_get_flag_name(enum rte_cpu_flag_t feature) +{ + if (feature >= RTE_CPUFLAG_NUMFLAGS) + return NULL; + return rte_cpu_feature_table[feature].name; +} diff --git a/lib/librte_eal/common/eal_common_cpuflags.c b/lib/librte_eal/common/eal_common_cpuflags.c index 9ba9b1e70d..8c0576d439 100644 --- a/lib/librte_eal/common/eal_common_cpuflags.c +++ b/lib/librte_eal/common/eal_common_cpuflags.c @@ -79,7 +79,7 @@ rte_cpu_check_supported(void) fprintf(stderr, "ERROR: This system does not support \"%s\".\n" "Please check that RTE_MACHINE is set correctly.\n", - rte_cpu_feature_table[compile_time_flags[i]].name); + rte_cpu_get_flag_name(compile_time_flags[i])); exit(1); } } diff --git a/lib/librte_eal/common/include/generic/rte_cpuflags.h b/lib/librte_eal/common/include/generic/rte_cpuflags.h index 5738a2a73a..3ca2e3660e 100644 --- a/lib/librte_eal/common/include/generic/rte_cpuflags.h +++ b/lib/librte_eal/common/include/generic/rte_cpuflags.h @@ -47,9 +47,7 @@ /** * Enumeration of all CPU features supported */ -#ifdef __DOXYGEN__ enum rte_cpu_flag_t; -#endif /** * Enumeration of CPU registers @@ -94,6 +92,18 @@ static const struct feature_entry cpu_feature_table[]; static inline void rte_cpu_get_features(uint32_t leaf, uint32_t subleaf, cpuid_registers_t out); +/** + * Get name of CPU flag + * + * @param feature + * CPU flag ID + * @return + * flag name + * NULL if flag ID is invalid + */ +const char * +rte_cpu_get_flag_name(enum rte_cpu_flag_t feature); + /** * Function for checking a CPU flag availability * diff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map b/lib/librte_eal/linuxapp/eal/rte_eal_version.map index 4c09c0be6f..48e8e4f1f1 100644 --- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map +++ b/lib/librte_eal/linuxapp/eal/rte_eal_version.map @@ -142,6 +142,7 @@ DPDK_2.2 { DPDK_2.3 { global: + rte_cpu_get_flag_name; rte_eal_pci_map_device; rte_eal_pci_unmap_device; rte_cpu_feature_table; -- 2.20.1