Extend constant pool for select (same rules as other DF/QW instr.)

Change-Id: I1af172cb70babd5576b06a314c2a833d90f411e6

Author: bgajdaINTC

IGC/Compiler/CISACodeGen/EmitVISAPass.cpp

@@ -3240,8 +3240,12 @@ void EmitPass::Select(const SSource sources[3], const DstModifier& modifier)
 {
     assert(modifier.flag == nullptr && sources[0].mod == EMOD_NONE);
     CVariable* flag = GetSrcVariable(sources[0]);
-    CVariable* src0 = GetSrcVariable(sources[1]);;
-    CVariable* src1 = GetSrcVariable(sources[2]);;
+
+    bool fromConstantPool = sources[1].fromConstantPool;
+    CVariable* src0 = GetSrcVariable(sources[1], fromConstantPool);
+
+    fromConstantPool = sources[2].fromConstantPool;
+    CVariable* src1 = GetSrcVariable(sources[2], fromConstantPool);
 
     SetSourceModifiers(0, sources[1]);
     SetSourceModifiers(1, sources[2]);

IGC/Compiler/CISACodeGen/PatternMatchPass.cpp

@@ -2760,18 +2760,14 @@ namespace IGC
             pattern->sources[1] = GetSource(I.getOperand(1), supportModifer, supportRegioning);
         }
 
-        if (nbSources > 1 && (I.getType()->isDoubleTy() || I.getType()->isIntegerTy(64)))
+        if (nbSources > 1)
         {
             // add df imm to constant pool for binary/ternary inst
-            // we do 64-bit int imm biggerthan 32 bits, since smaller may fit in D/W
+            // we do 64-bit int imm bigger than 32 bits, since smaller may fit in D/W
             for (int i = 0, numSrc = (int)nbSources; i < numSrc; ++i)
             {
                 Value* op = I.getOperand(i);
-                bool isDF = isa<ConstantFP>(op);
-                auto ci = dyn_cast<ConstantInt>(op);
-                bool isBigQW = ci && !ci->getValue().isNullValue() && !ci->getValue().isSignedIntN(32);
-
-                if (isDF || isBigQW)
+                if (isCandidateForConstantPool(op))
                 {
                     AddToConstantPool(I.getParent(), op);
                     pattern->sources[i].fromConstantPool = true;
@@ -2978,6 +2974,20 @@ namespace IGC
         pattern->sources[0] = GetSource(I.getCondition(), false, false);
         pattern->sources[1] = GetSource(I.getTrueValue(), true, false);
         pattern->sources[2] = GetSource(I.getFalseValue(), true, false);
+
+        // try to add to constant pool whatever possible.
+        if (isCandidateForConstantPool(I.getTrueValue()))
+        {
+            AddToConstantPool(I.getParent(), I.getTrueValue());
+            pattern->sources[1].fromConstantPool = true;
+        }
+
+        if (isCandidateForConstantPool(I.getFalseValue()))
+        {
+            AddToConstantPool(I.getParent(), I.getFalseValue());
+            pattern->sources[2].fromConstantPool = true;
+        }
+
         AddPattern(pattern);
         return true;
     }
@@ -3425,16 +3435,10 @@ namespace IGC
             }
             pattern->sources[i] = GetSource(src, mod, false);
 
-            if (src->getType()->isIntegerTy(64))
+            if (isCandidateForConstantPool(src))
             {
-                auto ci = dyn_cast<ConstantInt>(src);
-                bool isBigQW = ci && !ci->getValue().isNullValue() && !ci->getValue().isSignedIntN(32);
-
-                if (isBigQW)
-                {
-                    AddToConstantPool(I.getParent(), src);
-                    pattern->sources[i].fromConstantPool = true;
-                }
+                AddToConstantPool(I.getParent(), src);
+                pattern->sources[i].fromConstantPool = true;
             }
 
 
@@ -4226,6 +4230,14 @@ namespace IGC
         return found;
     }
 
+    bool isCandidateForConstantPool(llvm::Value * val)
+    {
+        auto ci = dyn_cast<ConstantInt>(val);
+        bool isBigQW = ci && !ci->getValue().isNullValue() && !ci->getValue().isSignedIntN(32);
+        bool isDF = val->getType()->isDoubleTy();
+        return (isBigQW || isDF);
+    };
+
     uint CodeGenPatternMatch::GetBlockId(llvm::BasicBlock* block)
     {
         auto it = m_blockMap.find(block);

IGC/Compiler/CISACodeGen/PatternMatchPass.hpp

@@ -321,6 +321,7 @@ namespace IGC
     bool isSat(llvm::Instruction* sat, llvm::Value*& source);
     bool isOne(llvm::Value* zero);
     bool isMinOrMax(llvm::Value* inst, llvm::Value*& source0, llvm::Value*& source1, bool& isMin, bool& isUnsigned);
+    bool isCandidateForConstantPool(llvm::Value * val);
     e_modifier CombineModifier(e_modifier mod1, e_modifier mod2);
 
     static uint GetNbSources(llvm::Instruction& v)