DPDK patches and discussions
 help / color / mirror / Atom feed
From: Jan Viktorin <viktorin@rehivetech.com>
To: dev@dpdk.org, David Hunt <david.hunt@intel.com>,
	David Marchand <david.marchand@6wind.com>,
	"Ananyev, Konstantin" <konstantin.ananyev@intel.com>
Cc: Vlastimil Kosar <kosar@rehivetech.com>
Subject: [dpdk-dev] [PATCH v3 10/17] eal/arm: cpu flag checks for ARM
Date: Tue, 27 Oct 2015 20:13:42 +0100	[thread overview]
Message-ID: <1445973229-22058-11-git-send-email-viktorin@rehivetech.com> (raw)
In-Reply-To: <1445973229-22058-1-git-send-email-viktorin@rehivetech.com>

From: Vlastimil Kosar <kosar@rehivetech.com>

This implementation is based on IBM POWER version of
rte_cpuflags. We use software emulation of HW capability
registers, because those are usually not directly accessible
from userspace on ARM.

Signed-off-by: Vlastimil Kosar <kosar@rehivetech.com>
Signed-off-by: Jan Viktorin <viktorin@rehivetech.com>
---
 app/test/test_cpuflags.c                           |   5 +
 .../common/include/arch/arm/rte_cpuflags.h         | 177 +++++++++++++++++++++
 mk/rte.cpuflags.mk                                 |   6 +
 3 files changed, 188 insertions(+)
 create mode 100644 lib/librte_eal/common/include/arch/arm/rte_cpuflags.h

diff --git a/app/test/test_cpuflags.c b/app/test/test_cpuflags.c
index 5b92061..557458f 100644
--- a/app/test/test_cpuflags.c
+++ b/app/test/test_cpuflags.c
@@ -115,6 +115,11 @@ test_cpuflags(void)
 	CHECK_FOR_FLAG(RTE_CPUFLAG_ICACHE_SNOOP);
 #endif
 
+#if defined(RTE_ARCH_ARM)
+	printf("Check for NEON:\t\t");
+	CHECK_FOR_FLAG(RTE_CPUFLAG_NEON);
+#endif
+
 #if defined(RTE_ARCH_X86_64) || defined(RTE_ARCH_I686)
 	printf("Check for SSE:\t\t");
 	CHECK_FOR_FLAG(RTE_CPUFLAG_SSE);
