Merged master:6a44edb8da33 into amd-gfx:b3b0d224fe25

Local branch amd-gfx b3b0d22 Merged master:3d1b0000f9da into amd-gfx:705782cee308 Remote branch master 6a44edb [InstCombine] fold abs of select with negated op (PR39474)
jaebaek · Aug 24, 2020 · 568c74a · 568c74a
2 parents b3b0d22 + 6a44edb
commit 568c74a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h b/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h
@@ -86,7 +86,7 @@ class Type;
       assert(i == 0 && "Operand index out of range!");
       return Operands[0];
     }
-    using op_iterator = const SCEV *const *;
+    using op_iterator = std::array<const SCEV *, 1>::const_iterator;
     using op_range = iterator_range<op_iterator>;
 
     op_range operands() const {
@@ -274,7 +274,7 @@ class Type;
   class SCEVUDivExpr : public SCEV {
     friend class ScalarEvolution;
 
-    std::array<const SCEV*, 2> Operands;
+    std::array<const SCEV *, 2> Operands;
 
     SCEVUDivExpr(const FoldingSetNodeIDRef ID, const SCEV *lhs, const SCEV *rhs)
         : SCEV(ID, scUDivExpr, computeExpressionSize({lhs, rhs})) {
@@ -291,7 +291,7 @@ class Type;
       return i == 0 ? getLHS() : getRHS();
     }
 
-    using op_iterator = const SCEV *const *;
+    using op_iterator = std::array<const SCEV *, 2>::const_iterator;
     using op_range = iterator_range<op_iterator>;
     op_range operands() const {
       return make_range(Operands.begin(), Operands.end());

diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp
@@ -776,6 +776,10 @@ Instruction *InstCombinerImpl::visitCallInst(CallInst &CI) {
     Value *X;
     if (match(IIOperand, m_Neg(m_Value(X))))
       return replaceOperand(*II, 0, X);
+    if (match(IIOperand, m_Select(m_Value(), m_Value(X), m_Neg(m_Deferred(X)))))
+      return replaceOperand(*II, 0, X);
+    if (match(IIOperand, m_Select(m_Value(), m_Neg(m_Value(X)), m_Deferred(X))))
+      return replaceOperand(*II, 0, X);
 
     break;
   }

diff --git a/llvm/test/Transforms/InstCombine/abs-intrinsic.ll b/llvm/test/Transforms/InstCombine/abs-intrinsic.ll
@@ -104,3 +104,25 @@ define <4 x i32> @abs_of_neg_vec(<4 x i32> %x) {
   %b = call <4 x i32> @llvm.abs.v4i32(<4 x i32> %a, i1 false)
   ret <4 x i32> %b
 }
+
+define i32 @abs_of_select_neg_true_val(i1 %b, i32 %x) {
+; CHECK-LABEL: @abs_of_select_neg_true_val(
+; CHECK-NEXT:    [[ABS:%.*]] = call i32 @llvm.abs.i32(i32 [[X:%.*]], i1 true)
+; CHECK-NEXT:    ret i32 [[ABS]]
+;
+  %neg = sub i32 0, %x
+  %sel = select i1 %b, i32 %neg, i32 %x
+  %abs = call i32 @llvm.abs.i32(i32 %sel, i1 true)
+  ret i32 %abs
+}
+
+define <4 x i32> @abs_of_select_neg_false_val(<4 x i1> %b, <4 x i32> %x) {
+; CHECK-LABEL: @abs_of_select_neg_false_val(
+; CHECK-NEXT:    [[ABS:%.*]] = call <4 x i32> @llvm.abs.v4i32(<4 x i32> [[X:%.*]], i1 false)
+; CHECK-NEXT:    ret <4 x i32> [[ABS]]
+;
+  %neg = sub <4 x i32> zeroinitializer, %x
+  %sel = select <4 x i1> %b, <4 x i32> %x, <4 x i32> %neg
+  %abs = call <4 x i32> @llvm.abs.v4i32(<4 x i32> %sel, i1 false)
+  ret <4 x i32> %abs
+}