Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update LongConstantCompositeINTEL to LongCompositesINTEL capability after Headers change #2258

Merged
merged 4 commits into from
Dec 13, 2023
Merged

Update LongConstantCompositeINTEL to LongCompositesINTEL capability after Headers change #2258

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
63bafe6
Bump SPIRV-Headers to 1c6bb2743599e6eb6f37b2969acc0aef812e32e3
bwlodarcz Dec 7, 2023
6ceb032
replace internal SPV_INTEL_long_composites ext with the published SPV…
vmaksimo Dec 8, 2023
15f28e3
don't rename extension for now
vmaksimo Dec 8, 2023
94083a6
add comment
vmaksimo Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/SPIRV/libSPIRV/SPIRVEntry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,7 @@ class SPIRVContinuedInstINTELBase : public SPIRVEntryNoId<OC> {
}

SPIRVCapVec getRequiredCapability() const override {
return getVec(CapabilityLongConstantCompositeINTEL);
return getVec(CapabilityLongCompositesINTEL);
}

std::optional<ExtensionID> getRequiredExtension() const override {
Expand Down
2 changes: 1 addition & 1 deletion lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,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");
Expand Down
2 changes: 1 addition & 1 deletion spirv-headers-tag.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cca08c63cefa129d082abca0302adcb81610b465
1c6bb2743599e6eb6f37b2969acc0aef812e32e3
2 changes: 1 addition & 1 deletion test/SpecConstants/long-spec-const-composite.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/long-constant-array.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/long-type-struct.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: TypeInt [[TInt:[0-9]+]] 8
; CHECK-SPIRV: TypePointer [[TIntPtr:[0-9]+]] 8 [[TInt]]
Expand Down
Loading