diff mbox

[dpdk-dev,1/6] hash: compile armv8a CRC32 support conditionally

Message ID 20170510101643.30556-2-ashwin.sekhar@caviumnetworks.com (mailing list archive)
State Superseded, archived
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Ashwin Sekhar T K May 10, 2017, 10:16 a.m. UTC 
  Compile the armv8a CRC32 support only if the machine
has the CRC extensions i.e if RTE_MACHINE_CPUFLAG_CRC32
is defined.

Removed the .arch assembly directives as these are no
more necessary.

Signed-off-by: Ashwin Sekhar T K <ashwin.sekhar@caviumnetworks.com>
---
 lib/librte_hash/Makefile        | 2 ++
 lib/librte_hash/rte_crc_arm64.h | 4 ----
 lib/librte_hash/rte_hash_crc.h  | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

Comments

Jerin Jacob May 11, 2017, 5:21 a.m. UTC | #1 
-----Original Message-----
> Date: Wed, 10 May 2017 03:16:38 -0700
> From: Ashwin Sekhar T K <ashwin.sekhar@caviumnetworks.com>
> To: thomas@monjalon.net, jerin.jacob@caviumnetworks.com,
>  maciej.czekaj@caviumnetworks.com, viktorin@rehivetech.com,
>  jianbo.liu@linaro.org, bruce.richardson@intel.com,
>  pablo.de.lara.guarch@intel.com, konstantin.ananyev@intel.com
> Cc: dev@dpdk.org, Ashwin Sekhar T K <ashwin.sekhar@caviumnetworks.com>
> Subject: [dpdk-dev] [PATCH 1/6] hash: compile armv8a CRC32 support
>  conditionally
> X-Mailer: git-send-email 2.13.0.rc1
> 
> Compile the armv8a CRC32 support only if the machine
> has the CRC extensions i.e if RTE_MACHINE_CPUFLAG_CRC32
> is defined.
> 
> Removed the .arch assembly directives as these are no
> more necessary.
> 
> Signed-off-by: Ashwin Sekhar T K <ashwin.sekhar@caviumnetworks.com>

Reviewed-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>

