Used m_SExtLike matchers.

Author: vzakhari

llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp

@@ -2808,8 +2808,8 @@ Instruction *InstCombinerImpl::visitSub(BinaryOperator &I) {
     return Res;
 
   // (sub (sext (add nsw (X, Y)), sext (X))) --> (sext (Y))
-  if (match(Op1, m_SExt(m_Value(X))) &&
-      match(Op0, m_SExt(m_c_NSWAdd(m_Specific(X), m_Value(Y))))) {
+  if (match(Op1, m_SExtLike(m_Value(X))) &&
+      match(Op0, m_SExtLike(m_c_NSWAdd(m_Specific(X), m_Value(Y))))) {
     Value *SExtY = Builder.CreateSExt(Y, I.getType());
     return replaceInstUsesWith(I, SExtY);
   }
@@ -2818,8 +2818,8 @@ Instruction *InstCombinerImpl::visitSub(BinaryOperator &I) {
   // --> (sub[ nsw] (sext (Y), sext(Z)))
   {
     Value *Z, *Add0, *Add1;
-    if (match(Op0, m_SExt(m_Value(Add0))) &&
-        match(Op1, m_SExt(m_Value(Add1))) &&
+    if (match(Op0, m_SExtLike(m_Value(Add0))) &&
+        match(Op1, m_SExtLike(m_Value(Add1))) &&
         ((match(Add0, m_NSWAdd(m_Value(X), m_Value(Y))) &&
           match(Add1, m_c_NSWAdd(m_Specific(X), m_Value(Z)))) ||
          (match(Add0, m_NSWAdd(m_Value(Y), m_Value(X))) &&

llvm/test/Transforms/InstCombine/sub-sext-add.ll

@@ -61,6 +61,21 @@ define i64 @src_2add_2sext_sub_4(i32 %x, i32 %y, i32 %z) {
   ret i64 %sub
 }
 
+define i64 @src_2add_2sextlike_sub(i32 %x, i32 %y, i32 %z) {
+; CHECK-LABEL: @src_2add_2sextlike_sub(
+; CHECK-NEXT:    [[SEXT1:%.*]] = sext i32 [[Y:%.*]] to i64
+; CHECK-NEXT:    [[SEXT2:%.*]] = sext i32 [[Z:%.*]] to i64
+; CHECK-NEXT:    [[SUB:%.*]] = sub nsw i64 [[SEXT1]], [[SEXT2]]
+; CHECK-NEXT:    ret i64 [[SUB]]
+;
+  %add1 = add nsw i32 %x, %y
+  %add2 = add nsw i32 %x, %z
+  %sext1 = zext nneg i32 %add1 to i64
+  %sext2 = zext nneg i32 %add2 to i64
+  %sub = sub i64 %sext1, %sext2
+  ret i64 %sub
+}
+
 define i64 @src_2add_2sext_sub_nsw(i32 %x, i32 %y, i32 %z) {
 ; CHECK-LABEL: @src_2add_2sext_sub_nsw(
 ; CHECK-NEXT:    [[SEXT1:%.*]] = sext i32 [[Y:%.*]] to i64
@@ -115,6 +130,18 @@ define i64 @src_x_add_2sext_sub_2(i32 %x, i32 %y) {
   ret i64 %sub
 }
 
+define i64 @src_x_add_2sextlike_sub(i32 %x, i32 %y) {
+; CHECK-LABEL: @src_x_add_2sextlike_sub(
+; CHECK-NEXT:    [[SUB:%.*]] = sext i32 [[Y:%.*]] to i64
+; CHECK-NEXT:    ret i64 [[SUB]]
+;
+  %add1 = add nsw i32 %x, %y
+  %sext1 = zext nneg i32 %add1 to i64
+  %sext2 = zext nneg i32 %x to i64
+  %sub = sub i64 %sext1, %sext2
+  ret i64 %sub
+}
+
 define i64 @src_x_add_2sext_sub_nsw(i32 %x, i32 %y) {
 ; CHECK-LABEL: @src_x_add_2sext_sub_nsw(
 ; CHECK-NEXT:    [[SUB:%.*]] = sext i32 [[Y:%.*]] to i64