diff --git a/lib/librte_eal/common/include/arch/arm/rte_cpuflags.h b/lib/librte_eal/common/include/arch/arm/rte_cpuflags.h
new file mode 100644
index 0000000..1eadb33
--- /dev/null
+++ b/lib/librte_eal/common/include/arch/arm/rte_cpuflags.h
@@ -0,0 +1,177 @@
+/*
+ *   BSD LICENSE
+ *
+ *   Copyright(c) 2015 RehiveTech. All rights reserved.
+ *
+ *   Redistribution and use in source and binary forms, with or without
+ *   modification, are permitted provided that the following conditions
+ *   are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *     * Neither the name of RehiveTech nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _RTE_CPUFLAGS_ARM_H_
+#define _RTE_CPUFLAGS_ARM_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <elf.h>
+#include <fcntl.h>
+#include <assert.h>
+#include <unistd.h>
+
+#include "generic/rte_cpuflags.h"
+
+#ifndef AT_HWCAP
+#define AT_HWCAP 16
+#endif
+
+#ifndef AT_HWCAP2
+#define AT_HWCAP2 26
+#endif
+
+/* software based registers */
+enum cpu_register_t {
+	REG_HWCAP = 0,
+	REG_HWCAP2,
+};
+
+/**
+ * Enumeration of all CPU features supported
+ */
+enum rte_cpu_flag_t {
+	RTE_CPUFLAG_SWP = 0,
+	RTE_CPUFLAG_HALF,
+	RTE_CPUFLAG_THUMB,
+	RTE_CPUFLAG_A26BIT,
+	RTE_CPUFLAG_FAST_MULT,
+	RTE_CPUFLAG_FPA,
+	RTE_CPUFLAG_VFP,
+	RTE_CPUFLAG_EDSP,
+	RTE_CPUFLAG_JAVA,
+	RTE_CPUFLAG_IWMMXT,
+	RTE_CPUFLAG_CRUNCH,
+	RTE_CPUFLAG_THUMBEE,
+	RTE_CPUFLAG_NEON,
+	RTE_CPUFLAG_VFPv3,
+	RTE_CPUFLAG_VFPv3D16,
+	RTE_CPUFLAG_TLS,
+	RTE_CPUFLAG_VFPv4,
+	RTE_CPUFLAG_IDIVA,
+	RTE_CPUFLAG_IDIVT,
+	RTE_CPUFLAG_VFPD32,
+	RTE_CPUFLAG_LPAE,
+	RTE_CPUFLAG_EVTSTRM,
+	RTE_CPUFLAG_AES,
+	RTE_CPUFLAG_PMULL,
+	RTE_CPUFLAG_SHA1,
+	RTE_CPUFLAG_SHA2,
+	RTE_CPUFLAG_CRC32,
+	/* The last item */
+	RTE_CPUFLAG_NUMFLAGS,/**< This should always be the last! */
+};
+
+static const struct feature_entry cpu_feature_table[] = {
+	FEAT_DEF(SWP,       0x00000001, 0, REG_HWCAP,  0)
+	FEAT_DEF(HALF,      0x00000001, 0, REG_HWCAP,  1)
+	FEAT_DEF(THUMB,     0x00000001, 0, REG_HWCAP,  2)
+	FEAT_DEF(A26BIT,    0x00000001, 0, REG_HWCAP,  3)
+	FEAT_DEF(FAST_MULT, 0x00000001, 0, REG_HWCAP,  4)
+	FEAT_DEF(FPA,       0x00000001, 0, REG_HWCAP,  5)
+	FEAT_DEF(VFP,       0x00000001, 0, REG_HWCAP,  6)
+	FEAT_DEF(EDSP,      0x00000001, 0, REG_HWCAP,  7)
+	FEAT_DEF(JAVA,      0x00000001, 0, REG_HWCAP,  8)
+	FEAT_DEF(IWMMXT,    0x00000001, 0, REG_HWCAP,  9)
+	FEAT_DEF(CRUNCH,    0x00000001, 0, REG_HWCAP,  10)
+	FEAT_DEF(THUMBEE,   0x00000001, 0, REG_HWCAP,  11)
+	FEAT_DEF(NEON,      0x00000001, 0, REG_HWCAP,  12)
+	FEAT_DEF(VFPv3,     0x00000001, 0, REG_HWCAP,  13)
+	FEAT_DEF(VFPv3D16,  0x00000001, 0, REG_HWCAP,  14)
+	FEAT_DEF(TLS,       0x00000001, 0, REG_HWCAP,  15)
+	FEAT_DEF(VFPv4,     0x00000001, 0, REG_HWCAP,  16)
+	FEAT_DEF(IDIVA,     0x00000001, 0, REG_HWCAP,  17)
+	FEAT_DEF(IDIVT,     0x00000001, 0, REG_HWCAP,  18)
+	FEAT_DEF(VFPD32,    0x00000001, 0, REG_HWCAP,  19)
+	FEAT_DEF(LPAE,      0x00000001, 0, REG_HWCAP,  20)
+	FEAT_DEF(EVTSTRM,   0x00000001, 0, REG_HWCAP,  21)
+	FEAT_DEF(AES,       0x00000001, 0, REG_HWCAP2,  0)
+	FEAT_DEF(PMULL,     0x00000001, 0, REG_HWCAP2,  1)
+	FEAT_DEF(SHA1,      0x00000001, 0, REG_HWCAP2,  2)
+	FEAT_DEF(SHA2,      0x00000001, 0, REG_HWCAP2,  3)
+	FEAT_DEF(CRC32,     0x00000001, 0, REG_HWCAP2,  4)
+};
+
+/*
+ * Read AUXV software register and get cpu features for ARM
+ */
+static inline void
+rte_cpu_get_features(__attribute__((unused)) uint32_t leaf,
+	__attribute__((unused)) uint32_t subleaf, cpuid_registers_t out)
+{
+	int auxv_fd;
+	Elf32_auxv_t auxv;
+
+	auxv_fd = open("/proc/self/auxv", O_RDONLY);
+	assert(auxv_fd);
+	while (read(auxv_fd, &auxv,
+		sizeof(Elf32_auxv_t)) == sizeof(Elf32_auxv_t)) {
+		if (auxv.a_type == AT_HWCAP)
+			out[REG_HWCAP] = auxv.a_un.a_val;
+		else if (auxv.a_type == AT_HWCAP2)
+			out[REG_HWCAP2] = auxv.a_un.a_val;
+	}
+}
+
+/*
+ * Checks if a particular flag is available on current machine.
+ */
+static inline int
+rte_cpu_get_flag_enabled(enum rte_cpu_flag_t feature)
+{
+	const struct feature_entry *feat;
+	cpuid_registers_t regs = {0};
+
+	if (feature >= RTE_CPUFLAG_NUMFLAGS)
+		/* Flag does not match anything in the feature tables */
+		return -ENOENT;
+
+	feat = &cpu_feature_table[feature];
+
+	if (!feat->leaf)
+		/* This entry in the table wasn't filled out! */
+		return -EFAULT;
+
+	/* get the cpuid leaf containing the desired feature */
+	rte_cpu_get_features(feat->leaf, feat->subleaf, regs);
+
+	/* check if the feature is enabled */
+	return (regs[feat->reg] >> feat->bit) & 1;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_CPUFLAGS_ARM_H_ */
diff --git a/mk/rte.cpuflags.mk b/mk/rte.cpuflags.mk
index f595cd0..bec7bdd 100644
--- a/mk/rte.cpuflags.mk
+++ b/mk/rte.cpuflags.mk
@@ -106,6 +106,12 @@ ifneq ($(filter $(AUTO_CPUFLAGS),__builtin_vsx_xvnmaddadp),)
 CPUFLAGS += VSX
 endif
 
+# ARM flags
+ifneq ($(filter $(AUTO_CPUFLAGS),__ARM_NEON_FP),)
+CPUFLAGS += NEON
+endif
+
+
 MACHINE_CFLAGS += $(addprefix -DRTE_MACHINE_CPUFLAG_,$(CPUFLAGS))
 
 # To strip whitespace
-- 
2.6.1

  parent reply	other threads:[~2015-10-27 19:16 UTC|newest]

Thread overview: 72+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-26 16:37 [dpdk-dev] [PATCH v2 00/16] Support ARMv7 architecture Jan Viktorin
2015-10-26 16:37 ` [dpdk-dev] [PATCH v2 01/16] mk: Introduce " Jan Viktorin
2015-10-28 13:34   ` David Marchand
2015-10-28 17:32     ` Jan Viktorin
2015-10-28 17:36       ` Richardson, Bruce
2015-10-28 13:39   ` David Marchand
2015-10-28 17:32     ` Jan Viktorin
2015-10-26 16:37 ` [dpdk-dev] [PATCH v2 02/16] eal/arm: atomic operations for ARM Jan Viktorin
2015-10-26 16:37 ` [dpdk-dev] [PATCH v2 03/16] eal/arm: byte order " Jan Viktorin
2015-10-26 16:37 ` [dpdk-dev] [PATCH v2 04/16] eal/arm: cpu cycle " Jan Viktorin
2015-10-26 16:37 ` [dpdk-dev] [PATCH v2 05/16] eal/arm: implement rdtsc by PMU or clock_gettime Jan Viktorin
2015-10-26 16:37 ` [dpdk-dev] [PATCH v2 06/16] eal/arm: prefetch operations for ARM Jan Viktorin
2015-10-26 16:37 ` [dpdk-dev] [PATCH v2 07/16] eal/arm: spinlock operations for ARM (without HTM) Jan Viktorin
2015-10-26 16:37 ` [dpdk-dev] [PATCH v2 08/16] eal/arm: vector memcpy for ARM Jan Viktorin
2015-10-26 16:37 ` [dpdk-dev] [PATCH v2 09/16] eal/arm: use vector memcpy only when NEON is enabled Jan Viktorin
2015-10-26 16:37 ` [dpdk-dev] [PATCH v2 10/16] eal/arm: cpu flag checks for ARM Jan Viktorin
2015-10-26 16:37 ` [dpdk-dev] [PATCH v2 11/16] eal/arm: detect arm architecture in cpu flags Jan Viktorin
2015-10-26 16:37 ` [dpdk-dev] [PATCH v2 12/16] eal/arm: rwlock support for ARM Jan Viktorin
2015-10-26 16:37 ` [dpdk-dev] [PATCH v2 13/16] gcc/arm: avoid alignment errors to break build Jan Viktorin
2015-10-26 16:37 ` [dpdk-dev] [PATCH v2 14/16] maintainers: claim responsibility for ARMv7 Jan Viktorin
2015-10-26 16:37 ` [dpdk-dev] [PATCH v2 15/16] lpm/arm: implement rte_lpm_lookupx4 using rte_lpm_lookup_bulk on for-x86 Jan Viktorin
2015-10-27 15:31   ` Ananyev, Konstantin
2015-10-27 15:38     ` Jan Viktorin
2015-10-26 16:37 ` [dpdk-dev] [PATCH v2 16/16] acl: check for SSE 4.1 support Jan Viktorin
2015-10-27 15:55   ` Ananyev, Konstantin
2015-10-27 17:10     ` Jan Viktorin
2015-10-27 19:13 ` [dpdk-dev] [PATCH v3 00/17] Support ARMv7 architecture Jan Viktorin
2015-10-27 19:13   ` [dpdk-dev] [PATCH v3 01/17] mk: Introduce " Jan Viktorin
2015-10-28 10:09     ` David Marchand
2015-10-28 10:56       ` Jan Viktorin
2015-10-28 13:40         ` David Marchand
2015-10-28 13:44         ` Hunt, David
2015-10-27 19:13   ` [dpdk-dev] [PATCH v3 02/17] eal/arm: atomic operations for ARM Jan Viktorin
2015-10-27 19:13   ` [dpdk-dev] [PATCH v3 03/17] eal/arm: byte order " Jan Viktorin
2015-10-27 19:13   ` [dpdk-dev] [PATCH v3 04/17] eal/arm: cpu cycle " Jan Viktorin
2015-10-27 19:13   ` [dpdk-dev] [PATCH v3 05/17] eal/arm: implement rdtsc by PMU or clock_gettime Jan Viktorin
2015-10-27 19:13   ` [dpdk-dev] [PATCH v3 06/17] eal/arm: prefetch operations for ARM Jan Viktorin
2015-10-27 19:13   ` [dpdk-dev] [PATCH v3 07/17] eal/arm: spinlock operations for ARM (without HTM) Jan Viktorin
2015-10-27 19:13   ` [dpdk-dev] [PATCH v3 08/17] eal/arm: vector memcpy for ARM Jan Viktorin
2015-10-27 19:13   ` [dpdk-dev] [PATCH v3 09/17] eal/arm: use vector memcpy only when NEON is enabled Jan Viktorin
2015-10-27 19:13   ` Jan Viktorin [this message]
2015-10-27 19:13   ` [dpdk-dev] [PATCH v3 11/17] eal/arm: detect arm architecture in cpu flags Jan Viktorin
2015-10-27 19:13   ` [dpdk-dev] [PATCH v3 12/17] eal/arm: rwlock support for ARM Jan Viktorin
2015-10-27 19:13   ` [dpdk-dev] [PATCH v3 13/17] gcc/arm: avoid alignment errors to break build Jan Viktorin
2015-10-28 12:16     ` David Marchand
2015-10-28 17:34       ` Jan Viktorin
2015-10-27 19:13   ` [dpdk-dev] [PATCH v3 14/17] maintainers: claim responsibility for ARMv7 Jan Viktorin
2015-10-27 19:13   ` [dpdk-dev] [PATCH v3 15/17] eal/arm: add very incomplete rte_vect Jan Viktorin
2015-10-27 19:13   ` [dpdk-dev] [PATCH v3 16/17] lpm/arm: implement rte_lpm_lookupx4 using rte_lpm_lookup_bulk for non-x86 Jan Viktorin
2015-10-27 19:13   ` [dpdk-dev] [PATCH v3 17/17] acl: handle when SSE 4.1 is unsupported Jan Viktorin
2015-10-28 14:54   ` [dpdk-dev] [PATCH v3 00/17] Support ARMv7 architecture David Marchand
2015-10-28 17:38     ` Jan Viktorin
2015-10-28 17:58       ` David Marchand
2015-10-29 14:02         ` Thomas Monjalon
2015-10-29 14:09           ` Jan Viktorin
2015-10-29 15:02             ` Thomas Monjalon
2015-10-29 12:43   ` [dpdk-dev] [PATCH v4 00/15] " Jan Viktorin
2015-10-29 12:43     ` [dpdk-dev] [PATCH v4 01/15] eal/arm: atomic operations for ARM Jan Viktorin
2015-10-29 12:43     ` [dpdk-dev] [PATCH v4 02/15] eal/arm: byte order " Jan Viktorin
2015-10-29 12:43     ` [dpdk-dev] [PATCH v4 03/15] eal/arm: cpu cycle " Jan Viktorin
2015-10-29 12:43     ` [dpdk-dev] [PATCH v4 04/15] eal/arm: implement rdtsc by PMU or clock_gettime Jan Viktorin
2015-10-29 12:43     ` [dpdk-dev] [PATCH v4 05/15] eal/arm: prefetch operations for ARM Jan Viktorin
2015-10-29 12:43     ` [dpdk-dev] [PATCH v4 06/15] eal/arm: spinlock operations for ARM (without HTM) Jan Viktorin
2015-10-29 12:43     ` [dpdk-dev] [PATCH v4 07/15] eal/arm: vector memcpy for ARM Jan Viktorin
2015-10-29 12:43     ` [dpdk-dev] [PATCH v4 08/15] eal/arm: use vector memcpy only when NEON is enabled Jan Viktorin
2015-10-29 12:43     ` [dpdk-dev] [PATCH v4 09/15] eal/arm: cpu flag checks for ARM Jan Viktorin
2015-10-29 12:43     ` [dpdk-dev] [PATCH v4 10/15] eal/arm: detect arm architecture in cpu flags Jan Viktorin
2015-10-29 12:43     ` [dpdk-dev] [PATCH v4 11/15] eal/arm: rwlock support for ARM Jan Viktorin
2015-10-29 12:43     ` [dpdk-dev] [PATCH v4 12/15] eal/arm: add very incomplete rte_vect Jan Viktorin
2015-10-29 12:43     ` [dpdk-dev] [PATCH v4 13/15] gcc/arm: avoid alignment errors to break build Jan Viktorin
2015-10-29 12:43     ` [dpdk-dev] [PATCH v4 14/15] mk: Introduce ARMv7 architecture Jan Viktorin
2015-10-29 12:43     ` [dpdk-dev] [PATCH v4 15/15] maintainers: claim responsibility for ARMv7 Jan Viktorin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1445973229-22058-11-git-send-email-viktorin@rehivetech.com \
    --to=viktorin@rehivetech.com \
    --cc=david.hunt@intel.com \
    --cc=david.marchand@6wind.com \
    --cc=dev@dpdk.org \
    --cc=konstantin.ananyev@intel.com \
    --cc=kosar@rehivetech.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).