[dpdk-stable] patch 'eal/arm: add vcopyq intrinsic for aarch32' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/26/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 586e03ddd6c45d15a3f49258ec8c5b67f39b6710 Mon Sep 17 00:00:00 2001
From: Ruifeng Wang <ruifeng.wang at arm.com>
Date: Wed, 24 Jun 2020 15:10:12 +0800
Subject: [PATCH] eal/arm: add vcopyq intrinsic for aarch32

[ upstream commit 4eb25acdb773b30c94adb0080659c9280bca4ee1 ]

vcopyq_laneq_u32 should be implemented for aarch32 which doesn't have
the intrinsic.
This fixes build of examples/l3fwd for armv7.

Fixes: 3c4b4024c225 ("arch/arm: add vcopyq_laneq_u32 for old gcc")

Signed-off-by: Ruifeng Wang <ruifeng.wang at arm.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 lib/librte_eal/common/include/arch/arm/rte_vect.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/librte_eal/common/include/arch/arm/rte_vect.h b/lib/librte_eal/common/include/arch/arm/rte_vect.h
index 2a18a6854..71e56ec63 100644
--- a/lib/librte_eal/common/include/arch/arm/rte_vect.h
+++ b/lib/librte_eal/common/include/arch/arm/rte_vect.h
@@ -62,7 +62,11 @@ vaddvq_u16(uint16x8_t a)
 
 #endif
 
-#if defined(RTE_TOOLCHAIN_GCC) && (GCC_VERSION < 70000)
+#if defined(RTE_ARCH_ARM) || \
+(defined(RTE_ARCH_ARM64) && RTE_TOOLCHAIN_GCC && (GCC_VERSION < 70000))
+/* NEON intrinsic vcopyq_laneq_u32() is not supported in ARMv7-A(AArch32)
+ * On AArch64, this intrinsic is supported since GCC version 7.
+ */
 static inline uint32x4_t
 vcopyq_laneq_u32(uint32x4_t a, const int lane_a,
 		 uint32x4_t b, const int lane_b)
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:51.032535390 +0100
+++ 0063-eal-arm-add-vcopyq-intrinsic-for-aarch32.patch	2020-07-24 12:53:48.287006460 +0100
@@ -1,32 +1,33 @@
-From 4eb25acdb773b30c94adb0080659c9280bca4ee1 Mon Sep 17 00:00:00 2001
+From 586e03ddd6c45d15a3f49258ec8c5b67f39b6710 Mon Sep 17 00:00:00 2001
 From: Ruifeng Wang <ruifeng.wang at arm.com>
 Date: Wed, 24 Jun 2020 15:10:12 +0800
 Subject: [PATCH] eal/arm: add vcopyq intrinsic for aarch32
 
+[ upstream commit 4eb25acdb773b30c94adb0080659c9280bca4ee1 ]
+
 vcopyq_laneq_u32 should be implemented for aarch32 which doesn't have
 the intrinsic.
 This fixes build of examples/l3fwd for armv7.
 
 Fixes: 3c4b4024c225 ("arch/arm: add vcopyq_laneq_u32 for old gcc")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ruifeng Wang <ruifeng.wang at arm.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
 ---
- lib/librte_eal/arm/include/rte_vect.h | 6 +++++-
+ lib/librte_eal/common/include/arch/arm/rte_vect.h | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
-diff --git a/lib/librte_eal/arm/include/rte_vect.h b/lib/librte_eal/arm/include/rte_vect.h
-index 9287a1117..01c51712a 100644
---- a/lib/librte_eal/arm/include/rte_vect.h
-+++ b/lib/librte_eal/arm/include/rte_vect.h
+diff --git a/lib/librte_eal/common/include/arch/arm/rte_vect.h b/lib/librte_eal/common/include/arch/arm/rte_vect.h
+index 2a18a6854..71e56ec63 100644
+--- a/lib/librte_eal/common/include/arch/arm/rte_vect.h
++++ b/lib/librte_eal/common/include/arch/arm/rte_vect.h
 @@ -62,7 +62,11 @@ vaddvq_u16(uint16x8_t a)
  
  #endif
  
--#if RTE_CC_IS_GNU && (GCC_VERSION < 70000)
+-#if defined(RTE_TOOLCHAIN_GCC) && (GCC_VERSION < 70000)
 +#if defined(RTE_ARCH_ARM) || \
-+(defined(RTE_ARCH_ARM64) && RTE_CC_IS_GNU && (GCC_VERSION < 70000))
++(defined(RTE_ARCH_ARM64) && RTE_TOOLCHAIN_GCC && (GCC_VERSION < 70000))
 +/* NEON intrinsic vcopyq_laneq_u32() is not supported in ARMv7-A(AArch32)
 + * On AArch64, this intrinsic is supported since GCC version 7.
 + */