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 AC00143345 for ; Thu, 16 Nov 2023 14:25:00 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A5FD440DF5; Thu, 16 Nov 2023 14:25:00 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id D427B40A89 for ; Thu, 16 Nov 2023 14:24:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141098; 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=1HsKrtyVksdRg2bBrBBaxo+8KwV0eQ8oqk6csuVX4Q4=; b=dcQOG5/GN2WDEjWFD4L+9Lt6N5CKs60a3u7SM9W3IRRt3RwTFPsAu33X5+b1sr94fbrHUY q0jJvIfSd7BknOzBK8bFJSJ7Ci7qrI73Ckr6+XyT+dRjMMmTzPktfLifCl4uVFdAxzmG1D 9es+z0UONKIjiiUuY9cv2VWN+VMKVk0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-690-GdoD33a1NumpTafGRkijSQ-1; Thu, 16 Nov 2023 08:24:55 -0500 X-MC-Unique: GdoD33a1NumpTafGRkijSQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id E19C2185A786; Thu, 16 Nov 2023 13:24:54 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id DC5BD2166B28; Thu, 16 Nov 2023 13:24:53 +0000 (UTC) From: Kevin Traynor To: =?UTF-8?q?Juraj=20Linke=C5=A1?= Cc: Ruifeng Wang , Paul Szczepanek , dpdk stable Subject: patch 'config/arm: fix aarch32 build with GCC 13' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:23:24 +0000 Message-ID: <20231116132348.557257-42-ktraynor@redhat.com> In-Reply-To: <20231116132348.557257-1-ktraynor@redhat.com> References: <20231116132348.557257-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 21.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/21/23. 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/c268e6c466144e614bf99f563a880a78df947afa Thanks. Kevin --- >From c268e6c466144e614bf99f563a880a78df947afa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraj=20Linke=C5=A1?= Date: Wed, 25 Oct 2023 14:57:14 +0200 Subject: [PATCH] config/arm: fix aarch32 build with GCC 13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 7bfb0d4eaf51d329464e6c041315cf2025b97784 ] The aarch32 with gcc13 fails with: Compiler for C supports arguments -march=armv8-a: NO ../config/arm/meson.build:714:12: ERROR: Problem encountered: No suitable armv8 march version found. This is because we test -march=armv8-a alone (without the -mpfu option), which is no longer supported in gcc13 aarch32 builds. The most recent recommendation from the compiler team is to build with -march=armv8-a+simd -mfpu=auto, which should work for compilers old and new. The suggestion is to first check -march=armv8-a+simd and only then check -mfpu=auto. To address this, add a way to force the architecture (the value of the -march option). Signed-off-by: Juraj Linkeš Acked-by: Ruifeng Wang Reviewed-by: Paul Szczepanek --- config/arm/meson.build | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/config/arm/meson.build b/config/arm/meson.build index 89a3bf4213..4131d6e227 100644 --- a/config/arm/meson.build +++ b/config/arm/meson.build @@ -45,5 +45,7 @@ implementer_generic = { 'generic_aarch32': { 'march': 'armv8-a', - 'compiler_options': ['-mfpu=neon'], + 'force_march': true, + 'march_features': ['simd'], + 'compiler_options': ['-mfpu=auto'], 'flags': [ ['RTE_ARCH_ARM_NEON_MEMCPY', false], @@ -536,19 +538,23 @@ if update_flags candidate_march = '' if part_number_config.has_key('march') - supported_marchs = ['armv8.6-a', 'armv8.5-a', 'armv8.4-a', 'armv8.3-a', - 'armv8.2-a', 'armv8.1-a', 'armv8-a'] - check_compiler_support = false - foreach supported_march: supported_marchs - if supported_march == part_number_config['march'] - # start checking from this version downwards - check_compiler_support = true - endif - if (check_compiler_support and - cc.has_argument('-march=' + supported_march)) - candidate_march = supported_march - # highest supported march version found - break - endif - endforeach + if part_number_config.get('force_march', false) + candidate_march = part_number_config['march'] + else + supported_marchs = ['armv8.6-a', 'armv8.5-a', 'armv8.4-a', 'armv8.3-a', + 'armv8.2-a', 'armv8.1-a', 'armv8-a'] + check_compiler_support = false + foreach supported_march: supported_marchs + if supported_march == part_number_config['march'] + # start checking from this version downwards + check_compiler_support = true + endif + if (check_compiler_support and + cc.has_argument('-march=' + supported_march)) + candidate_march = supported_march + # highest supported march version found + break + endif + endforeach + endif if candidate_march == '' error('No suitable armv8 march version found.') @@ -582,5 +588,5 @@ if update_flags if part_number_config.has_key('compiler_options') foreach flag: part_number_config['compiler_options'] - if cc.has_argument(flag) + if cc.has_multi_arguments(machine_args + [flag]) machine_args += flag else -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:53.566766530 +0000 +++ 0042-config-arm-fix-aarch32-build-with-GCC-13.patch 2023-11-16 13:21:52.506946538 +0000 @@ -1 +1 @@ -From 7bfb0d4eaf51d329464e6c041315cf2025b97784 Mon Sep 17 00:00:00 2001 +From c268e6c466144e614bf99f563a880a78df947afa Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 7bfb0d4eaf51d329464e6c041315cf2025b97784 ] + @@ -27,2 +28,0 @@ -Cc: stable@dpdk.org - @@ -37 +37 @@ -index efd0bf32bc..36f21d2259 100644 +index 89a3bf4213..4131d6e227 100644 @@ -40 +40 @@ -@@ -44,5 +44,7 @@ implementer_generic = { +@@ -45,5 +45,7 @@ implementer_generic = { @@ -49 +49 @@ -@@ -697,19 +699,23 @@ if update_flags +@@ -536,19 +538,23 @@ if update_flags @@ -88 +88 @@ -@@ -743,5 +749,5 @@ if update_flags +@@ -582,5 +588,5 @@ if update_flags