.gitignore

@@ -1 +1,10 @@
-SOURCES/SPIRV-Tools-sdk-1.3.283.0.tar.gz
+/spirv-tools-*.tar.gz
+/SPIRV-Tools-sdk-1.3.216.0.tar.gz
+/SPIRV-Tools-sdk-1.3.224.0.tar.gz
+/SPIRV-Tools-sdk-1.3.231.1.tar.gz
+/SPIRV-Tools-sdk-1.3.239.0.tar.gz
+/SPIRV-Tools-sdk-1.3.243.0.tar.gz
+/SPIRV-Tools-sdk-1.3.250.0.tar.gz
+/SPIRV-Tools-sdk-1.3.261.1.tar.gz
+/SPIRV-Tools-sdk-1.3.268.0.tar.gz
+/SPIRV-Tools-sdk-1.3.283.0.tar.gz

.spirv-tools.metadata

@@ -1 +0,0 @@
-b96c7ad5e38f678a16b3e3f0fb7be5f98178b036 SOURCES/SPIRV-Tools-sdk-1.3.283.0.tar.gz

0001-optimizer-restore-previous-ABI.patch

@@ -0,0 +1,53 @@
+From 449c00f9b32ffb71be7e8274871e1f383b046ca2 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Mon, 6 Dec 2021 13:49:10 +1000
+Subject: [PATCH] optimizer: restore previous ABI.
+
+The change in
+commit 4ac8e5e541ea992dc6f44a4d4eb065a8fe0888ec
+Author: Greg Fischer <greg@lunarg.com>
+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<opt::SSARewritePass>());
+ }
+ 
++Optimizer::PassToken CreateAggressiveDCEPass() {
++  return MakeUnique<Optimizer::PassToken::Impl>(
++      MakeUnique<opt::AggressiveDCEPass>(false));
++}
++
+ Optimizer::PassToken CreateAggressiveDCEPass(bool preserve_interface) {
+   return MakeUnique<Optimizer::PassToken::Impl>(
+       MakeUnique<opt::AggressiveDCEPass>(preserve_interface));
+-- 
+2.33.1
+

README.md

@@ -0,0 +1,3 @@
+# spirv-tools
+
+The spirv-tools package

SOURCES/rhel8-workaround.patch

@@ -1,13 +0,0 @@
-diff -up SPIRV-Tools-sdk-1.3.250.1/CMakeLists.txt.dma SPIRV-Tools-sdk-1.3.250.1/CMakeLists.txt
-diff -up SPIRV-Tools-sdk-1.3.250.1/tools/CMakeLists.txt.dma SPIRV-Tools-sdk-1.3.250.1/tools/CMakeLists.txt
---- SPIRV-Tools-sdk-1.3.250.1/tools/CMakeLists.txt.dma	2023-07-12 15:03:54.303896734 +1000
-+++ SPIRV-Tools-sdk-1.3.250.1/tools/CMakeLists.txt	2023-07-12 15:05:46.480030301 +1000
-@@ -74,7 +74,7 @@ if (NOT ${SPIRV_SKIP_EXECUTABLES})
-                            objdump/extract_source.cpp
-                            util/cli_consumer.cpp
-                            ${COMMON_TOOLS_SRCS}
--                      LIBS ${SPIRV_TOOLS_FULL_VISIBILITY})
-+                      LIBS ${SPIRV_TOOLS_FULL_VISIBILITY} stdc++fs)
-     target_include_directories(spirv-objdump PRIVATE ${spirv-tools_SOURCE_DIR}
-                                                      ${SPIRV_HEADER_INCLUDE_DIR})
-     set(SPIRV_INSTALL_TARGETS ${SPIRV_INSTALL_TARGETS} spirv-objdump)

SPECS/spirv-tools.spec

