Changes in code.

Change-Id: I337cc974221e0aa59238688ec8eb29ff068d3271

Author: apronin-intel

IGC/VectorCompiler/lib/GenXCodeGen/GenX.h

@@ -139,6 +139,11 @@ const constexpr int DWordBytes = DWordBits / ByteBits;
 const constexpr int QWordBytes = QWordBits / ByteBits;
 const constexpr int OWordBytes = OWordBits / ByteBits;
 
+// Currently EM determines behavior of 32 lanes.
+// Probably that should be moved to subtarget if
+// different targets will support different EM sizes.
+const constexpr unsigned int TotalEMSize = 32;
+
 // vISA allows [-512,511] for operation to be baled as offset
 // for rdregion, copied from visa
 const constexpr int G4_MAX_ADDR_IMM = 511;

IGC/VectorCompiler/lib/GenXCodeGen/GenXCategory.cpp

@@ -577,8 +577,9 @@ bool GenXCategory::fixCircularPhis(Function *F)
       // A phi node is never a struct -- GenXLowering removed struct phis.
       assert(!isa<StructType>(Phi->getType()));
       // Insert a copy, split as required to be legal.
-      auto NewCopy = Liveness->insertCopy(Phi, nullptr, BB->getFirstNonPHI(),
-          Phi->getName() + ".unoverlapper", 0);
+      auto NewCopy =
+          Liveness->insertCopy(Phi, nullptr, BB->getFirstNonPHI(),
+                               Phi->getName() + ".unoverlapper", 0, Subtarget);
       // Change the uses that existed before we added the copy to use the
       // copy instead.
       for (auto ui = Uses.begin(), ue = Uses.end(); ui != ue; ++ui)

IGC/VectorCompiler/lib/GenXCodeGen/GenXCoalescing.cpp

@@ -1671,7 +1671,8 @@ Instruction *GenXCoalescing::insertCopy(SimpleValue Input, LiveRange *LR,
     Liveness->setLiveRange(SimpleValue(Extract), SourceLR);
     Input = SimpleValue(Extract);
   }
-  return Liveness->insertCopy(Input.getValue(), LR, InsertBefore, Name, Number);
+  return Liveness->insertCopy(Input.getValue(), LR, InsertBefore, Name, Number,
+                              ST);
 }
 
 /***********************************************************************

IGC/VectorCompiler/lib/GenXCodeGen/GenXLiveness.cpp

@@ -37,6 +37,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "GenXIntrinsics.h"
 #include "GenXNumbering.h"
 #include "GenXRegion.h"
+#include "GenXSubtarget.h"
 #include "GenXUtil.h"
 #include "vc/GenXOpts/Utils/RegCategory.h"
 #include "llvm/ADT/SmallSet.h"
@@ -1163,8 +1164,9 @@ bool GenXLiveness::wrapsAround(Value *V1, Value *V2)
  * adjust live ranges. Also at this stage there is no baling info to update.
  */
 Instruction *GenXLiveness::insertCopy(Value *InputVal, LiveRange *LR,
-    Instruction *InsertBefore, const Twine &Name, unsigned Number)
-{
+                                      Instruction *InsertBefore,
+                                      const Twine &Name, unsigned Number,
+                                      const GenXSubtarget *ST) {
   assert(!isa<Constant>(InputVal));
   bool AdjustLRs = LR != nullptr;
   LiveRange *SourceLR = nullptr;
@@ -1211,7 +1213,10 @@ Instruction *GenXLiveness::insertCopy(Value *InputVal, LiveRange *LR,
   }
 
   Region R(InputVal);
-  unsigned MaxNum = R.ElementBytes == 1 ? 32 : 64 / R.ElementBytes;
+  unsigned MaxNum =
+      R.getLegalSize(/* StartIdx */ 0, /* Allow2D */ false, R.NumElements, ST);
+  // Adjust size to Exec size
+  MaxNum = std::min(MaxNum, TotalEMSize);
   if (exactLog2(R.NumElements) >= 0 && R.NumElements <= MaxNum) {
     // Can be done with a single copy.
     if (SourceLR && (SourceLR->Category != RegCategory::GENERAL

IGC/VectorCompiler/lib/GenXCodeGen/GenXLiveness.h

@@ -196,6 +196,7 @@ class FunctionPass;
 class GenXBaling;
 class GenXLiveness;
 class GenXNumbering;
+class GenXSubtarget;
 class Instruction;
 class PHINode;
 class raw_ostream;
@@ -609,7 +610,9 @@ class GenXLiveness : public FunctionGroupPass {
   // See if V1 is a phi node and V2 wraps round to a phi use in the same BB after V1's def
   static bool wrapsAround(Value *V1, Value *V2);
   // Insert a copy of a non-struct value.
-  Instruction *insertCopy(Value *InputVal, genx::LiveRange *LR, Instruction *InsertBefore, const Twine &Name, unsigned Number);
+  Instruction *insertCopy(Value *InputVal, genx::LiveRange *LR,
+                          Instruction *InsertBefore, const Twine &Name,
+                          unsigned Number, const GenXSubtarget *ST);
   // eraseUnusedTree : erase unused tree of instructions, and remove from GenXLiveness
   void eraseUnusedTree(Instruction *Inst);
   // setArgAddressBase : set the base value of an argument indirect address