[Autobackout][FuncReg]Revert of change: fb5308f

Bale-in IntToPtr and PtrToInt operands

Author: azabazno

IGC/VectorCompiler/lib/GenXCodeGen/GenXBaling.cpp

@@ -78,12 +78,6 @@ static cl::opt<bool> BaleSelect("bale-select", cl::init(true), cl::Hidden,
 static cl::opt<bool> BaleFNeg("bale-fneg", cl::init(true), cl::Hidden,
                               cl::desc("Bale fneg"));
 
-static cl::opt<bool> BaleIntToPtr("bale-inttoptr", cl::init(true), cl::Hidden,
-                                  cl::desc("Bale inttoptr"));
-
-static cl::opt<bool> BalePtrToInt("bale-ptrtoint", cl::init(true), cl::Hidden,
-                                  cl::desc("Bale ptrtoint"));
-
 //----------------------------------------------------------------------
 // Administrivia for GenXFuncBaling pass
 //
@@ -373,16 +367,6 @@ static int checkModifier(Instruction *Inst)
       return BaleInfo::SEXT;
     }
     break;
-  case Instruction::IntToPtr: {
-    LLVM_DEBUG(llvm::dbgs()
-               << "Instruction " << *Inst << " detected as INTTOPTR\n");
-    return BaleInfo::INTTOPTR;
-  } break;
-  case Instruction::PtrToInt: {
-    LLVM_DEBUG(llvm::dbgs()
-               << "Instruction " << *Inst << " detected as PTRTOINT\n");
-    return BaleInfo::PTRTOINT;
-  } break;
   default:
     switch (GenXIntrinsic::getGenXIntrinsicID(Inst)) {
     case GenXIntrinsic::genx_absi:
@@ -449,12 +433,6 @@ bool GenXBaling::operandCanBeBaled(
         break;
     }
   }
-
-  // Always bale in IntToPtr and PtrToInt operands
-  if (Opnd->getOpcode() == Instruction::IntToPtr ||
-      Opnd->getOpcode() == Instruction::PtrToInt)
-    return true;
-
   if (GenXIntrinsic::isRdRegion(Opnd)) {
     // The operand is a rdregion. Check any restrictions.
     // (Note we call isRegionOKForIntrinsic even when Inst is not an
@@ -1338,10 +1316,6 @@ static bool acceptableMainInst(Instruction *Inst) {
   if (Inst->getOpcode() == Instruction::FNeg)
     return BaleFNeg;
 #endif
-  if (Inst->getOpcode() == Instruction::IntToPtr)
-    return BaleIntToPtr;
-  if (Inst->getOpcode() == Instruction::PtrToInt)
-    return BalePtrToInt;
   return false;
 }
 
@@ -2699,8 +2673,6 @@ const char *BaleInfo::getTypeString() const
     case BaleInfo::GSTORE: return "g_store";
     case BaleInfo::SHUFFLEPRED: return "shufflepred";
     case BaleInfo::FADDR: return "faddr";
-    case BaleInfo::INTTOPTR: return "inttoptr";
-    case BaleInfo::PTRTOINT: return "ptrtoint";
     default: return "???";
   }
 }

IGC/VectorCompiler/lib/GenXCodeGen/GenXBaling.h

@@ -257,8 +257,7 @@ struct BaleInfo {
   // rdregion, wrregion, modifier, or main instruction.
   enum { MAININST, WRREGION, SATURATE, NOTMOD, NEGMOD, ABSMOD,
       RDREGION, ADDRADD, ADDROR, FADDR, RDPREDREGION, ALLANY, NOTP, ZEXT, SEXT,
-      SHUFFLEPRED, WRPREDREGION, WRPREDPREDREGION, CMPDST, GSTORE, REGINTR, INTTOPTR, PTRTOINT};
-
+      SHUFFLEPRED, WRPREDREGION, WRPREDPREDREGION, CMPDST, GSTORE, REGINTR };
   uint16_t Type;
   uint16_t Bits; // bitmap of which operands are baled in
   BaleInfo(int Type = MAININST, unsigned Bits = 0) : Type(Type), Bits(Bits) {}

IGC/VectorCompiler/lib/GenXCodeGen/GenXCisaBuilder.cpp

@@ -1465,8 +1465,7 @@ bool GenXKernelBuilder::buildInstruction(Instruction *Inst) {
     Inst = cast<Instruction>(Inst->getOperand(0));
     BI = Baling->getBaleInfo(Inst);
   }
-  if (BI.Type == BaleInfo::REGINTR || BI.Type == BaleInfo::INTTOPTR ||
-      BI.Type == BaleInfo::PTRTOINT)
+  if (BI.Type == BaleInfo::REGINTR)
     return false;
   if (BI.Type == BaleInfo::WRREGION || BI.Type == BaleInfo::WRPREDREGION ||
       BI.Type == BaleInfo::WRPREDPREDREGION) {
@@ -2175,12 +2174,6 @@ VISA_VectorOpnd *GenXKernelBuilder::createSource(Value *V, Signedness Signed,
   case BaleInfo::SEXT:
     Signed = SIGNED;
     break;
-  case BaleInfo::INTTOPTR:
-    Signed = UNSIGNED;
-    break;
-  case BaleInfo::PTRTOINT:
-    Signed = SIGNED;
-    break;
   default:
     IGC_ASSERT_EXIT_MESSAGE(0, "unknown bale type");
     break;