From patchwork Tue Feb 2 22:59:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 10332 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 8B71F95CE; Wed, 3 Feb 2016 00:01:19 +0100 (CET) Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) by dpdk.org (Postfix) with ESMTP id E380F8D90 for ; Wed, 3 Feb 2016 00:01:17 +0100 (CET) Received: by mail-wm0-f49.google.com with SMTP id p63so45299142wmp.1 for ; Tue, 02 Feb 2016 15:01:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hozTsEeLuo6pYMMvaiu7DrZZobFWCaEJt8EL79zK+j4=; b=eUo0lvgX7zWXf0GP4nkJIKU7MDaTZtRM8fy4eFIM7BGRQD0+xRK3YhN8gvT+JIM9GS BeF0M5Fn8iEQinzdiTa2L46t3zIr6jLt9mIqqm9eLQS1g5UQ/0N6xOx9JyMg6ww9sYbY yJEYMcBxvfyWgKQbzurYZSXN8gmxHx81tbKGuSJe9e4a5Aua37rbkdnQ8/p54XpJgHdw 9aKjSa2nIV29Rq2oOYPwtQVzq4mZ5vXn4kb6ikKESYAJ0zsqw/Z1tGALaqZG2xZEIr1u fXQF3NlHwDpK8a1+snvBHDHIkReg7WDV9z2UCQVm+Px4lROLLDFeYJjnNjbSZq+5eDsE X2OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hozTsEeLuo6pYMMvaiu7DrZZobFWCaEJt8EL79zK+j4=; b=Zr5fIwT5RpO+J2VWCSrs03OFmFN1vYg9eofNE5JQQW5QN9eMBrJq8UG/JvLxfWVBrr YGkhXs/oWjjtDD5vlMvi4HFiH4zKyBClTYf4hVzlWcccA/UDbXv6eI008wGNcN7rviXL 98PJyCY2slzSUKUpU+aCsFPPzvrhbUJM9donpgjIt8FGy2WEJ7tHyrG5VMf17R4zhTjB hXcjwrwhU0DWCmKuTg+fu89mbMfbmDeUB/V4S4n8LLJAzj3WLRS5SHLkrYqDG8hG9pap 93+4qekJ9AX7T7yixLVThlpBIxzZBbz3Z3iE9pOAv879ODQjJ1f4Y/Dzz4619eoHvG6c Kz5A== X-Gm-Message-State: AG10YOQf/EdJVWi0udXHhCGwt0X0HdAsM/b0HxiPrvHSXzi1qfUznshdOl7OD8dx5aWxqxyf X-Received: by 10.194.111.199 with SMTP id ik7mr11066487wjb.25.1454454077810; Tue, 02 Feb 2016 15:01:17 -0800 (PST) Received: from localhost.localdomain (136-92-190-109.dsl.ovh.fr. [109.190.92.136]) by smtp.gmail.com with ESMTPSA id e9sm3555612wja.25.2016.02.02.15.01.16 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 02 Feb 2016 15:01:17 -0800 (PST) From: Thomas Monjalon To: david.marchand@6wind.com, ferruh.yigit@intel.com Date: Tue, 2 Feb 2016 23:59:49 +0100 Message-Id: <1454453993-3903-2-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.5.2 In-Reply-To: <1454453993-3903-1-git-send-email-thomas.monjalon@6wind.com> References: <1454453993-3903-1-git-send-email-thomas.monjalon@6wind.com> Cc: dev@dpdk.org, viktorin@rehivetech.com Subject: [dpdk-dev] [PATCH v1 1/5] eal: get CPU flag name X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 +- lib/librte_eal/common/include/generic/rte_cpuflags.h | 14 ++++++++++++-- lib/librte_eal/linuxapp/eal/rte_eal_version.map | 2 ++ 7 files changed, 39 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 6fa9c67..1280cb2 100644 --- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map +++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map @@ -140,5 +140,6 @@ DPDK_2.3 { global: rte_cpu_feature_table; + rte_cpu_get_flag_name; } DPDK_2.2; diff --git a/lib/librte_eal/common/arch/arm/rte_cpuflags.c b/lib/librte_eal/common/arch/arm/rte_cpuflags.c index 4348574..62e0791 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 7f4e6dd..a270ccc 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 22dc572..3346fde 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 9ba9b1e..8c0576d 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 5738a2a..3ca2e36 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 @@ -95,6 +93,18 @@ 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 * * @param feature diff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map b/lib/librte_eal/linuxapp/eal/rte_eal_version.map index aa4fcbd..d8a5978 100644 --- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map +++ b/lib/librte_eal/linuxapp/eal/rte_eal_version.map @@ -143,4 +143,6 @@ DPDK_2.3 { global: rte_cpu_feature_table; + rte_cpu_get_flag_name; + } DPDK_2.2;