From 307307456277f62f963e494de85b2b24f9c4afe2 Mon Sep 17 00:00:00 2001
From: Sanjay Patel <spatel@rotateright.com>
Date: Fri, 21 Oct 2022 12:22:40 -0400
Subject: [PATCH] [InstCombine] allow more commutative matches for logical-and
 to select fold

When the common value is part of either select condition,
this is safe to reduce. Otherwise, it is not poison-safe
(with the select form of the pattern):
https://alive2.llvm.org/ce/z/FxQTzB

This is another patch motivated by issue #58313.
---
 .../lib/Transforms/InstCombine/InstCombineSelect.cpp |  8 ++++++++
 .../Transforms/InstCombine/select-safe-transforms.ll | 20 ++++----------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp b/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp
index 6bed09d..4e0ca60 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp
@@ -2851,11 +2851,19 @@ Instruction *InstCombinerImpl::visitSelectInst(SelectInst &SI) {
       Value *C;
 
       // (C && A) || (!C && B) --> sel C, A, B
+      // (A && C) || (!C && B) --> sel C, A, B
       if (match(FalseVal, m_LogicalAnd(m_Not(m_Value(C)), m_Value(B))) &&
           match(CondVal, m_c_LogicalAnd(m_Specific(C), m_Value(A))))
         return SelectInst::Create(C, A, B);
 
+      // (C && A) || (B && !C) --> sel C, A, B
+      // TODO: (A && C) || (B && !C) is safe to transform with real 'and' ops.
+      if (match(FalseVal, m_LogicalAnd(m_Value(B), m_Not(m_Value(C)))) &&
+          match(CondVal, m_LogicalAnd(m_Specific(C), m_Value(A))))
+        return SelectInst::Create(C, A, B);
+
       // (!C && A) || (C && B) --> sel C, B, A
+      // (!C && A) || (B && C) --> sel C, B, A
       if (match(CondVal, m_LogicalAnd(m_Not(m_Value(C)), m_Value(A))) &&
           match(FalseVal, m_c_LogicalAnd(m_Specific(C), m_Value(B))))
         return SelectInst::Create(C, B, A);
diff --git a/llvm/test/Transforms/InstCombine/select-safe-transforms.ll b/llvm/test/Transforms/InstCombine/select-safe-transforms.ll
index 8526758..b0b8108 100644
--- a/llvm/test/Transforms/InstCombine/select-safe-transforms.ll
+++ b/llvm/test/Transforms/InstCombine/select-safe-transforms.ll
@@ -479,10 +479,7 @@ define i1 @bools2_logical_commute1_and1_and2(i1 %a, i1 %b, i1 %c) {
 
 define i1 @bools2_logical_commute2(i1 %a, i1 %b, i1 %c) {
 ; CHECK-LABEL: @bools2_logical_commute2(
-; CHECK-NEXT:    [[NOT:%.*]] = xor i1 [[C:%.*]], true
-; CHECK-NEXT:    [[AND1:%.*]] = select i1 [[C]], i1 [[A:%.*]], i1 false
-; CHECK-NEXT:    [[AND2:%.*]] = select i1 [[B:%.*]], i1 [[NOT]], i1 false
-; CHECK-NEXT:    [[OR:%.*]] = select i1 [[AND1]], i1 true, i1 [[AND2]]
+; CHECK-NEXT:    [[OR:%.*]] = select i1 [[C:%.*]], i1 [[A:%.*]], i1 [[B:%.*]]
 ; CHECK-NEXT:    ret i1 [[OR]]
 ;
   %not = xor i1 %c, -1
@@ -494,10 +491,7 @@ define i1 @bools2_logical_commute2(i1 %a, i1 %b, i1 %c) {
 
 define i1 @bools2_logical_commute2_and1(i1 %a, i1 %b, i1 %c) {
 ; CHECK-LABEL: @bools2_logical_commute2_and1(
-; CHECK-NEXT:    [[NOT:%.*]] = xor i1 [[C:%.*]], true
-; CHECK-NEXT:    [[AND1:%.*]] = and i1 [[C]], [[A:%.*]]
-; CHECK-NEXT:    [[AND2:%.*]] = select i1 [[B:%.*]], i1 [[NOT]], i1 false
-; CHECK-NEXT:    [[OR:%.*]] = select i1 [[AND1]], i1 true, i1 [[AND2]]
+; CHECK-NEXT:    [[OR:%.*]] = select i1 [[C:%.*]], i1 [[A:%.*]], i1 [[B:%.*]]
 ; CHECK-NEXT:    ret i1 [[OR]]
 ;
   %not = xor i1 %c, -1
@@ -510,10 +504,7 @@ define i1 @bools2_logical_commute2_and1(i1 %a, i1 %b, i1 %c) {
 define i1 @bools2_logical_commute2_and2(i1 %a, i1 %c) {
 ; CHECK-LABEL: @bools2_logical_commute2_and2(
 ; CHECK-NEXT:    [[B:%.*]] = call i1 @gen1()
-; CHECK-NEXT:    [[NOT:%.*]] = xor i1 [[C:%.*]], true
-; CHECK-NEXT:    [[AND1:%.*]] = select i1 [[C]], i1 [[A:%.*]], i1 false
-; CHECK-NEXT:    [[AND2:%.*]] = and i1 [[B]], [[NOT]]
-; CHECK-NEXT:    [[OR:%.*]] = select i1 [[AND1]], i1 true, i1 [[AND2]]
+; CHECK-NEXT:    [[OR:%.*]] = select i1 [[C:%.*]], i1 [[A:%.*]], i1 [[B]]
 ; CHECK-NEXT:    ret i1 [[OR]]
 ;
   %b = call i1 @gen1()
@@ -527,10 +518,7 @@ define i1 @bools2_logical_commute2_and2(i1 %a, i1 %c) {
 define i1 @bools2_logical_commute2_and1_and2(i1 %a, i1 %c) {
 ; CHECK-LABEL: @bools2_logical_commute2_and1_and2(
 ; CHECK-NEXT:    [[B:%.*]] = call i1 @gen1()
-; CHECK-NEXT:    [[NOT:%.*]] = xor i1 [[C:%.*]], true
-; CHECK-NEXT:    [[AND1:%.*]] = and i1 [[C]], [[A:%.*]]
-; CHECK-NEXT:    [[AND2:%.*]] = and i1 [[B]], [[NOT]]
-; CHECK-NEXT:    [[OR:%.*]] = select i1 [[AND1]], i1 true, i1 [[AND2]]
+; CHECK-NEXT:    [[OR:%.*]] = select i1 [[C:%.*]], i1 [[A:%.*]], i1 [[B]]
 ; CHECK-NEXT:    ret i1 [[OR]]
 ;
   %b = call i1 @gen1()
-- 
2.7.4