commit: e211dba86187e3c74ea383873e6b5243b840e86c
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Oct 26 14:06:39 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Oct 27 07:10:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e211dba8
dev-util/spirv-llvm-translator: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
...v-llvm-translator-15.0.0-intel-capability.patch | 77 ----------------------
...vm-translator-16.0.0-llvm-link-llvm-dylib.patch | 73 --------------------
2 files changed, 150 deletions(-)
diff --git
a/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-15.0.0-intel-capability.patch
b/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-15.0.0-intel-capability.patch
deleted file mode 100644
index 612a493fbed6..000000000000
---
a/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-15.0.0-intel-capability.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/include/LLVMSPIRVExtensions.inc b/include/LLVMSPIRVExtensions.inc
-index 8eaf24de..695a5d85 100644
---- a/include/LLVMSPIRVExtensions.inc
-+++ b/include/LLVMSPIRVExtensions.inc
-@@ -38,6 +38,7 @@ EXT(SPV_INTEL_variable_length_array)
- EXT(SPV_INTEL_fp_fast_math_mode)
- EXT(SPV_INTEL_fpga_cluster_attributes)
- EXT(SPV_INTEL_loop_fuse)
-+EXT(SPV_INTEL_long_composites)
- EXT(SPV_INTEL_long_constant_composite)
- EXT(SPV_INTEL_optnone)
- EXT(SPV_INTEL_fpga_dsp_control)
-diff --git a/lib/SPIRV/libSPIRV/SPIRVEntry.h b/lib/SPIRV/libSPIRV/SPIRVEntry.h
-index b43cd892..8be8d1b9 100644
---- a/lib/SPIRV/libSPIRV/SPIRVEntry.h
-+++ b/lib/SPIRV/libSPIRV/SPIRVEntry.h
-@@ -901,7 +901,7 @@ public:
- }
-
- SPIRVCapVec getRequiredCapability() const override {
-- return getVec(CapabilityLongConstantCompositeINTEL);
-+ return getVec(CapabilityLongCompositesINTEL);
- }
-
- llvm::Optional<ExtensionID> getRequiredExtension() const override {
-diff --git a/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h
b/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h
-index 88071dd7..3ba1cc38 100644
---- a/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h
-+++ b/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h
-@@ -591,7 +591,7 @@ template <> inline void SPIRVMap<Capability,
std::string>::init() {
- add(CapabilityGroupNonUniformRotateKHR, "GroupNonUniformRotateKHR");
- add(CapabilityAtomicFloat32AddEXT, "AtomicFloat32AddEXT");
- add(CapabilityAtomicFloat64AddEXT, "AtomicFloat64AddEXT");
-- add(CapabilityLongConstantCompositeINTEL, "LongConstantCompositeINTEL");
-+ add(CapabilityLongCompositesINTEL, "LongCompositesINTEL");
- add(CapabilityOptNoneINTEL, "OptNoneINTEL");
- add(CapabilityAtomicFloat16AddEXT, "AtomicFloat16AddEXT");
- add(CapabilityDebugInfoModuleINTEL, "DebugInfoModuleINTEL");
-diff --git a/test/SpecConstants/long-spec-const-composite.ll
b/test/SpecConstants/long-spec-const-composite.ll
-index 974a0776..4510a1e6 100644
---- a/test/SpecConstants/long-spec-const-composite.ll
-+++ b/test/SpecConstants/long-spec-const-composite.ll
-@@ -11,7 +11,7 @@
- target datalayout =
"e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64"
- target triple = "spir64-unknown-unknown"
-
--; CHECK-SPIRV: Capability LongConstantCompositeINTEL
-+; CHECK-SPIRV: Capability LongCompositesINTEL
- ; CHECK-SPIRV: Extension "SPV_INTEL_long_constant_composite"
- ; CHECK-SPIRV-DAG: Decorate [[First:[0-9]+]] SpecId 0
- ; CHECK-SPIRV-DAG: Decorate [[Last:[0-9]+]] SpecId 65548
-diff --git a/test/long-constant-array.ll b/test/long-constant-array.ll
-index 03b33771..d0b4c3b3 100644
---- a/test/long-constant-array.ll
-+++ b/test/long-constant-array.ll
-@@ -9,7 +9,7 @@
- ; TODO: run validator once it supports the extension
- ; RUNx: spirv-val %t.spv
-
--; CHECK-SPIRV: Capability LongConstantCompositeINTEL
-+; CHECK-SPIRV: Capability LongCompositesINTEL
- ; CHECK-SPIRV: Extension "SPV_INTEL_long_constant_composite"
- ; CHECK-SPIRV: TypeInt [[TInt:[0-9]+]] 8
- ; CHECK-SPIRV: Constant {{[0-9]+}} [[ArrSize:[0-9]+]] 78000
-diff --git a/test/long-type-struct.ll b/test/long-type-struct.ll
-index b9478f0f..a1cdfc6b 100644
---- a/test/long-type-struct.ll
-+++ b/test/long-type-struct.ll
-@@ -10,7 +10,7 @@
-
- ; RUN: not llvm-spirv %t.bc -o %t.spv 2>&1 | FileCheck %s
--check-prefix=CHECK-ERROR
-
--; CHECK-SPIRV: Capability LongConstantCompositeINTEL
-+; CHECK-SPIRV: Capability LongCompositesINTEL
- ; CHECK-SPIRV: Extension "SPV_INTEL_long_constant_composite"
- ; CHECK-SPIRV: TypeForwardPointer [[TFwdPtr:[0-9]+]]
- ; CHECK-SPIRV: TypeInt [[TInt:[0-9]+]]
diff --git
a/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-16.0.0-llvm-link-llvm-dylib.patch
b/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-16.0.0-llvm-link-llvm-dylib.patch
deleted file mode 100644
index 5cd90086f1e2..000000000000
---
a/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-16.0.0-llvm-link-llvm-dylib.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 98fadafeae0204defedd89f015f7fb88f2888b2f Mon Sep 17 00:00:00 2001
-From: Tulio Magno Quites Machado Filho <[email protected]>
-Date: Fri, 17 Mar 2023 14:27:10 -0300
-Subject: [PATCH] Fix standalone builds with LLVM_LINK_LLVM_DYLIB=ON
-
-Move the LLVM components to LINK_COMPONENTS because the DEPENDS list has
-the same semantics as add_dependencies(). In this
-case it doesn't include the LLVM components when calling the linker.
----
- lib/SPIRV/CMakeLists.txt | 47 ++++++++++++----------------------------
- 1 file changed, 14 insertions(+), 33 deletions(-)
-
-diff --git a/lib/SPIRV/CMakeLists.txt b/lib/SPIRV/CMakeLists.txt
-index bbef00528..2810c6b2c 100644
---- a/lib/SPIRV/CMakeLists.txt
-+++ b/lib/SPIRV/CMakeLists.txt
-@@ -38,42 +38,23 @@ set(SRC_LIST
- libSPIRV/SPIRVType.cpp
- libSPIRV/SPIRVValue.cpp
- )
--if(LLVM_LINK_LLVM_DYLIB)
-- add_llvm_library(LLVMSPIRVLib STATIC DISABLE_LLVM_LINK_LLVM_DYLIB
-- ${SRC_LIST}
-- DEPENDS
-- intrinsics_gen
-- LLVMAnalysis
-- LLVMBitWriter
-- LLVMCodeGen
-- LLVMCore
-- LLVMDemangle
-- LLVMIRReader
-- LLVMLinker
-- LLVMPasses
-- LLVMSupport
-- LLVMTargetParser
-- LLVMTransformUtils
-- )
--else()
-- add_llvm_library(LLVMSPIRVLib
-- ${SRC_LIST}
-- LINK_COMPONENTS
-- Analysis
-- BitWriter
-- CodeGen
-- Core
-- Demangle
-- IRReader
-- Linker
-- Passes
-- Support
-- TargetParser
-- TransformUtils
-+add_llvm_library(LLVMSPIRVLib
-+ ${SRC_LIST}
-+ LINK_COMPONENTS
-+ Analysis
-+ BitWriter
-+ CodeGen
-+ Core
-+ Demangle
-+ IRReader
-+ Linker
-+ Passes
-+ Support
-+ TargetParser
-+ TransformUtils
- DEPENDS
- intrinsics_gen
- )
--endif()
-
- target_include_directories(LLVMSPIRVLib
- PRIVATE
