Further tweaks / fixes.

Author: AlexVlx

llvm/lib/Transforms/HC/PromotePointerKernArgsToGlobal/PromotePointerKernArgsToGlobal.cpp

@@ -54,11 +54,18 @@ class PromotePointerKernArgsToGlobal : public FunctionPass {
                                             &*Builder.GetInsertPoint());
   }
 
-  void maybePromoteUse(IRBuilder<>& Builder, Instruction *UI) {
+  void maybePromoteUser(IRBuilder<>& Builder, Instruction *UI) {
     if (!UI)
       return;
 
-    Builder.SetInsertPoint(UI->getNextNonDebugInstruction());
+    Instruction *NI = UI->getNextNonDebugInstruction();
+    while (NI && isa<PHINode>(NI))
+      NI = NI->getNextNonDebugInstruction();
+
+    if (!NI)
+      return;
+
+    Builder.SetInsertPoint(NI);
 
     createPromotableCast(Builder, UI, createTemporary(Builder, UI->getType()));
   }
@@ -77,15 +84,15 @@ class PromotePointerKernArgsToGlobal : public FunctionPass {
       return false;
 
     SmallVector<Argument *, 8> PromotableArgs;
-    SmallVector<User *, 8> PromotableUses;
+    SmallVector<User *, 8> PromotableUsers;
     for (auto &&Arg : F.args()) {
       for (auto &&U : Arg.users()) {
         if (!U->getType()->isPointerTy())
           continue;
         if (U->getType()->getPointerAddressSpace() != FlatAddrSpace)
           continue;
 
-        PromotableUses.push_back(U);
+        PromotableUsers.push_back(U);
       }
 
       if (!Arg.getType()->isPointerTy())
@@ -96,12 +103,12 @@ class PromotePointerKernArgsToGlobal : public FunctionPass {
       PromotableArgs.push_back(&Arg);
     }
 
-    if (PromotableArgs.empty() && PromotableUses.empty())
+    if (PromotableArgs.empty() && PromotableUsers.empty())
       return false;
 
     IRBuilder<> Builder(F.getContext());
-    for (auto &&PU : PromotableUses)
-      maybePromoteUse(Builder, dyn_cast<Instruction>(PU));
+    for (auto &&PU : PromotableUsers)
+      maybePromoteUser(Builder, dyn_cast<Instruction>(PU));
 
     Builder.SetInsertPoint(&F.getEntryBlock().front());
     for (auto &&Arg : PromotableArgs)

llvm/lib/Transforms/HC/SelectAcceleratorCode/SelectAcceleratorCode.cpp

@@ -132,6 +132,8 @@ class SelectAcceleratorCode : public ModulePass {
   }
 
   static bool setFunctionAttributes(Function &F) {
+    if (F.isIntrinsic())
+      return false;
     if (F.getCallingConv() == CallingConv::AMDGPU_KERNEL)
       return false;
     if (!EnableFunctionCalls)
@@ -142,8 +144,13 @@ class SelectAcceleratorCode : public ModulePass {
       F.addFnAttr(Attribute::NoRecurse);
       Modified = true;
     }
-    if (F.getVisibility() != Function::VisibilityTypes::HiddenVisibility) {
-      F.setVisibility(Function::VisibilityTypes::HiddenVisibility);
+    if (!F.isDSOLocal()) {
+      F.setDSOLocal(true);
+      Modified = true;
+    }
+    if (!F.isDeclaration() && !F.hasInternalLinkage()) {
+      F.setVisibility(Function::VisibilityTypes::DefaultVisibility);
+      F.setLinkage(Function::LinkageTypes::InternalLinkage);
       Modified = true;
     }
 
@@ -174,7 +181,7 @@ class SelectAcceleratorCode : public ModulePass {
     Modified = eraseDeadAliases_(M) || Modified;
 
     for (auto &&F : M.functions())
-      Modified = setFunctionAttributes(F);
+      Modified = setFunctionAttributes(F) || Modified;
 
     return Modified;
   }