diff --git a/.gitignore b/.gitignore index 031a38c..d5052e8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/spirv-tools-21e3f681e2004590c7865bc8c0195a4ab8e66c88.tar.gz +SOURCES/spirv-tools-45dd184c790d6bfc78a5a74a10c37e888b1823fa.tar.gz diff --git a/.spirv-tools.metadata b/.spirv-tools.metadata index 2fc929e..bd2f046 100644 --- a/.spirv-tools.metadata +++ b/.spirv-tools.metadata @@ -1 +1 @@ -0ab8feda8d1e26ad379255c7d51ca38c28abfe6c SOURCES/spirv-tools-21e3f681e2004590c7865bc8c0195a4ab8e66c88.tar.gz +96023ce0c9c256d96db8771aaeeff981cf202229 SOURCES/spirv-tools-45dd184c790d6bfc78a5a74a10c37e888b1823fa.tar.gz diff --git a/SOURCES/0001-optimizer-restore-previous-ABI.patch b/SOURCES/0001-optimizer-restore-previous-ABI.patch deleted file mode 100644 index 49b1509..0000000 --- a/SOURCES/0001-optimizer-restore-previous-ABI.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 449c00f9b32ffb71be7e8274871e1f383b046ca2 Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Mon, 6 Dec 2021 13:49:10 +1000 -Subject: [PATCH] optimizer: restore previous ABI. - -The change in -commit 4ac8e5e541ea992dc6f44a4d4eb065a8fe0888ec -Author: Greg Fischer -Date: Wed Sep 15 12:38:34 2021 -0600 - - Add preserve_interface mode to aggressive_dead_code_elim (#4520) - -Broke the C++ ABI for spirv-tools shared libraries on Linux, for not a great reason. - -Restore the previous ABI. ---- - include/spirv-tools/optimizer.hpp | 3 ++- - source/opt/optimizer.cpp | 5 +++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/include/spirv-tools/optimizer.hpp b/include/spirv-tools/optimizer.hpp -index 21059cbe..d9c511af 100644 ---- a/include/spirv-tools/optimizer.hpp -+++ b/include/spirv-tools/optimizer.hpp -@@ -519,7 +519,8 @@ Optimizer::PassToken CreateDeadInsertElimPass(); - // interface are considered live and are not eliminated. This mode is needed - // by GPU-Assisted validation instrumentation, where a change in the interface - // is not allowed. --Optimizer::PassToken CreateAggressiveDCEPass(bool preserve_interface = false); -+Optimizer::PassToken CreateAggressiveDCEPass(); -+Optimizer::PassToken CreateAggressiveDCEPass(bool preserve_interface); - - // 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 e74db26f..32a3d01e 100644 ---- a/source/opt/optimizer.cpp -+++ b/source/opt/optimizer.cpp -@@ -764,6 +764,11 @@ Optimizer::PassToken CreateLocalMultiStoreElimPass() { - MakeUnique()); - } - -+Optimizer::PassToken CreateAggressiveDCEPass() { -+ return MakeUnique( -+ MakeUnique(false)); -+} -+ - Optimizer::PassToken CreateAggressiveDCEPass(bool preserve_interface) { - return MakeUnique( - MakeUnique(preserve_interface)); --- -2.33.1 - diff --git a/SPECS/spirv-tools.spec b/SPECS/spirv-tools.spec index 0726475..5fa693b 100644 --- a/SPECS/spirv-tools.spec +++ b/SPECS/spirv-tools.spec @@ -1,18 +1,17 @@ -%global commit 21e3f681e2004590c7865bc8c0195a4ab8e66c88 +%global commit 45dd184c790d6bfc78a5a74a10c37e888b1823fa %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20211110 +%global commit_date 20220202 %global gitrel .%{commit_date}.git%{shortcommit} Name: spirv-tools -Version: 2021.4 -Release: 3%{?gitrel}%{?dist} +Version: 2022.1 +Release: 1%{?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/%{commit}.tar.gz#/%{name}-%{commit}.tar.gz -Patch0: 0001-optimizer-restore-previous-ABI.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: ninja-build @@ -91,17 +90,8 @@ popd %{_libdir}/pkgconfig/SPIRV-Tools.pc %changelog -* Fri Dec 10 2021 Dave Airlie - 2021.4-3.20211110.git21e3f68 -- Restore both ABIs - -* Thu Dec 09 2021 Dave Airlie - 2021.4-2.20211110.git21e3f68 -- Restore upstream ABI - -* Thu Nov 25 2021 Dave Airlie - 2021.4-1.20211110.git21e3f68 -- Update to 1.2.198.0 SDK Version - -* Wed Sep 08 2021 Dave Airlie - 2021.3-1 -- Update to 1.2.189.0 SDK version +* Mon Feb 21 2022 Dave Airlie - 2022.1-1 +- Update to 1.3.204.0 SDK version * Thu Jan 28 2021 Dave Airlie - 2020.5-3 - Update to 1.2.162.0 SDK version