From patchwork Mon Nov 4 21:38:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Eatmon X-Patchwork-Id: 51712 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A8360D1BDF8 for ; Mon, 4 Nov 2024 21:38:24 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by mx.groups.io with SMTP id smtpd.web10.2566.1730756303874746186 for ; Mon, 04 Nov 2024 13:38:24 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=N01UdElz; spf=pass (domain: ti.com, ip: 198.47.19.141, mailfrom: reatmon@ti.com) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 4A4LcMeJ120393; Mon, 4 Nov 2024 15:38:22 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1730756302; bh=f3udvDzw1OziOJv9yjw8NdCAfheXl4vVoR88f/AGSvM=; h=From:To:Subject:Date; b=N01UdElziN9nnGG6jj6vLoxrqxhINS+r25cosxE7WR4+cb0IBNa8cPpKxzQwqcIiX enY3WZLaLglVLYo34KsBfr9l/mkHsfuwWhYEvzhJCTVolCpgWlQJGoSiBz1zIqB9qO XjGDSlVcxH5PVnS8GJdeNbcLf2F04+5QNFmItxSI= Received: from DLEE109.ent.ti.com (dlee109.ent.ti.com [157.170.170.41]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 4A4LcMHf037439 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 4 Nov 2024 15:38:22 -0600 Received: from DLEE103.ent.ti.com (157.170.170.33) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Mon, 4 Nov 2024 15:38:21 -0600 Received: from lelvsmtp5.itg.ti.com (10.180.75.250) by DLEE103.ent.ti.com (157.170.170.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Mon, 4 Nov 2024 15:38:21 -0600 Received: from uda0214219 (uda0214219.dhcp.ti.com [128.247.81.222]) by lelvsmtp5.itg.ti.com (8.15.2/8.15.2) with ESMTP id 4A4LcL7W016763; Mon, 4 Nov 2024 15:38:21 -0600 Received: from reatmon by uda0214219 with local (Exim 4.90_1) (envelope-from ) id 1t84mD-0002tN-OT; Mon, 04 Nov 2024 15:38:21 -0600 From: Ryan Eatmon To: Praneeth Bajjuri , Denys Dmytriyenko , Subject: [meta-ti][master/scarthgap][PATCH v2 1/2] mesa-pvr_23.2.1: Fix build issues with llvm 18+ Date: Mon, 4 Nov 2024 15:38:20 -0600 Message-ID: <20241104213821.11077-1-reatmon@ti.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 04 Nov 2024 21:38:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18037 Backport two fixes from the latest mesa project to fix two builds issues related to newer llvm versions. Signed-off-by: Ryan Eatmon --- v2: Rework commit message since we need to add patches for mesa-pvr_22.3.5 too. ...allium-Fix-build-with-llvm-18-and-19.patch | 53 +++++++++++++++++++ .../recipes-graphics/mesa/mesa-pvr_23.2.1.bb | 1 + 2 files changed, 54 insertions(+) create mode 100644 meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-gallium-Fix-build-with-llvm-18-and-19.patch diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-gallium-Fix-build-with-llvm-18-and-19.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-gallium-Fix-build-with-llvm-18-and-19.patch new file mode 100644 index 00000000..ad5059f1 --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-gallium-Fix-build-with-llvm-18-and-19.patch @@ -0,0 +1,53 @@ +From 6c5033bb01a3a1341d4db5007586a5f2e2727b0a Mon Sep 17 00:00:00 2001 +From: Ryan Eatmon +Date: Mon, 4 Nov 2024 13:37:29 -0600 +Subject: [PATCH] gallium: Fix build with llvm 18 and 19 + +- CodeGenOpt::Level changed to CodeGenOoptLevel. [1] +- llvm::sys::getHostCPUFeatures() now returns the features instead of +modifying the passed in argument. [2] + +Upstream-Status: Backport [1][https://gitlab.freedesktop.org/mesa/mesa/-/commit/f79617fe804ea6524651ff1bc3a91098d3199179] +Upstream-Status: Backport [2][https://gitlab.freedesktop.org/mesa/mesa/-/commit/fa9cd89a85b904615ebc11da609445b5b751e68d] + +Signed-off-by: Ryan Eatmon +--- + src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +index 5e7a30a6cc2..dbc777e3096 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +@@ -366,7 +366,11 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, + builder.setEngineKind(EngineKind::JIT) + .setErrorStr(&Error) + .setTargetOptions(options) ++#if LLVM_VERSION_MAJOR >= 18 ++ .setOptLevel((CodeGenOptLevel)OptLevel); ++#else + .setOptLevel((CodeGenOpt::Level)OptLevel); ++#endif + + #if DETECT_OS_WINDOWS + /* +@@ -394,8 +398,14 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, + * which allows us to enable/disable code generation based + * on the results of cpuid on these architectures. + */ +- llvm::StringMap features; +- llvm::sys::getHostCPUFeatures(features); ++ #if LLVM_VERSION_MAJOR >= 19 ++ /* llvm-19+ returns StringMap from getHostCPUFeatures. ++ */ ++ auto features = llvm::sys::getHostCPUFeatures(); ++ #else ++ llvm::StringMap features; ++ llvm::sys::getHostCPUFeatures(features); ++ #endif + + for (StringMapIterator f = features.begin(); + f != features.end(); +-- +2.17.1 + diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb index 21134bc7..33af456d 100644 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb @@ -16,6 +16,7 @@ SRC_URI = " \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ file://0001-gallium-Fix-build-with-llvm-17.patch \ file://0001-meson-Disable-cmake-dependency-detector-for-llvm.patch \ + file://0001-gallium-Fix-build-with-llvm-18-and-19.patch \ " S = "${WORKDIR}/git" From patchwork Mon Nov 4 21:38:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Eatmon X-Patchwork-Id: 51713 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4169D1BDFB for ; Mon, 4 Nov 2024 21:38:24 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by mx.groups.io with SMTP id smtpd.web11.2470.1730756303479712020 for ; Mon, 04 Nov 2024 13:38:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=NIgqEYjN; spf=pass (domain: ti.com, ip: 198.47.19.141, mailfrom: reatmon@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 4A4LcMo3120388; Mon, 4 Nov 2024 15:38:22 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1730756302; bh=EkTOwloTWuphkvC1PfuoriehOdDz7BxKDTc8LgquqPI=; h=From:To:Subject:Date:In-Reply-To:References; b=NIgqEYjNxD+N7RKD41Rzzr9tdq+I+vbyEiwr3H1K1eEgQdakwadZLXM/z/s0WTB8J ti03eIsZcSG7fyTNkUHQn8qM9BKtC3t+SYhC8Ucb0NE7X9kVBxvfpIQUnnNHme/vNM zgCkFgxsOg3MdEeC+kesk6Men1PKL9yBXzOplLN8= Received: from DLEE111.ent.ti.com (dlee111.ent.ti.com [157.170.170.22]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTP id 4A4LcMCo105171; Mon, 4 Nov 2024 15:38:22 -0600 Received: from DLEE115.ent.ti.com (157.170.170.26) by DLEE111.ent.ti.com (157.170.170.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Mon, 4 Nov 2024 15:38:22 -0600 Received: from lelvsmtp5.itg.ti.com (10.180.75.250) by DLEE115.ent.ti.com (157.170.170.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Mon, 4 Nov 2024 15:38:21 -0600 Received: from uda0214219 (uda0214219.dhcp.ti.com [128.247.81.222]) by lelvsmtp5.itg.ti.com (8.15.2/8.15.2) with ESMTP id 4A4LcL4n016766; Mon, 4 Nov 2024 15:38:21 -0600 Received: from reatmon by uda0214219 with local (Exim 4.90_1) (envelope-from ) id 1t84mD-0002tP-Rf; Mon, 04 Nov 2024 15:38:21 -0600 From: Ryan Eatmon To: Praneeth Bajjuri , Denys Dmytriyenko , Subject: [meta-ti][master/scarthgap][PATCH v2 2/2] mesa-pvr-22.3.5: Fix build issues with llvm 18+ Date: Mon, 4 Nov 2024 15:38:21 -0600 Message-ID: <20241104213821.11077-2-reatmon@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20241104213821.11077-1-reatmon@ti.com> References: <20241104213821.11077-1-reatmon@ti.com> MIME-Version: 1.0 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 04 Nov 2024 21:38:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18036 Backport two fixes from the latest mesa project to fix two builds issues related to newer llvm versions. Signed-off-by: Ryan Eatmon --- ...lude-of-Host-h-moved-to-TargetParser.patch | 65 +++++++++++++++++++ ...allium-Fix-build-with-llvm-18-and-19.patch | 6 +- .../recipes-graphics/mesa/mesa-pvr_22.3.5.bb | 2 + 3 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-fix-LLVM-include-of-Host-h-moved-to-TargetParser.patch copy meta-ti-bsp/recipes-graphics/mesa/{mesa-pvr-23.2.1 => mesa-pvr-22.3.5}/0001-gallium-Fix-build-with-llvm-18-and-19.patch (92%) diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-fix-LLVM-include-of-Host-h-moved-to-TargetParser.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-fix-LLVM-include-of-Host-h-moved-to-TargetParser.patch new file mode 100644 index 00000000..7d4fe078 --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-fix-LLVM-include-of-Host-h-moved-to-TargetParser.patch @@ -0,0 +1,65 @@ +From bb2db56ffec6e527d88751f75117ae690227cd6c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= +Date: Sat, 11 Feb 2023 18:38:01 +0100 +Subject: [PATCH] fix: gallivm: fix LLVM #include of Host.h, moved to + TargetParser + +Upstream moved Host.h from Support to TargetParser in LLVM 17. + +This shouldn't lead to a FTBFS, since there is a forwarding include left +behind. Sadly the added deprecation warning #pragma is invalid and thus +causes a build failure right away. But since we would have to follow the +move anyway in the future, just do it right away. + +Reference: https://github.com/llvm/llvm-project/commit/d768bf994f508d7eaf9541a568be3d71096febf5 +Reviewed-by: Bas Nieuwenhuizen +Closes: #8275 +Part-of: + +Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/bb2db56ffec6e527d88751f75117ae690227cd6c] + +--- + src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 7 ++++++- + src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 4 +++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +index 54bc5d5ada36c..f78f04f042be8 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +@@ -35,9 +35,14 @@ + #include + #include + #include +-#include + #include + ++#if LLVM_VERSION_MAJOR >= 17 ++#include ++#else ++#include ++#endif ++ + #include "util/u_math.h" + #include "util/u_debug.h" + +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +index 334c13530394b..5e7a30a6cc2e3 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +@@ -60,7 +60,11 @@ + #include + #include + #include ++#if LLVM_VERSION_MAJOR >= 17 ++#include ++#else + #include ++#endif + #include + #include + #include + +-- +GitLab + diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-gallium-Fix-build-with-llvm-18-and-19.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gallium-Fix-build-with-llvm-18-and-19.patch similarity index 92% copy from meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-gallium-Fix-build-with-llvm-18-and-19.patch copy to meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gallium-Fix-build-with-llvm-18-and-19.patch index ad5059f1..37888c34 100644 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-gallium-Fix-build-with-llvm-18-and-19.patch +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gallium-Fix-build-with-llvm-18-and-19.patch @@ -19,7 +19,7 @@ diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxilia index 5e7a30a6cc2..dbc777e3096 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -@@ -366,7 +366,11 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, +@@ -368,7 +368,11 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, builder.setEngineKind(EngineKind::JIT) .setErrorStr(&Error) .setTargetOptions(options) @@ -29,9 +29,9 @@ index 5e7a30a6cc2..dbc777e3096 100644 .setOptLevel((CodeGenOpt::Level)OptLevel); +#endif - #if DETECT_OS_WINDOWS + #ifdef _WIN32 /* -@@ -394,8 +398,14 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, +@@ -392,8 +396,14 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, * which allows us to enable/disable code generation based * on the results of cpuid on these architectures. */ diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb index c93d01f9..bdc9ce16 100644 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb @@ -19,6 +19,8 @@ SRC_URI = " \ file://0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch \ file://0001-gallium-Fix-build-with-llvm-17.patch \ file://0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch \ + file://0001-fix-gallivm-fix-LLVM-include-of-Host-h-moved-to-TargetParser.patch \ + file://0001-gallium-Fix-build-with-llvm-18-and-19.patch \ " S = "${WORKDIR}/git"