Skip to content

Commit 6675e28

Browse files
vmaksimovmaksimo
authored
Refactor handling of untyped pointers in builtins reverse translation (KhronosGroup#2924)
This fixes the mangling in enqueue_kernel.cl test. Without the fix we get such mangled function: @_Z21__spirv_EnqueueKernelP13__spirv_QueueiPciPU3AS4P19__spirv_DeviceEventS5_U13block_pointerFvvEPU3AS4cii instead of the expected: @_Z21__spirv_EnqueueKernelP13__spirv_Queuei9ndrange_tiPU3AS4P19__spirv_DeviceEventS5_U13block_pointerFvvEPU3AS4cii
1 parent 05adb24 commit 6675e28

File tree

2 files changed

+82
-40
lines changed

2 files changed

+82
-40
lines changed

‎lib/SPIRV/SPIRVReader.cpp‎

Lines changed: 58 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3548,40 +3548,65 @@ Instruction *SPIRVToLLVM::transBuiltinFromInst(const std::string &FuncName,
35483548
transType(AI->getSemanticType()),
35493549
SPIRSPIRVAddrSpaceMap::rmap(
35503550
BI->getValueType(Ops[Ptr]->getId())->getPointerStorageClass()));
3551-
} else if (OC == spv::OpCooperativeMatrixStoreKHR ||
3552-
OC == spv::internal::OpJointMatrixStoreINTEL ||
3553-
OC == spv::internal::OpCooperativeMatrixStoreCheckedINTEL ||
3554-
OC == spv::internal::OpJointMatrixLoadINTEL ||
3555-
OC == spv::OpCompositeConstruct ||
3556-
OC == spv::internal::OpCooperativeMatrixApplyFunctionINTEL) {
3557-
auto *Val = transValue(Ops[Ptr], BB->getParent(), BB);
3558-
Val = Val->stripPointerCasts();
3559-
if (auto *GEP = dyn_cast<GetElementPtrInst>(Val))
3560-
ArgTys[Ptr] = TypedPointerType::get(
3561-
GEP->getSourceElementType(),
3562-
SPIRSPIRVAddrSpaceMap::rmap(
3563-
BI->getValueType(Ops[Ptr]->getId())->getPointerStorageClass()));
3564-
else if (auto *AI = dyn_cast<AllocaInst>(Val))
3565-
ArgTys[Ptr] = TypedPointerType::get(
3566-
AI->getAllocatedType(),
3567-
SPIRSPIRVAddrSpaceMap::rmap(
3568-
BI->getValueType(Ops[Ptr]->getId())->getPointerStorageClass()));
3569-
else if (isa<Argument>(Val) && !RetTy->isVoidTy()) {
3570-
// Pointer could be a function parameter. Assume that the type of the
3571-
// pointer is the same as the return type.
3572-
Type *Ty = nullptr;
3573-
// it return type is array type, assign its element type to Ty
3574-
if (RetTy->isArrayTy())
3575-
Ty = RetTy->getArrayElementType();
3576-
else if (RetTy->isVectorTy())
3577-
Ty = cast<VectorType>(RetTy)->getElementType();
3578-
else
3579-
Ty = RetTy;
3551+
}
3552+
}
35803553

