Skip to contentSkip to conversation

spirv-headers,spirv-tools: Upgrade to 1.4.321.0 release

PATCH In review Khem Raj 5 participants 16 messages Jul 28, 2025 – Jul 31, 2025

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/5 spirv-headers,spirv-tools: Upgrade to 1.4.321.0 release

---
 ...{spirv-headers_1.4.313.0.bb => spirv-headers_1.4.321.0.bb} | 4 ++--
 .../{spirv-tools_1.4.313.0.bb => spirv-tools_1.4.321.0.bb}    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/spir/{spirv-headers_1.4.313.0.bb => spirv-headers_1.4.321.0.bb} (84%)
 rename meta/recipes-graphics/spir/{spirv-tools_1.4.313.0.bb => spirv-tools_1.4.321.0.bb} (97%)
meta/recipes-graphics/spir/spirv-headers_1.4.321.0.bb renamed from meta/recipes-graphics/spir/spirv-headers_1.4.313.0.bb +2 -2
similarity index 84%
rename from meta/recipes-graphics/spir/spirv-headers_1.4.313.0.bb
rename to meta/recipes-graphics/spir/spirv-headers_1.4.321.0.bb
index a551814689c..1da2e74f93b 100644
@@ -2,9 +2,9 @@ SUMMARY = "Machine-readable files for the SPIR-V Registry"
 SECTION = "graphics"
 HOMEPAGE = "https://www.khronos.org/registry/spir-v"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d14ee3b13f42e9c9674acc5925c3d741"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a0dcaa512cc2dee95fe0fd791ee83a18"
 
-SRCREV = "aa6cef192b8e693916eb713e7a9ccadf06062ceb"
+SRCREV = "2a611a970fdbc41ac2e3e328802aed9985352dca"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main"
 PE = "1"
 # These recipes need to be updated in lockstep with each other:
meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb renamed from meta/recipes-graphics/spir/spirv-tools_1.4.313.0.bb +1 -1
similarity index 97%
rename from meta/recipes-graphics/spir/spirv-tools_1.4.313.0.bb
rename to meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb
index 4594a1a9426..319b25b7f43 100644
@@ -7,7 +7,7 @@ SECTION = "graphics"
 LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "a62abcb402009b9ca5975e6167c09f237f630e0e"
+SRCREV = "33e02568181e3312f49a3cf33df470bf96ef293a"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https \
            "
 PE = "1"
author
#1 lore raw

PATCH 2/5 clang: Drop dependency on spirv-tools-native

spirv is now a separate recipe.

---
 meta/recipes-devtools/clang/clang_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/clang/clang_git.bb +1 -1
index 830c0282cd6..5f0ddd1a2db 100644
@@ -185,7 +185,7 @@ EXTRA_OECMAKE:append:class-target = "\
                   -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} \
 "
 
-DEPENDS = "binutils zlib zstd libffi libxml2 libxml2-native ninja-native swig-native spirv-tools-native llvm-tblgen-native"
+DEPENDS = "binutils zlib zstd libffi libxml2 libxml2-native ninja-native swig-native llvm-tblgen-native"
 DEPENDS:append:class-nativesdk = " clang-crosssdk-${SDK_SYS} virtual/nativesdk-cross-binutils nativesdk-python3"
 DEPENDS:append:class-target = " clang-cross-${TARGET_ARCH} python3 ${@bb.utils.contains('TC_CXX_RUNTIME', 'llvm', 'compiler-rt libcxx', '', d)}"
 
#2 lore raw

Re: [OE-core] [PATCH 2/5] clang: Drop dependency on spirv-tools-native

Quoted 18 lines · Khem Raj via lists.openembedded.org

spirv is now a separate recipe.

---
meta/recipes-devtools/clang/clang_git.bb | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/clang/clang_git.bb +0 -0
index 830c0282cd6..5f0ddd1a2db 100644
@@ -185,7 +185,7 @@ EXTRA_OECMAKE:append:class-target = "\
                  -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} \

"

