Skip to content

[SPIR-V] Ensure that internal intrinsic functions for PHI's operand are inserted at the correct positions #92316

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
May 17, 2024
Merged

[SPIR-V] Ensure that internal intrinsic functions for PHI's operand are inserted at the correct positions #92316

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
4 changes: 2 additions & 2 deletions llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ static bool isAggrToReplace(const Value *V) {

static void setInsertPointSkippingPhis(IRBuilder<> &B, Instruction *I) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe you want getInsertionPointAfterDef()?

The exact way you write it doesn't really matter much if you don't have exception-handling, though.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not exactly, it's a bit different case. But thank you very much for the pointer, getInsertionPointAfterDef() and its applications were worth a study.

if (isa<PHINode>(I))
B.SetInsertPoint(I->getParent(), I->getParent()->getFirstInsertionPt());
B.SetInsertPoint(I->getParent()->getFirstNonPHIOrDbgOrAlloca());
else
B.SetInsertPoint(I);
}
Expand Down Expand Up @@ -491,7 +491,7 @@ void SPIRVEmitIntrinsics::deduceOperandElementType(Instruction *I) {
if (Instruction *User = dyn_cast<Instruction>(Op->use_begin()->get()))
setInsertPointSkippingPhis(B, User->getNextNode());
else
B.SetInsertPoint(I);
setInsertPointSkippingPhis(B, I);
Value *OpTyVal = Constant::getNullValue(KnownElemTy);
Type *OpTy = Op->getType();
if (!Ty) {
Expand Down
59 changes: 59 additions & 0 deletions llvm/test/CodeGen/SPIRV/phi-insert-point.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
; The goal of the test is to check that internal intrinsic functions for PHI's
; operand are inserted at the correct positions, and don't break rules of
; instruction domination and PHI nodes grouping at top of basic block.

; RUN: llc -O0 -mtriple=spirv64-unknown-unknown %s -o - | FileCheck %s
; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv64-unknown-unknown %s -o - -filetype=obj | spirv-val %}

; CHECK-DAG: OpName %[[#Foo:]] "foo"
; CHECK-DAG: OpName %[[#Bar:]] "bar"
; CHECK: %[[#Foo]] = OpFunction
; CHECK: OpPhi
; CHECK-NEXT: OpPhi
; CHECK-NEXT: OpPhi
; CHECK-NEXT: OpPhi
; CHECK: %[[#Bar]] = OpFunction
; CHECK: OpPhi
; CHECK-NEXT: OpPhi
; CHECK-NEXT: OpPhi
; CHECK-NEXT: OpPhi

%struct = type { i64, i64 }

define spir_kernel void @foo(i64 %arg_val, ptr addrspace(4) byval(%struct) %arg_ptr) {
entry:
%fl = icmp eq i64 %arg_val, 0
br i1 %fl, label %ok, label %err

err:
br label %ok

ok:
%r1 = phi i64 [ undef, %err ], [ %arg_val, %entry ]
%r2 = phi i64 [ undef, %err ], [ %arg_val, %entry ]
%r3 = phi ptr addrspace(4) [ undef, %err ], [ %arg_ptr, %entry ]
%r4 = phi ptr addrspace(4) [ undef, %err ], [ %arg_ptr, %entry ]
br label %exit

exit:
ret void
}

define spir_kernel void @bar(i64 %arg_val, i64 %arg_val_def, ptr addrspace(4) byval(%struct) %arg_ptr, ptr addrspace(4) %arg_ptr_def) {
entry:
%fl = icmp eq i64 %arg_val, 0
br i1 %fl, label %ok, label %err

err:
br label %ok

ok:
%r1 = phi i64 [ %arg_val_def, %err ], [ %arg_val, %entry ]
%r2 = phi i64 [ %arg_val_def, %err ], [ %arg_val, %entry ]
%r3 = phi ptr addrspace(4) [ %arg_ptr_def, %err ], [ %arg_ptr, %entry ]
%r4 = phi ptr addrspace(4) [ %arg_ptr_def, %err ], [ %arg_ptr, %entry ]
br label %exit

exit:
ret void
}
Loading