3581-
ArgTys[Ptr] = TypedPointerType::get(
3582-
Ty,
3583-
SPIRSPIRVAddrSpaceMap::rmap(
3584-
BI->getValueType(Ops[Ptr]->getId())->getPointerStorageClass()));
3554+
for (unsigned I = 0; I < ArgTys.size(); I++) {
3555+
if (isa<PointerType>(ArgTys[I])) {
3556+
SPIRVType *OpTy = BI->getValueType(Ops[I]->getId());
3557+
// `Param` must be a pointer to an 8-bit integer type scalar.
3558+
// Avoid demangling for this argument if it's a pointer to get `Pc`
3559+
// mangling.
3560+
if (OC == OpEnqueueKernel && I == 7) {
3561+
if (ArgTys[I]->isPointerTy())
3562+
continue;
3563+
}
3564+
if (OpTy->isTypeUntypedPointerKHR()) {
3565+
auto *Val = transValue(Ops[I], BB->getParent(), BB);
3566+
Val = Val->stripPointerCasts();
3567+
if (isUntypedAccessChainOpCode(Ops[I]->getOpCode())) {
3568+
SPIRVType *BaseTy =
3569+
reinterpret_cast<SPIRVAccessChainBase *>(Ops[I])->getBaseType();
3570+
3571+
Type *Ty = nullptr;
3572+
if (BaseTy->isTypeArray())
3573+
Ty = transType(BaseTy->getArrayElementType());
3574+
else if (BaseTy->isTypeVector())
3575+
Ty = transType(BaseTy->getVectorComponentType());
3576+
else
3577+
Ty = transType(BaseTy);
3578+
ArgTys[I] = TypedPointerType::get(
3579+
Ty, SPIRSPIRVAddrSpaceMap::rmap(OpTy->getPointerStorageClass()));
3580+
} else if (auto *GEP = dyn_cast<GetElementPtrInst>(Val)) {
3581+
ArgTys[I] = TypedPointerType::get(
3582+
GEP->getSourceElementType(),
3583+
SPIRSPIRVAddrSpaceMap::rmap(OpTy->getPointerStorageClass()));
3584+
} else if (Ops[I]->getOpCode() == OpUntypedVariableKHR) {
3585+
SPIRVUntypedVariableKHR *UV =
3586+
static_cast<SPIRVUntypedVariableKHR *>(Ops[I]);
3587+
Type *Ty = transType(UV->getDataType());
3588+
ArgTys[I] = TypedPointerType::get(
3589+
Ty, SPIRSPIRVAddrSpaceMap::rmap(OpTy->getPointerStorageClass()));
3590+
} else if (auto *AI = dyn_cast<AllocaInst>(Val)) {
3591+
ArgTys[I] = TypedPointerType::get(
3592+
AI->getAllocatedType(),
3593+
SPIRSPIRVAddrSpaceMap::rmap(OpTy->getPointerStorageClass()));
3594+
} else if (Ops[I]->getOpCode() == OpFunctionParameter &&
3595+
!RetTy->isVoidTy()) {
3596+
// Pointer could be a function parameter. Assume that the type of
3597+
// the pointer is the same as the return type.
3598+
Type *Ty = nullptr;
3599+
// it return type is array type, assign its element type to Ty
3600+
if (RetTy->isArrayTy())
3601+
Ty = RetTy->getArrayElementType();
3602+
else if (RetTy->isVectorTy())
3603+
Ty = cast<VectorType>(RetTy)->getElementType();
3604+
else
3605+
Ty = RetTy;
3606+
3607+
ArgTys[I] = TypedPointerType::get(
3608+
Ty, SPIRSPIRVAddrSpaceMap::rmap(OpTy->getPointerStorageClass()));
3609+
}
35853610
}
35863611
}
35873612
}

‎test/transcoding/enqueue_kernel.cl‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %clang_cc1 -triple spir-unknown-unknown -O0 -cl-std=CL2.0 -emit-llvm-bc %s -o %t.bc
22
// RUN: llvm-spirv %t.bc -spirv-text -o %t.spv.txt
3-
// RUN: FileCheck < %t.spv.txt %s --check-prefix=CHECK-SPIRV
3+
// RUN: FileCheck < %t.spv.txt %s --check-prefixes=CHECK-SPIRV,CHECK-SPIRV-TYPED-PTR
44
// RUN: llvm-spirv %t.bc -o %t.spv
55
// RUN: spirv-val %t.spv
66
// RUN: llvm-spirv -r %t.spv --spirv-target-env CL2.0 -o %t.rev.bc
@@ -10,6 +10,17 @@
1010
// RUN: llvm-dis %t.rev.bc
1111
// RUN: FileCheck < %t.rev.ll %s --check-prefix=CHECK-SPV-IR
1212

13+
// RUN: llvm-spirv %t.bc -spirv-text -o %t.spv.txt --spirv-ext=+SPV_KHR_untyped_pointers
14+
// RUN: FileCheck < %t.spv.txt %s --check-prefixes=CHECK-SPIRV,CHECK-SPIRV-UNTYPED-PTR
15+
// RUN: llvm-spirv %t.bc -o %t.spv --spirv-ext=+SPV_KHR_untyped_pointers
16+
// RUN: spirv-val %t.spv
17+
// RUN: llvm-spirv -r %t.spv --spirv-target-env CL2.0 -o %t.rev.bc
18+
// RUN: llvm-dis %t.rev.bc
19+
// RUN: FileCheck < %t.rev.ll %s --check-prefix=CHECK-LLVM
20+
// RUN: llvm-spirv -r %t.spv --spirv-target-env SPV-IR -o %t.rev.bc
21+
// RUN: llvm-dis %t.rev.bc
22+
// RUN: FileCheck < %t.rev.ll %s --check-prefix=CHECK-SPV-IR
23+
1324
// CHECK-SPIRV: EntryPoint {{[0-9]+}} [[BlockKer1:[0-9]+]] "__device_side_enqueue_block_invoke_kernel"
1425
// CHECK-SPIRV: EntryPoint {{[0-9]+}} [[BlockKer2:[0-9]+]] "__device_side_enqueue_block_invoke_2_kernel"
1526
// CHECK-SPIRV: EntryPoint {{[0-9]+}} [[BlockKer3:[0-9]+]] "__device_side_enqueue_block_invoke_3_kernel"
@@ -32,9 +43,11 @@
3243
// CHECK-SPIRV: Constant [[Int32Ty]] [[ConstInt8:[0-9]+]] 8
3344
// CHECK-SPIRV: Constant [[Int32Ty]] [[ConstInt20:[0-9]+]] 24
3445

