import spirv-tools-2021.4-3.20211110.git21e3f68.el8_5

This commit is contained in:
CentOS Sources 2022-02-01 15:13:03 -05:00 committed by Stepan Oksanichenko
parent 7f31c559c8
commit 57b04f9aa3
4 changed files with 69 additions and 6 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/spirv-tools-1fbed83c8aab8517d821fcb4164c08567951938f.tar.gz
SOURCES/spirv-tools-21e3f681e2004590c7865bc8c0195a4ab8e66c88.tar.gz

View File

@ -1 +1 @@
bdb75c83663ab3dc120137ca8858fcdb41f1ed57 SOURCES/spirv-tools-1fbed83c8aab8517d821fcb4164c08567951938f.tar.gz
0ab8feda8d1e26ad379255c7d51ca38c28abfe6c SOURCES/spirv-tools-21e3f681e2004590c7865bc8c0195a4ab8e66c88.tar.gz

View File

@ -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

View File

@ -1,17 +1,18 @@
%global commit 1fbed83c8aab8517d821fcb4164c08567951938f
%global commit 21e3f681e2004590c7865bc8c0195a4ab8e66c88
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20210825
%global commit_date 20211110
%global gitrel .%{commit_date}.git%{shortcommit}
Name: spirv-tools
Version: 2021.3
Release: 1%{?gitrel}%{?dist}
Version: 2021.4
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/%{commit}.tar.gz#/%{name}-%{commit}.tar.gz
Patch0: 0001-optimizer-restore-previous-ABI.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: ninja-build
@ -90,6 +91,15 @@ popd
%{_libdir}/pkgconfig/SPIRV-Tools.pc
%changelog
* Fri Dec 10 2021 Dave Airlie <airlied@redhat.com> - 2021.4-3.20211110.git21e3f68
- Restore both ABIs
* Thu Dec 09 2021 Dave Airlie <airlied@redhat.com> - 2021.4-2.20211110.git21e3f68
- Restore upstream ABI
* Thu Nov 25 2021 Dave Airlie <airlied@redhat.com> - 2021.4-1.20211110.git21e3f68
- Update to 1.2.198.0 SDK Version
* Wed Sep 08 2021 Dave Airlie <airlied@redhat.com> - 2021.3-1
- Update to 1.2.189.0 SDK version