meta/recipes-devtools/clang/clang_git.bb +1 -1
-DEPENDS = "binutils zlib zstd libffi libxml2 libxml2-native ninja-native swig-native spirv-tools-native llvm-tblgen-native"
+DEPENDS = "binutils zlib zstd libffi libxml2 libxml2-native ninja-native swig-native llvm-tblgen-native"
Quoted 2 lines

DEPENDS:append:class-nativesdk = " clang-crosssdk-${SDK_SYS} virtual/nativesdk-cross-binutils nativesdk-python3" DEPENDS:append:class-target = " clang-cross-${TARGET_ARCH} python3 ${@bb.utils.contains('TC_CXX_RUNTIME', 'llvm', 'compiler-rt libcxx', '', d)}”

Have you verified there’s no change to the output after this? I thought that spirv piece was used by the codegen for optional backends.

Ross

author
#3 lore raw

Re: [OE-core] [PATCH 2/5] clang: Drop dependency on spirv-tools-native

Quoted 18 lines · Ross Burton
Quoted 16 lines · Khem Raj via lists.openembedded.org

spirv is now a separate recipe.

---
meta/recipes-devtools/clang/clang_git.bb | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/clang/clang_git.bb +0 -0
index 830c0282cd6..5f0ddd1a2db 100644
@@ -185,7 +185,7 @@ EXTRA_OECMAKE:append:class-target = "\
                  -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} \

"

Quoted 7 lines
Quoted 4 lines
meta/recipes-devtools/clang/clang_git.bb +1 -1
-DEPENDS = "binutils zlib zstd libffi libxml2 libxml2-native ninja-native swig-native spirv-tools-native llvm-tblgen-native"
+DEPENDS = "binutils zlib zstd libffi libxml2 libxml2-native ninja-native swig-native llvm-tblgen-native"

DEPENDS:append:class-nativesdk = " clang-crosssdk-${SDK_SYS} virtual/nativesdk-cross-binutils nativesdk-python3" DEPENDS:append:class-target = " clang-cross-${TARGET_ARCH} python3 ${@bb.utils.contains('TC_CXX_RUNTIME', 'llvm', 'compiler-rt libcxx', '', d)}”

Have you verified there’s no change to the output after this? I thought that spirv piece was used by the codegen for optional backends.

it was used when libclc was being built as part of clang recipe

Quoted 1 line

Ross

author
#4 lore raw

PATCH 3/5 spirv-headers,spirv-tools: Update to tip of trunk

In reply to Khem Raj

This is needed for compiling SPIRV llvm-translator from llvm 21.1.0 rc1

---
 meta/recipes-graphics/spir/spirv-headers_1.4.321.0.bb | 3 ++-
 meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-graphics/spir/spirv-headers_1.4.321.0.bb +2 -1
index 1da2e74f93b..b1cec77080a 100644
@@ -4,7 +4,8 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a0dcaa512cc2dee95fe0fd791ee83a18"
 
-SRCREV = "2a611a970fdbc41ac2e3e328802aed9985352dca"
+PV .= "+git"
+SRCREV = "de1807b7cfa8e722979d5ab7b7445b258dbc1836"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main"
 PE = "1"
 # These recipes need to be updated in lockstep with each other:
meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb +2 -1
index 319b25b7f43..f66b25c60db 100644
@@ -7,7 +7,8 @@ SECTION = "graphics"
 LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "33e02568181e3312f49a3cf33df470bf96ef293a"
+Pv .= "+git"
+SRCREV = "a983ab19d6f91a07a8272767427b6c5208576d08"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https \
            "
 PE = "1"
#5 lore raw

Re: [OE-core] [PATCH 3/5] spirv-headers,spirv-tools: Update to tip of trunk

Quoted 27 lines · Khem Raj via lists.openembedded.org

This is needed for compiling SPIRV llvm-translator from llvm 21.1.0 rc1

---
 meta/recipes-graphics/spir/spirv-headers_1.4.321.0.bb | 3 ++-
 meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-graphics/spir/spirv-headers_1.4.321.0.bb +2 -1
