diff --git a/baselibs.conf b/baselibs.conf index 11233cb..c3f857d 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libSPIRV-Tools-suse21 +libSPIRV-Tools-suse22 spirv-tools-devel requires -spirv-tools- - requires "libSPIRV-Tools-suse21- = " + requires "libSPIRV-Tools-suse22- = " diff --git a/spirv-tools.changes b/spirv-tools.changes index 54a367c..da42a80 100644 --- a/spirv-tools.changes +++ b/spirv-tools.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Sep 6 05:13:36 UTC 2021 - Jan Engelhardt + +- Update to release 2021.3 + * Support Intel extensions for fixed point and hls-float + * Add SPV_KHR_vulkan_memory_model to aggressive_dead_code_elim + * spirv-val: Vulkan Storage Class for Execution Model + * Support SPV_KHR_subgroup_uniform_control_flow + * Initial support for SPV_KHR_integer_dot_product + * Add validation for SPV_EXT_shader_atomic_float16_add + * Add non-semantic vulkan extended instruction set + * Don't fold unsigned divides of an constant and a negation + ------------------------------------------------------------------- Wed May 5 09:30:43 UTC 2021 - Jan Engelhardt diff --git a/spirv-tools.spec b/spirv-tools.spec index 380f79e..75dd2d5 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -17,10 +17,10 @@ %define _lto_cflags %nil -%define lname libSPIRV-Tools-suse21 +%define lname libSPIRV-Tools-suse22 Name: spirv-tools -Version: 2021.1 +Version: 2021.3 Release: 0 Summary: API and commands for processing SPIR-V modules License: Apache-2.0 @@ -37,7 +37,7 @@ BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: python3-base BuildRequires: python3-xml -BuildRequires: spirv-headers >= 1.5.4.g48 +BuildRequires: spirv-headers >= 1.5.4.g106 %description The package includes an assembler, binary module parser, @@ -77,6 +77,7 @@ export CXXFLAGS="%optflags -Wno-error=stringop-truncation" %install %cmake_install +perl -i -lpe 's{^#!/usr/bin/env sh$}{#!/bin/sh}' "%buildroot/%_bindir/spirv-lesspipe.sh" %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig @@ -88,6 +89,7 @@ export CXXFLAGS="%optflags -Wno-error=stringop-truncation" %files -n %lname %_libdir/libSPIRV-Tools.so.* %_libdir/libSPIRV-Tools-link.so.* +%_libdir/libSPIRV-Tools-lint.so.* %_libdir/libSPIRV-Tools-opt.so.* %_libdir/libSPIRV-Tools-reduce.so.* %_libdir/libSPIRV-Tools-shared.so.* @@ -96,6 +98,7 @@ export CXXFLAGS="%optflags -Wno-error=stringop-truncation" %_libdir/cmake/ %_libdir/libSPIRV-Tools.so %_libdir/libSPIRV-Tools-link.so +%_libdir/libSPIRV-Tools-lint.so %_libdir/libSPIRV-Tools-opt.so %_libdir/libSPIRV-Tools-reduce.so %_libdir/libSPIRV-Tools-shared.so diff --git a/v2021.1.tar.gz b/v2021.1.tar.gz deleted file mode 100644 index 1d79e47..0000000 --- a/v2021.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd42f6d766ac50f1a1ab46ce96d59e24ab28fb9779a71fccfa8bad760842c274 -size 2608588 diff --git a/v2021.3.tar.gz b/v2021.3.tar.gz new file mode 100644 index 0000000..d7934e6 --- /dev/null +++ b/v2021.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6b4194121ee8084c62b20f8d574c32f766e4e9237dfe60b0658b316d19c6b13 +size 2847869 diff --git a/ver.diff b/ver.diff index 0bb90ec..b783ebb 100644 --- a/ver.diff +++ b/ver.diff @@ -7,83 +7,96 @@ Unversioned libraries suck! source/CMakeLists.txt | 3 +++ source/fuzz/CMakeLists.txt | 1 + source/link/CMakeLists.txt | 1 + + source/lint/CMakeLists.txt | 1 + source/opt/CMakeLists.txt | 1 + source/reduce/CMakeLists.txt | 1 + - 5 files changed, 7 insertions(+) + 6 files changed, 8 insertions(+) -Index: SPIRV-Tools-2020.6/source/CMakeLists.txt +Index: SPIRV-Tools-2021.3/source/CMakeLists.txt =================================================================== ---- SPIRV-Tools-2020.6.orig/source/CMakeLists.txt -+++ SPIRV-Tools-2020.6/source/CMakeLists.txt -@@ -367,6 +367,7 @@ endfunction() +--- SPIRV-Tools-2021.3.orig/source/CMakeLists.txt ++++ SPIRV-Tools-2021.3/source/CMakeLists.txt +@@ -377,6 +377,7 @@ endfunction() add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES}) spirv_tools_default_target_options(${SPIRV_TOOLS}-shared) set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES CXX_VISIBILITY_PRESET hidden) -+set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse21) ++set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse22) target_compile_definitions(${SPIRV_TOOLS}-shared PRIVATE SPIRV_TOOLS_IMPLEMENTATION PUBLIC SPIRV_TOOLS_SHAREDLIB -@@ -377,6 +378,7 @@ if(SPIRV_TOOLS_BUILD_STATIC) +@@ -387,6 +388,7 @@ if(SPIRV_TOOLS_BUILD_STATIC) spirv_tools_default_target_options(${SPIRV_TOOLS}-static) # The static target does not have the '-static' suffix. set_target_properties(${SPIRV_TOOLS}-static PROPERTIES OUTPUT_NAME "${SPIRV_TOOLS}") -+ set_target_properties(${SPIRV_TOOLS}-static PROPERTIES SOVERSION suse21) ++ set_target_properties(${SPIRV_TOOLS}-static PROPERTIES SOVERSION suse22) # Create the "${SPIRV_TOOLS}" target as an alias to either "${SPIRV_TOOLS}-static" # or "${SPIRV_TOOLS}-shared" depending on the value of BUILD_SHARED_LIBS. -@@ -389,6 +391,7 @@ if(SPIRV_TOOLS_BUILD_STATIC) +@@ -399,6 +401,7 @@ if(SPIRV_TOOLS_BUILD_STATIC) set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static ${SPIRV_TOOLS}-shared) else() add_library(${SPIRV_TOOLS} ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_SOURCES}) -+ set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse21) ++ set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse22) spirv_tools_default_target_options(${SPIRV_TOOLS}) set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS} ${SPIRV_TOOLS}-shared) endif() -Index: SPIRV-Tools-2020.6/source/fuzz/CMakeLists.txt +Index: SPIRV-Tools-2021.3/source/fuzz/CMakeLists.txt =================================================================== ---- SPIRV-Tools-2020.6.orig/source/fuzz/CMakeLists.txt -+++ SPIRV-Tools-2020.6/source/fuzz/CMakeLists.txt -@@ -425,6 +425,7 @@ if(SPIRV_BUILD_FUZZER) +--- SPIRV-Tools-2021.3.orig/source/fuzz/CMakeLists.txt ++++ SPIRV-Tools-2021.3/source/fuzz/CMakeLists.txt +@@ -439,6 +439,7 @@ if(SPIRV_BUILD_FUZZER) spvtools_pch(SPIRV_TOOLS_FUZZ_SOURCES pch_source_fuzz) add_library(SPIRV-Tools-fuzz ${SPIRV_TOOLS_FUZZ_SOURCES}) -+ set_target_properties(SPIRV-Tools-fuzz PROPERTIES SOVERSION suse21) ++ set_target_properties(SPIRV-Tools-fuzz PROPERTIES SOVERSION suse22) spvtools_default_compile_options(SPIRV-Tools-fuzz) -Index: SPIRV-Tools-2020.6/source/link/CMakeLists.txt +Index: SPIRV-Tools-2021.3/source/link/CMakeLists.txt =================================================================== ---- SPIRV-Tools-2020.6.orig/source/link/CMakeLists.txt -+++ SPIRV-Tools-2020.6/source/link/CMakeLists.txt +--- SPIRV-Tools-2021.3.orig/source/link/CMakeLists.txt ++++ SPIRV-Tools-2021.3/source/link/CMakeLists.txt @@ -14,6 +14,7 @@ add_library(SPIRV-Tools-link ${SPIRV_TOOLS_LIBRARY_TYPE} linker.cpp ) -+set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse21) ++set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse22) spvtools_default_compile_options(SPIRV-Tools-link) target_include_directories(SPIRV-Tools-link -Index: SPIRV-Tools-2020.6/source/opt/CMakeLists.txt +Index: SPIRV-Tools-2021.3/source/lint/CMakeLists.txt =================================================================== ---- SPIRV-Tools-2020.6.orig/source/opt/CMakeLists.txt -+++ SPIRV-Tools-2020.6/source/opt/CMakeLists.txt -@@ -234,6 +234,7 @@ spvtools_pch(SPIRV_TOOLS_OPT_SOURCES pch +--- SPIRV-Tools-2021.3.orig/source/lint/CMakeLists.txt ++++ SPIRV-Tools-2021.3/source/lint/CMakeLists.txt +@@ -25,6 +25,7 @@ endif() + + add_library(SPIRV-Tools-lint ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_TOOLS_LINT_SOURCES}) + ++set_target_properties(SPIRV-Tools-lint PROPERTIES SOVERSION suse22) + spvtools_default_compile_options(SPIRV-Tools-lint) + target_include_directories(SPIRV-Tools-lint + PUBLIC +Index: SPIRV-Tools-2021.3/source/opt/CMakeLists.txt +=================================================================== +--- SPIRV-Tools-2021.3.orig/source/opt/CMakeLists.txt ++++ SPIRV-Tools-2021.3/source/opt/CMakeLists.txt +@@ -235,6 +235,7 @@ spvtools_pch(SPIRV_TOOLS_OPT_SOURCES pch add_library(SPIRV-Tools-opt ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_TOOLS_OPT_SOURCES}) -+set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse21) ++set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse22) spvtools_default_compile_options(SPIRV-Tools-opt) target_include_directories(SPIRV-Tools-opt PUBLIC -Index: SPIRV-Tools-2020.6/source/reduce/CMakeLists.txt +Index: SPIRV-Tools-2021.3/source/reduce/CMakeLists.txt =================================================================== ---- SPIRV-Tools-2020.6.orig/source/reduce/CMakeLists.txt -+++ SPIRV-Tools-2020.6/source/reduce/CMakeLists.txt -@@ -88,6 +88,7 @@ target_include_directories(SPIRV-Tools-r +--- SPIRV-Tools-2021.3.orig/source/reduce/CMakeLists.txt ++++ SPIRV-Tools-2021.3/source/reduce/CMakeLists.txt +@@ -92,6 +92,7 @@ target_include_directories(SPIRV-Tools-r $ PRIVATE ${spirv-tools_BINARY_DIR} ) -+set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse21) ++set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse22) # The reducer reuses a lot of functionality from the SPIRV-Tools library. target_link_libraries(SPIRV-Tools-reduce PUBLIC ${SPIRV_TOOLS_FULL_VISIBILITY}