Skip to content

Commit

Permalink
Report disallowed extensions in metadata (#2125)
Browse files Browse the repository at this point in the history
When translating the `spirv.Extension` metadata of an LLVM Module,
report an error when encountering an extension that has been
explicitly disabled.
  • Loading branch information
svenvh authored Aug 17, 2023
1 parent 36936af commit 2e917c9
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 0 deletions.
4 changes: 4 additions & 0 deletions lib/SPIRV/SPIRVWriter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5400,6 +5400,10 @@ bool LLVMToSPIRVBase::transExtension() {
std::string S;
N.nextOp().get(S);
assert(!S.empty() && "Invalid extension");
ExtensionID ExtID = SPIRVMap<ExtensionID, std::string>::rmap(S);
if (!BM->getErrorLog().checkError(BM->isAllowedToUseExtension(ExtID),
SPIRVEC_RequiresExtension, S))
return false;
BM->getExtension().insert(S);
}
}
Expand Down
32 changes: 32 additions & 0 deletions test/negative/extension_from_metadata.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
; Check whether the translator reports an error for a module with !spirv.Extension
; metadata containing an extension that is disabled by --spirv-ext

; RUN: llvm-as < %s -o %t.bc
; RUN: not llvm-spirv --spirv-ext=-SPV_KHR_bit_instructions %t.bc 2>&1 | FileCheck %s

; CHECK: RequiresExtension: Feature requires the following SPIR-V extension:
; CHECK-NEXT: SPV_KHR_bit_instructions

target datalayout = "e-p:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024"
target triple = "spir-unknown-unknown"

; Function Attrs: nounwind
define spir_kernel void @foo() #0 {
entry:
ret void
}

attributes #0 = { nounwind }

!spirv.MemoryModel = !{!0}
!spirv.Source = !{!1}
!spirv.Extension = !{!3}
!opencl.spir.version = !{!0}
!opencl.ocl.version = !{!0}
!opencl.used.extensions = !{!2}
!opencl.used.optional.core.features = !{!2}

!0 = !{i32 1, i32 2}
!1 = !{i32 3, i32 102000}
!2 = !{}
!3 = !{!"SPV_KHR_bit_instructions"}

0 comments on commit 2e917c9

Please sign in to comment.