index 1da2e74f93b..b1cec77080a 100644
@@ -4,7 +4,8 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a0dcaa512cc2dee95fe0fd791ee83a18"
 
-SRCREV = "2a611a970fdbc41ac2e3e328802aed9985352dca"
+PV .= "+git"
+SRCREV = "de1807b7cfa8e722979d5ab7b7445b258dbc1836"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main"
 PE = "1"
 # These recipes need to be updated in lockstep with each other:
meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb +0 -0
index 319b25b7f43..f66b25c60db 100644

meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb SECTION = "graphics" · line 10

Quoted 5 lines
meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb +1 -1
@@ -7,7 +7,8 @@ SECTION = "graphics"
 LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "33e02568181e3312f49a3cf33df470bf96ef293a"
+Pv .= "+git"

There is a typo in PV

Quoted 4 lines
meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb +1 -0
+SRCREV = "a983ab19d6f91a07a8272767427b6c5208576d08"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https \
            "
 PE = "1"
#6 lore raw

Re: [OE-core] [PATCH 3/5] spirv-headers,spirv-tools: Update to tip of trunk

Also, I'd prefer a backport of the needed fixes, as this would mis-match with other vulkan items, potentially breaking them.

Alex

Quoted 51 lines · Gyorgy Sarvari via lists.openembedded.org
Quoted 27 lines · Khem Raj via lists.openembedded.org

This is needed for compiling SPIRV llvm-translator from llvm 21.1.0 rc1

---
 meta/recipes-graphics/spir/spirv-headers_1.4.321.0.bb | 3 ++-
 meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-graphics/spir/spirv-headers_1.4.321.0.bb +2 -1
index 1da2e74f93b..b1cec77080a 100644
@@ -4,7 +4,8 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a0dcaa512cc2dee95fe0fd791ee83a18"
 
-SRCREV = "2a611a970fdbc41ac2e3e328802aed9985352dca"
+PV .= "+git"
+SRCREV = "de1807b7cfa8e722979d5ab7b7445b258dbc1836"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main"
 PE = "1"
 # These recipes need to be updated in lockstep with each other:
meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb +0 -0
index 319b25b7f43..f66b25c60db 100644

meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb SECTION = "graphics" · line 10

Quoted 5 lines
meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb +1 -1
@@ -7,7 +7,8 @@ SECTION = "graphics"
 LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "33e02568181e3312f49a3cf33df470bf96ef293a"
+Pv .= "+git"

There is a typo in PV

meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb SECTION = "graphics" · line 14

Quoted 4 lines
meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb +1 -0
+SRCREV = "a983ab19d6f91a07a8272767427b6c5208576d08"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https \
            "
 PE = "1"

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#220992): https://lists.openembedded.org/g/openembedded-core/message/220992
Mute This Topic: https://lists.openembedded.org/mt/114408566/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

author
#7 lore raw

Re: [OE-core] [PATCH 3/5] spirv-headers,spirv-tools: Update to tip of trunk

Quoted 3 lines · Alexander Kanavin

Also, I'd prefer a backport of the needed fixes, as this would mis-match with other vulkan items, potentially breaking them.

There are many that its not worth it, since I am expecting spirv-tools to do a release for llvm-21
question is how long that happens after/before llvm-21 release

Quoted 57 lines

Alex

Quoted 51 lines · Gyorgy Sarvari via lists.openembedded.org
Quoted 27 lines · Khem Raj via lists.openembedded.org

This is needed for compiling SPIRV llvm-translator from llvm 21.1.0 rc1

---
 meta/recipes-graphics/spir/spirv-headers_1.4.321.0.bb | 3 ++-
 meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-graphics/spir/spirv-headers_1.4.321.0.bb +2 -1
index 1da2e74f93b..b1cec77080a 100644
@@ -4,7 +4,8 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a0dcaa512cc2dee95fe0fd791ee83a18"
 