35-
// CHECK-SPIRV: TypePointer [[Int8PtrGenTy:[0-9]+]] 8 [[Int8Ty]]
46+
// CHECK-SPIRV-TYPED-PTR: TypePointer [[Int8PtrGenTy:[0-9]+]] 8 [[Int8Ty]]
47+
// CHECK-SPIRV-UNTYPED-PTR: TypeUntypedPointerKHR [[Int8PtrGenTy:[0-9]+]] 8
3648
// CHECK-SPIRV: TypeVoid [[VoidTy:[0-9]+]]
37-
// CHECK-SPIRV: TypePointer [[Int32LocPtrTy:[0-9]+]] 7 [[Int32Ty]]
49+
// CHECK-SPIRV-TYPED-PTR: TypePointer [[Int32LocPtrTy:[0-9]+]] 7 [[Int32Ty]]
50+
// CHECK-SPIRV-UNTYPED-PTR: TypeUntypedPointerKHR [[Int32LocPtrTy:[0-9]+]] 7
3851
// CHECK-SPIRV: TypeDeviceEvent [[EventTy:[0-9]+]]
3952
// CHECK-SPIRV: TypePointer [[EventPtrTy:[0-9]+]] 8 [[EventTy]]
4053
// CHECK-SPIRV: TypeFunction [[BlockTy1:[0-9]+]] [[VoidTy]] [[Int8PtrGenTy]]
@@ -101,7 +114,8 @@ kernel void device_side_enqueue(global int *a, global int *b, int i, char c0) {
101114
// Emits global block literal and block kernel.
102115
// CHECK-SPIRV: PtrCastToGeneric [[EventPtrTy]] [[Event1:[0-9]+]]
103116
// CHECK-SPIRV: PtrCastToGeneric [[EventPtrTy]] [[Event2:[0-9]+]]
104-
// CHECK-SPIRV-COUNT-2: PtrAccessChain [[Int32LocPtrTy]] [[LocalBuf31:[0-9]+]]
117+
// CHECK-SPIRV-TYPED-PTR-COUNT-2: PtrAccessChain [[Int32LocPtrTy]] [[LocalBuf31:[0-9]+]]
118+
// CHECK-SPIRV-UNTYPED-PTR-COUNT-2: UntypedPtrAccessChainKHR [[Int32LocPtrTy]] [[LocalBuf31:[0-9]+]]
105119
// CHECK-SPIRV: PtrCastToGeneric {{[0-9]+}} [[BlockLit3Tmp:[0-9]+]] [[BlockGlb1:[0-9]+]]
106120
// CHECK-SPIRV: Bitcast [[Int8PtrGenTy]] [[BlockLit3:[0-9]+]] [[BlockLit3Tmp]]
107121
// CHECK-SPIRV: EnqueueKernel [[Int32Ty]] [[#]] [[#]] [[#]] [[#]]
@@ -122,9 +136,12 @@ kernel void device_side_enqueue(global int *a, global int *b, int i, char c0) {
122136

123137
// Emits global block literal and block kernel.
124138

125-
// CHECK-SPIRV-COUNT-4: PtrAccessChain [[Int32LocPtrTy]] [[LocalBuf41:[0-9]+]]
126-
// CHECK-SPIRV: PtrAccessChain [[Int32LocPtrTy]] [[LocalBuf42:[0-9]+]]
127-
// CHECK-SPIRV: PtrAccessChain [[Int32LocPtrTy]] [[LocalBuf43:[0-9]+]]
139+
// CHECK-SPIRV-TYPED-PTR-COUNT-4: PtrAccessChain [[Int32LocPtrTy]] [[LocalBuf41:[0-9]+]]
140+
// CHECK-SPIRV-TYPED-PTR: PtrAccessChain [[Int32LocPtrTy]] [[LocalBuf42:[0-9]+]]
141+
// CHECK-SPIRV-TYPED-PTR: PtrAccessChain [[Int32LocPtrTy]] [[LocalBuf43:[0-9]+]]
142+
// CHECK-SPIRV-UNTYPED-PTR-COUNT-4: UntypedPtrAccessChainKHR [[Int32LocPtrTy]] [[LocalBuf41:[0-9]+]]
143+
// CHECK-SPIRV-UNTYPED-PTR: UntypedPtrAccessChainKHR [[Int32LocPtrTy]] [[LocalBuf42:[0-9]+]]
144+
// CHECK-SPIRV-UNTYPED-PTR: UntypedPtrAccessChainKHR [[Int32LocPtrTy]] [[LocalBuf43:[0-9]+]]
128145
// CHECK-SPIRV: PtrCastToGeneric {{[0-9]+}} [[BlockLit4Tmp:[0-9]+]] [[BlockGlb2:[0-9]+]]
129146
// CHECK-SPIRV: Bitcast [[Int8PtrGenTy]] [[BlockLit4:[0-9]+]] [[BlockLit4Tmp]]
130147
// CHECK-SPIRV: EnqueueKernel [[Int32Ty]] [[#]] [[#]] [[#]] [[#]]

0 commit comments

Comments
 (0)