[llvm] 4abc69c - [InstSimplify] fold max (max X, Y), X --> max X, Y

Sanjay Patel via llvm-commits llvm-commits at lists.llvm.org
Sun Aug 2 08:51:20 PDT 2020


Author: Sanjay Patel
Date: 2020-08-02T11:50:58-04:00
New Revision: 4abc69c6f541e7726913c9b0940728b1e0024b4a

URL: https://github.com/llvm/llvm-project/commit/4abc69c6f541e7726913c9b0940728b1e0024b4a
DIFF: https://github.com/llvm/llvm-project/commit/4abc69c6f541e7726913c9b0940728b1e0024b4a.diff

LOG: [InstSimplify] fold max (max X, Y), X --> max X, Y

https://alive2.llvm.org/ce/z/VGgG3M

Added: 
    

Modified: 
    llvm/lib/Analysis/InstructionSimplify.cpp
    llvm/test/Transforms/InstSimplify/maxmin_intrinsics.ll

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Analysis/InstructionSimplify.cpp b/llvm/lib/Analysis/InstructionSimplify.cpp
index 4f09ea189664..6e75478d52af 100644
--- a/llvm/lib/Analysis/InstructionSimplify.cpp
+++ b/llvm/lib/Analysis/InstructionSimplify.cpp
@@ -5239,6 +5239,17 @@ static Value *simplifyBinaryIntrinsic(Function *F, Value *Op0, Value *Op1,
         return ConstantInt::get(ReturnType, APInt::getMinValue(BitWidth));
     }
 
+    // For 4 commuted variants of each intrinsic:
+    // max (max X, Y), X --> max X, Y
+    if (auto *MinMax0 = dyn_cast<IntrinsicInst>(Op0))
+      if (MinMax0->getIntrinsicID() == IID &&
+          (MinMax0->getOperand(0) == Op1 || MinMax0->getOperand(1) == Op1))
+        return MinMax0;
+    if (auto *MinMax1 = dyn_cast<IntrinsicInst>(Op1))
+      if (MinMax1->getIntrinsicID() == IID &&
+          (MinMax1->getOperand(0) == Op0 || MinMax1->getOperand(1) == Op0))
+        return MinMax1;
+
     const APInt *C;
     if (!match(Op1, m_APIntAllowUndef(C)))
       break;

