Comments + adapt inline asm test w/o CL opt

Author: Pierre-vh

llvm/lib/Target/AMDGPU/AMDGPUSplitModule.cpp

@@ -109,10 +109,6 @@ static cl::opt<bool> NoExternalizeOnAddrTaken(
     cl::desc(
         "disables externalization of functions whose addresses are taken"));
 
-static cl::opt<bool> InlineAsmIsIndirectCall(
-    "amdgpu-module-splitting-inline-asm-is-indirect-call", cl::Hidden,
-    cl::desc("consider inline assembly as an indirect call"));
-
 static cl::opt<std::string>
     ModuleDotCfgOutput("amdgpu-module-splitting-print-module-dotcfg",
                        cl::Hidden,
@@ -519,8 +515,9 @@ void SplitGraph::buildGraph(CallGraph &CG) {
     // Keep track of this function if it contains an indirect call and/or if it
     // can be indirectly called.
     if (CallsExternal) {
-      LLVM_DEBUG(dbgs() << "  [!] callgraph is incomplete for " << Fn.getName()
-                        << " - analyzing function\n");
+      LLVM_DEBUG(dbgs() << "  [!] callgraph is incomplete for ";
+                 Fn.printAsOperand(dbgs());
+                 dbgs() << " - analyzing function\n");
 
       bool HasIndirectCall = false;
       for (const auto &Inst : instructions(Fn)) {
@@ -530,8 +527,6 @@ void SplitGraph::buildGraph(CallGraph &CG) {
           // inline assembly can be ignored, unless InlineAsmIsIndirectCall is
           // true.
           if (CB->isInlineAsm()) {
-            if (InlineAsmIsIndirectCall)
-              HasIndirectCall = true;
             LLVM_DEBUG(dbgs() << "    found inline assembly\n");
             continue;
           }
@@ -1372,11 +1367,9 @@ static void splitAMDGPUModule(
     for (auto &Fn : M) {
       // TODO: Should aliases count? Probably not but they're so rare I'm not
       // sure it's worth fixing.
-      if (Fn.hasAddressTaken()) {
-        if (Fn.hasLocalLinkage()) {
-          LLVM_DEBUG(dbgs() << "[externalize] " << Fn.getName()
-                            << " because its address is taken\n");
-        }
+      if (Fn.hasLocalLinkage() && Fn.hasAddressTaken()) {
+        LLVM_DEBUG(dbgs() << "[externalize] "; Fn.printAsOperand(dbgs());
+                   dbgs() << " because its address is taken\n");
         externalize(Fn);
       }
     }

llvm/test/tools/llvm-split/AMDGPU/indirect-call-inline-asm-debug.ll

@@ -0,0 +1,28 @@
+; REQUIRES: asserts
+
+; RUN: llvm-split -o %t %s -j 2 -mtriple amdgcn-amd-amdhsa -amdgpu-module-splitting-no-externalize-address-taken -debug-only=amdgpu-split-module 2>&1 | FileCheck %s
+
+; CHECK:      [!] callgraph is incomplete for ptr @A  - analyzing function
+; CHECK-NEXT:     found inline assembly
+; CHECK-NOT:      indirect call found
+
+@addrthief = global [2 x ptr] [ptr @HelperA, ptr @HelperB]
+
+define internal void @HelperA() {
+  ret void
+}
+
+define internal void @HelperB() {
+  ret void
+}
+
+define amdgpu_kernel void @A() {
+  call void asm sideeffect "v_mov_b32 v0, 7", "~{v0}"()
+  call void @HelperA()
+  ret void
+}
+
+define amdgpu_kernel void @B(ptr %out) {
+  call void @HelperB()
+  ret void
+}

llvm/test/tools/llvm-split/AMDGPU/indirect-call-inline-asm.ll

@@ -2,23 +2,12 @@
 ; RUN: llvm-dis -o - %t0 | FileCheck --check-prefix=CHECK0 --implicit-check-not=define %s
 ; RUN: llvm-dis -o - %t1 | FileCheck --check-prefix=CHECK1 --implicit-check-not=define %s
 
-; RUN: llvm-split -o %t_as_indirect %s -j 2 -mtriple amdgcn-amd-amdhsa -amdgpu-module-splitting-no-externalize-address-taken -amdgpu-module-splitting-inline-asm-is-indirect-call
-; RUN: llvm-dis -o - %t_as_indirect0 | FileCheck --check-prefix=CHECK-INDIRECT0 --implicit-check-not=define %s
-; RUN: llvm-dis -o - %t_as_indirect1 | FileCheck --check-prefix=CHECK-INDIRECT1 --implicit-check-not=define %s
-
 ; CHECK0: define internal void @HelperB
 ; CHECK0: define amdgpu_kernel void @B
 
 ; CHECK1: define internal void @HelperA()
 ; CHECK1: define amdgpu_kernel void @A()
 
-; CHECK-INDIRECT0: define internal void @HelperB
-; CHECK-INDIRECT0: define amdgpu_kernel void @B
-
-; CHECK-INDIRECT1: define internal void @HelperA()
-; CHECK-INDIRECT1: define internal void @HelperB()
-; CHECK-INDIRECT1: define amdgpu_kernel void @A()
-
 @addrthief = global [2 x ptr] [ptr @HelperA, ptr @HelperB]
 
 define internal void @HelperA() {