patch 'eal/x86: fix some intrinsics header include for Windows' has been queued to stable release 24.11.2
Kevin Traynor
ktraynor at redhat.com
Thu Feb 13 10:57:37 CET 2025
Hi,
FYI, your patch has been queued to stable release 24.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/17/25. 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.
Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/21948b12f36c9ef19aa44997516a8b54f379e3ca
Thanks.
Kevin
---
>From 21948b12f36c9ef19aa44997516a8b54f379e3ca Mon Sep 17 00:00:00 2001
From: Andre Muezerie <andremue at linux.microsoft.com>
Date: Tue, 14 Jan 2025 08:21:13 -0800
Subject: [PATCH] eal/x86: fix some intrinsics header include for Windows
[ upstream commit 5b856206c74bbcf19e12cafa15382a7e15b0a1b5 ]
Error reported:
../lib/net/net_crc_sse.c:49:17: error: call to undeclared function
'_mm_clmulepi64_si128'; ISO C99 and later do not support implicit
function declarations [-Wimplicit-function-declaration]
The fix is to remove the unnecessary ifdef around the inclusion of
header file immintrin.h. This header also contains functions that do
not require AVX instructions, so should not be included only when AVX
is available.
Bugzilla ID: 1595
Fixes: da826b7135a4 ("eal: introduce ymm type for AVX 256-bit")
Reported-by: Pier Damouny <pdamouny at nvidia.com>
Signed-off-by: Andre Muezerie <andremue at linux.microsoft.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
.mailmap | 2 +-
lib/eal/x86/include/rte_vect.h | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/.mailmap b/.mailmap
index 1a1744df4d..d1a3a005d5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1192,5 +1192,5 @@ Phanendra Vukkisala <pvukkisala at marvell.com>
Phil Yang <phil.yang at arm.com>
Philip Prindeville <philipp at redfish-solutions.com>
-Pier Damouny <pdamouny at nvidia.com>
+Pier Damouny <pdamouny at nvidia.com>
Pierre Pfister <ppfister at cisco.com>
Piotr Azarewicz <piotr.azarewicz at intel.com> <piotrx.t.azarewicz at intel.com>
diff --git a/lib/eal/x86/include/rte_vect.h b/lib/eal/x86/include/rte_vect.h
index 5ac3ccfd82..5fdcd632ac 100644
--- a/lib/eal/x86/include/rte_vect.h
+++ b/lib/eal/x86/include/rte_vect.h
@@ -20,7 +20,5 @@
#if defined(__ICC) || defined(_WIN64)
#include <smmintrin.h> /* SSE4 */
-#if defined(__AVX__)
#include <immintrin.h>
-#endif
#else
#include <x86intrin.h>
--
2.48.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2025-02-12 17:29:35.682544542 +0000
+++ 0010-eal-x86-fix-some-intrinsics-header-include-for-Windo.patch 2025-02-12 17:29:34.144944700 +0000
@@ -1 +1 @@
-From 5b856206c74bbcf19e12cafa15382a7e15b0a1b5 Mon Sep 17 00:00:00 2001
+From 21948b12f36c9ef19aa44997516a8b54f379e3ca Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5b856206c74bbcf19e12cafa15382a7e15b0a1b5 ]
+
@@ -18 +19,0 @@
-Cc: stable at dpdk.org
@@ -29 +30 @@
-index cc1ffe1ad9..94e12acbd4 100644
+index 1a1744df4d..d1a3a005d5 100644
@@ -32 +33 @@
-@@ -1193,5 +1193,5 @@ Phanendra Vukkisala <pvukkisala at marvell.com>
+@@ -1192,5 +1192,5 @@ Phanendra Vukkisala <pvukkisala at marvell.com>
More information about the stable
mailing list