diff  --git a/llvm/test/Transforms/InstSimplify/maxmin_intrinsics.ll b/llvm/test/Transforms/InstSimplify/maxmin_intrinsics.ll
index 6fcc6133aca3..c0064ab0a423 100644
--- a/llvm/test/Transforms/InstSimplify/maxmin_intrinsics.ll
+++ b/llvm/test/Transforms/InstSimplify/maxmin_intrinsics.ll
@@ -271,8 +271,7 @@ define <2 x i8> @umin_maxval_partial_undef(<2 x i8> %x) {
 define i8 @umax_umax(i8 %x, i8 %y) {
 ; CHECK-LABEL: @umax_umax(
 ; CHECK-NEXT:    [[M:%.*]] = call i8 @llvm.umax.i8(i8 [[X:%.*]], i8 [[Y:%.*]])
-; CHECK-NEXT:    [[M2:%.*]] = call i8 @llvm.umax.i8(i8 [[X]], i8 [[M]])
-; CHECK-NEXT:    ret i8 [[M2]]
+; CHECK-NEXT:    ret i8 [[M]]
 ;
   %m = call i8 @llvm.umax.i8(i8 %x, i8 %y)
   %m2 = call i8 @llvm.umax.i8(i8 %x, i8 %m)
@@ -282,8 +281,7 @@ define i8 @umax_umax(i8 %x, i8 %y) {
 define i8 @umax_umax_commute1(i8 %x, i8 %y) {
 ; CHECK-LABEL: @umax_umax_commute1(
 ; CHECK-NEXT:    [[M:%.*]] = call i8 @llvm.umax.i8(i8 [[Y:%.*]], i8 [[X:%.*]])
-; CHECK-NEXT:    [[M2:%.*]] = call i8 @llvm.umax.i8(i8 [[X]], i8 [[M]])
-; CHECK-NEXT:    ret i8 [[M2]]
+; CHECK-NEXT:    ret i8 [[M]]
 ;
   %m = call i8 @llvm.umax.i8(i8 %y, i8 %x)
   %m2 = call i8 @llvm.umax.i8(i8 %x, i8 %m)
@@ -293,8 +291,7 @@ define i8 @umax_umax_commute1(i8 %x, i8 %y) {
 define i8 @umax_umax_commute2(i8 %x, i8 %y) {
 ; CHECK-LABEL: @umax_umax_commute2(
 ; CHECK-NEXT:    [[M:%.*]] = call i8 @llvm.umax.i8(i8 [[X:%.*]], i8 [[Y:%.*]])
-; CHECK-NEXT:    [[M2:%.*]] = call i8 @llvm.umax.i8(i8 [[M]], i8 [[X]])
-; CHECK-NEXT:    ret i8 [[M2]]
+; CHECK-NEXT:    ret i8 [[M]]
 ;
   %m = call i8 @llvm.umax.i8(i8 %x, i8 %y)
   %m2 = call i8 @llvm.umax.i8(i8 %m, i8 %x)
@@ -304,8 +301,7 @@ define i8 @umax_umax_commute2(i8 %x, i8 %y) {
 define <2 x i8> @umax_umax_commute3(<2 x i8> %x, <2 x i8> %y) {
 ; CHECK-LABEL: @umax_umax_commute3(
 ; CHECK-NEXT:    [[M:%.*]] = call <2 x i8> @llvm.umax.v2i8(<2 x i8> [[Y:%.*]], <2 x i8> [[X:%.*]])
-; CHECK-NEXT:    [[M2:%.*]] = call <2 x i8> @llvm.umax.v2i8(<2 x i8> [[M]], <2 x i8> [[X]])
-; CHECK-NEXT:    ret <2 x i8> [[M2]]
+; CHECK-NEXT:    ret <2 x i8> [[M]]
 ;
   %m = call <2 x i8> @llvm.umax.v2i8(<2 x i8> %y, <2 x i8> %x)
   %m2 = call <2 x i8> @llvm.umax.v2i8(<2 x i8> %m, <2 x i8> %x)
@@ -315,8 +311,7 @@ define <2 x i8> @umax_umax_commute3(<2 x i8> %x, <2 x i8> %y) {
 define i8 @umin_umin(i8 %x, i8 %y) {
 ; CHECK-LABEL: @umin_umin(
 ; CHECK-NEXT:    [[M:%.*]] = call i8 @llvm.umin.i8(i8 [[X:%.*]], i8 [[Y:%.*]])
-; CHECK-NEXT:    [[M2:%.*]] = call i8 @llvm.umin.i8(i8 [[X]], i8 [[M]])
-; CHECK-NEXT:    ret i8 [[M2]]
+; CHECK-NEXT:    ret i8 [[M]]
 ;
   %m = call i8 @llvm.umin.i8(i8 %x, i8 %y)
   %m2 = call i8 @llvm.umin.i8(i8 %x, i8 %m)
@@ -326,8 +321,7 @@ define i8 @umin_umin(i8 %x, i8 %y) {
 define i8 @umin_umin_commute1(i8 %x, i8 %y) {
 ; CHECK-LABEL: @umin_umin_commute1(
 ; CHECK-NEXT:    [[M:%.*]] = call i8 @llvm.umin.i8(i8 [[Y:%.*]], i8 [[X:%.*]])
-; CHECK-NEXT:    [[M2:%.*]] = call i8 @llvm.umin.i8(i8 [[X]], i8 [[M]])
-; CHECK-NEXT:    ret i8 [[M2]]
+; CHECK-NEXT:    ret i8 [[M]]
 ;
   %m = call i8 @llvm.umin.i8(i8 %y, i8 %x)
   %m2 = call i8 @llvm.umin.i8(i8 %x, i8 %m)
@@ -337,8 +331,7 @@ define i8 @umin_umin_commute1(i8 %x, i8 %y) {
 define <2 x i8> @umin_umin_commute2(<2 x i8> %x, <2 x i8> %y) {
 ; CHECK-LABEL: @umin_umin_commute2(
 ; CHECK-NEXT:    [[M:%.*]] = call <2 x i8> @llvm.umin.v2i8(<2 x i8> [[X:%.*]], <2 x i8> [[Y:%.*]])
-; CHECK-NEXT:    [[M2:%.*]] = call <2 x i8> @llvm.umin.v2i8(<2 x i8> [[M]], <2 x i8> [[X]])
-; CHECK-NEXT:    ret <2 x i8> [[M2]]
+; CHECK-NEXT:    ret <2 x i8> [[M]]
 ;
   %m = call <2 x i8> @llvm.umin.v2i8(<2 x i8> %x, <2 x i8> %y)
   %m2 = call <2 x i8> @llvm.umin.v2i8(<2 x i8> %m, <2 x i8> %x)
@@ -348,8 +341,7 @@ define <2 x i8> @umin_umin_commute2(<2 x i8> %x, <2 x i8> %y) {
 define i8 @umin_umin_commute3(i8 %x, i8 %y) {
 ; CHECK-LABEL: @umin_umin_commute3(
 ; CHECK-NEXT:    [[M:%.*]] = call i8 @llvm.umin.i8(i8 [[Y:%.*]], i8 [[X:%.*]])
-; CHECK-NEXT:    [[M2:%.*]] = call i8 @llvm.umin.i8(i8 [[M]], i8 [[X]])
-; CHECK-NEXT:    ret i8 [[M2]]
+; CHECK-NEXT:    ret i8 [[M]]
 ;
   %m = call i8 @llvm.umin.i8(i8 %y, i8 %x)
   %m2 = call i8 @llvm.umin.i8(i8 %m, i8 %x)
@@ -359,8 +351,7 @@ define i8 @umin_umin_commute3(i8 %x, i8 %y) {
 define i8 @smax_smax(i8 %x, i8 %y) {
 ; CHECK-LABEL: @smax_smax(
 ; CHECK-NEXT:    [[M:%.*]] = call i8 @llvm.smax.i8(i8 [[X:%.*]], i8 [[Y:%.*]])
-; CHECK-NEXT:    [[M2:%.*]] = call i8 @llvm.smax.i8(i8 [[X]], i8 [[M]])
-; CHECK-NEXT:    ret i8 [[M2]]
+; CHECK-NEXT:    ret i8 [[M]]
 ;
   %m = call i8 @llvm.smax.i8(i8 %x, i8 %y)
   %m2 = call i8 @llvm.smax.i8(i8 %x, i8 %m)
@@ -370,8 +361,7 @@ define i8 @smax_smax(i8 %x, i8 %y) {
 define <2 x i8> @smax_smax_commute1(<2 x i8> %x, <2 x i8> %y) {
 ; CHECK-LABEL: @smax_smax_commute1(
 ; CHECK-NEXT:    [[M:%.*]] = call <2 x i8> @llvm.smax.v2i8(<2 x i8> [[Y:%.*]], <2 x i8> [[X:%.*]])
-; CHECK-NEXT:    [[M2:%.*]] = call <2 x i8> @llvm.smax.v2i8(<2 x i8> [[X]], <2 x i8> [[M]])
-; CHECK-NEXT:    ret <2 x i8> [[M2]]
+; CHECK-NEXT:    ret <2 x i8> [[M]]
 ;
   %m = call <2 x i8> @llvm.smax.v2i8(<2 x i8> %y, <2 x i8> %x)
   %m2 = call <2 x i8> @llvm.smax.v2i8(<2 x i8> %x, <2 x i8> %m)
@@ -381,8 +371,7 @@ define <2 x i8> @smax_smax_commute1(<2 x i8> %x, <2 x i8> %y) {
 define i8 @smax_smax_commute2(i8 %x, i8 %y) {
 ; CHECK-LABEL: @smax_smax_commute2(
 ; CHECK-NEXT:    [[M:%.*]] = call i8 @llvm.smax.i8(i8 [[X:%.*]], i8 [[Y:%.*]])
-; CHECK-NEXT:    [[M2:%.*]] = call i8 @llvm.smax.i8(i8 [[M]], i8 [[X]])
-; CHECK-NEXT:    ret i8 [[M2]]
+; CHECK-NEXT:    ret i8 [[M]]
 ;
   %m = call i8 @llvm.smax.i8(i8 %x, i8 %y)
   %m2 = call i8 @llvm.smax.i8(i8 %m, i8 %x)
@@ -392,8 +381,7 @@ define i8 @smax_smax_commute2(i8 %x, i8 %y) {
 define i8 @smax_smax_commute3(i8 %x, i8 %y) {
 ; CHECK-LABEL: @smax_smax_commute3(
 ; CHECK-NEXT:    [[M:%.*]] = call i8 @llvm.smax.i8(i8 [[Y:%.*]], i8 [[X:%.*]])
-; CHECK-NEXT:    [[M2:%.*]] = call i8 @llvm.smax.i8(i8 [[M]], i8 [[X]])
-; CHECK-NEXT:    ret i8 [[M2]]
+; CHECK-NEXT:    ret i8 [[M]]
 ;
   %m = call i8 @llvm.smax.i8(i8 %y, i8 %x)
   %m2 = call i8 @llvm.smax.i8(i8 %m, i8 %x)
@@ -403,8 +391,7 @@ define i8 @smax_smax_commute3(i8 %x, i8 %y) {
 define <2 x i8> @smin_smin(<2 x i8> %x, <2 x i8> %y) {
 ; CHECK-LABEL: @smin_smin(
 ; CHECK-NEXT:    [[M:%.*]] = call <2 x i8> @llvm.smin.v2i8(<2 x i8> [[X:%.*]], <2 x i8> [[Y:%.*]])
-; CHECK-NEXT:    [[M2:%.*]] = call <2 x i8> @llvm.smin.v2i8(<2 x i8> [[X]], <2 x i8> [[M]])
-; CHECK-NEXT:    ret <2 x i8> [[M2]]
+; CHECK-NEXT:    ret <2 x i8> [[M]]
 ;
   %m = call <2 x i8> @llvm.smin.v2i8(<2 x i8> %x, <2 x i8> %y)
   %m2 = call <2 x i8> @llvm.smin.v2i8(<2 x i8> %x, <2 x i8> %m)
@@ -414,8 +401,7 @@ define <2 x i8> @smin_smin(<2 x i8> %x, <2 x i8> %y) {
 define i8 @smin_smin_commute1(i8 %x, i8 %y) {
 ; CHECK-LABEL: @smin_smin_commute1(
 ; CHECK-NEXT:    [[M:%.*]] = call i8 @llvm.smin.i8(i8 [[Y:%.*]], i8 [[X:%.*]])
-; CHECK-NEXT:    [[M2:%.*]] = call i8 @llvm.smin.i8(i8 [[X]], i8 [[M]])
-; CHECK-NEXT:    ret i8 [[M2]]
+; CHECK-NEXT:    ret i8 [[M]]
 ;
   %m = call i8 @llvm.smin.i8(i8 %y, i8 %x)
   %m2 = call i8 @llvm.smin.i8(i8 %x, i8 %m)
@@ -425,8 +411,7 @@ define i8 @smin_smin_commute1(i8 %x, i8 %y) {
 define i8 @smin_smin_commute2(i8 %x, i8 %y) {
 ; CHECK-LABEL: @smin_smin_commute2(
 ; CHECK-NEXT:    [[M:%.*]] = call i8 @llvm.smin.i8(i8 [[X:%.*]], i8 [[Y:%.*]])
-; CHECK-NEXT:    [[M2:%.*]] = call i8 @llvm.smin.i8(i8 [[M]], i8 [[X]])
-; CHECK-NEXT:    ret i8 [[M2]]
+; CHECK-NEXT:    ret i8 [[M]]
 ;
   %m = call i8 @llvm.smin.i8(i8 %x, i8 %y)
   %m2 = call i8 @llvm.smin.i8(i8 %m, i8 %x)
@@ -436,8 +421,7 @@ define i8 @smin_smin_commute2(i8 %x, i8 %y) {
 define i8 @smin_smin_commute3(i8 %x, i8 %y) {
 ; CHECK-LABEL: @smin_smin_commute3(
 ; CHECK-NEXT:    [[M:%.*]] = call i8 @llvm.smin.i8(i8 [[Y:%.*]], i8 [[X:%.*]])
-; CHECK-NEXT:    [[M2:%.*]] = call i8 @llvm.smin.i8(i8 [[M]], i8 [[X]])
-; CHECK-NEXT:    ret i8 [[M2]]
+; CHECK-NEXT:    ret i8 [[M]]
 ;
   %m = call i8 @llvm.smin.i8(i8 %y, i8 %x)
   %m2 = call i8 @llvm.smin.i8(i8 %m, i8 %x)


        


More information about the llvm-commits mailing list