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

Translate LLVM-IR zero-length arrays to 1-length arrays in SPIR-V #2743

Merged
merged 6 commits into from
Oct 8, 2024
+8 −12
Merged

Translate LLVM-IR zero-length arrays to 1-length arrays in SPIR-V #2743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0f89baf
Translate LLVM-IR zero-length arrays to 1-length arrays in SPIR-V
lbushi25 Oct 7, 2024
235c87d
Fix formatting and update zero-length-array test
lbushi25 Oct 7, 2024
f3f30c5
Fix formatting and update zero-length-array test
lbushi25 Oct 7, 2024
c51c428
Remove InvalidArraySize from SPIRVErrorEnum.h as it is no longer used
lbushi25 Oct 8, 2024
0c1c3bd
Merge branch 'KhronosGroup:main' into lbushi/zero_length_arrays
lbushi25 Oct 8, 2024
68971b3
Merge branch 'lbushi/zero_length_arrays' of https://github.com/lbushi…
lbushi25 Oct 8, 2024
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
13 changes: 4 additions & 9 deletions lib/SPIRV/SPIRVWriter.cpp
View file
Open in desktop
svenvh marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -449,24 +449,19 @@ SPIRVType *LLVMToSPIRVBase::transType(Type *T) {
if (T->isArrayTy()) {
// SPIR-V 1.3 s3.32.6: Length is the number of elements in the array.
// It must be at least 1.
if (T->getArrayNumElements() < 1) {
std::string Str;
llvm::raw_string_ostream OS(Str);
OS << *T;
SPIRVCK(T->getArrayNumElements() >= 1, InvalidArraySize, OS.str());
svenvh marked this conversation as resolved.
Show resolved Hide resolved
}
const auto ArraySize =
T->getArrayNumElements() ? T->getArrayNumElements() : 1;
Type *ElTy = T->getArrayElementType();
SPIRVType *TransType = BM->addArrayType(
transType(ElTy),
static_cast<SPIRVConstant *>(transValue(
ConstantInt::get(getSizetType(), T->getArrayNumElements(), false),
nullptr)));
ConstantInt::get(getSizetType(), ArraySize, false), nullptr)));
mapType(T, TransType);
if (ElTy->isPointerTy()) {
mapType(
ArrayType::get(TypedPointerType::get(Type::getInt8Ty(*Ctx),
ElTy->getPointerAddressSpace()),
T->getArrayNumElements()),
ArraySize),
TransType);
}
return TransType;
Expand Down
1 change: 0 additions & 1 deletion lib/SPIRV/libSPIRV/SPIRVErrorEnum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ _SPIRV_OP(InvalidMemoryModel, "Expects 0-3.")
_SPIRV_OP(InvalidFunctionControlMask, "")
_SPIRV_OP(InvalidBuiltinSetName, "Expects OpenCL.std.")
_SPIRV_OP(InvalidFunctionCall, "Unexpected llvm intrinsic:\n")
_SPIRV_OP(InvalidArraySize, "Array size must be at least 1:")
_SPIRV_OP(InvalidBitWidth, "Invalid bit width in input:")
_SPIRV_OP(InvalidModule, "Invalid SPIR-V module:")
_SPIRV_OP(InvalidLlvmModule, "Invalid LLVM module:")
Expand Down
6 changes: 4 additions & 2 deletions test/negative/zero-length-array.ll → test/zero-length-array.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
; RUN: llvm-as %s -o %t.bc
; RUN: not llvm-spirv %t.bc -o %t.spv 2>&1 | FileCheck %s
; RUN: llvm-spirv %t.bc -o %t.spv
; RUN: spirv-dis %t.spv | FileCheck %s

; CHECK: InvalidArraySize: Array size must be at least 1: [0 x i32]
; CHECK: [[REGISTER:%[a-zA-Z0-9_]+]] = OpConstant %uint 1
; CHECK: OpTypeArray %uint [[REGISTER]]

source_filename = "test.cl"
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"
Expand Down
Loading