@@ -1,180 +0,0 @@
-%undefine __cmake_in_source_build
-
-%global sdkver 1.3.283.0
-
-Name:           spirv-tools
-Version:        2024.2
-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/vulkan-sdk-%{sdkver}.tar.gz#/SPIRV-Tools-sdk-%{sdkver}.tar.gz
-
-Patch0: rhel8-workaround.patch
-Patch1: fix-gcc12-build.patch
-
-BuildRequires:  cmake3
-BuildRequires:  gcc-c++
-BuildRequires:  ninja-build
-%if 0%{?rhel} == 7
-BuildRequires:  python36-devel
-%else
-BuildRequires:  python3-devel
-%endif
-BuildRequires:  python3-rpm-macros
-BuildRequires:  spirv-headers-devel
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
-
-%description
-The package includes an assembler, binary module parser,
-disassembler, and validator for SPIR-V..
-
-%package        libs
-Summary:        Library files for %{name}
-Provides:       %{name}-libs%{?_isa} = %{version}
-
-%description    libs
-library files for %{name}
-
-%package        devel
-Summary:        Development files for %{name}
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
-
-%description    devel
-Development files for %{name}
-
-%prep
-%autosetup -p1 -n SPIRV-Tools-vulkan-sdk-%{sdkver}
-
-%build
-%cmake3 -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_LIBDIR=%{_lib} \
-        -DSPIRV-Headers_SOURCE_DIR=%{_prefix} \
-        -DPYTHON_EXECUTABLE=%{__python3} \
-        -DSPIRV_TOOLS_BUILD_STATIC=OFF \
-        -GNinja
-%cmake3_build
-
-%install
-%cmake3_install
-
-%ldconfig_scriptlets libs
-
-%files
-%license LICENSE
-%doc README.md CHANGES
-%{_bindir}/spirv-as
-%{_bindir}/spirv-cfg
-%{_bindir}/spirv-dis
-%{_bindir}/spirv-lesspipe.sh
-%{_bindir}/spirv-link
-%{_bindir}/spirv-lint
-%{_bindir}/spirv-objdump
-%{_bindir}/spirv-opt
-%{_bindir}/spirv-reduce
-%{_bindir}/spirv-val
-
-%files libs
-%{_libdir}/libSPIRV-Tools-diff.so
-%{_libdir}/libSPIRV-Tools-link.so
-%{_libdir}/libSPIRV-Tools-lint.so
-%{_libdir}/libSPIRV-Tools-opt.so
-%{_libdir}/libSPIRV-Tools.so
-%{_libdir}/libSPIRV-Tools-reduce.so
-%{_libdir}/libSPIRV-Tools-shared.so
-
-%files devel
-%{_includedir}/spirv-tools/
-%{_libdir}/cmake/*
-%{_libdir}/pkgconfig/SPIRV-Tools-shared.pc
-%{_libdir}/pkgconfig/SPIRV-Tools.pc
-
-%changelog
-* Tue Sep 10 2024 José Expósito <jexposit@redhat.com> - 1.3.283.0-1
-- Update to 1.3.283.0 SDK
-  Resolves: https://issues.redhat.com/browse/RHEL-54285
-
-* Wed Jul 12 2023 Dave Airlie <airlied@redhat.com> - 2023.1-3
-- Update to 1.3.250.1 SDK version
-
-* Wed Feb 15 2023 Dave Airlie <airlied@redhat.com> - 2023.1-2
-- fix spirv-tools ABI break
-
-* Mon Feb 13 2023 Dave Airlie <airlied@redhat.com> - 2023.1-1
-- Update to 1.3.239.0 SDK version
-
-* Wed Aug 24 2022 Dave Airlie <airlied@redhat.com> - 2022.2-2
-- Update to 1.3.224.0 SDK version
-
-* Mon Jun 20 2022 Dave Airlie <airlied@redhat.com> - 2022.2-1
-- Update to 1.3.216.0 SDK version
-
-* Mon Feb 21 2022 Dave Airlie <airlied@redhat.com> - 2022.1-1
-- Update to 1.3.204.0 SDK version
-
-* Thu Jan 28 2021 Dave Airlie <airlied@redhat.com> - 2020.5-3
-- Update to 1.2.162.0 SDK version
-
-* Wed Aug 05 2020 Dave Airlie <airlied@redhat.com> - 2020.5-1
-- update to latest upstream
-
-* Wed Jan 29 2020 Dave Airlie <airlied@redhat.com> - 2019.5-1
-- update to latest upstream
-
-* Sat Dec 07 2019 Dave Airlie <airlied@redhat.com> - 2019.4-2
-- rebuild for 8.2.0
-
-* Tue Nov 12 2019 Dave Airlie <airlied@redhat.com> - 2019.4-1
-- latest upstream snapshot
-
-* Sun Aug 04 2019 Dave Airlie <airlied@redhat.com> - 2019.4-0.1
-- Update to latest upstream for glslang
-- drop spirv-stats as per upstream.
-
-* Thu Mar 07 2019 Dave Airlie <airlied@redhat.com> - 2019.1-1
-- Update to 2019.1 release
-
-* Mon Jul 23 2018 Leigh Scott <leigh123linux@googlemail.com> - 2018.4-1
-- Update to 2018.4 release
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2018.3.0-0.3.20180407.git26a698c
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Mon Jun 25 2018 Dave Airlie <airlied@redhat.com> - 2018.3.0-0.2.20180407.git26a698c
-- Move to python3 and drop the simplejson buildreq.
-
-* Tue Apr 24 2018 Leigh Scott <leigh123linux@googlemail.com> - 2018.3.0-0.1.20180407.git26a698c
-- Bump version to 2018.3.0 to match .pc files
-
-* Tue Apr 24 2018 Leigh Scott <leigh123linux@googlemail.com> - 2018.1-0.4.20180407.git26a698c
-- Bump provides to 2018.3.0
-
-* Tue Apr 24 2018 Leigh Scott <leigh123linux@googlemail.com> - 2018.1-0.3.20180407.git26a698c
-- Update for vulkan 1.1.73.0
-
-* Wed Feb 14 2018 Leigh Scott <leigh123linux@googlemail.com> - 2018.1-0.2.20180205.git9e19fc0
-- Add isa to the provides
-
-* Fri Feb 09 2018 Leigh Scott <leigh123linux@googlemail.com> - 2018.1-0.1.20180205.git9e19fc0
-- Fix version
-- Fix pkgconfig file
-- Add version provides to -libs package
-
-* Fri Feb 09 2018 Leigh Scott <leigh123linux@googlemail.com> - 2016.7-0.5.20180205.git9e19fc0
-- Update for vulkan 1.0.68.0
-- Try building as shared object
-- Split libs into -libs subpackage
-
-* Fri Feb 09 2018 Leigh Scott <leigh123linux@googlemail.com> - 2016.7-0.4.20171023.git5834719
-- Use ninja to build
-
-* Mon Jan 22 2018 Leigh Scott <leigh123linux@googlemail.com> - 2016.7-0.3.20171023.git5834719
-- Add python prefix to fix the stupid Bodhi tests
-
-* Wed Jan 03 2018 Leigh Scott <leigh123linux@googlemail.com> - 2016.7-0.2.20171023.git5834719
-- Split binaries into main package
-
-* Thu Jul 13 2017 Leigh Scott <leigh123linux@googlemail.com> - 2016.7-0.1.20171023.git5834719
-- First build
-

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-10
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

sources

@@ -0,0 +1 @@
+SHA512 (SPIRV-Tools-sdk-1.3.283.0.tar.gz) = 45c521307c8df2d74bdf811a50ff37028a45a77f58dcac910924f3490dfe3f8e9dacace77dab989d8d261528cd0f0a8e36ca7627dda608b9b09afb2e374736e5

spirv-tools.spec

@@ -0,0 +1,93 @@
+%undefine __cmake_in_source_build
+
+%global sdkver 1.3.283.0
+
+Name:           spirv-tools
+Version:        2024.2
+Release:        %autorelease
+Summary:        API and commands for processing SPIR-V modules
+
+License:        Apache-2.0
+URL:            https://github.com/KhronosGroup/SPIRV-Tools
+Source0:        %url/archive/vulkan-sdk-%{sdkver}.tar.gz#/SPIRV-Tools-sdk-%{sdkver}.tar.gz
+
+Patch0: fix-gcc12-build.patch
+
+BuildRequires:  cmake3
+BuildRequires:  gcc-c++
+BuildRequires:  ninja-build
+%if 0%{?rhel} == 7
+BuildRequires:  python36-devel
+%else
+BuildRequires:  python3-devel
+%endif
+BuildRequires:  python3-rpm-macros
+BuildRequires:  spirv-headers-devel
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+
+%description
+The package includes an assembler, binary module parser,
+disassembler, and validator for SPIR-V..
+
+%package        libs
+Summary:        Library files for %{name}
+Provides:       %{name}-libs%{?_isa} = %{version}
+
+%description    libs
+library files for %{name}
+
+%package        devel
+Summary:        Development files for %{name}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+
+%description    devel
+Development files for %{name}
+
+%prep
+%autosetup -p1 -n SPIRV-Tools-vulkan-sdk-%{sdkver}
+
+%build
+%cmake3 -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_LIBDIR=%{_lib} \
+        -DSPIRV-Headers_SOURCE_DIR=%{_prefix} \
+        -DPYTHON_EXECUTABLE=%{__python3} \
+        -DSPIRV_TOOLS_BUILD_STATIC=OFF \
+        -GNinja
+%cmake3_build
+
+%install
+%cmake3_install
+
+%ldconfig_scriptlets libs
+
+%files
+%license LICENSE
+%doc README.md CHANGES
+%{_bindir}/spirv-as
+%{_bindir}/spirv-cfg
+%{_bindir}/spirv-dis
+%{_bindir}/spirv-lesspipe.sh
+%{_bindir}/spirv-link
+%{_bindir}/spirv-lint
+%{_bindir}/spirv-objdump
+%{_bindir}/spirv-opt
+%{_bindir}/spirv-reduce
+%{_bindir}/spirv-val
+
+%files libs
+%{_libdir}/libSPIRV-Tools-diff.so
+%{_libdir}/libSPIRV-Tools-link.so
+%{_libdir}/libSPIRV-Tools-lint.so
+%{_libdir}/libSPIRV-Tools-opt.so
+%{_libdir}/libSPIRV-Tools.so
+%{_libdir}/libSPIRV-Tools-reduce.so
+%{_libdir}/libSPIRV-Tools-shared.so
+
+%files devel
+%{_includedir}/spirv-tools/
+%{_libdir}/cmake/*
+%{_libdir}/pkgconfig/SPIRV-Tools-shared.pc
+%{_libdir}/pkgconfig/SPIRV-Tools.pc
+
+%changelog
+%autochangelog