[llvm] [InstCombine]PtrReplacer: Correctly handle select with unavailable operands (PR #148829)
via llvm-commits
llvm-commits at lists.llvm.org
Tue Jul 15 04:29:55 PDT 2025
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-llvm-transforms
Author: Pierre van Houtryve (Pierre-vh)
<details>
<summary>Changes</summary>
The testcase I added previously failed because a SelectInst with invalid operands was created (one side `addrspace(4)`, the other `addrspace(5)`).
PointerReplacer needs to dig deeper if the true and/or false instructions of the select are not available.
Fixes SWDEV-542957
---
Full diff: https://github.com/llvm/llvm-project/pull/148829.diff
2 Files Affected:
- (modified) llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp (+21-7)
- (added) llvm/test/Transforms/InstCombine/AMDGPU/ptr-replacer-select-addrspacecast-crash.ll (+20)
``````````diff
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp b/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp
index e791bc4b56e52..2cc1bc9fa4a67 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp
@@ -277,6 +277,15 @@ bool PointerReplacer::collectUsers() {
Worklist.emplace_back(I);
};
+ auto TryPushInstOperand = [&](Instruction *InstOp) {
+ if (!UsersToReplace.contains(InstOp)) {
+ if (!ValuesToRevisit.insert(InstOp))
+ return false;
+ Worklist.emplace_back(InstOp);
+ }
+ return true;
+ };
+
PushUsersToWorklist(&Root);
while (!Worklist.empty()) {
Instruction *Inst = Worklist.pop_back_val();
@@ -309,12 +318,8 @@ bool PointerReplacer::collectUsers() {
// incoming values.
Worklist.emplace_back(PHI);
for (unsigned Idx = 0; Idx < PHI->getNumIncomingValues(); ++Idx) {
- auto *IncomingValue = cast<Instruction>(PHI->getIncomingValue(Idx));
- if (UsersToReplace.contains(IncomingValue))
- continue;
- if (!ValuesToRevisit.insert(IncomingValue))
+ if (!TryPushInstOperand(cast<Instruction>(PHI->getIncomingValue(Idx))))
return false;
- Worklist.emplace_back(IncomingValue);
}
} else if (auto *SI = dyn_cast<SelectInst>(Inst)) {
auto *TrueInst = dyn_cast<Instruction>(SI->getTrueValue());
@@ -322,8 +327,17 @@ bool PointerReplacer::collectUsers() {
if (!TrueInst || !FalseInst)
return false;
- UsersToReplace.insert(SI);
- PushUsersToWorklist(SI);
+ if (isAvailable(TrueInst) && isAvailable(FalseInst)) {
+ UsersToReplace.insert(SI);
+ PushUsersToWorklist(SI);
+ continue;
+ }
+
+ // Push select back onto the stack, followed by unavailable true/false
+ // value.
+ Worklist.emplace_back(SI);
+ if (!TryPushInstOperand(TrueInst) || !TryPushInstOperand(FalseInst))
+ return false;
} else if (auto *GEP = dyn_cast<GetElementPtrInst>(Inst)) {
UsersToReplace.insert(GEP);
PushUsersToWorklist(GEP);
diff --git a/llvm/test/Transforms/InstCombine/AMDGPU/ptr-replacer-select-addrspacecast-crash.ll b/llvm/test/Transforms/InstCombine/AMDGPU/ptr-replacer-select-addrspacecast-crash.ll
new file mode 100644
index 0000000000000..921a72364e6f9
--- /dev/null
+++ b/llvm/test/Transforms/InstCombine/AMDGPU/ptr-replacer-select-addrspacecast-crash.ll
@@ -0,0 +1,20 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
+; RUN: opt -mtriple=amdgcn-amd-amdhsa -passes=instcombine %s -S -o - | FileCheck %s
+
+; Crashed in IC PtrReplacer because an invalid select was generated with addrspace(4) and addrspace(5)
+; operands.
+
+define amdgpu_kernel void @eggs(ptr addrspace(4) byref([12 x i8]) align 16 %arg) {
+; CHECK-LABEL: define amdgpu_kernel void @eggs(
+; CHECK-SAME: ptr addrspace(4) byref([12 x i8]) align 16 [[ARG:%.*]]) {
+; CHECK-NEXT: [[BB:.*:]]
+; CHECK-NEXT: ret void
+;
+bb:
+ %alloca = alloca i32, i32 0, align 8, addrspace(5)
+ %alloca1 = alloca [12 x i8], align 16, addrspace(5)
+ call void @llvm.memcpy.p5.p4.i64(ptr addrspace(5) %alloca1, ptr addrspace(4) %arg, i64 0, i1 false)
+ %select = select i1 false, ptr addrspace(5) %alloca1, ptr addrspace(5) %alloca
+ call void @llvm.memcpy.p0.p5.i64(ptr null, ptr addrspace(5) %select, i64 0, i1 false)
+ ret void
+}
``````````
</details>
https://github.com/llvm/llvm-project/pull/148829
More information about the llvm-commits
mailing list