From 5326138e6f819dcbbf6ba9736e281e80d843b17a Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 6 Jul 2023 17:50:11 +1000 Subject: [PATCH] Update to 1.3.250.1 SDK release Resolves: rhbz#2178531 --- .gitignore | 1 + 0001-opt-fix-spirv-ABI-on-Linux-again.patch | 52 --------------------- sources | 2 +- spirv-tools.spec | 9 ++-- 4 files changed, 8 insertions(+), 56 deletions(-) delete mode 100644 0001-opt-fix-spirv-ABI-on-Linux-again.patch diff --git a/.gitignore b/.gitignore index 9dfc4c0..abb18c6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /SPIRV-Tools-sdk-1.3.216.0.tar.gz /SPIRV-Tools-sdk-1.3.224.0.tar.gz /SPIRV-Tools-sdk-1.3.239.0.tar.gz +/SPIRV-Tools-sdk-1.3.250.1.tar.gz diff --git a/0001-opt-fix-spirv-ABI-on-Linux-again.patch b/0001-opt-fix-spirv-ABI-on-Linux-again.patch deleted file mode 100644 index 055b7be..0000000 --- a/0001-opt-fix-spirv-ABI-on-Linux-again.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 743578474de0736850286c2c6d2b796a923b1a7c Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Wed, 15 Feb 2023 16:50:24 +1000 -Subject: [PATCH] opt: fix spirv ABI on Linux again. - -Breaking the ABI for this API isn't worth it when the fix is so simple. ---- - include/spirv-tools/optimizer.hpp | 6 ++++-- - source/opt/optimizer.cpp | 10 ++++++++++ - 2 files changed, 14 insertions(+), 2 deletions(-) - -diff --git a/include/spirv-tools/optimizer.hpp b/include/spirv-tools/optimizer.hpp -index aa6a614e..8bdd4e82 100644 ---- a/include/spirv-tools/optimizer.hpp -+++ b/include/spirv-tools/optimizer.hpp -@@ -525,8 +525,10 @@ Optimizer::PassToken CreateDeadInsertElimPass(); - // If |remove_outputs| is true, allow outputs to be removed from the interface. - // This is only safe if the caller knows that there is no corresponding input - // variable in the following shader. It is false by default. --Optimizer::PassToken CreateAggressiveDCEPass(bool preserve_interface = false, -- bool remove_outputs = false); -+Optimizer::PassToken CreateAggressiveDCEPass(); -+Optimizer::PassToken CreateAggressiveDCEPass(bool preserve_interface); -+Optimizer::PassToken CreateAggressiveDCEPass(bool preserve_interface, -+ bool remove_outputs); - - // Creates a remove-unused-interface-variables pass. - // Removes variables referenced on the |OpEntryPoint| instruction that are not -diff --git a/source/opt/optimizer.cpp b/source/opt/optimizer.cpp -index cbc4b82f..46a92dd9 100644 ---- a/source/opt/optimizer.cpp -+++ b/source/opt/optimizer.cpp -@@ -785,6 +785,16 @@ Optimizer::PassToken CreateLocalMultiStoreElimPass() { - MakeUnique()); - } - -+Optimizer::PassToken CreateAggressiveDCEPass() { -+ return MakeUnique( -+ MakeUnique(false, false)); -+} -+ -+Optimizer::PassToken CreateAggressiveDCEPass(bool preserve_interface) { -+ return MakeUnique( -+ MakeUnique(preserve_interface, false)); -+} -+ - Optimizer::PassToken CreateAggressiveDCEPass(bool preserve_interface, - bool remove_outputs) { - return MakeUnique( --- -2.39.1 - diff --git a/sources b/sources index 35e3915..cbf0491 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SPIRV-Tools-sdk-1.3.239.0.tar.gz) = 1e930397c40fd65eb04c80a27c1fb2b3546aca2ce0fec6b40e8e09fbdb93b48f00281fabf10b8ba54c0186139640794b517b54a2e87b81842d5ea067afedc528 +SHA512 (SPIRV-Tools-sdk-1.3.250.1.tar.gz) = 29bd10d2222d552581a341e5f5905effe1ad620e42b9216ad06c79d3fa3aeee26cccb64e0ad1f6e556fb7143991ee390f0a1f64f14694d614421efc94a47c4e0 diff --git a/spirv-tools.spec b/spirv-tools.spec index b5484b9..cb0fd04 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -1,17 +1,16 @@ %undefine __cmake_in_source_build -%global sdkver 1.3.239.0 +%global sdkver 1.3.250.1 Name: spirv-tools Version: 2023.1 -Release: 2%{?gitrel}%{?dist} +Release: 3%{?gitrel}%{?dist} Summary: API and commands for processing SPIR-V modules License: ASL 2.0 URL: https://github.com/KhronosGroup/SPIRV-Tools Source0: %url/archive/sdk-%{sdkver}.tar.gz#/SPIRV-Tools-sdk-%{sdkver}.tar.gz -Patch0: 0001-opt-fix-spirv-ABI-on-Linux-again.patch BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: ninja-build @@ -68,6 +67,7 @@ Development files for %{name} %{_bindir}/spirv-lesspipe.sh %{_bindir}/spirv-link %{_bindir}/spirv-lint +%{_bindir}/spirv-objdump %{_bindir}/spirv-opt %{_bindir}/spirv-reduce %{_bindir}/spirv-val @@ -88,6 +88,9 @@ Development files for %{name} %{_libdir}/pkgconfig/SPIRV-Tools.pc %changelog +* Thu Jul 06 2023 Dave Airlie - 2023.1-3 +- Update to 1.3.250.1 SDK release + * Wed Feb 15 2023 Dave Airlie - 2023.1-2 - Restore spirv-tools ABI