[Autobackout][FunctionalRegression]Revert of change: 3218302: Lower VNNI-transforming shufflevector pattern in VC

.

Author: sys-igc

IGC/VectorCompiler/lib/GenXCodeGen/GenXLowering.cpp

@@ -230,7 +230,6 @@ class GenXLowering : public FunctionPass {
   void lowerShuffleSplat(ShuffleVectorInst *SI,
                          ShuffleVectorAnalyzer::SplatInfo Splat);
   bool lowerShuffleToSelect(ShuffleVectorInst *Inst);
-  bool lowerShuffleToVNNI(ShuffleVectorInst *Inst, unsigned ExecSize);
   void lowerShuffleToMove(ShuffleVectorInst *SI);
   bool lowerShr(Instruction *Inst);
   bool lowerExtractValue(ExtractValueInst *Inst);
@@ -3127,62 +3126,17 @@ void GenXLowering::lowerShuffleSplat(ShuffleVectorInst *SI,
  * Any other shuffle is currently unsupported
  */
 bool GenXLowering::lowerShuffle(ShuffleVectorInst *SI) {
-  ShuffleVectorAnalyzer SVA(SI);
-
-  auto Splat = SVA.getAsSplat();
+  auto Splat = ShuffleVectorAnalyzer(SI).getAsSplat();
   if (Splat.Input) {
     lowerShuffleSplat(SI, Splat);
     return true;
   }
   if (lowerShuffleToSelect(SI))
     return true;
-
-  if (auto ExecSize = ST->getGRFByteSize() / genx::DWordBytes;
-      SVA.isVNNIShuffle(ExecSize))
-    return lowerShuffleToVNNI(SI, ExecSize);
-
   lowerShuffleToMove(SI);
   return true;
 }
 
-bool GenXLowering::lowerShuffleToVNNI(ShuffleVectorInst *SI,
-                                      unsigned ExecSize) {
-  auto *Ty = cast<IGCLLVM::FixedVectorType>(SI->getType());
-  auto *EltTy = Ty->getElementType();
-  auto EltSize = DL->getTypeSizeInBits(EltTy);
-
-  auto VNNIFactor = genx::DWordBits / EltSize;
-
-  auto *Src = SI->getOperand(0);
-  Value *Res = UndefValue::get(Ty);
-
-  vc::Region ReadRgn(SI);
-  ReadRgn.VStride = ExecSize * VNNIFactor;
-  ReadRgn.Width = ExecSize;
-  ReadRgn.Stride = 1;
-  ReadRgn.Offset = 0;
-
-  vc::Region WriteRgn(SI);
-  WriteRgn.VStride = VNNIFactor;
-  WriteRgn.Width = 1;
-  WriteRgn.Stride = 0;
-  WriteRgn.Offset = 0;
-
-  for (int I = 0; I < VNNIFactor; I++) {
-    auto *Read = ReadRgn.createRdRegion(Src, "", SI, SI->getDebugLoc());
-    Res = WriteRgn.createWrRegion(Res, Read, "", SI, SI->getDebugLoc());
-    ReadRgn.Offset += ExecSize * ReadRgn.ElementBytes;
-    WriteRgn.Offset += WriteRgn.ElementBytes;
-  }
-
-  auto *NewInst = cast<Instruction>(Res);
-  NewInst->takeName(SI);
-  SI->replaceAllUsesWith(NewInst);
-  ToErase.push_back(SI);
-
-  return true;
-}
-
 // Lower those shufflevector that can be implemented efficiently as select.
 bool GenXLowering::lowerShuffleToSelect(ShuffleVectorInst *SI) {
   int NumElements =

IGC/VectorCompiler/lib/GenXCodeGen/GenXUtil.cpp

@@ -495,43 +495,6 @@ bool ShuffleVectorAnalyzer::isReplicatedSlice() const {
   return true;
 }
 
-bool ShuffleVectorAnalyzer::isVNNIShuffle(unsigned ExecSize) const {
-  IGC_ASSERT(SI);
-
-  if (!SI->isSingleSource())
-    return false;
-
-  auto *Ty = cast<IGCLLVM::FixedVectorType>(SI->getType());
-  auto *EltTy = Ty->getElementType();
-  auto EltSize = EltTy->getPrimitiveSizeInBits();
-
-  if (EltSize != genx::WordBits && EltSize != genx::ByteBits)
-    return false;
-
-  auto VNNIFactor = genx::DWordBits / EltSize;
-
-  auto RowSize = ExecSize * VNNIFactor;
-  auto NumElts = Ty->getNumElements();
-
-  if (NumElts % ExecSize * VNNIFactor != 0)
-    return false;
-
-  auto Rows = NumElts / RowSize;
-
-  for (unsigned R = 0; R < Rows; ++R) {
-    for (unsigned I = 0; I < ExecSize; ++I) {
-      for (unsigned J = 0; J < VNNIFactor; ++J) {
-        auto Idx = R * RowSize + I * VNNIFactor + J;
-        auto ExpectedVal = R * RowSize + ExecSize * J + I;
-        if (SI->getMaskValue(Idx) != ExpectedVal)
-          return false;
-      }
-    }
-  }
-
-  return true;
-}
-
 Value *genx::getMaskOperand(const Instruction *Inst) {
   IGC_ASSERT(Inst);
 

IGC/VectorCompiler/lib/GenXCodeGen/GenXUtil.h

@@ -341,8 +341,6 @@ class ShuffleVectorAnalyzer {
     return ShuffleVectorAnalyzer(SI).getReplicatedSliceDescriptor();
   }
 
-  bool isVNNIShuffle(unsigned ExecSize) const;
-
   // getAsUnslice : see if the shufflevector is an
   //     unslice where the "old value" is operand 0 and operand 1 is another
   //     shufflevector and operand 0 of that is the "new value" Returns start