Skip to content

[SYCL] Simplify handing of builtins in LowerWGScope #1399

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

Merged
merged 1 commit into from
Mar 27, 2020
Merged

[SYCL] Simplify handing of builtins in LowerWGScope #1399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 18 additions & 31 deletions llvm/lib/SYCLLowerIR/LowerWGScope.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ enum class MemorySemantics : unsigned {
};

Instruction *genWGBarrier(Instruction &Before, const Triple &TT);
Value *genLinearLocalID(Instruction &Before, const Triple &TT);
Value *genPseudoLocalID(Instruction &Before, const Triple &TT);
GlobalVariable *createWGLocalVariable(Module &M, Type *T, const Twine &Name);
} // namespace spirv

Expand Down Expand Up @@ -261,7 +261,7 @@ static void guardBlockWithIsLeaderCheck(BasicBlock *IfBB, BasicBlock *TrueBB,
BasicBlock *MergeBB,
const DebugLoc &DbgLoc,
const Triple &TT) {
Value *LinearLocalID = spirv::genLinearLocalID(*IfBB->getTerminator(), TT);
Value *LinearLocalID = spirv::genPseudoLocalID(*IfBB->getTerminator(), TT);
auto *Ty = LinearLocalID->getType();
Value *Zero = Constant::getNullValue(Ty);
IRBuilder<> Builder(IfBB->getContext());
Expand Down Expand Up @@ -861,11 +861,8 @@ GlobalVariable *spirv::createWGLocalVariable(Module &M, Type *T,
// TODO generalize to support all SPIR-V intrinsic operations and builtin
// variables

// extern "C" const __constant size_t __spirv_BuiltInLocalInvocationIndex;
// Must correspond to the code in
// llvm-spirv/lib/SPIRV/OCL20ToSPIRV.cpp
// OCL20ToSPIRV::transWorkItemBuiltinsToVariables()
Value *spirv::genLinearLocalID(Instruction &Before, const Triple &TT) {
// Return a value equals to 0 if and only if the local linear id is 0.
Value *spirv::genPseudoLocalID(Instruction &Before, const Triple &TT) {
Module &M = *Before.getModule();
if (TT.isNVPTX()) {
LLVMContext &Ctx = Before.getContext();
Expand All @@ -874,35 +871,29 @@ Value *spirv::genLinearLocalID(Instruction &Before, const Triple &TT) {
IRBuilder<> Bld(Ctx);
Bld.SetInsertPoint(&Before);

AttributeList Attr;
Attr = Attr.addAttribute(Ctx, AttributeList::FunctionIndex,
Attribute::Convergent);

#define CREATE_CALLEE(NAME, FN_NAME) \
FunctionCallee FnCallee##NAME = M.getOrInsertFunction(FN_NAME, Attr, RetTy); \
FunctionCallee FnCallee##NAME = M.getOrInsertFunction(FN_NAME, RetTy); \
assert(FnCallee##NAME && "spirv intrinsic creation failed"); \
auto NAME = Bld.CreateCall(FnCallee##NAME, {}); \
NAME->addAttribute(AttributeList::FunctionIndex, Attribute::Convergent);
auto NAME = Bld.CreateCall(FnCallee##NAME, {});

CREATE_CALLEE(LocalInvocationId_X, "_Z27__spirv_LocalInvocationId_xv");
CREATE_CALLEE(LocalInvocationId_Y, "_Z27__spirv_LocalInvocationId_yv");
CREATE_CALLEE(LocalInvocationId_Z, "_Z27__spirv_LocalInvocationId_zv");
CREATE_CALLEE(WorkgroupSize_Y, "_Z23__spirv_WorkgroupSize_yv");
CREATE_CALLEE(WorkgroupSize_Z, "_Z23__spirv_WorkgroupSize_zv");

#undef CREATE_CALLEE

// 1: ((__spirv_WorkgroupSize_y() * __spirv_WorkgroupSize_z())
// 2: * __spirv_LocalInvocationId_x())
// 3: + (__spirv_WorkgroupSize_z() * __spirv_LocalInvocationId_y())
// 4: + (__spirv_LocalInvocationId_z())
return Bld.CreateAdd(
Bld.CreateAdd(
Bld.CreateMul(Bld.CreateMul(WorkgroupSize_Y, WorkgroupSize_Z), // 1
LocalInvocationId_X), // 2
Bld.CreateMul(WorkgroupSize_Z, LocalInvocationId_Y)), // 3
LocalInvocationId_Z); // 4
// 1: returns
// __spirv_LocalInvocationId_x() |
// __spirv_LocalInvocationId_y() |
// __spirv_LocalInvocationId_z()
//
return Bld.CreateOr(LocalInvocationId_X,
Bld.CreateOr(LocalInvocationId_Y, LocalInvocationId_Z));
} else {
// extern "C" const __constant size_t __spirv_BuiltInLocalInvocationIndex;
// Must correspond to the code in
// llvm-spirv/lib/SPIRV/OCL20ToSPIRV.cpp
// OCL20ToSPIRV::transWorkItemBuiltinsToVariables()
StringRef Name = "__spirv_BuiltInLocalInvocationIndex";
GlobalVariable *G = M.getGlobalVariable(Name);

Expand Down Expand Up @@ -932,11 +923,7 @@ Value *spirv::genLinearLocalID(Instruction &Before, const Triple &TT) {
// uint32_t Semantics) noexcept;
Instruction *spirv::genWGBarrier(Instruction &Before, const Triple &TT) {
Module &M = *Before.getModule();
StringRef Name;
if (TT.isNVPTX())
Name = "_Z22__spirv_ControlBarrierN5__spv5ScopeES0_j";
else
Name = "__spirv_ControlBarrier";
StringRef Name = "_Z22__spirv_ControlBarrierjjj";
LLVMContext &Ctx = Before.getContext();
Type *ScopeTy = Type::getInt32Ty(Ctx);
Type *SemanticsTy = Type::getInt32Ty(Ctx);
Expand Down
2 changes: 1 addition & 1 deletion llvm/test/SYCLLowerIR/byval_arg.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ define internal spir_func void @wibble(%struct.baz* byval(%struct.baz) %arg1) !w
; CHECK-NEXT: call void @llvm.memcpy.p3i8.p0i8.i64(i8 addrspace(3)* align 8 bitcast (%struct.baz addrspace(3)* @[[SHADOW]] to i8 addrspace(3)*), i8* [[TMP2]], i64 8, i1 false)
; CHECK-NEXT: br label [[MERGE]]
; CHECK: merge:
; CHECK-NEXT: call void @__spirv_ControlBarrier(i32 2, i32 2, i32 272)
; CHECK-NEXT: call void @_Z22__spirv_ControlBarrierjjj(i32 2, i32 2, i32 272)
; CHECK-NEXT: ret void
;
ret void
Expand Down
35 changes: 9 additions & 26 deletions llvm/test/SYCLLowerIR/convergent.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,25 @@
; RUN: opt < %s -LowerWGScope -S | FileCheck %s
; RUN: opt < %s -LowerWGScope --mtriple=nvptx -S | FileCheck %s -check-prefix=CHECK-PTX
; RUN: opt < %s -LowerWGScope --mtriple=nvptx -S | FileCheck %s -check-prefix=CHECK -check-prefix=CHECK-PTX


%struct.baz = type { i64 }

define internal spir_func void @wibble(%struct.baz* byval(%struct.baz) %arg1) !work_group_scope !0 {
; CHECK-PTX: %1 = call i64 @_Z27__spirv_LocalInvocationId_xv() #0
; CHECK-PTX: %2 = call i64 @_Z27__spirv_LocalInvocationId_yv() #0
; CHECK-PTX: %3 = call i64 @_Z27__spirv_LocalInvocationId_zv() #0
; CHECK-PTX: %4 = call i64 @_Z23__spirv_WorkgroupSize_yv() #0
; CHECK-PTX: %5 = call i64 @_Z23__spirv_WorkgroupSize_zv() #0
; CHECK-PTX: call void @_Z22__spirv_ControlBarrierN5__spv5ScopeES0_j(i32 2, i32 2, i32 272) #0
; CHECK: call void @__spirv_ControlBarrier(i32 2, i32 2, i32 272) #1
; CHECK-PTX: call i64 @_Z27__spirv_LocalInvocationId_xv()
; CHECK-PTX: call i64 @_Z27__spirv_LocalInvocationId_yv()
; CHECK-PTX: call i64 @_Z27__spirv_LocalInvocationId_zv()
; CHECK: call void @_Z22__spirv_ControlBarrierjjj(i32 2, i32 2, i32 272)
ret void
}

; CHECK-PTX: ; Function Attrs: convergent
; CHECK-PTX: declare i64 @_Z27__spirv_LocalInvocationId_xv() #0
; CHECK-PTX: declare i64 @_Z27__spirv_LocalInvocationId_xv()

; CHECK-PTX: ; Function Attrs: convergent
; CHECK-PTX: declare i64 @_Z27__spirv_LocalInvocationId_yv() #0
; CHECK-PTX: declare i64 @_Z27__spirv_LocalInvocationId_yv()

; CHECK-PTX: ; Function Attrs: convergent
; CHECK-PTX: declare i64 @_Z27__spirv_LocalInvocationId_zv() #0

; CHECK-PTX: ; Function Attrs: convergent
; CHECK-PTX: declare i64 @_Z23__spirv_WorkgroupSize_yv() #0

; CHECK-PTX: ; Function Attrs: convergent
; CHECK-PTX: declare i64 @_Z23__spirv_WorkgroupSize_zv() #0

; CHECK-PTX: ; Function Attrs: convergent
; CHECK-PTX: declare void @_Z22__spirv_ControlBarrierN5__spv5ScopeES0_j(i32, i32, i32) #0

; CHECK-PTX: attributes #0 = { convergent }
; CHECK-PTX: declare i64 @_Z27__spirv_LocalInvocationId_zv()

; CHECK: ; Function Attrs: convergent
; CHECK: declare void @__spirv_ControlBarrier(i32, i32, i32) #1
; CHECK: declare void @_Z22__spirv_ControlBarrierjjj(i32, i32, i32) #1

; CHECK: attributes #1 = { convergent }

Expand Down
6 changes: 3 additions & 3 deletions llvm/test/SYCLLowerIR/pfwg_and_pfwi.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ define internal spir_func void @wibble(%struct.bar addrspace(4)* %arg, %struct.z
; CHECK-NEXT: call void @llvm.memcpy.p3i8.p0i8.i64(i8 addrspace(3)* align 16 bitcast (%struct.zot addrspace(3)* @[[GROUP_SHADOW]] to i8 addrspace(3)*), i8* align 8 [[TMP1]], i64 96, i1 false)
; CHECK-NEXT: br label [[MERGE]]
; CHECK: merge:
; CHECK-NEXT: call void @__spirv_ControlBarrier(i32 2, i32 2, i32 272)
; CHECK-NEXT: call void @_Z22__spirv_ControlBarrierjjj(i32 2, i32 2, i32 272)
; CHECK-NEXT: [[TMP:%.*]] = alloca [[STRUCT_BAR:%.*]] addrspace(4)*, align 8
; CHECK-NEXT: [[TMP2:%.*]] = alloca [[STRUCT_FOO_0:%.*]], align 1
; CHECK-NEXT: [[ID:%.*]] = load i64, i64 addrspace(1)* @__spirv_BuiltInLocalInvocationIndex
Expand All @@ -51,12 +51,12 @@ define internal spir_func void @wibble(%struct.bar addrspace(4)* %arg, %struct.z
; CHECK-NEXT: store [[STRUCT_BAR]] addrspace(4)* [[MAT_LD]], [[STRUCT_BAR]] addrspace(4)* addrspace(3)* @[[PFWG_SHADOW]]
; CHECK-NEXT: br label [[LEADERMAT]]
; CHECK: LeaderMat:
; CHECK-NEXT: call void @__spirv_ControlBarrier(i32 2, i32 2, i32 272)
; CHECK-NEXT: call void @_Z22__spirv_ControlBarrierjjj(i32 2, i32 2, i32 272)
; CHECK-NEXT: [[MAT_LD1:%.*]] = load [[STRUCT_BAR]] addrspace(4)*, [[STRUCT_BAR]] addrspace(4)* addrspace(3)* @[[PFWG_SHADOW]]
; CHECK-NEXT: store [[STRUCT_BAR]] addrspace(4)* [[MAT_LD1]], [[STRUCT_BAR]] addrspace(4)** [[TMP]]
; CHECK-NEXT: [[TMP5:%.*]] = bitcast %struct.foo.0* [[TMP2]] to i8*
; CHECK-NEXT: call void @llvm.memcpy.p0i8.p3i8.i64(i8* align 1 [[TMP5]], i8 addrspace(3)* align 8 getelementptr inbounds (%struct.foo.0, [[STRUCT_FOO_0]] addrspace(3)* @[[PFWI_SHADOW]], i32 0, i32 0), i64 1, i1 false)
; CHECK-NEXT: call void @__spirv_ControlBarrier(i32 2, i32 2, i32 272)
; CHECK-NEXT: call void @_Z22__spirv_ControlBarrierjjj(i32 2, i32 2, i32 272)
; CHECK-NEXT: [[WG_VAL_TMP4:%.*]] = load [[STRUCT_ZOT]] addrspace(4)*, [[STRUCT_ZOT]] addrspace(4)* addrspace(3)* @wibbleWG_tmp4
; CHECK-NEXT: call spir_func void @bar(%struct.zot addrspace(4)* [[WG_VAL_TMP4]], %struct.foo.0* byval(%struct.foo.0) align 1 [[TMP2]])
; CHECK-NEXT: ret void
Expand Down