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 6D9464625C for ; Tue, 18 Feb 2025 13:43:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 69363402C4; Tue, 18 Feb 2025 13:43:11 +0100 (CET) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2056.outbound.protection.outlook.com [40.107.96.56]) by mails.dpdk.org (Postfix) with ESMTP id 56C79402A0 for ; Tue, 18 Feb 2025 13:43:10 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=un+pj9zx0blTQRw866VVnwKPpfTlG96nDzUVD/vh6jCSA/SRJlpBimYKBCgSjNhMr0k0yN2ARw1Pf5OE3uNf6g62RsorDrPVfI6K6d1niYH+OGJbKWBRYDXhN9YTYgQr1MUWIH7FRkmcD4FiD1TTE/rbEKu1nwQaDm24VwB5caoD0lfCqVgmD2Z2/FWOiZPy1PkJygj88gJgtI0Vfm5IS0Ya1fc07uOzgm3ywTCphqMJ2uPfWTgEtS3l/9G2Nc58xwC+pZSI5aANjkg6vQpIKUxMMd5WcnX0t7Zd38FXoAzJiBxs9pbE5K1PQnQNB4/PKMWWTYuE3vpSYUwWT/VVmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1g1T+RUFD5qSISCDobdcEAyMqVlif+9KrLISpASyKK4=; b=gM8jMdOvBeB8Gx4/kaOJXAykjT0iBSAIgVEUO/Tg17JDmuM3oBUdu1hfDlECZRw66f6FIBlIJN0WTW6YSSaW36KuhdbGLuiZk2epz2IuIylP1RNdu0gRoCXN0lNg53t3inEgZVHL8SjDP8RUAyvJjZDd563RYkHG0wcLcYH3gjUgw24EHFx5wgv4LsPiMCouoxugZgkPH04R8oVEZl5qk+wXj0emzQkpBQV+xHSq/tPj0mwR9QpFTetmzn7EZkXw+sZgSwx06hCxMFJR1k0Pz0z3VvILqZcpy53R3YGLg8ezxL3SBKEGc3Csrkks0ChLvm7Bx3CDIyTjaPyD2KA+Kw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1g1T+RUFD5qSISCDobdcEAyMqVlif+9KrLISpASyKK4=; b=XokRI8s85e3isp176JnGfqaR/SBvYqZizkNJrmvwNkT1RqAYwpdN/gH7bJJKSA8ZFO7S30b8SmBHgCFwOzquOn4SCqWFsfiFI7XStEQpCngXHAK22sC5BDfo5YgGOT7ypxPNDBi4mjaIgLmYvPYqQ1O4YcKBYPNDind9XKs1/RJ8Sbc/NaJkCGScVKwWOFbEiZp+Syzj3aP+EOyv6ybcQtZOc1Vl/LCTX2860G0wfQYeQfNCLGcNUSgo55oOUpHKfisJ4ddbEKp8YwbnPXTDj+dCGfb8c/diln+UB2beIM+tnHKt52iL1G/kQW31iEcMWLao5ryXu67we7lSvmZYMw== Received: from SA1PR03CA0002.namprd03.prod.outlook.com (2603:10b6:806:2d3::11) by SA1PR12MB9246.namprd12.prod.outlook.com (2603:10b6:806:3ac::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.19; Tue, 18 Feb 2025 12:43:04 +0000 Received: from SA2PEPF000015C8.namprd03.prod.outlook.com (2603:10b6:806:2d3:cafe::d1) by SA1PR03CA0002.outlook.office365.com (2603:10b6:806:2d3::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.18 via Frontend Transport; Tue, 18 Feb 2025 12:43:04 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SA2PEPF000015C8.mail.protection.outlook.com (10.167.241.198) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:43:04 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 18 Feb 2025 04:42:52 -0800 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Tue, 18 Feb 2025 04:42:50 -0800 From: Xueming Li To: Bruce Richardson CC: , Ian Stokes , dpdk stable Subject: patch 'net/intel: fix build with icx' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:35:06 +0800 Message-ID: <20250218123523.36836-72-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF000015C8:EE_|SA1PR12MB9246:EE_ X-MS-Office365-Filtering-Correlation-Id: 573d659e-3b77-4de5-bab1-08dd5019c9c7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|1800799024|376014|36860700013|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?UxZuL//UPWl1MuXiPXDlTfsFJbjl8eXd+5cr12eIXtDMGLj8iNVYK7yqim2H?= =?us-ascii?Q?u7Z05+mUvgJ22xbEz6mtTAym16Ae3nQdmTTQA1UIHixUMULZayD8SmnK/ttO?= =?us-ascii?Q?1OoQ/sSA08vZ99BcbBRs6r6LYaHMQK1u5fMgAzx5aqeACS014Ld+lflzRrrB?= =?us-ascii?Q?pKncZT75bXqXfn0+SLkw8f7NF0pqrp5jfVl1ZjPq+954fScyV14pwpS5gJAu?= =?us-ascii?Q?QTIFl1cgnmNbhqdG5SciSi2X0tVgOj3ZkBmr3+eKkI0BlJrMG5pQGGwCCfzW?= =?us-ascii?Q?pPVm+9mQjIsEpC4SF+rFBkNq4BzNE1DmzBagcWaLsVkvSUyXaBccrM78b2q8?= =?us-ascii?Q?4vlff9teRIgc/nISOaLJVSFhioWYpC6QwFmuwCU+g8vw8bOy7f4b9ceDREO2?= =?us-ascii?Q?vmPN+ML6y7F+0P7LkfjfbrNrN/YAdW/uIevPSyoNIIGUeykbYXVfW1dqjBrN?= =?us-ascii?Q?K68kt3FmSDj8krGPt70UsiNSXQKnZXlzydpQfsoRhh1UP/6koq6qwMTynYcH?= =?us-ascii?Q?QEJkq+dss6mfcadcWIvOfRF6ex50OJscUvQgRh6muNzDVNzOVz8oZ1ZaAchB?= =?us-ascii?Q?4oqGFq0rC1qcw0WcRF/E6R34RzQZrtj1K1pA1QH0ieNWUDNzPvsq4Z+Af2Xk?= =?us-ascii?Q?CZfgVFvjae2EODTu2f42Mkt0Wv4bDKrCnCjrdaFuP9+Ne0SSCqnIgz5abIHv?= =?us-ascii?Q?JEc7EemZ/u2mOqXQW3X6nM56lMAGrljvm/eXXY+FpPFpd4Xlg2/kDt9jLPLO?= =?us-ascii?Q?cc9irWGNCh81h+G57/Prf2RFhnrFTaJ5FgVOZb8Y69QMvsKl9Hlfjil6d+xB?= =?us-ascii?Q?BRygjcamQnrgjBiKTh3BhOh8ViQRK46QTLrrwPO4ZVPPSFqN3jGytHNnZAlY?= =?us-ascii?Q?2enyEHakj4I2MNdFLo3q90+ZDXJTv9ddeqLPdS6T5BK/P8FAOHeFXp8J6Ji7?= =?us-ascii?Q?qP0vTggif9ZjFGkDNIu1rG1Bu/vSDu5YMJSY/n2JlXdrOwbYQbf8uNmT473e?= =?us-ascii?Q?DtnW6cDGn1e4h9d78bx0V1BHmFVJEbdUHZzlcLr8qPHZQpkW+TBipSlJ7oUp?= =?us-ascii?Q?rNFhRlMsxgdB/aZnNPOIIrRkwqcB+BvbSGwZb7ZvdhfeaLd2W03LtjVlE30O?= =?us-ascii?Q?HM7R8DJh4zESbhNEoHnlulbN+VKPDN0p/CZw83Qq6qe6MFs8nLkbo9bPVS1T?= =?us-ascii?Q?li4xWDibqZCrqpH4HpxTsVkPTjRNjF6st/q+wTCKZQbyxzWbw4Cbkh5448tV?= =?us-ascii?Q?Z7ND/uohycd31WKtQfticxNcS0bEd8FfkYh7/bidnRNNq45DbBbh3vD4Fe3c?= =?us-ascii?Q?95RpMXgmP81p3CoGimEpbrG7o7+5IL+wGI/fop0L8CXm19BFl7BTfF/8DbcJ?= =?us-ascii?Q?X7seUcH1b6pvsUVGY/Pg22/IUhLgT8x8PoVrMmlyDY3yK8MiHYkUoKTxh0Pi?= =?us-ascii?Q?rG4Wq2sHnqBwHuxqY2onBzRixEY14WMXW539CrSQ0JBOK0SbPGT22g5f4o0s?= =?us-ascii?Q?ntuquR9sZGDsBsA=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(82310400026)(1800799024)(376014)(36860700013)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:43:04.4786 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 573d659e-3b77-4de5-bab1-08dd5019c9c7 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF000015C8.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB9246 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 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 --- >From 9c13d0d07a36076a1fd7a4fd25b46afcdf70c841 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 Cc: Xueming Li [ 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/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 + +[ upstream commit 2641704664267dd3ebe4ad77784ae28440dfaf60 ] @@ -18 +20,0 @@ -Cc: stable@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',