-SRCREV = "2a611a970fdbc41ac2e3e328802aed9985352dca"
+PV .= "+git"
+SRCREV = "de1807b7cfa8e722979d5ab7b7445b258dbc1836"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main"
 PE = "1"
 # These recipes need to be updated in lockstep with each other:
meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb +0 -0
index 319b25b7f43..f66b25c60db 100644

meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb SECTION = "graphics" · line 10

Quoted 5 lines
meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb +1 -1
@@ -7,7 +7,8 @@ SECTION = "graphics"
 LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "33e02568181e3312f49a3cf33df470bf96ef293a"
+Pv .= "+git"

There is a typo in PV

meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb SECTION = "graphics" · line 14

Quoted 4 lines
meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb +1 -0
+SRCREV = "a983ab19d6f91a07a8272767427b6c5208576d08"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https \
            "
 PE = "1"

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#220992): https://lists.openembedded.org/g/openembedded-core/message/220992
Mute This Topic: https://lists.openembedded.org/mt/114408566/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

author
#8 lore raw

Re: [OE-core] [PATCH 3/5] spirv-headers,spirv-tools: Update to tip of trunk

In reply to Gyorgy Sarvari
Quoted 32 lines · Gyorgy Sarvari
Quoted 30 lines · Khem Raj via lists.openembedded.org

This is needed for compiling SPIRV llvm-translator from llvm 21.1.0 rc1

---
 meta/recipes-graphics/spir/spirv-headers_1.4.321.0.bb | 3 ++-
 meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-graphics/spir/spirv-headers_1.4.321.0.bb +2 -1
index 1da2e74f93b..b1cec77080a 100644
@@ -4,7 +4,8 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a0dcaa512cc2dee95fe0fd791ee83a18"
 
-SRCREV = "2a611a970fdbc41ac2e3e328802aed9985352dca"
+PV .= "+git"
+SRCREV = "de1807b7cfa8e722979d5ab7b7445b258dbc1836"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main"
 PE = "1"
 # These recipes need to be updated in lockstep with each other:
meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb +0 -0
index 319b25b7f43..f66b25c60db 100644
@@ -7,7 +7,8 @@ SECTION = "graphics"
 LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
Quoted 4 lines

meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb SECTION = "graphics" · line 10

Quoted 2 lines
meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb +1 -1
-SRCREV = "33e02568181e3312f49a3cf33df470bf96ef293a"
+Pv .= "+git"

There is a typo in PV

ah bummer.

Quoted 6 lines
Quoted 5 lines
meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb +1 -0
+SRCREV = "a983ab19d6f91a07a8272767427b6c5208576d08"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https \
            "
 PE = "1"
author
#9 lore raw

PATCH 4/5 compiler-rt: Add missing VER_SUFFIX to installation directory name

In reply to Khem Raj

This helps building, pre-release snapshots e.g. -rc1 etc.

---
 meta/recipes-devtools/clang/compiler-rt-sanitizers_git.bb | 2 +-
 meta/recipes-devtools/clang/compiler-rt_git.bb            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/clang/compiler-rt-sanitizers_git.bb +1 -1
index 198942ec359..2ef206fba04 100644
@@ -56,7 +56,7 @@ OECMAKE_TARGET_COMPILE = "compiler-rt"
 OECMAKE_TARGET_INSTALL = "install-compiler-rt install-compiler-rt-headers"
 OECMAKE_SOURCEPATH = "${S}/llvm"
 
-INSTALL_VER ?= "${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}"
+INSTALL_VER ?= "${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}${VER_SUFFIX}"
 INSTALL_VER:class-native = "${@oe.utils.trim_version("${PV}", 1)}"
 
 EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RelWithDebInfo \
meta/recipes-devtools/clang/compiler-rt_git.bb +1 -1
index c88000d33b0..a2ab63eef50 100644
@@ -72,7 +72,7 @@ OECMAKE_TARGET_COMPILE = "compiler-rt"
 OECMAKE_TARGET_INSTALL = "install-compiler-rt install-compiler-rt-headers"
 OECMAKE_SOURCEPATH = "${S}/llvm"
 
