patch 'net/intel: fix build with icx' has been queued to stable release 23.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=9c13d0d07a36076a1fd7a4fd25b46afcdf70c841

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 9c13d0d07a36076a1fd7a4fd25b46afcdf70c841 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Mon, 10 Feb 2025 17:19:57 +0000
Subject: [PATCH] net/intel: fix build with icx
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 2641704664267dd3ebe4ad77784ae28440dfaf60 ]

The Intel oneAPI DPC++/C++ Compiler (icx), issues warnings on build when
the "-march=native", or other configured global "-march" flag, is
overridden to "skylake-avx512", when compiling AVX-512 code.

Allow building with icx with warnings-as-errors flag (werror) enabled by
disabling the warning for the cases where we pass that extra "-march"
flag.

Fixes: e6a6a138919f ("net/i40e: add AVX512 vector path")
Fixes: 31737f2b66fb ("net/iavf: enable AVX512 for legacy Rx")
Fixes: 7f85d5ebcfe1 ("net/ice: add AVX512 vector path")
Fixes: 0fac6a1c44d5 ("common/idpf: add AVX512 for single queue model")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Ian Stokes <ian.stokes at intel.com>
---
 drivers/net/i40e/meson.build | 3 +++
 drivers/net/iavf/meson.build | 3 +++
 drivers/net/ice/meson.build  | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/drivers/net/i40e/meson.build b/drivers/net/i40e/meson.build
index 80171b9dc6..e3b19e60a1 100644
--- a/drivers/net/i40e/meson.build
+++ b/drivers/net/i40e/meson.build
@@ -71,6 +71,9 @@ if arch_subdir == 'x86'
         avx512_args = [cflags, '-mavx512f', '-mavx512bw']
         if cc.has_argument('-march=skylake-avx512')
             avx512_args += '-march=skylake-avx512'
