From 0c7e7112fb19de30aa27735c37f96361acab1ff9 Mon Sep 17 00:00:00 2001 From: Viktoria Maximova Date: Tue, 23 Jan 2024 12:37:41 +0100 Subject: [PATCH] [Backport to 13] Update LongConstantCompositeINTEL to LongCompositesINTEL capability after Headers change (#2312) The original change: https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/0166a0fb86dc6c0e8903436bbc3a89bc3273ebc0 * Bump SPIRV-Headers to 1c6bb2743599e6eb6f37b2969acc0aef812e32e3 * replace internal SPV_INTEL_long_composites ext with the published SPV_INTEL_long_composites * don't rename extension for now --- include/LLVMSPIRVExtensions.inc | 4 +++- lib/SPIRV/libSPIRV/SPIRVEntry.h | 2 +- lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h | 2 +- spirv-headers-tag.conf | 2 +- test/SpecConstants/long-spec-const-composite.ll | 2 +- test/long-constant-array.ll | 2 +- test/long-type-struct.ll | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/LLVMSPIRVExtensions.inc b/include/LLVMSPIRVExtensions.inc index 8bdcfb0cea..b356b918a3 100644 --- a/include/LLVMSPIRVExtensions.inc +++ b/include/LLVMSPIRVExtensions.inc @@ -36,7 +36,9 @@ 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_constant_composite) +EXT(SPV_INTEL_long_composites) +EXT(SPV_INTEL_long_constant_composite) // TODO: rename to + // SPV_INTEL_long_composites later EXT(SPV_INTEL_optnone) EXT(SPV_INTEL_fpga_dsp_control) EXT(SPV_INTEL_memory_access_aliasing) diff --git a/lib/SPIRV/libSPIRV/SPIRVEntry.h b/lib/SPIRV/libSPIRV/SPIRVEntry.h index acb2aab1f4..5264e3a8c6 100644 --- a/lib/SPIRV/libSPIRV/SPIRVEntry.h +++ b/lib/SPIRV/libSPIRV/SPIRVEntry.h @@ -904,7 +904,7 @@ class SPIRVContinuedInstINTELBase : public SPIRVEntryNoId { } SPIRVCapVec getRequiredCapability() const override { - return getVec(CapabilityLongConstantCompositeINTEL); + return getVec(CapabilityLongCompositesINTEL); } llvm::Optional getRequiredExtension() const override { diff --git a/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h b/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h index 963be0b0e4..8447add72c 100644 --- a/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h +++ b/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h @@ -564,7 +564,7 @@ template <> inline void SPIRVMap::init() { add(CapabilityBitInstructions, "BitInstructions"); add(CapabilityAtomicFloat32AddEXT, "AtomicFloat32AddEXT"); add(CapabilityAtomicFloat64AddEXT, "AtomicFloat64AddEXT"); - add(CapabilityLongConstantCompositeINTEL, "LongConstantCompositeINTEL"); + add(CapabilityLongCompositesINTEL, "LongCompositesINTEL"); add(CapabilityAtomicFloat16AddEXT, "AtomicFloat16AddEXT"); add(CapabilityDebugInfoModuleINTEL, "DebugInfoModuleINTEL"); diff --git a/spirv-headers-tag.conf b/spirv-headers-tag.conf index 2d0f2237fc..7fae55f32b 100644 --- a/spirv-headers-tag.conf +++ b/spirv-headers-tag.conf @@ -1 +1 @@ -0bcc624926a25a2a273d07877fd25a6ff5ba1cfb +1c6bb2743599e6eb6f37b2969acc0aef812e32e3 diff --git a/test/SpecConstants/long-spec-const-composite.ll b/test/SpecConstants/long-spec-const-composite.ll index 63ea861494..4f6d6f20af 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: Decorate [[First:[0-9]+]] SpecId 0 ; CHECK-SPIRV: Decorate [[Last:[0-9]+]] SpecId 65548 diff --git a/test/long-constant-array.ll b/test/long-constant-array.ll index 03b33771b5..d0b4c3b3a2 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 b9478f0ff5..a1cdfc6b07 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]+]]