-INSTALL_VER ?= "${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}"
+INSTALL_VER ?= "${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}${VER_SUFFIX}"
 INSTALL_VER:class-native = "${@oe.utils.trim_version("${PV}", 1)}"
 
 EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RelWithDebInfo \
author
#10 lore raw

PATCH 5/5 mesa: Fix a build issue with clang-21

In reply to Khem Raj

This is a backport, helps compiling with upcoming clang-21

---
 ...itch-to-new-non-owned-TargetOptions-.patch | 39 +++++++++++++++++++
 meta/recipes-graphics/mesa/mesa.inc           |  1 +
 2 files changed, 40 insertions(+)
 create mode 100644 meta/recipes-graphics/mesa/files/0001-fix-FTBFS-clc-switch-to-new-non-owned-TargetOptions-.patch
meta/recipes-graphics/mesa/files/0001-fix-FTBFS-clc-switch-to-new-non-owned-TargetOptions-.patch new file +39 -0
new file mode 100644
index 00000000000..2633869625b
@@ -0,0 +1,39 @@
+From 531c6696d42953cd642dea7bf70153285c7949ae Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= <[email protected]>
+Date: Tue, 6 May 2025 14:36:57 +0200
+Subject: [PATCH] fix(FTBFS): clc: switch to new non-owned `TargetOptions` for
+ LLVM 21
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream hid the `TargetOptions` in commit 985410f87f2d19910a8d327527fd30062b042b63
+
+Use the new `getTargetOpts()` to obtain the `TargetOptions` for
+`setTarget()`.
+
+Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34835]
+
+Signed-off-by: Kai Wasserbäch <[email protected]>
+Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13079
+Reference: https://github.com/llvm/llvm-project/commit/985410f87f2d19910a8d327527fd30062b042b63
+Reviewed-by: Karol Herbst <[email protected]>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34835>
+---
+ src/compiler/clc/clc_helpers.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/src/compiler/clc/clc_helpers.cpp
++++ b/src/compiler/clc/clc_helpers.cpp
+@@ -874,7 +874,11 @@ clc_compile_to_llvm_module(LLVMContext &
+                            diag_opts));
+ 
+    c->setTarget(clang::TargetInfo::CreateTargetInfo(
++#if LLVM_VERSION_MAJOR >= 21
++                   c->getDiagnostics(), c->getInvocation().getTargetOpts()));
++#else
+                    c->getDiagnostics(), c->getInvocation().TargetOpts));
++#endif
+ 
+    c->getFrontendOpts().ProgramAction = clang::frontend::EmitLLVMOnly;
+ 
meta/recipes-graphics/mesa/mesa.inc +1 -0
index 58e3d9f7453..0d6f013ae10 100644
@@ -18,6 +18,7 @@ SRC_URI = "https://archive.mesa3d.org/mesa-${PV}.tar.xz \
            file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
            file://0001-freedreno-don-t-encode-build-path-into-binaries.patch \
            file://0001-dont-build-clover-frontend.patch \
+           file://0001-fix-FTBFS-clc-switch-to-new-non-owned-TargetOptions-.patch \
 "
 
 SRC_URI[sha256sum] = "9f2b69eb39d2d8717d30a9868fdda3e0c0d3708ba32778bbac8ddb044538ce84"
#11 lore raw

Patchtest results for [PATCH 1/5] spirv-headers,spirv-tools: Upgrade to 1.4.321.0 release

In reply to Khem Raj

Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:

---
Testing patch /home/patchtest/share/mboxes/1-5-spirv-headers-spirv-tools-Upgrade-to-1.4.321.0-release.patch

FAIL: test commit message presence: Please include a commit message on your patch explaining the change (test_mbox.TestMbox.test_commit_message_presence)
FAIL: test lic files chksum modified not mentioned: LIC_FILES_CHKSUM changed without "License-Update:" tag and description in commit message (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)

PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files)
PASS: test CVE check ignore (test_metadata.TestMetadata.test_cve_check_ignore)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)

SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format)
SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence)
SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!

