From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6348546211 for ; Thu, 13 Feb 2025 11:03:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5CC2442F6D; Thu, 13 Feb 2025 11:03:48 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id A20F142F51 for ; Thu, 13 Feb 2025 11:03:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739441026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=E2Rdr5Vj2T40uVezi5fZ2Y04MgUvc/IGBKnCa6MqMJ0=; b=ZidLguU5Wtt4MB2bWpSqcs8AXXubgGuY64zthYLWNXtHpQAQ3mbpveac/1PDPLsRAhtoib s1Od+YxOz175HZdJJzypoh00XV3MvriMfv2wETxU6OV1QhRWho6yCuNbD143pJ1VMJYLVn 1R5IRiqrd2ASb7L4nyoFx9YlFHynM4g= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-581-v_BbSfelMfeFAehxVARbhw-1; Thu, 13 Feb 2025 05:03:42 -0500 X-MC-Unique: v_BbSfelMfeFAehxVARbhw-1 X-Mimecast-MFC-AGG-ID: v_BbSfelMfeFAehxVARbhw Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EC75518EB2C6; Thu, 13 Feb 2025 10:03:41 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 62E6F1800359; Thu, 13 Feb 2025 10:03:40 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Ian Stokes , dpdk stable Subject: patch 'net/intel: fix build with icx' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:59:09 +0000 Message-ID: <20250213095933.362078-102-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 8Qa-giPo8j2C26LNwctMwbX5CP-oHdE5HZYi6W0GFXY_1739441022 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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/6375e577f8226bf24ef3adb863ce9ffcc16d7c3c Thanks. Kevin --- >From 6375e577f8226bf24ef3adb863ce9ffcc16d7c3c Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Mon, 10 Feb 2025 17:19:57 +0000 Subject: [PATCH] net/intel: fix build with icx [ 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 Acked-by: Ian Stokes --- drivers/common/idpf/meson.build | 3 +++ drivers/net/i40e/meson.build | 3 +++ drivers/net/iavf/meson.build | 3 +++ drivers/net/ice/meson.build | 3 +++ 4 files changed, 12 insertions(+) diff --git a/drivers/common/idpf/meson.build b/drivers/common/idpf/meson.build index 46fd45c03b..7dbcdabd90 100644 --- a/drivers/common/idpf/meson.build +++ b/drivers/common/idpf/meson.build @@ -22,4 +22,7 @@ if arch_subdir == 'x86' 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', diff --git a/drivers/net/i40e/meson.build b/drivers/net/i40e/meson.build index 5c93493124..ffa40c5d64 100644 --- a/drivers/net/i40e/meson.build +++ b/drivers/net/i40e/meson.build @@ -58,4 +58,7 @@ if arch_subdir == 'x86' 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', diff --git a/drivers/net/iavf/meson.build b/drivers/net/iavf/meson.build index b48bb83438..c1c4271911 100644 --- a/drivers/net/iavf/meson.build +++ b/drivers/net/iavf/meson.build @@ -43,4 +43,7 @@ if arch_subdir == 'x86' 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', diff --git a/drivers/net/ice/meson.build b/drivers/net/ice/meson.build index 1c9dc0cc6d..81ebc706f4 100644 --- a/drivers/net/ice/meson.build +++ b/drivers/net/ice/meson.build @@ -41,4 +41,7 @@ if arch_subdir == 'x86' 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', -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:45.318537246 +0000 +++ 0102-net-intel-fix-build-with-icx.patch 2025-02-12 17:29:34.602947433 +0000 @@ -1 +1 @@ -From 2641704664267dd3ebe4ad77784ae28440dfaf60 Mon Sep 17 00:00:00 2001 +From 6375e577f8226bf24ef3adb863ce9ffcc16d7c3c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2641704664267dd3ebe4ad77784ae28440dfaf60 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -23,4 +24,4 @@ - 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 +++ + drivers/common/idpf/meson.build | 3 +++ + drivers/net/i40e/meson.build | 3 +++ + drivers/net/iavf/meson.build | 3 +++ + drivers/net/ice/meson.build | 3 +++ @@ -29,5 +30,5 @@ -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 -@@ -58,4 +58,7 @@ if arch_subdir == 'x86' +diff --git a/drivers/common/idpf/meson.build b/drivers/common/idpf/meson.build +index 46fd45c03b..7dbcdabd90 100644 +--- a/drivers/common/idpf/meson.build ++++ b/drivers/common/idpf/meson.build +@@ -22,4 +22,7 @@ if arch_subdir == 'x86' @@ -40,6 +41,6 @@ - i40e_avx512_lib = static_library('i40e_avx512_lib', -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 -@@ -46,4 +46,7 @@ if arch_subdir == 'x86' + idpf_common_avx512_lib = static_library('idpf_common_avx512_lib', +diff --git a/drivers/net/i40e/meson.build b/drivers/net/i40e/meson.build +index 5c93493124..ffa40c5d64 100644 +--- a/drivers/net/i40e/meson.build ++++ b/drivers/net/i40e/meson.build +@@ -58,4 +58,7 @@ if arch_subdir == 'x86' @@ -52,6 +53,6 @@ - iavf_avx512_lib = static_library('iavf_avx512_lib', -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 -@@ -52,4 +52,7 @@ if arch_subdir == 'x86' + i40e_avx512_lib = static_library('i40e_avx512_lib', +diff --git a/drivers/net/iavf/meson.build b/drivers/net/iavf/meson.build +index b48bb83438..c1c4271911 100644 +--- a/drivers/net/iavf/meson.build ++++ b/drivers/net/iavf/meson.build +@@ -43,4 +43,7 @@ if arch_subdir == 'x86' @@ -64,6 +65,6 @@ - ice_avx512_lib = static_library('ice_avx512_lib', -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 -@@ -32,4 +32,7 @@ if arch_subdir == 'x86' and dpdk_conf.get('RTE_IOVA_IN_MBUF') == 1 + iavf_avx512_lib = static_library('iavf_avx512_lib', +diff --git a/drivers/net/ice/meson.build b/drivers/net/ice/meson.build +index 1c9dc0cc6d..81ebc706f4 100644 +--- a/drivers/net/ice/meson.build ++++ b/drivers/net/ice/meson.build +@@ -41,4 +41,7 @@ if arch_subdir == 'x86' @@ -76 +77 @@ - idpf_common_avx512_lib = static_library('idpf_common_avx512_lib', + ice_avx512_lib = static_library('ice_avx512_lib',