Fix isAnyNonTrivialIntrinsic-calls for internal intrinsics

.

Author: igorban-intel

IGC/VectorCompiler/lib/GenXCodeGen/GenXArgIndirection.cpp

@@ -1058,11 +1058,11 @@ void SubroutineArg::gatherBalesToModify(Alignment Align)
       // Add the def to the list of bales that will need modifying, unless
       // it is a phi node or coalesced bitcast or insert/extract in struct
       // or a non-intrinsic call.
-      if (!isa<PHINode>(Inst) && (!isa<BitCastInst>(Inst)
-          || Pass->Liveness->getLiveRange(Inst->getOperand(0)) != ArgLR)
-          && !isa<InsertValueInst>(Inst) && !isa<ExtractValueInst>(Inst)
-          && (!isa<CallInst>(Inst)
-            || GenXIntrinsic::isAnyNonTrivialIntrinsic(Inst)))
+      if (!isa<PHINode>(Inst) &&
+          (!isa<BitCastInst>(Inst) ||
+           Pass->Liveness->getLiveRange(Inst->getOperand(0)) != ArgLR) &&
+          !isa<InsertValueInst>(Inst) && !isa<ExtractValueInst>(Inst) &&
+          (!isa<CallInst>(Inst) || vc::isAnyNonTrivialIntrinsic(Inst)))
         if (BalesSeen.insert(Inst).second)
           Pass->BalesToModify.push_back(Inst);
     } else if (V != Arg)
@@ -1071,8 +1071,7 @@ void SubroutineArg::gatherBalesToModify(Alignment Align)
       auto User = cast<Instruction>(ui->getUser());
       if (auto CI = dyn_cast<CallInst>(User)) {
         Function *CF = CI->getCalledFunction();
-        if (!GenXIntrinsic::isAnyNonTrivialIntrinsic(CF) &&
-            !vc::requiresStackCall(CF)) {
+        if (!vc::isAnyNonTrivialIntrinsic(CF) && !vc::requiresStackCall(CF)) {
           // Non-intrinsic call. Ignore. (A call site using an arg being
           // indirected gets handled differently.)
           // Cannot indirect if there is a stack call. Do not ignore stack
@@ -1127,7 +1126,7 @@ bool GenXArgIndirection::checkIndirectBale(Bale *B, LiveRange *ArgLR,
       return false;
     }
     unsigned IID = vc::getAnyIntrinsicID(MainInst->Inst);
-    if (GenXIntrinsic::isAnyNonTrivialIntrinsic(IID)) {
+    if (vc::isAnyNonTrivialIntrinsic(IID)) {
       auto IntrInfo = GenXIntrinsicInfo(IID);
       // Cannot indirect a raw or direct only operand.
       bool RawOrDirectOnly =

IGC/VectorCompiler/lib/GenXCodeGen/GenXBaling.cpp

@@ -2097,7 +2097,7 @@ void GenXBaling::buildBaleSub(Instruction *Inst, Bale *B, bool IncludeAddr) cons
 
   if (isa<PHINode>(Inst) ||
       (isa<CallInst>(Inst) && !cast<CallInst>(Inst)->isInlineAsm() &&
-       !GenXIntrinsic::isAnyNonTrivialIntrinsic(Inst)))
+       !vc::isAnyNonTrivialIntrinsic(Inst)))
     return;
   if (IncludeAddr) {
     int AddrOperandNum = getAddrOperandNum(GenXIntrinsic::getGenXIntrinsicID(Inst));

IGC/VectorCompiler/lib/GenXCodeGen/GenXDepressurizer.cpp

@@ -729,7 +729,7 @@ void GenXDepressurizer::processInstruction(Instruction *Inst) {
   Live->removeValue(Inst);
   // If this is a non-intrisic call, add the max pressure from inside the call.
   if (auto CI = dyn_cast<CallInst>(Inst)) {
-    if (!GenXIntrinsic::isAnyNonTrivialIntrinsic(CI)) {
+    if (!vc::isAnyNonTrivialIntrinsic(CI)) {
       LLVM_DEBUG(dbgs() << "pressure inside subroutine: "
                         << SubroutinePressures[CI->getCalledFunction()]
                         << '\n');

IGC/VectorCompiler/lib/GenXCodeGen/GenXPrologEpilogInsertion.cpp

@@ -767,7 +767,7 @@ void GenXPrologEpilogInsertion::emitPrivateMemoryAllocations() {
 void GenXPrologEpilogInsertion::visitCallInst(CallInst &I) {
   if (I.isInlineAsm())
     return;
-  if (GenXIntrinsic::isAnyNonTrivialIntrinsic(&I))
+  if (vc::isAnyNonTrivialIntrinsic(&I))
     return;
   bool IsIndirectCall = I.isIndirectCall();
 // FIXME: Temporary solution until SPIRV translator conversion of unnamed
@@ -777,8 +777,7 @@ void GenXPrologEpilogInsertion::visitCallInst(CallInst &I) {
   if (auto *CE = dyn_cast<ConstantExpr>(Op);
       CE && CE->getOpcode() == Instruction::BitCast) {
     auto *CalledFunction = cast<Function>(CE->getOperand(0));
-    IsIntrinsicIndirect =
-        GenXIntrinsic::isAnyNonTrivialIntrinsic(CalledFunction);
+    IsIntrinsicIndirect = vc::isAnyNonTrivialIntrinsic(CalledFunction);
     IGC_ASSERT_MESSAGE(IsIntrinsicIndirect, "Only intrinsic is expected");
   }
 

IGC/VectorCompiler/lib/GenXCodeGen/GenXVectorDecomposer.cpp

@@ -208,8 +208,7 @@ bool VectorDecomposer::determineDecomposition(Instruction *Inst) {
         setNotDecomposing(Inst, "use of function argument or constant");
     } else {
       // Any other def. This stops decomposition.
-      if ((isa<CallInst>(Inst) &&
-           !GenXIntrinsic::isAnyNonTrivialIntrinsic(Inst)) ||
+      if ((isa<CallInst>(Inst) && !vc::isAnyNonTrivialIntrinsic(Inst)) ||
           isa<ExtractValueInst>(Inst))
         setNotDecomposing(Inst, "return value from call");
       else
@@ -246,8 +245,7 @@ bool VectorDecomposer::determineDecomposition(Instruction *Inst) {
       // in the Seen set.)
       if (isa<InsertValueInst>(user) || isa<ReturnInst>(user))
         setNotDecomposing(user, "use as return value");
-      else if (isa<CallInst>(user) &&
-               !GenXIntrinsic::isAnyNonTrivialIntrinsic(user))
+      else if (isa<CallInst>(user) && !vc::isAnyNonTrivialIntrinsic(user))
         setNotDecomposing(user, "use as call argument");
       else
         setNotDecomposing(user, "other non-decomposable use");