#12 lore raw
In reply to Khem Raj

These need to be updated in lockstep with other vulkan items:

$ find . -name *1.4.3*
./meta/recipes-graphics/glslang/glslang_1.4.313.0.bb
./meta/recipes-graphics/vulkan/vulkan-headers_1.4.313.0.bb
./meta/recipes-graphics/vulkan/vulkan-loader_1.4.313.0.bb
./meta/recipes-graphics/vulkan/vulkan-tools_1.4.313.0.bb
./meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.4.313.0.bb
./meta/recipes-graphics/vulkan/vulkan-validation-layers_1.4.313.0.bb
./meta/recipes-graphics/vulkan/vulkan-volk_1.4.313.0.bb
./meta/recipes-graphics/spir/spirv-headers_1.4.313.0.bb
./meta/recipes-graphics/spir/spirv-tools_1.4.313.0.bb

Alex

Quoted 53 lines · Khem Raj via lists.openembedded.org
---
 ...{spirv-headers_1.4.313.0.bb => spirv-headers_1.4.321.0.bb} | 4 ++--
 .../{spirv-tools_1.4.313.0.bb => spirv-tools_1.4.321.0.bb}    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/spir/{spirv-headers_1.4.313.0.bb => spirv-headers_1.4.321.0.bb} (84%)
 rename meta/recipes-graphics/spir/{spirv-tools_1.4.313.0.bb => spirv-tools_1.4.321.0.bb} (97%)
meta/recipes-graphics/spir/spirv-headers_1.4.321.0.bb renamed from meta/recipes-graphics/spir/spirv-headers_1.4.313.0.bb +2 -2
similarity index 84%
rename from meta/recipes-graphics/spir/spirv-headers_1.4.313.0.bb
rename to meta/recipes-graphics/spir/spirv-headers_1.4.321.0.bb
index a551814689c..1da2e74f93b 100644
@@ -2,9 +2,9 @@ SUMMARY = "Machine-readable files for the SPIR-V Registry"
 SECTION = "graphics"
 HOMEPAGE = "https://www.khronos.org/registry/spir-v"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d14ee3b13f42e9c9674acc5925c3d741"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a0dcaa512cc2dee95fe0fd791ee83a18"
 
-SRCREV = "aa6cef192b8e693916eb713e7a9ccadf06062ceb"
+SRCREV = "2a611a970fdbc41ac2e3e328802aed9985352dca"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main"
 PE = "1"
 # These recipes need to be updated in lockstep with each other:
meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb renamed from meta/recipes-graphics/spir/spirv-tools_1.4.313.0.bb +1 -2
similarity index 97%
rename from meta/recipes-graphics/spir/spirv-tools_1.4.313.0.bb
rename to meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb
index 4594a1a9426..319b25b7f43 100644
@@ -7,7 +7,7 @@ SECTION = "graphics"
 LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "a62abcb402009b9ca5975e6167c09f237f630e0e"
+SRCREV = "33e02568181e3312f49a3cf33df470bf96ef293a"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https \
            "
 PE = "1"
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#220984): https://lists.openembedded.org/g/openembedded-core/message/220984
Mute This Topic: https://lists.openembedded.org/mt/114408564/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

author
#13 lore raw
Quoted 13 lines · Alexander Kanavin

These need to be updated in lockstep with other vulkan items:

$ find . -name *1.4.3*
./meta/recipes-graphics/glslang/glslang_1.4.313.0.bb
./meta/recipes-graphics/vulkan/vulkan-headers_1.4.313.0.bb
./meta/recipes-graphics/vulkan/vulkan-loader_1.4.313.0.bb
./meta/recipes-graphics/vulkan/vulkan-tools_1.4.313.0.bb
./meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.4.313.0.bb
./meta/recipes-graphics/vulkan/vulkan-validation-layers_1.4.313.0.bb
./meta/recipes-graphics/vulkan/vulkan-volk_1.4.313.0.bb
./meta/recipes-graphics/spir/spirv-headers_1.4.313.0.bb
./meta/recipes-graphics/spir/spirv-tools_1.4.313.0.bb

