commit: 5258471ddf31bf452c44ee0402b0ec73c8ddc3a0 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Fri Mar 15 22:44:46 2024 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Fri Mar 15 23:58:55 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5258471d
dev-util/spirv-llvm-translator: fix compilation with newer headers Closes: https://bugs.gentoo.org/924132 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> ...v-llvm-translator-15.0.0-intel-capability.patch | 77 ++++++++++++++++++++++ .../spirv-llvm-translator-15.0.0-r1.ebuild | 4 +- 2 files changed, 80 insertions(+), 1 deletion(-) 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 new file mode 100644 index 000000000000..612a493fbed6 --- /dev/null +++ b/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-15.0.0-intel-capability.patch @@ -0,0 +1,77 @@ +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/spirv-llvm-translator-15.0.0-r1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0-r1.ebuild index 71e848b4a204..bdefd6ed9703 100644 --- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0-r1.ebuild +++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -35,6 +35,8 @@ BDEPEND=" ) " +PATCHES=( "${FILESDIR}"/${PN}-15.0.0-intel-capability.patch ) + src_prepare() { append-flags -fPIC cmake_src_prepare
