[llvm] 0724153 - [CostModel] Fix cast crash
Sam Parker via llvm-commits
llvm-commits at lists.llvm.org
Fri Jul 3 00:02:02 PDT 2020
Author: Sam Parker
Date: 2020-07-03T07:53:45+01:00
New Revision: 0724153bbeb543b329c3af51930092f2d73c503e
URL: https://github.com/llvm/llvm-project/commit/0724153bbeb543b329c3af51930092f2d73c503e
DIFF: https://github.com/llvm/llvm-project/commit/0724153bbeb543b329c3af51930092f2d73c503e.diff
LOG: [CostModel] Fix cast crash
Don't presume instruction operands while matching reductions.
Bugzilla: https://bugs.llvm.org/show_bug.cgi?id=46430
Differential Revision: https://reviews.llvm.org/D82453
Added:
llvm/test/Transforms/LoopUnroll/X86/pr46430.ll
Modified:
llvm/lib/Analysis/TargetTransformInfo.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Analysis/TargetTransformInfo.cpp b/llvm/lib/Analysis/TargetTransformInfo.cpp
index c92f27f78efd..87c6f83938ed 100644
--- a/llvm/lib/Analysis/TargetTransformInfo.cpp
+++ b/llvm/lib/Analysis/TargetTransformInfo.cpp
@@ -1053,6 +1053,8 @@ static TTI::ReductionKind matchPairwiseReductionAtLevel(Instruction *I,
// Check that the next levels binary operation exists and matches with the
// current one.
if (Level + 1 != NumLevels) {
+ if (!isa<Instruction>(NextLevelOp))
+ return TTI::RK_None;
Optional<TTI::ReductionData> NextLevelRD =
getReductionData(cast<Instruction>(NextLevelOp));
if (!NextLevelRD || !RD->hasSameData(*NextLevelRD))
@@ -1074,7 +1076,7 @@ static TTI::ReductionKind matchPairwiseReductionAtLevel(Instruction *I,
return RD->Kind;
// Match next level.
- return matchPairwiseReductionAtLevel(cast<Instruction>(NextLevelOp), Level,
+ return matchPairwiseReductionAtLevel(dyn_cast<Instruction>(NextLevelOp), Level,
NumLevels);
}
diff --git a/llvm/test/Transforms/LoopUnroll/X86/pr46430.ll b/llvm/test/Transforms/LoopUnroll/X86/pr46430.ll
new file mode 100644
index 000000000000..7698689ad8ed
--- /dev/null
+++ b/llvm/test/Transforms/LoopUnroll/X86/pr46430.ll
@@ -0,0 +1,23 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
+; RUN: opt -mtriple=x86_64-unknown-linux-gnu -loop-unroll -costmodel-reduxcost -S -o - %s | FileCheck %s
+
+define void @g() {
+; CHECK-LABEL: @g(
+; CHECK-NEXT: entry:
+; CHECK-NEXT: br label [[F_EXIT:%.*]]
+; CHECK: f.exit:
+; CHECK-NEXT: [[RDX_SHUF9_I:%.*]] = shufflevector <4 x i16> <i16 1, i16 0, i16 undef, i16 undef>, <4 x i16> undef, <4 x i32> <i32 1, i32 undef, i32 undef, i32 undef>
+; CHECK-NEXT: [[BIN_RDX10_I:%.*]] = xor <4 x i16> <i16 1, i16 0, i16 undef, i16 undef>, [[RDX_SHUF9_I]]
+; CHECK-NEXT: [[TMP0:%.*]] = extractelement <4 x i16> [[BIN_RDX10_I]], i32 0
+; CHECK-NEXT: br label [[F_EXIT]]
+;
+entry:
+ br label %f.exit
+
+f.exit: ; preds = %f.exit, %entry
+ %rdx.shuf9.i = shufflevector <4 x i16> <i16 1, i16 0, i16 undef, i16 undef>, <4 x i16> undef, <4 x i32> <i32 1, i32 undef, i32 undef, i32 undef>
+ %bin.rdx10.i = xor <4 x i16> <i16 1, i16 0, i16 undef, i16 undef>, %rdx.shuf9.i
+ %0 = extractelement <4 x i16> %bin.rdx10.i, i32 0
+ br label %f.exit
+}
+
More information about the llvm-commits
mailing list