[llvm] f65c78a - Revert "[InstSimplify][NFC] Add baseline tests for folds of icmp with ctpop"

Hirochika Matsumoto via llvm-commits llvm-commits at lists.llvm.org
Sat Apr 2 10:31:02 PDT 2022


Author: Hirochika Matsumoto
Date: 2022-04-03T02:27:59+09:00
New Revision: f65c78a0949023bb0f3051cdaea7758e48420978

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

LOG: Revert "[InstSimplify][NFC] Add baseline tests for folds of icmp with ctpop"

This reverts commit b48abeea44ac3c7860b13b863210116e8db1d978.

Accidentally added already optimized tests, not baseline tests.

Added: 
    

Modified: 
    llvm/test/Transforms/InstCombine/ispow2.ll

Removed: 
    llvm/test/Transforms/InstSimplify/and-or-icmp-ctpop.ll


################################################################################
diff  --git a/llvm/test/Transforms/InstCombine/ispow2.ll b/llvm/test/Transforms/InstCombine/ispow2.ll
index cbc247f3c3817..6a8dbc86e0b8c 100644
--- a/llvm/test/Transforms/InstCombine/ispow2.ll
+++ b/llvm/test/Transforms/InstCombine/ispow2.ll
@@ -900,13 +900,13 @@ define i1 @is_pow2or0_ctpop_wrong_pred1(i32 %x) {
 define i1 @is_pow2or0_ctpop_wrong_pred2_logical(i32 %x) {
 ; CHECK-LABEL: @is_pow2or0_ctpop_wrong_pred2_logical(
 ; CHECK-NEXT:    [[T0:%.*]] = tail call i32 @llvm.ctpop.i32(i32 [[X:%.*]]), !range [[RNG0]]
-; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i32 [[T0]], 1
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i32 [[T0]], 1
 ; CHECK-NEXT:    [[ISZERO:%.*]] = icmp ne i32 [[X]], 0
 ; CHECK-NEXT:    [[R:%.*]] = or i1 [[ISZERO]], [[CMP]]
 ; CHECK-NEXT:    ret i1 [[R]]
 ;
   %t0 = tail call i32 @llvm.ctpop.i32(i32 %x)
-  %cmp = icmp ne i32 %t0, 1
+  %cmp = icmp eq i32 %t0, 1
   %iszero = icmp ne i32 %x, 0
   %r = select i1 %iszero, i1 true, i1 %cmp
   ret i1 %r
@@ -1092,13 +1092,13 @@ define i1 @isnot_pow2nor0_ctpop_wrong_pred1(i32 %x) {
 define i1 @isnot_pow2nor0_ctpop_wrong_pred2_logical(i32 %x) {
 ; CHECK-LABEL: @isnot_pow2nor0_ctpop_wrong_pred2_logical(
 ; CHECK-NEXT:    [[T0:%.*]] = tail call i32 @llvm.ctpop.i32(i32 [[X:%.*]]), !range [[RNG0]]
-; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i32 [[T0]], 1
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i32 [[T0]], 1
 ; CHECK-NEXT:    [[NOTZERO:%.*]] = icmp eq i32 [[X]], 0
 ; CHECK-NEXT:    [[R:%.*]] = and i1 [[NOTZERO]], [[CMP]]
 ; CHECK-NEXT:    ret i1 [[R]]
 ;
   %t0 = tail call i32 @llvm.ctpop.i32(i32 %x)
-  %cmp = icmp eq i32 %t0, 1
+  %cmp = icmp ne i32 %t0, 1
   %notzero = icmp eq i32 %x, 0
   %r = select i1 %notzero, i1 %cmp, i1 false
   ret i1 %r

diff  --git a/llvm/test/Transforms/InstSimplify/and-or-icmp-ctpop.ll b/llvm/test/Transforms/InstSimplify/and-or-icmp-ctpop.ll
deleted file mode 100644
index 6de97c3a7a76d..0000000000000
--- a/llvm/test/Transforms/InstSimplify/and-or-icmp-ctpop.ll
+++ /dev/null
@@ -1,102 +0,0 @@
-; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -passes=instsimplify -S | FileCheck %s
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;
-; (ctpop(X) == N) || (X != 0) --> X != 0
-; where N > 0
-;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-declare i32 @llvm.ctpop.i32(i32)
-
-define i1 @eq_or_non_0(i32 %x) {
-; CHECK-LABEL: @eq_or_non_0(
-; CHECK-NEXT:    [[NOTZERO:%.*]] = icmp ne i32 [[X:%.*]], 0
-; CHECK-NEXT:    ret i1 [[NOTZERO]]
-;
-  %t0 = tail call i32 @llvm.ctpop.i32(i32 %x)
-  %cmp = icmp eq i32 %t0, 10
-  %notzero = icmp ne i32 %x, 0
-  %r = or i1 %notzero, %cmp
-  ret i1 %r
-}
-
-declare <2 x i32> @llvm.ctpop.v2i32(<2 x i32>)
-
-define <2 x i1> @eq_or_non_0_commute(<2 x i32> %x) {
-; CHECK-LABEL: @eq_or_non_0_commute(
-; CHECK-NEXT:    [[NOTZERO:%.*]] = icmp ne <2 x i32> [[X:%.*]], zeroinitializer
-; CHECK-NEXT:    ret <2 x i1> [[NOTZERO]]
-;
-  %t0 = tail call <2 x i32> @llvm.ctpop.v2i32(<2 x i32> %x)
-  %cmp = icmp eq <2 x i32> %t0, <i32 20, i32 20>
-  %notzero = icmp ne <2 x i32> %x, <i32 0, i32 0>
-  %r = or <2 x i1> %cmp, %notzero
-  ret <2 x i1> %r
-}
-
-; Negative test - wrong predicate
-
-define i1 @eq_or_non_0_wrong_pred1(i32 %x) {
-; CHECK-LABEL: @eq_or_non_0_wrong_pred1(
-; CHECK-NEXT:    [[T0:%.*]] = tail call i32 @llvm.ctpop.i32(i32 [[X:%.*]])
-; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i32 [[T0]], 10
-; CHECK-NEXT:    [[NOTZERO:%.*]] = icmp ne i32 [[X]], 0
-; CHECK-NEXT:    [[R:%.*]] = or i1 [[NOTZERO]], [[CMP]]
-; CHECK-NEXT:    ret i1 [[R]]
-;
-  %t0 = tail call i32 @llvm.ctpop.i32(i32 %x)
-  %cmp = icmp ne i32 %t0, 10
-  %notzero = icmp ne i32 %x, 0
-  %r = or i1 %notzero, %cmp
-  ret i1 %r
-}
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;
-; (ctpop(X) != N) && (X == 0) --> X == 0
-; where N > 0
-;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-define i1 @ne_and_is_0(i32 %x) {
-; CHECK-LABEL: @ne_and_is_0(
-; CHECK-NEXT:    [[ISZERO:%.*]] = icmp eq i32 [[X:%.*]], 0
-; CHECK-NEXT:    ret i1 [[ISZERO]]
-;
-  %t0 = tail call i32 @llvm.ctpop.i32(i32 %x)
-  %cmp = icmp ne i32 %t0, 10
-  %iszero = icmp eq i32 %x, 0
-  %r = and i1 %iszero, %cmp
-  ret i1 %r
-}
-
-define <2 x i1> @ne_and_is_0_commute(<2 x i32> %x) {
-; CHECK-LABEL: @ne_and_is_0_commute(
-; CHECK-NEXT:    [[ISZERO:%.*]] = icmp eq <2 x i32> [[X:%.*]], zeroinitializer
-; CHECK-NEXT:    ret <2 x i1> [[ISZERO]]
-;
-  %t0 = tail call <2 x i32> @llvm.ctpop.v2i32(<2 x i32> %x)
-  %cmp = icmp ne <2 x i32> %t0, <i32 20, i32 20>
-  %iszero = icmp eq <2 x i32> %x, <i32 0, i32 0>
-  %r = and <2 x i1> %cmp, %iszero
-  ret <2 x i1> %r
-}
-
-; Negative test - wrong predicate
-
-define i1 @ne_and_is_0_wrong_pred1(i32 %x) {
-; CHECK-LABEL: @ne_and_is_0_wrong_pred1(
-; CHECK-NEXT:    [[T0:%.*]] = tail call i32 @llvm.ctpop.i32(i32 [[X:%.*]])
-; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i32 [[T0]], 10
-; CHECK-NEXT:    [[ISZERO:%.*]] = icmp eq i32 [[X]], 0
-; CHECK-NEXT:    [[R:%.*]] = or i1 [[ISZERO]], [[CMP]]
-; CHECK-NEXT:    ret i1 [[R]]
-;
-  %t0 = tail call i32 @llvm.ctpop.i32(i32 %x)
-  %cmp = icmp ne i32 %t0, 10
-  %iszero = icmp eq i32 %x, 0
-  %r = or i1 %iszero, %cmp
-  ret i1 %r
-}


        


More information about the llvm-commits mailing list