[SPIR-V] Don't replace spirv.Type with spv_track_constant #134448

cassiebeckley · 2025-04-04T21:43:25Z

Fixes #134417

Fixes llvm#134417

llvmbot · 2025-04-04T21:43:57Z

@llvm/pr-subscribers-backend-spir-v

Author: Cassandra Beckley (cassiebeckley)

Changes

Fixes #134417

Full diff: https://github.com/llvm/llvm-project/pull/134448.diff

2 Files Affected:

(modified) llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.cpp (+3-11)
(added) llvm/test/CodeGen/SPIRV/inline/type.undef.ll (+17)

diff --git a/llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.cpp b/llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.cpp
index 0067d2400529a..064e9c7074750 100644
--- a/llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.cpp
@@ -2062,21 +2062,13 @@ void SPIRVEmitIntrinsics::processInstrAfterVisit(Instruction *I,
     }
     Type *OpTy = Op->getType();
     Value *OpTyVal = Op;
-    if (OpTy->isTargetExtTy())
-      OpTyVal = getNormalizedPoisonValue(OpTy);
     Type *OpElemTy = GR->findDeducedElementType(Op);
     Value *NewOp = Op;
-    if (OpTy->isTargetExtTy()) {
+    TargetExtType *TargetTy = dyn_cast<TargetExtType>(OpTy);
+    if (TargetTy && TargetTy->getName() != "spirv.Type") {
+      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())) {
diff --git a/llvm/test/CodeGen/SPIRV/inline/type.undef.ll b/llvm/test/CodeGen/SPIRV/inline/type.undef.ll
new file mode 100644
index 0000000000000..1b8a8428fc74c
--- /dev/null
+++ b/llvm/test/CodeGen/SPIRV/inline/type.undef.ll
@@ -0,0 +1,17 @@
+; 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:
+; CHECK-DAG: [[undef:%[0-9]+]] = OpUndef [[int_t]]
+; CHECK-DAG: OpReturnValue [[undef]]
+  ret %int_t undef
+}

github-actions · 2025-04-04T21:45:50Z

⚠️ undef deprecator found issues in your code. ⚠️

You can test this locally with the following command:

git diff -U0 --pickaxe-regex -S '([^a-zA-Z0-9#_-]undef[^a-zA-Z0-9_-]|UndefValue::get)' 'HEAD~1' HEAD llvm/test/CodeGen/SPIRV/inline/type.undef.ll llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.cpp

The following files introduce new uses of undef:

llvm/test/CodeGen/SPIRV/inline/type.undef.ll

Undef is now deprecated and should only be used in the rare cases where no replacement is possible. For example, a load of uninitialized memory yields undef. You should use poison values for placeholders instead.

In tests, avoid using undef and having tests that trigger undefined behavior. If you need an operand with some unimportant value, you can add a new argument to the function and use that instead.

For example, this is considered a bad practice:

define void @fn() {
  ...
  br i1 undef, ...
}

Please use the following instead:

define void @fn(i1 %cond) {
  ...
  br i1 %cond, ...
}

Please refer to the Undefined Behavior Manual for more information.

[SPIR-V] Don't replace spirv.Type with spv_track_constant

75a2934

Fixes llvm#134417

llvmbot added the backend:SPIR-V label Apr 4, 2025

Use poison instead of undef

92ebdb0

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[SPIR-V] Don't replace spirv.Type with spv_track_constant #134448

[SPIR-V] Don't replace spirv.Type with spv_track_constant #134448

cassiebeckley commented Apr 4, 2025

llvmbot commented Apr 4, 2025

github-actions bot commented Apr 4, 2025

[SPIR-V] Don't replace spirv.Type with spv_track_constant #134448

Are you sure you want to change the base?

[SPIR-V] Don't replace spirv.Type with spv_track_constant #134448

Conversation

cassiebeckley commented Apr 4, 2025

llvmbot commented Apr 4, 2025

github-actions bot commented Apr 4, 2025