Attachment #887206 for bug #924132

Lines 38-43 EXT(SPV_INTEL_variable_length_array) Link Here

(-)a/include/LLVMSPIRVExtensions.inc (+1 lines)
38	EXT(SPV_INTEL_fp_fast_math_mode)	38	EXT(SPV_INTEL_fp_fast_math_mode)
39	EXT(SPV_INTEL_fpga_cluster_attributes)	39	EXT(SPV_INTEL_fpga_cluster_attributes)
40	EXT(SPV_INTEL_loop_fuse)	40	EXT(SPV_INTEL_loop_fuse)
		41	EXT(SPV_INTEL_long_composites)
41	EXT(SPV_INTEL_long_constant_composite)	42	EXT(SPV_INTEL_long_constant_composite)
42	EXT(SPV_INTEL_optnone)	43	EXT(SPV_INTEL_optnone)
43	EXT(SPV_INTEL_fpga_dsp_control)	44	EXT(SPV_INTEL_fpga_dsp_control)

Lines 901-907 public: Link Here

(-)a/lib/SPIRV/libSPIRV/SPIRVEntry.h (-1 / +1 lines)
901	}	901	}
902		902
903	SPIRVCapVec getRequiredCapability() const override {	903	SPIRVCapVec getRequiredCapability() const override {
904	return getVec(CapabilityLongConstantCompositeINTEL);	904	return getVec(CapabilityLongCompositesINTEL);
905	}	905	}
906		906
907	llvm::Optional<ExtensionID> getRequiredExtension() const override {	907	llvm::Optional<ExtensionID> getRequiredExtension() const override {

Lines 591-597 template <> inline void SPIRVMap<Capability, std::string>::init() { Link Here

(-)a/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h (-1 / +1 lines)
591	add(CapabilityGroupNonUniformRotateKHR, "GroupNonUniformRotateKHR");	591	add(CapabilityGroupNonUniformRotateKHR, "GroupNonUniformRotateKHR");
592	add(CapabilityAtomicFloat32AddEXT, "AtomicFloat32AddEXT");	592	add(CapabilityAtomicFloat32AddEXT, "AtomicFloat32AddEXT");
593	add(CapabilityAtomicFloat64AddEXT, "AtomicFloat64AddEXT");	593	add(CapabilityAtomicFloat64AddEXT, "AtomicFloat64AddEXT");
594	add(CapabilityLongConstantCompositeINTEL, "LongConstantCompositeINTEL");	594	add(CapabilityLongCompositesINTEL, "LongCompositesINTEL");
595	add(CapabilityOptNoneINTEL, "OptNoneINTEL");	595	add(CapabilityOptNoneINTEL, "OptNoneINTEL");
596	add(CapabilityAtomicFloat16AddEXT, "AtomicFloat16AddEXT");	596	add(CapabilityAtomicFloat16AddEXT, "AtomicFloat16AddEXT");
597	add(CapabilityDebugInfoModuleINTEL, "DebugInfoModuleINTEL");	597	add(CapabilityDebugInfoModuleINTEL, "DebugInfoModuleINTEL");

Lines 11-17 Link Here

(-)a/test/SpecConstants/long-spec-const-composite.ll (-1 / +1 lines)
11	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"	11	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"
12	target triple = "spir64-unknown-unknown"	12	target triple = "spir64-unknown-unknown"
13		13
14	; CHECK-SPIRV: Capability LongConstantCompositeINTEL	14	; CHECK-SPIRV: Capability LongCompositesINTEL
15	; CHECK-SPIRV: Extension "SPV_INTEL_long_constant_composite"	15	; CHECK-SPIRV: Extension "SPV_INTEL_long_constant_composite"
16	; CHECK-SPIRV-DAG: Decorate [[First:[0-9]+]] SpecId 0	16	; CHECK-SPIRV-DAG: Decorate [[First:[0-9]+]] SpecId 0
17	; CHECK-SPIRV-DAG: Decorate [[Last:[0-9]+]] SpecId 65548	17	; CHECK-SPIRV-DAG: Decorate [[Last:[0-9]+]] SpecId 65548

Lines 9-15 Link Here

(-)a/test/long-constant-array.ll (-1 / +1 lines)
9	; TODO: run validator once it supports the extension	9	; TODO: run validator once it supports the extension
10	; RUNx: spirv-val %t.spv	10	; RUNx: spirv-val %t.spv
11		11
12	; CHECK-SPIRV: Capability LongConstantCompositeINTEL	12	; CHECK-SPIRV: Capability LongCompositesINTEL
13	; CHECK-SPIRV: Extension "SPV_INTEL_long_constant_composite"	13	; CHECK-SPIRV: Extension "SPV_INTEL_long_constant_composite"
14	; CHECK-SPIRV: TypeInt [[TInt:[0-9]+]] 8	14	; CHECK-SPIRV: TypeInt [[TInt:[0-9]+]] 8
15	; CHECK-SPIRV: Constant {{[0-9]+}} [[ArrSize:[0-9]+]] 78000	15	; CHECK-SPIRV: Constant {{[0-9]+}} [[ArrSize:[0-9]+]] 78000

Lines 10-16 Link Here

(-)a/test/long-type-struct.ll (-1 / +1 lines)
10		10
11	; RUN: not llvm-spirv %t.bc -o %t.spv 2>&1 \| FileCheck %s --check-prefix=CHECK-ERROR	11	; RUN: not llvm-spirv %t.bc -o %t.spv 2>&1 \| FileCheck %s --check-prefix=CHECK-ERROR
12		12
13	; CHECK-SPIRV: Capability LongConstantCompositeINTEL	13	; CHECK-SPIRV: Capability LongCompositesINTEL
14	; CHECK-SPIRV: Extension "SPV_INTEL_long_constant_composite"	14	; CHECK-SPIRV: Extension "SPV_INTEL_long_constant_composite"
15	; CHECK-SPIRV: TypeForwardPointer [[TFwdPtr:[0-9]+]]	15	; CHECK-SPIRV: TypeForwardPointer [[TFwdPtr:[0-9]+]]
16	; CHECK-SPIRV: TypeInt [[TInt:[0-9]+]]	16	; CHECK-SPIRV: TypeInt [[TInt:[0-9]+]]

Return to bug 924132