Yes thats reasonable. Although what worries me is the spread of dependencies for atomic upgrades now, libclc is built from clang sources and libclc has dependencies
into these via spirv-tools, this is adding quite a bit of sundry dependency upgrades
that compiler upgrade will have to do. Thats my worry all along when we spun packages
out of clang, It would make it hard to do version upgrades in future.

Quoted 57 lines

Alex

Quoted 53 lines · Khem Raj via lists.openembedded.org
---
 ...{spirv-headers_1.4.313.0.bb => spirv-headers_1.4.321.0.bb} | 4 ++--
 .../{spirv-tools_1.4.313.0.bb => spirv-tools_1.4.321.0.bb}    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/spir/{spirv-headers_1.4.313.0.bb => spirv-headers_1.4.321.0.bb} (84%)
 rename meta/recipes-graphics/spir/{spirv-tools_1.4.313.0.bb => spirv-tools_1.4.321.0.bb} (97%)
meta/recipes-graphics/spir/spirv-headers_1.4.321.0.bb renamed from meta/recipes-graphics/spir/spirv-headers_1.4.313.0.bb +2 -2
similarity index 84%
rename from meta/recipes-graphics/spir/spirv-headers_1.4.313.0.bb
rename to meta/recipes-graphics/spir/spirv-headers_1.4.321.0.bb
index a551814689c..1da2e74f93b 100644
@@ -2,9 +2,9 @@ SUMMARY = "Machine-readable files for the SPIR-V Registry"
 SECTION = "graphics"
 HOMEPAGE = "https://www.khronos.org/registry/spir-v"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d14ee3b13f42e9c9674acc5925c3d741"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a0dcaa512cc2dee95fe0fd791ee83a18"
 
-SRCREV = "aa6cef192b8e693916eb713e7a9ccadf06062ceb"
+SRCREV = "2a611a970fdbc41ac2e3e328802aed9985352dca"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main"
 PE = "1"
 # These recipes need to be updated in lockstep with each other:
meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb renamed from meta/recipes-graphics/spir/spirv-tools_1.4.313.0.bb +1 -2
similarity index 97%
rename from meta/recipes-graphics/spir/spirv-tools_1.4.313.0.bb
rename to meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb
index 4594a1a9426..319b25b7f43 100644
@@ -7,7 +7,7 @@ SECTION = "graphics"
 LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "a62abcb402009b9ca5975e6167c09f237f630e0e"
+SRCREV = "33e02568181e3312f49a3cf33df470bf96ef293a"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https \
            "
 PE = "1"
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#220984): https://lists.openembedded.org/g/openembedded-core/message/220984
Mute This Topic: https://lists.openembedded.org/mt/114408564/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#14 lore raw
Quoted 8 lines · Khem Raj via lists.openembedded.org

Yes thats reasonable. Although what worries me is the spread of dependencies for atomic upgrades now, libclc is built from clang sources and libclc has dependencies
into these via spirv-tools, this is adding quite a bit of sundry dependency upgrades
that compiler upgrade will have to do. Thats my worry all along when we spun packages
out of clang, It would make it hard to do version upgrades in future.

There’s no change to what actual code is being built, the libclc recipe uses the llvm shared sources.

Ross

author
#15 lore raw
Quoted 11 lines · Ross Burton
Quoted 8 lines · Khem Raj via lists.openembedded.org

Yes thats reasonable. Although what worries me is the spread of dependencies for atomic upgrades now, libclc is built from clang sources and libclc has dependencies
into these via spirv-tools, this is adding quite a bit of sundry dependency upgrades
that compiler upgrade will have to do. Thats my worry all along when we spun packages
out of clang, It would make it hard to do version upgrades in future.

Quoted 1 line

There’s no change to what actual code is being built, the libclc recipe uses the llvm shared sources.

We controlled the spirv (headers/tools) deps inside clang recipes initially when it was part of clang recipe.

Quoted 2 lines

Ross