Skip to content

[SPIR-V] Consistent handling of TargetExtTypes in emit-intrinsics #135682

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 5 commits into from
May 29, 2025
Merged

[SPIR-V] Consistent handling of TargetExtTypes in emit-intrinsics #135682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e5b9e1d
[SPIR-V] Consistent handling of TargetExtTypes in emit-intrinsics
cassiebeckley Apr 14, 2025
50c254c
Merge remote-tracking branch 'upstream/main' into spirv-type-undef
cassiebeckley May 23, 2025
ef15dff
Add comments
cassiebeckley May 23, 2025
737c66f
Fix format
s-perron May 29, 2025
341da6b
Merge branch 'main' into spirv-type-undef
s-perron May 29, 2025
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
24 changes: 11 additions & 13 deletions llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1961,10 +1961,16 @@ void SPIRVEmitIntrinsics::insertAssignTypeIntrs(Instruction *I,
GR->buildAssignPtr(B, ElemTy ? ElemTy : deduceElementType(Op, true),
Op);
} else {
Value *OpTyVal = Op;
if (OpTy->isTargetExtTy()) {
// We need to do this in order to be consistent with how target ext
// types are handled in `processInstrAfterVisit`
OpTyVal = getNormalizedPoisonValue(OpTy);
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's please document this explicitly in comments.

A wider context is that in #130605 we have started elimination of spv_track_constant intrinsics, and this is a work in progress. I understand this change and its need to resolve the issue, however, it introduces a hidden relations between this point in the code and SPIRVEmitIntrinsics::processInstrAfterVisit() where Intrinsic::spv_track_constant is inserted. This create a pitfall for anyone who will try to untangle type inference logic from emit-intrinsic logic.

I think it's ok to introduce this change, but please add a longer comment here and in SPIRVEmitIntrinsics::processInstrAfterVisit(), referencing another occurrence of the spv_track_constant/spv_assign_type pair implicitly linked by isTargetExtTy(), so that we do not forget to address this after the prospective rework of type inference vs. emit-intrinsic starts.

}
CallInst *AssignCI =
buildIntrWithMD(Intrinsic::spv_assign_type, {OpTy},
getNormalizedPoisonValue(OpTy), Op, {}, B);
GR->addAssignPtrTypeInstr(Op, AssignCI);
getNormalizedPoisonValue(OpTy), OpTyVal, {}, B);
GR->addAssignPtrTypeInstr(OpTyVal, AssignCI);
}
}
}
Expand Down Expand Up @@ -2075,22 +2081,14 @@ void SPIRVEmitIntrinsics::processInstrAfterVisit(Instruction *I,
BPrepared = true;
}
Type *OpTy = Op->getType();
Value *OpTyVal = Op;
if (OpTy->isTargetExtTy())
OpTyVal = getNormalizedPoisonValue(OpTy);
Type *OpElemTy = GR->findDeducedElementType(Op);
Value *NewOp = Op;
if (OpTy->isTargetExtTy()) {
// Since this value is replaced by poison, we need to do the same in
// `insertAssignTypeIntrs`.
Value *OpTyVal = getNormalizedPoisonValue(OpTy);
NewOp = buildIntrWithMD(Intrinsic::spv_track_constant,
{OpTy, OpTyVal->getType()}, Op, OpTyVal, {}, B);
if (isPointerTy(OpTy)) {
if (OpElemTy) {
GR->buildAssignPtr(B, OpElemTy, NewOp);
} else {
insertTodoType(NewOp);
GR->buildAssignPtr(B, OpTy, NewOp);
}
}
}
if (!IsConstComposite && isPointerTy(OpTy) && OpElemTy != nullptr &&
OpElemTy != IntegerType::getInt8Ty(I->getContext())) {
Expand Down
20 changes: 20 additions & 0 deletions llvm/test/CodeGen/SPIRV/inline/type.undef.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
; RUN: llc -verify-machineinstrs -O0 -mtriple=spirv-unknown-unknown %s -o - | FileCheck %s
; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv-unknown-unknown %s -o - -filetype=obj | spirv-val %}
; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv-unknown-unknown %s -o - | spirv-as - -o - | spirv-val %}

%literal_32 = type target("spirv.Literal", 32)
%literal_true = type target("spirv.Literal", 1)

; CHECK-DAG: OpUnknown(21, 4) [[int_t:%[0-9]+]] 32 1
%int_t = type target("spirv.Type", %literal_32, %literal_true, 21, 4, 32)

; CHECK-DAG: {{%[0-9]+}} = OpTypeFunction [[int_t]]
define %int_t @foo() {
entry:
%v = alloca %int_t
%i = load %int_t, ptr %v

; CHECK-DAG: [[i:%[0-9]+]] = OpUndef [[int_t]]
; CHECK-DAG: OpReturnValue [[i]]
ret %int_t %i
}
Loading