> ---
>  lib/librte_hash/Makefile        | 2 ++
>  lib/librte_hash/rte_crc_arm64.h | 4 ----
>  lib/librte_hash/rte_hash_crc.h  | 2 +-
>  3 files changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/librte_hash/Makefile b/lib/librte_hash/Makefile
> index d856aa26d..9cf13a045 100644
> --- a/lib/librte_hash/Makefile
> +++ b/lib/librte_hash/Makefile
> @@ -49,8 +49,10 @@ SRCS-$(CONFIG_RTE_LIBRTE_HASH) += rte_fbk_hash.c
>  SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include := rte_hash.h
>  SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_hash_crc.h
>  ifeq ($(CONFIG_RTE_ARCH_ARM64),y)
> +ifneq ($(findstring RTE_MACHINE_CPUFLAG_CRC32,$(CFLAGS)),)
>  SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_crc_arm64.h
>  endif
> +endif
>  SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_jhash.h
>  SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_thash.h
>  SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_fbk_hash.h
> diff --git a/lib/librte_hash/rte_crc_arm64.h b/lib/librte_hash/rte_crc_arm64.h
> index 7dd6334ee..91cde3b9d 100644
> --- a/lib/librte_hash/rte_crc_arm64.h
> +++ b/lib/librte_hash/rte_crc_arm64.h
> @@ -52,7 +52,6 @@ extern "C" {
>  static inline uint32_t
>  crc32c_arm64_u8(uint8_t data, uint32_t init_val)
>  {
> -	asm(".arch armv8-a+crc");
>  	__asm__ volatile(
>  			"crc32cb %w[crc], %w[crc], %w[value]"
>  			: [crc] "+r" (init_val)
> @@ -63,7 +62,6 @@ crc32c_arm64_u8(uint8_t data, uint32_t init_val)
>  static inline uint32_t
>  crc32c_arm64_u16(uint16_t data, uint32_t init_val)
>  {
> -	asm(".arch armv8-a+crc");
>  	__asm__ volatile(
>  			"crc32ch %w[crc], %w[crc], %w[value]"
>  			: [crc] "+r" (init_val)
> @@ -74,7 +72,6 @@ crc32c_arm64_u16(uint16_t data, uint32_t init_val)
>  static inline uint32_t
>  crc32c_arm64_u32(uint32_t data, uint32_t init_val)
>  {
> -	asm(".arch armv8-a+crc");
>  	__asm__ volatile(
>  			"crc32cw %w[crc], %w[crc], %w[value]"
>  			: [crc] "+r" (init_val)
> @@ -85,7 +82,6 @@ crc32c_arm64_u32(uint32_t data, uint32_t init_val)
>  static inline uint32_t
>  crc32c_arm64_u64(uint64_t data, uint32_t init_val)
>  {
> -	asm(".arch armv8-a+crc");
>  	__asm__ volatile(
>  			"crc32cx %w[crc], %w[crc], %x[value]"
>  			: [crc] "+r" (init_val)
> diff --git a/lib/librte_hash/rte_hash_crc.h b/lib/librte_hash/rte_hash_crc.h
> index 0f485b854..808a082c5 100644
> --- a/lib/librte_hash/rte_hash_crc.h
> +++ b/lib/librte_hash/rte_hash_crc.h
> @@ -453,7 +453,7 @@ crc32c_sse42_u64(uint64_t data, uint64_t init_val)
>  
>  static uint8_t crc32_alg = CRC32_SW;
>  
> -#if defined(RTE_ARCH_ARM64)
> +#if defined(RTE_ARCH_ARM64) && defined(RTE_MACHINE_CPUFLAG_CRC32)
>  #include "rte_crc_arm64.h"
>  #else
>  
> -- 
> 2.13.0.rc1
>
Ashwin Sekhar T K May 11, 2017, 2:33 p.m. UTC | #2 
This series of patches adds the clang compilation support for armv8a linuxapp.

Patch 1 is basically for removing the usage of assembly directive ".arch armv8-a+crc"
as this is not understood by clang. For removing these directives, compilation of
armv8a crc32 support is made conditional and is only done for machines which has
the crc extensions. Doing this avoids the need for having the ".arch armv8-a+crc"
directives in the code.

Patch 2 adds the arm64-armv8a-linuxapp-clang defconfig. It also moves all the common
defines to common_armv8a_config. Now defconfigs arm64-armv8a-linuxapp-gcc/clang contain
only the defines related to toolchain.

Patch 3, 4, and 5 are for fixing the compilation errors/warnings.

Patch 6 adds an rte_pause() to a tight while loops in rte_eal_wait_lcore().
It fixes warning -Wempty-body seen with armv8a clang compilation.

v2:
 * Moved common defines from arm64-armv8a-linuxapp-gcc to common_armv8a_config
 * Removed the -Wno-empty-body flag from eal Makefile. Added rte_pause() to the
   while loop causing this warning.

Ashwin Sekhar T K (6):
  hash: compile armv8a CRC32 support conditionally
  config: add clang support for armv8a linuxapp
  net/thunderx: fix compile errors for armv8a clang
  acl: fix warning seen with armv8a clang
  eal/arm: fix warnings seen with armv8a clang
  eal: pause while busy-waiting for slave

 config/common_armv8a_linuxapp                      | 53 ++++++++++++++++++++++
 config/defconfig_arm64-armv8a-linuxapp-clang       | 35 ++++++++++++++
 config/defconfig_arm64-armv8a-linuxapp-gcc         | 23 +---------
 drivers/net/thunderx/base/nicvf_plat.h             |  2 +-
 lib/librte_acl/Makefile                            |  5 +-
 lib/librte_eal/common/eal_common_launch.c          |  3 +-
 .../common/include/arch/arm/rte_byteorder.h        |  2 +-
 lib/librte_hash/Makefile                           |  2 +
 lib/librte_hash/rte_crc_arm64.h                    |  4 --
 lib/librte_hash/rte_hash_crc.h                     |  2 +-
 10 files changed, 100 insertions(+), 31 deletions(-)
 create mode 100644 config/common_armv8a_linuxapp
 create mode 100644 config/defconfig_arm64-armv8a-linuxapp-clang
diff mbox

Patch

diff --git a/lib/librte_hash/Makefile b/lib/librte_hash/Makefile
index d856aa26d..9cf13a045 100644
--- a/lib/librte_hash/Makefile
+++ b/lib/librte_hash/Makefile
@@ -49,8 +49,10 @@  SRCS-$(CONFIG_RTE_LIBRTE_HASH) += rte_fbk_hash.c
 SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include := rte_hash.h
 SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_hash_crc.h
 ifeq ($(CONFIG_RTE_ARCH_ARM64),y)
+ifneq ($(findstring RTE_MACHINE_CPUFLAG_CRC32,$(CFLAGS)),)
 SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_crc_arm64.h
 endif
+endif
 SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_jhash.h
 SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_thash.h
 SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_fbk_hash.h
diff --git a/lib/librte_hash/rte_crc_arm64.h b/lib/librte_hash/rte_crc_arm64.h
index 7dd6334ee..91cde3b9d 100644
--- a/lib/librte_hash/rte_crc_arm64.h
+++ b/lib/librte_hash/rte_crc_arm64.h
@@ -52,7 +52,6 @@  extern "C" {
 static inline uint32_t
 crc32c_arm64_u8(uint8_t data, uint32_t init_val)
 {
-	asm(".arch armv8-a+crc");
 	__asm__ volatile(
 			"crc32cb %w[crc], %w[crc], %w[value]"
 			: [crc] "+r" (init_val)
@@ -63,7 +62,6 @@  crc32c_arm64_u8(uint8_t data, uint32_t init_val)
 static inline uint32_t
 crc32c_arm64_u16(uint16_t data, uint32_t init_val)
 {
-	asm(".arch armv8-a+crc");
 	__asm__ volatile(
 			"crc32ch %w[crc], %w[crc], %w[value]"
 			: [crc] "+r" (init_val)
@@ -74,7 +72,6 @@  crc32c_arm64_u16(uint16_t data, uint32_t init_val)
 static inline uint32_t
 crc32c_arm64_u32(uint32_t data, uint32_t init_val)
 {
-	asm(".arch armv8-a+crc");
 	__asm__ volatile(
 			"crc32cw %w[crc], %w[crc], %w[value]"
 			: [crc] "+r" (init_val)
@@ -85,7 +82,6 @@  crc32c_arm64_u32(uint32_t data, uint32_t init_val)
 static inline uint32_t
 crc32c_arm64_u64(uint64_t data, uint32_t init_val)
 {
-	asm(".arch armv8-a+crc");
 	__asm__ volatile(
 			"crc32cx %w[crc], %w[crc], %x[value]"
 			: [crc] "+r" (init_val)
diff --git a/lib/librte_hash/rte_hash_crc.h b/lib/librte_hash/rte_hash_crc.h
index 0f485b854..808a082c5 100644
--- a/lib/librte_hash/rte_hash_crc.h
+++ b/lib/librte_hash/rte_hash_crc.h
@@ -453,7 +453,7 @@  crc32c_sse42_u64(uint64_t data, uint64_t init_val)
 
 static uint8_t crc32_alg = CRC32_SW;
 
-#if defined(RTE_ARCH_ARM64)
+#if defined(RTE_ARCH_ARM64) && defined(RTE_MACHINE_CPUFLAG_CRC32)
 #include "rte_crc_arm64.h"
 #else