+            if cc.has_argument('-Wno-overriding-option')
+                avx512_args += '-Wno-overriding-option'
+            endif
         endif
         i40e_avx512_lib = static_library('i40e_avx512_lib',
                 'i40e_rxtx_vec_avx512.c',
diff --git a/drivers/net/iavf/meson.build b/drivers/net/iavf/meson.build
index a6ce2725c3..982ac2707b 100644
--- a/drivers/net/iavf/meson.build
+++ b/drivers/net/iavf/meson.build
@@ -50,6 +50,9 @@ if arch_subdir == 'x86'
         avx512_args = [cflags, '-mavx512f', '-mavx512bw']
         if cc.has_argument('-march=skylake-avx512')
             avx512_args += '-march=skylake-avx512'
+            if cc.has_argument('-Wno-overriding-option')
+                avx512_args += '-Wno-overriding-option'
+            endif
         endif
         iavf_avx512_lib = static_library('iavf_avx512_lib',
                 'iavf_rxtx_vec_avx512.c',
diff --git a/drivers/net/ice/meson.build b/drivers/net/ice/meson.build
index a957fc5d3a..4016ee976b 100644
--- a/drivers/net/ice/meson.build
+++ b/drivers/net/ice/meson.build
@@ -51,6 +51,9 @@ if arch_subdir == 'x86'
         avx512_args = [cflags, '-mavx512f', '-mavx512bw']
         if cc.has_argument('-march=skylake-avx512')
             avx512_args += '-march=skylake-avx512'
+            if cc.has_argument('-Wno-overriding-option')
+                avx512_args += '-Wno-overriding-option'
+            endif
         endif
         ice_avx512_lib = static_library('ice_avx512_lib',
                 'ice_rxtx_vec_avx512.c',
--
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-02-18 19:39:03.187417707 +0800
+++ 0071-net-intel-fix-build-with-icx.patch	2025-02-18 19:39:00.688244037 +0800
@@ -1 +1 @@
-From 2641704664267dd3ebe4ad77784ae28440dfaf60 Mon Sep 17 00:00:00 2001
+From 9c13d0d07a36076a1fd7a4fd25b46afcdf70c841 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 2641704664267dd3ebe4ad77784ae28440dfaf60 ]
@@ -18 +20,0 @@
-Cc: stable at dpdk.org
@@ -23,12 +25,11 @@
- drivers/net/intel/i40e/meson.build | 3 +++
- drivers/net/intel/iavf/meson.build | 3 +++
- drivers/net/intel/ice/meson.build  | 3 +++
- drivers/net/intel/idpf/meson.build | 3 +++
- 4 files changed, 12 insertions(+)
-
-diff --git a/drivers/net/intel/i40e/meson.build b/drivers/net/intel/i40e/meson.build
-index 5c93493124..ffa40c5d64 100644
---- a/drivers/net/intel/i40e/meson.build
-+++ b/drivers/net/intel/i40e/meson.build
-@@ -57,6 +57,9 @@ if arch_subdir == 'x86'
-         avx512_args = cflags + cc_avx512_flags
+ drivers/net/i40e/meson.build | 3 +++
+ drivers/net/iavf/meson.build | 3 +++
+ drivers/net/ice/meson.build  | 3 +++
+ 3 files changed, 9 insertions(+)
+
+diff --git a/drivers/net/i40e/meson.build b/drivers/net/i40e/meson.build
+index 80171b9dc6..e3b19e60a1 100644
+--- a/drivers/net/i40e/meson.build
++++ b/drivers/net/i40e/meson.build
+@@ -71,6 +71,9 @@ if arch_subdir == 'x86'
+         avx512_args = [cflags, '-mavx512f', '-mavx512bw']
@@ -43,6 +44,6 @@
-diff --git a/drivers/net/intel/iavf/meson.build b/drivers/net/intel/iavf/meson.build
-index c823d618e3..19cd1cfbc8 100644
---- a/drivers/net/intel/iavf/meson.build
-+++ b/drivers/net/intel/iavf/meson.build
-@@ -45,6 +45,9 @@ if arch_subdir == 'x86'
-         avx512_args = cflags + cc_avx512_flags
+diff --git a/drivers/net/iavf/meson.build b/drivers/net/iavf/meson.build
+index a6ce2725c3..982ac2707b 100644
+--- a/drivers/net/iavf/meson.build
++++ b/drivers/net/iavf/meson.build
+@@ -50,6 +50,9 @@ if arch_subdir == 'x86'
+         avx512_args = [cflags, '-mavx512f', '-mavx512bw']
@@ -57,4 +58,4 @@
-diff --git a/drivers/net/intel/ice/meson.build b/drivers/net/intel/ice/meson.build
-index ff7f84597a..a34b7c966a 100644
---- a/drivers/net/intel/ice/meson.build
-+++ b/drivers/net/intel/ice/meson.build
+diff --git a/drivers/net/ice/meson.build b/drivers/net/ice/meson.build
+index a957fc5d3a..4016ee976b 100644
+--- a/drivers/net/ice/meson.build
++++ b/drivers/net/ice/meson.build
@@ -62 +63 @@
-         avx512_args = cflags + cc_avx512_flags
+         avx512_args = [cflags, '-mavx512f', '-mavx512bw']
@@ -71,14 +71,0 @@
-diff --git a/drivers/net/intel/idpf/meson.build b/drivers/net/intel/idpf/meson.build
-index f82c16746d..802b13035b 100644
---- a/drivers/net/intel/idpf/meson.build
-+++ b/drivers/net/intel/idpf/meson.build
-@@ -31,6 +31,9 @@ if arch_subdir == 'x86' and dpdk_conf.get('RTE_IOVA_IN_MBUF') == 1
-         avx512_args = cflags + cc_avx512_flags
-         if cc.has_argument('-march=skylake-avx512')
-             avx512_args += '-march=skylake-avx512'
-+            if cc.has_argument('-Wno-overriding-option')
-+                avx512_args += '-Wno-overriding-option'
-+            endif
-         endif
-         idpf_common_avx512_lib = static_library('idpf_common_avx512_lib',
-                 'idpf_common_rxtx_avx512.c',