From patchwork Tue Dec 5 03:52:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joyce Kong X-Patchwork-Id: 134858 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0EF1143437; Tue, 5 Dec 2023 04:53:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EB4A842DB0; Tue, 5 Dec 2023 04:53:34 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mails.dpdk.org (Postfix) with ESMTP id 7125A402E7; Tue, 5 Dec 2023 04:53:34 +0100 (CET) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8CB911474; Mon, 4 Dec 2023 19:54:20 -0800 (PST) Received: from net-arm-n1amp-02.shanghai.arm.com (net-arm-n1amp-02.shanghai.arm.com [10.169.210.107]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 7CED93F5A1; Mon, 4 Dec 2023 19:53:31 -0800 (PST) From: Joyce Kong To: thomas@monjalon.net, ruifeng.wang@arm.com, bruce.richardson@intel.com Cc: dev@dpdk.org, nd@arm.com, Joyce Kong , stable@dpdk.org Subject: [PATCH v4 1/2] config: correct cpu instruction set for cross build Date: Tue, 5 Dec 2023 03:52:58 +0000 Message-Id: <20231205035259.3516625-2-joyce.kong@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231205035259.3516625-1-joyce.kong@arm.com> References: <20230822074743.3243015-1-joyce.kong@arm.com> <20231205035259.3516625-1-joyce.kong@arm.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The platform value would be 'native' only when not cross build. Move the operation about modifying cpu_instruction_set while platform equals 'native' to the not cross build branch. Fixes: bf66003b51ec ("build: use platform for generic and native builds") Cc: stable@dpdk.org Signed-off-by: Joyce Kong Reviewed-by: Ruifeng Wang Acked-by: Stephen Hemminger Tested-by: Pavan Nikhilesh --- config/meson.build | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/config/meson.build b/config/meson.build index a9ccd56deb..0f37bc733c 100644 --- a/config/meson.build +++ b/config/meson.build @@ -121,13 +121,14 @@ else cpu_instruction_set = 'generic' endif endif + if platform == 'native' + if cpu_instruction_set == 'auto' + cpu_instruction_set = 'native' + endif + endif endif -if platform == 'native' - if cpu_instruction_set == 'auto' - cpu_instruction_set = 'native' - endif -elif platform == 'generic' +if platform == 'generic' if cpu_instruction_set == 'auto' cpu_instruction_set = 'generic' endif From patchwork Tue Dec 5 03:52:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joyce Kong X-Patchwork-Id: 134859 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1500F43437; Tue, 5 Dec 2023 04:53:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F2C7E42D7B; Tue, 5 Dec 2023 04:53:43 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mails.dpdk.org (Postfix) with ESMTP id 2B4CC42D45 for ; Tue, 5 Dec 2023 04:53:43 +0100 (CET) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5543B1474; Mon, 4 Dec 2023 19:54:29 -0800 (PST) Received: from net-arm-n1amp-02.shanghai.arm.com (net-arm-n1amp-02.shanghai.arm.com [10.169.210.107]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 4E4753F5A1; Mon, 4 Dec 2023 19:53:40 -0800 (PST) From: Joyce Kong To: thomas@monjalon.net, ruifeng.wang@arm.com, bruce.richardson@intel.com Cc: dev@dpdk.org, nd@arm.com, Joyce Kong , Honnappa Nagarahalli Subject: [PATCH v4 2/2] config/arm: use common cpu arch for cross files Date: Tue, 5 Dec 2023 03:52:59 +0000 Message-Id: <20231205035259.3516625-3-joyce.kong@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231205035259.3516625-1-joyce.kong@arm.com> References: <20230822074743.3243015-1-joyce.kong@arm.com> <20231205035259.3516625-1-joyce.kong@arm.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The cpu info in some cross files is inconsistent with that in SoC flags. The mismatch doesn't cause any issue because the cpu field in the cross file takes no effect and machine_args in config/arm/meson.build actually works. Use a common one in cross files to remove any confusion. Reported-by: Honnappa Nagarahalli Signed-off-by: Joyce Kong Reviewed-by: Ruifeng Wang Acked-by: Stephen Hemminger Tested-by: Pavan Nikhilesh --- config/arm/arm32_armv8_linux_gcc | 2 +- config/arm/arm64_altra_linux_gcc | 2 +- config/arm/arm64_ampereone_linux_gcc | 2 +- config/arm/arm64_armada_linux_gcc | 2 +- config/arm/arm64_armv8_linux_clang_ubuntu | 2 +- config/arm/arm64_armv8_linux_gcc | 2 +- config/arm/arm64_bluefield3_linux_gcc | 2 +- config/arm/arm64_bluefield_linux_gcc | 2 +- config/arm/arm64_cdx_linux_gcc | 2 +- config/arm/arm64_centriq2400_linux_gcc | 2 +- config/arm/arm64_cn10k_linux_gcc | 2 +- config/arm/arm64_cn9k_linux_gcc | 2 +- config/arm/arm64_dpaa_linux_gcc | 2 +- config/arm/arm64_emag_linux_gcc | 2 +- config/arm/arm64_ft2000plus_linux_gcc | 2 +- config/arm/arm64_graviton2_linux_gcc | 2 +- config/arm/arm64_graviton3_linux_gcc | 2 +- config/arm/arm64_hip10_linux_gcc | 2 +- config/arm/arm64_kunpeng920_linux_gcc | 2 +- config/arm/arm64_kunpeng930_linux_gcc | 2 +- config/arm/arm64_n1sdp_linux_gcc | 2 +- config/arm/arm64_n2_linux_gcc | 2 +- config/arm/arm64_stingray_linux_gcc | 2 +- config/arm/arm64_thunderx2_linux_gcc | 2 +- config/arm/arm64_thunderxt83_linux_gcc | 2 +- config/arm/arm64_thunderxt88_linux_gcc | 2 +- config/arm/arm64_tys2500_linux_gcc | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/config/arm/arm32_armv8_linux_gcc b/config/arm/arm32_armv8_linux_gcc index 269a60ba19..af1c8b68c3 100644 --- a/config/arm/arm32_armv8_linux_gcc +++ b/config/arm/arm32_armv8_linux_gcc @@ -9,7 +9,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch32' -cpu = 'armv8-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_altra_linux_gcc b/config/arm/arm64_altra_linux_gcc index ce0667ebe2..972de20614 100644 --- a/config/arm/arm64_altra_linux_gcc +++ b/config/arm/arm64_altra_linux_gcc @@ -9,7 +9,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8.2-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_ampereone_linux_gcc b/config/arm/arm64_ampereone_linux_gcc index 8964432a74..f1235993d8 100644 --- a/config/arm/arm64_ampereone_linux_gcc +++ b/config/arm/arm64_ampereone_linux_gcc @@ -9,7 +9,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8.6-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_armada_linux_gcc b/config/arm/arm64_armada_linux_gcc index 635b4946a3..aca498a3db 100644 --- a/config/arm/arm64_armada_linux_gcc +++ b/config/arm/arm64_armada_linux_gcc @@ -10,7 +10,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8-a' +cpu = 'aarch64' endian = 'little' [properties] diff --git a/config/arm/arm64_armv8_linux_clang_ubuntu b/config/arm/arm64_armv8_linux_clang_ubuntu index 86ae43937b..3d52a5e32e 100644 --- a/config/arm/arm64_armv8_linux_clang_ubuntu +++ b/config/arm/arm64_armv8_linux_clang_ubuntu @@ -10,7 +10,7 @@ pkgconfig = 'aarch64-linux-gnu-pkg-config' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_armv8_linux_gcc b/config/arm/arm64_armv8_linux_gcc index 529694b49d..98efa7fd2d 100644 --- a/config/arm/arm64_armv8_linux_gcc +++ b/config/arm/arm64_armv8_linux_gcc @@ -9,7 +9,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_bluefield3_linux_gcc b/config/arm/arm64_bluefield3_linux_gcc index 775cf5883d..cf58b4aa6b 100644 --- a/config/arm/arm64_bluefield3_linux_gcc +++ b/config/arm/arm64_bluefield3_linux_gcc @@ -9,7 +9,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8.4-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_bluefield_linux_gcc b/config/arm/arm64_bluefield_linux_gcc index 1286227915..d38922fea5 100644 --- a/config/arm/arm64_bluefield_linux_gcc +++ b/config/arm/arm64_bluefield_linux_gcc @@ -9,7 +9,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_cdx_linux_gcc b/config/arm/arm64_cdx_linux_gcc index 8e6d619dae..be2aa56430 100644 --- a/config/arm/arm64_cdx_linux_gcc +++ b/config/arm/arm64_cdx_linux_gcc @@ -10,7 +10,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_centriq2400_linux_gcc b/config/arm/arm64_centriq2400_linux_gcc index bc8737e072..ad08b2b83c 100644 --- a/config/arm/arm64_centriq2400_linux_gcc +++ b/config/arm/arm64_centriq2400_linux_gcc @@ -9,7 +9,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_cn10k_linux_gcc b/config/arm/arm64_cn10k_linux_gcc index fa904af5d0..ad403c3aa0 100644 --- a/config/arm/arm64_cn10k_linux_gcc +++ b/config/arm/arm64_cn10k_linux_gcc @@ -10,7 +10,7 @@ cmake = 'cmake' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8.6-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_cn9k_linux_gcc b/config/arm/arm64_cn9k_linux_gcc index 646ce4b5d3..f2947e94c0 100644 --- a/config/arm/arm64_cn9k_linux_gcc +++ b/config/arm/arm64_cn9k_linux_gcc @@ -10,7 +10,7 @@ cmake = 'cmake' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_dpaa_linux_gcc b/config/arm/arm64_dpaa_linux_gcc index 8465b5097b..e60edbaafb 100644 --- a/config/arm/arm64_dpaa_linux_gcc +++ b/config/arm/arm64_dpaa_linux_gcc @@ -10,7 +10,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_emag_linux_gcc b/config/arm/arm64_emag_linux_gcc index 248169ed68..10e2e83b56 100644 --- a/config/arm/arm64_emag_linux_gcc +++ b/config/arm/arm64_emag_linux_gcc @@ -9,7 +9,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_ft2000plus_linux_gcc b/config/arm/arm64_ft2000plus_linux_gcc index ae9f779056..8d65d18b8d 100644 --- a/config/arm/arm64_ft2000plus_linux_gcc +++ b/config/arm/arm64_ft2000plus_linux_gcc @@ -9,7 +9,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_graviton2_linux_gcc b/config/arm/arm64_graviton2_linux_gcc index fdb298bb11..adc96598e0 100644 --- a/config/arm/arm64_graviton2_linux_gcc +++ b/config/arm/arm64_graviton2_linux_gcc @@ -9,7 +9,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_graviton3_linux_gcc b/config/arm/arm64_graviton3_linux_gcc index 19b422075d..805566ae85 100644 --- a/config/arm/arm64_graviton3_linux_gcc +++ b/config/arm/arm64_graviton3_linux_gcc @@ -9,7 +9,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_hip10_linux_gcc b/config/arm/arm64_hip10_linux_gcc index 2943e4abbf..46764941b6 100644 --- a/config/arm/arm64_hip10_linux_gcc +++ b/config/arm/arm64_hip10_linux_gcc @@ -9,7 +9,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8-a' +cpu = 'aarch64' endian = 'little' [properties] diff --git a/config/arm/arm64_kunpeng920_linux_gcc b/config/arm/arm64_kunpeng920_linux_gcc index 193fb48a61..ea0f3f96d6 100644 --- a/config/arm/arm64_kunpeng920_linux_gcc +++ b/config/arm/arm64_kunpeng920_linux_gcc @@ -9,7 +9,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_kunpeng930_linux_gcc b/config/arm/arm64_kunpeng930_linux_gcc index e4281ceb4f..3a928ee998 100644 --- a/config/arm/arm64_kunpeng930_linux_gcc +++ b/config/arm/arm64_kunpeng930_linux_gcc @@ -9,7 +9,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_n1sdp_linux_gcc b/config/arm/arm64_n1sdp_linux_gcc index 2806a4241b..6eef27291a 100644 --- a/config/arm/arm64_n1sdp_linux_gcc +++ b/config/arm/arm64_n1sdp_linux_gcc @@ -9,7 +9,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_n2_linux_gcc b/config/arm/arm64_n2_linux_gcc index 7404bd197b..111ae52c5f 100644 --- a/config/arm/arm64_n2_linux_gcc +++ b/config/arm/arm64_n2_linux_gcc @@ -9,7 +9,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_stingray_linux_gcc b/config/arm/arm64_stingray_linux_gcc index 08148b5c3d..41903aaa1f 100644 --- a/config/arm/arm64_stingray_linux_gcc +++ b/config/arm/arm64_stingray_linux_gcc @@ -9,7 +9,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_thunderx2_linux_gcc b/config/arm/arm64_thunderx2_linux_gcc index 32ae938e95..eb07a59da0 100644 --- a/config/arm/arm64_thunderx2_linux_gcc +++ b/config/arm/arm64_thunderx2_linux_gcc @@ -9,7 +9,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_thunderxt83_linux_gcc b/config/arm/arm64_thunderxt83_linux_gcc index e9d9e62d44..cd4f9c2acb 100644 --- a/config/arm/arm64_thunderxt83_linux_gcc +++ b/config/arm/arm64_thunderxt83_linux_gcc @@ -9,7 +9,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_thunderxt88_linux_gcc b/config/arm/arm64_thunderxt88_linux_gcc index c6e5a5656a..b9e0d554a4 100644 --- a/config/arm/arm64_thunderxt88_linux_gcc +++ b/config/arm/arm64_thunderxt88_linux_gcc @@ -9,7 +9,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8-a' +cpu = 'auto' endian = 'little' [properties] diff --git a/config/arm/arm64_tys2500_linux_gcc b/config/arm/arm64_tys2500_linux_gcc index fce85fb0d8..994803d363 100644 --- a/config/arm/arm64_tys2500_linux_gcc +++ b/config/arm/arm64_tys2500_linux_gcc @@ -9,7 +9,7 @@ pcap-config = '' [host_machine] system = 'linux' cpu_family = 'aarch64' -cpu = 'armv8-a' +cpu = 'auto' endian = 'little' [properties]