Move select-to-logical peephole earlier in pipeline

Currently the peephole is applied on GenSpecificOpt but it is needed by SimplifyCFG.
Now applying it earlier in CustomSafeOpt.

(cherry picked from commit 1604f5d)

Author: ekochetk

IGC/Compiler/CustomSafeOptPass.cpp

@@ -1,6 +1,6 @@
 /*========================== begin_copyright_notice ============================
 
-Copyright (C) 2017-2022 Intel Corporation
+Copyright (C) 2017-2023 Intel Corporation
 
 SPDX-License-Identifier: MIT
 
@@ -782,6 +782,37 @@ void CustomSafeOptPass::visitCallInst(CallInst& C)
     }
 }
 
+void CustomSafeOptPass::visitSelectInst(SelectInst& I)
+{
+    // select i1 %x, 1, %y ->  or i1 %x, %y
+    // select i1 %x, %y, 0 -> and i1 %x, %y
+
+    using namespace llvm::PatternMatch;
+    llvm::IRBuilder<> Builder(&I);
+
+    if (I.getType()->isIntegerTy(1) && match(&I, m_Select(m_Value(), m_SpecificInt(1), m_Value())))
+    {
+        auto NewVal = Builder.CreateOr(I.getOperand(0), I.getOperand(2));
+        Instruction *OrInst = dyn_cast<Instruction>(NewVal);
+        if (OrInst)
+        {
+            OrInst->setDebugLoc(I.getDebugLoc());
+        }
+        I.replaceAllUsesWith(NewVal);
+    }
+
+    if (I.getType()->isIntegerTy(1) && match(&I, m_Select(m_Value(), m_Value(), m_SpecificInt(0))))
+    {
+        auto NewVal = Builder.CreateAnd(I.getOperand(0), I.getOperand(1));
+        Instruction *AndInst = dyn_cast<Instruction>(NewVal);
+        if (AndInst)
+        {
+            AndInst->setDebugLoc(I.getDebugLoc());
+        }
+        I.replaceAllUsesWith(NewVal);
+    }
+}
+
 
 //
 // pattern match packing of two half float from f32tof16:

IGC/Compiler/CustomSafeOptPass.hpp

@@ -1,6 +1,6 @@
 /*========================== begin_copyright_notice ============================
 
-Copyright (C) 2017-2021 Intel Corporation
+Copyright (C) 2017-2023 Intel Corporation
 
 SPDX-License-Identifier: MIT
 
@@ -75,6 +75,7 @@ namespace IGC
         void visitAnd(llvm::BinaryOperator& I);
         void visitXor(llvm::Instruction& XorInstr);
         void visitShuffleIndex(llvm::CallInst* I);
+        void visitSelectInst(llvm::SelectInst& S);
         //
         // IEEE Floating point arithmetic is not associative.  Any pattern
         // match that changes the order or paramters is unsafe.

IGC/Compiler/tests/CustomSafeOptPass/select.ll

@@ -0,0 +1,37 @@
+;=========================== begin_copyright_notice ============================
+;
+; Copyright (C) 2023 Intel Corporation
+;
+; SPDX-License-Identifier: MIT
+;
+;============================ end_copyright_notice =============================
+;
+; RUN: igc_opt -debugify --igc-custom-safe-opt -check-debugify -S < %s 2>&1 | FileCheck %s
+
+; Debug-info related check
+; CHECK-NOT: WARNING
+; CHECK: CheckModuleDebugify: PASS
+
+define spir_kernel void @test_select_and(i1 %srca, i1 %srcb) {
+; CHECK-LABEL: @test_select_and(
+; CHECK:    [[TMP:%[A-z0-9]*]] = and i1 %srca, %srcb
+; CHECK:    call void @use.i1(i1 [[TMP]])
+; CHECK:    ret void
+;
+  %1 = select i1 %srca, i1 %srcb, i1 false
+  call void @use.i1(i1 %1)
+  ret void
+}
+
+define spir_kernel void @test_select_or(i1 %srca, i1 %srcb) {
+; CHECK-LABEL: @test_select_or(
+; CHECK:    [[TMP:%[A-z0-9]*]] = or i1 %srca, %srcb
+; CHECK:    call void @use.i1(i1 [[TMP]])
+; CHECK:    ret void
+;
+  %1 = select i1 %srca, i1 true, i1 %srcb
+  call void @use.i1(i1 %1)
+  ret void
+}
+
+declare void @use.i1(i1)