mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2025-01-31 20:51:52 +01:00
[PowerPC] Fix a DAG replacement bug in PPCTargetLowering::DAGCombineExtBoolTrunc
While promoting nodes in PPCTargetLowering::DAGCombineExtBoolTrunc, it is possible for one of the nodes to be replaced by another. To make sure we do not visit the deleted nodes, and to make sure we visit the replacement nodes, use a list of HandleSDNodes to track the to-be-promoted nodes during the promotion process. The same fix has been applied to the analogous code in PPCTargetLowering::DAGCombineTruncBoolExt. Fixes PR26985. llvm-svn: 269272
This commit is contained in:
Hal Finkel
parent
7230d61b65
commit
ff8397dabb
@ -42,6 +42,7 @@
|
||||
#include "llvm/Support/MathExtras.h"
|
||||
#include "llvm/Support/raw_ostream.h"
|
||||
#include "llvm/Target/TargetOptions.h"
|
||||
#include <list>
|
||||
|
||||
using namespace llvm;
|
||||
|
||||
@ -9914,14 +9915,18 @@ SDValue PPCTargetLowering::DAGCombineTruncBoolExt(SDNode *N,
|
||||
DAG.ReplaceAllUsesOfValueWith(Inputs[i], Inputs[i].getOperand(0));
|
||||
}
|
||||
|
||||
std::list<HandleSDNode> PromOpHandles;
|
||||
for (auto &PromOp : PromOps)
|
||||
PromOpHandles.emplace_back(PromOp);
|
||||
|
||||
// Replace all operations (these are all the same, but have a different
|
||||
// (i1) return type). DAG.getNode will validate that the types of
|
||||
// a binary operator match, so go through the list in reverse so that
|
||||
// we've likely promoted both operands first. Any intermediate truncations or
|
||||
// extensions disappear.
|
||||
while (!PromOps.empty()) {
|
||||
SDValue PromOp = PromOps.back();
|
||||
PromOps.pop_back();
|
||||
while (!PromOpHandles.empty()) {
|
||||
SDValue PromOp = PromOpHandles.back().getValue();
|
||||
PromOpHandles.pop_back();
|
||||
|
||||
if (PromOp.getOpcode() == ISD::TRUNCATE ||
|
||||
PromOp.getOpcode() == ISD::SIGN_EXTEND ||
|
||||
@ -9930,7 +9935,7 @@ SDValue PPCTargetLowering::DAGCombineTruncBoolExt(SDNode *N,
|
||||
if (!isa<ConstantSDNode>(PromOp.getOperand(0)) &&
|
||||
PromOp.getOperand(0).getValueType() != MVT::i1) {
|
||||
// The operand is not yet ready (see comment below).
|
||||
PromOps.insert(PromOps.begin(), PromOp);
|
||||
PromOpHandles.emplace_front(PromOp);
|
||||
continue;
|
||||
}
|
||||
|
||||
@ -9957,7 +9962,7 @@ SDValue PPCTargetLowering::DAGCombineTruncBoolExt(SDNode *N,
|
||||
// promoted (this should be rare because we're going through the
|
||||
// list backward, but if one of the operands has several users in
|
||||
// this cluster of to-be-promoted nodes, it is possible).
|
||||
PromOps.insert(PromOps.begin(), PromOp);
|
||||
PromOpHandles.emplace_front(PromOp);
|
||||
continue;
|
||||
}
|
||||
|
||||
@ -10164,13 +10169,17 @@ SDValue PPCTargetLowering::DAGCombineExtBoolTrunc(SDNode *N,
|
||||
DAG.getAnyExtOrTrunc(InSrc, dl, N->getValueType(0)));
|
||||
}
|
||||
|
||||
std::list<HandleSDNode> PromOpHandles;
|
||||
for (auto &PromOp : PromOps)
|
||||
PromOpHandles.emplace_back(PromOp);
|
||||
|
||||
// Replace all operations (these are all the same, but have a different
|
||||
// (promoted) return type). DAG.getNode will validate that the types of
|
||||
// a binary operator match, so go through the list in reverse so that
|
||||
// we've likely promoted both operands first.
|
||||
while (!PromOps.empty()) {
|
||||
SDValue PromOp = PromOps.back();
|
||||
PromOps.pop_back();
|
||||
while (!PromOpHandles.empty()) {
|
||||
SDValue PromOp = PromOpHandles.back().getValue();
|
||||
PromOpHandles.pop_back();
|
||||
|
||||
unsigned C;
|
||||
switch (PromOp.getOpcode()) {
|
||||
@ -10187,7 +10196,7 @@ SDValue PPCTargetLowering::DAGCombineExtBoolTrunc(SDNode *N,
|
||||
// promoted (this should be rare because we're going through the
|
||||
// list backward, but if one of the operands has several users in
|
||||
// this cluster of to-be-promoted nodes, it is possible).
|
||||
PromOps.insert(PromOps.begin(), PromOp);
|
||||
PromOpHandles.emplace_front(PromOp);
|
||||
continue;
|
||||
}
|
||||
|
||||
@ -10199,7 +10208,7 @@ SDValue PPCTargetLowering::DAGCombineExtBoolTrunc(SDNode *N,
|
||||
PromOp.getOperand(0).getValueType() != N->getValueType(0)) ||
|
||||
(SelectTruncOp[1].count(PromOp.getNode()) &&
|
||||
PromOp.getOperand(1).getValueType() != N->getValueType(0))) {
|
||||
PromOps.insert(PromOps.begin(), PromOp);
|
||||
PromOpHandles.emplace_front(PromOp);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
38
test/CodeGen/PowerPC/ext-bool-trunc-repl.ll
Normal file
38
test/CodeGen/PowerPC/ext-bool-trunc-repl.ll
Normal file
@ -0,0 +1,38 @@
|
||||
; RUN: llc -O0 < %s | FileCheck %s
|
||||
target datalayout = "e-m:e-i64:64-n32:64"
|
||||
target triple = "powerpc64le-unknown-linux-gnu"
|
||||
|
||||
@c = external global i32, align 4
|
||||
@d = external global [2 x i32], align 4
|
||||
|
||||
; Function Attrs: norecurse nounwind
|
||||
define void @fn2() #0 {
|
||||
; CHECK-LABEL: @fn2
|
||||
|
||||
br i1 undef, label %1, label %10
|
||||
|
||||
; <label>:1: ; preds = %0
|
||||
br i1 undef, label %3, label %2
|
||||
|
||||
; <label>:2: ; preds = %2, %1
|
||||
br i1 undef, label %3, label %2
|
||||
|
||||
; <label>:3: ; preds = %2, %1
|
||||
br i1 undef, label %8, label %4
|
||||
|
||||
; <label>:4: ; preds = %4, %3
|
||||
%5 = phi i64 [ %6, %4 ], [ undef, %3 ]
|
||||
%6 = and i64 %5, and (i64 and (i64 and (i64 and (i64 and (i64 and (i64 and (i64 sext (i32 select (i1 icmp slt (i16 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i16), i16 0), i32 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i32), i32 lshr (i32 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i32), i32 6)) to i64), i64 sext (i32 select (i1 icmp slt (i16 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i16), i16 0), i32 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i32), i32 lshr (i32 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i32), i32 6)) to i64)), i64 sext (i32 select (i1 icmp slt (i16 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i16), i16 0), i32 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i32), i32 lshr (i32 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i32), i32 6)) to i64)), i64 sext (i32 select (i1 icmp slt (i16 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i16), i16 0), i32 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i32), i32 lshr (i32 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i32), i32 6)) to i64)), i64 sext (i32 select (i1 icmp slt (i16 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i16), i16 0), i32 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i32), i32 lshr (i32 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i32), i32 6)) to i64)), i64 sext (i32 select (i1 icmp slt (i16 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i16), i16 0), i32 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i32), i32 lshr (i32 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i32), i32 6)) to i64)), i64 sext (i32 select (i1 icmp slt (i16 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i16), i16 0), i32 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i32), i32 lshr (i32 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i32), i32 6)) to i64)), i64 sext (i32 select (i1 icmp slt (i16 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i16), i16 0), i32 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i32), i32 lshr (i32 zext (i1 icmp eq (i32* getelementptr inbounds ([2 x i32], [2 x i32]* @d, i64 0, i64 1), i32* @c) to i32), i32 6)) to i64))
|
||||
%7 = icmp slt i32 undef, 6
|
||||
br i1 %7, label %4, label %8
|
||||
|
||||
; <label>:8: ; preds = %4, %3
|
||||
%9 = phi i64 [ undef, %3 ], [ %6, %4 ]
|
||||
br label %10
|
||||
|
||||
; <label>:10: ; preds = %8, %0
|
||||
ret void
|
||||
}
|
||||
|
||||
attributes #0 = { norecurse nounwind "target-cpu"="ppc64le" }
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user