[Autobackout][FuncReg]Revert of change: 4842d9d

Bug fixes to enable function pointers directly passed by FE

Author: dlei6g

IGC/AdaptorCommon/ProcessFuncAttributes.cpp

@@ -322,10 +322,8 @@ bool ProcessFuncAttributes::runOnModule(Module& M)
         for (auto I : F->users()) {
             if (CallInst* callInst = dyn_cast<CallInst>(&*I)) {
                 // Go through call sites and remove NoInline atrributes.
-                // Verifier fails if a call has optnone but not noinline, so if we remove noinline, we must also remove optnone
                 if (callInst->hasFnAttr(llvm::Attribute::NoInline)) {
                     callInst->removeAttribute(AttributeList::FunctionIndex, llvm::Attribute::NoInline);
-                    callInst->removeAttribute(AttributeList::FunctionIndex, llvm::Attribute::OptimizeNone);
                 }
                 // Remove AlwaysInline at callsites
                 if (isOptDisable && callInst->hasFnAttr(llvm::Attribute::AlwaysInline)) {

IGC/Compiler/Optimizer/OpenCLPasses/DeviceEnqueueFuncs/TransformBlocks.cpp

@@ -1635,10 +1635,7 @@ namespace //Anonymous
                 }
             }
 
-            // Remove function pointer from instructions
-            // FIXME: Allowing function pointer calls directly passed by FE will cause regressions due to implicit args
-            // not being supported by indirect calls. When runtime turns on support, we should remove the following code
-            // to allow function pointer usage in all cases.
+            // remove function pointers
             auto nullPtrConst = llvm::ConstantPointerNull::get(Type::getInt8PtrTy(M.getContext()));
             for (auto& func : M.functions())
             {
@@ -1648,8 +1645,11 @@ namespace //Anonymous
                     {
                         if (!isa<llvm::Constant>(user)) {
                             user->replaceUsesOfWith(&func, nullPtrConst);
-                            changed = true;
                         }
+                        else {
+                            user->replaceAllUsesWith(llvm::Constant::getNullValue(user->getType()));
+                        }
+                        changed = true;
                     }
                 }
             }
@@ -2153,7 +2153,7 @@ namespace //Anonymous
         {
             return std::unique_ptr<StructValue>(new NullStructValue(sourceValue));
         }
-        // Not a block description struct
+        IGC_ASSERT_MESSAGE(0, "should not be here");
         return nullptr;
     }
 

IGC/Compiler/Optimizer/OpenCLPasses/PrivateMemory/PrivateMemoryUsageAnalysis.cpp

@@ -146,14 +146,15 @@ bool PrivateMemoryUsageAnalysis::runOnFunction(Function& F)
         }
     }
 
+    //Add private memory implicit arg
+    SmallVector<ImplicitArg::ArgType, ImplicitArg::NUM_IMPLICIT_ARGS> implicitArgs;
+    implicitArgs.push_back(ImplicitArg::R0);
+
     if (m_hasPrivateMem)
     {
-        //Add private memory implicit arg
-        SmallVector<ImplicitArg::ArgType, ImplicitArg::NUM_IMPLICIT_ARGS> implicitArgs;
-        implicitArgs.push_back(ImplicitArg::R0);
         implicitArgs.push_back(ImplicitArg::PRIVATE_BASE);
-        ImplicitArgs::addImplicitArgs(F, implicitArgs, getAnalysis<MetaDataUtilsWrapper>().getMetaDataUtils());
     }
+    ImplicitArgs::addImplicitArgs(F, implicitArgs, getAnalysis<MetaDataUtilsWrapper>().getMetaDataUtils());
 
     return true;
 }

IGC/Compiler/Optimizer/OpenCLPasses/ProgramScopeConstants/ProgramScopeConstantAnalysis.cpp

@@ -485,8 +485,7 @@ void ProgramScopeConstantAnalysis::addData(Constant* initializer,
                     if (Constant * C = dyn_cast<Constant>(&Op))
                         addData(C, inlineProgramScopeBuffer, pointerOffsetInfoList, inlineProgramScopeOffsets, addressSpace);
             }
-            else if (ce->getOpcode() == Instruction::AddrSpaceCast ||
-                ce->getOpcode() == Instruction::BitCast)
+            else if (ce->getOpcode() == Instruction::AddrSpaceCast)
             {
                 if (Constant * C = dyn_cast<Constant>(ce->getOperand(0)))
                     addData(C, inlineProgramScopeBuffer, pointerOffsetInfoList, inlineProgramScopeOffsets, addressSpace);