[llvm] 140cbca - Revert "[AMDGPU][SplitModule] Handle !callees metadata (#108802)"

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2024-10-14T17:26:15-04:00
New Revision: 140cbca83d2cf9ebb1718671fdd251fef5bc63b3

URL: https://github.com/llvm/llvm-project/commit/140cbca83d2cf9ebb1718671fdd251fef5bc63b3
DIFF: https://github.com/llvm/llvm-project/commit/140cbca83d2cf9ebb1718671fdd251fef5bc63b3.diff

LOG: Revert "[AMDGPU][SplitModule] Handle !callees metadata (#108802)"

This reverts commit 4a0dc3ef36ceff20787ff277a1fb6a1b513c4934.
Breaks tests, see comments on
https://github.com/llvm/llvm-project/pull/108802

Added: 
    

Modified: 
    llvm/lib/Target/AMDGPU/AMDGPUSplitModule.cpp

Removed: 
    llvm/test/tools/llvm-split/AMDGPU/kernels-dependency-indirect-callee-md.ll


################################################################################
diff  --git a/llvm/lib/Target/AMDGPU/AMDGPUSplitModule.cpp b/llvm/lib/Target/AMDGPU/AMDGPUSplitModule.cpp
index 7d86e0c72bd075..a62c72d124825e 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUSplitModule.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUSplitModule.cpp
@@ -482,29 +482,6 @@ void SplitGraph::Node::visitAllDependencies(
   }
 }
 
-/// Checks if \p I has MD_callees and if it does, parse it and put the function
-/// in \p Callees.
-///
-/// \returns true if there was metadata and it was parsed correctly. false if
-/// there was no MD or if it contained unknown entries and parsing failed.
-/// If this returns false, \p Callees will contain incomplete information
-/// and must not be used.
-static bool handleCalleesMD(const Instruction &I,
-                            SetVector<Function *> &Callees) {
-  auto *MD = I.getMetadata(LLVMContext::MD_callees);
-  if (!MD)
-    return false;
-
-  for (const auto &Op : MD->operands()) {
-    Function *Callee = mdconst::extract_or_null<Function>(Op);
-    if (!Callee)
-      return false;
-    Callees.insert(Callee);
-  }
-
-  return true;
-}
-
 void SplitGraph::buildGraph(CallGraph &CG) {
   SplitModuleTimer SMT("buildGraph", "graph construction");
   LLVM_DEBUG(
@@ -542,38 +519,28 @@ void SplitGraph::buildGraph(CallGraph &CG) {
                  Fn.printAsOperand(dbgs());
                  dbgs() << " - analyzing function\n");
 
-      SetVector<Function *> KnownCallees;
-      bool HasUnknownIndirectCall = false;
+      bool HasIndirectCall = false;
       for (const auto &Inst : instructions(Fn)) {
         // look at all calls without a direct callee.
-        const auto *CB = dyn_cast<CallBase>(&Inst);
-        if (!CB || CB->getCalledFunction())
-          continue;
-
-        // inline assembly can be ignored, unless InlineAsmIsIndirectCall is
-        // true.
-        if (CB->isInlineAsm()) {
-          LLVM_DEBUG(dbgs() << "    found inline assembly\n");
-          continue;
-        }
-
-        if (handleCalleesMD(Inst, KnownCallees))
-          continue;
-        // If we failed to parse any !callees MD, or some was missing,
-        // the entire KnownCallees list is now unreliable.
-        KnownCallees.clear();
+        if (const auto *CB = dyn_cast<CallBase>(&Inst);
+            CB && !CB->getCalledFunction()) {
+          // inline assembly can be ignored, unless InlineAsmIsIndirectCall is
+          // true.
+          if (CB->isInlineAsm()) {
+            LLVM_DEBUG(dbgs() << "    found inline assembly\n");
+            continue;
+          }
 
-        // Everything else is handled conservatively. If we fall into the
-        // conservative case don't bother analyzing further.
-        HasUnknownIndirectCall = true;
-        break;
+          // everything else is handled conservatively.
+          HasIndirectCall = true;
+          break;
+        }
       }
 
-      if (HasUnknownIndirectCall) {
+      if (HasIndirectCall) {
         LLVM_DEBUG(dbgs() << "    indirect call found\n");
         FnsWithIndirectCalls.push_back(&Fn);
-      } else if (!KnownCallees.empty())
-        DirectCallees.insert(KnownCallees.begin(), KnownCallees.end());
+      }
     }
 
     Node &N = getNode(Cache, Fn);

diff  --git a/llvm/test/tools/llvm-split/AMDGPU/kernels-dependency-indirect-callee-md.ll b/llvm/test/tools/llvm-split/AMDGPU/kernels-dependency-indirect-callee-md.ll
deleted file mode 100644
index f1ed02b2502a06..00000000000000
--- a/llvm/test/tools/llvm-split/AMDGPU/kernels-dependency-indirect-callee-md.ll
+++ /dev/null
@@ -1,69 +0,0 @@
-; RUN: sed -s 's/_MD_/, !callees !{ptr @CallCandidate0}/' %s | llvm-split -o %t -j 3 -mtriple amdgcn-amd-amdhsa
-; 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-dis -o - %t2 | FileCheck --check-prefix=CHECK2 --implicit-check-not=define %s
-
-; RUN: sed -s 's/_MD_//g' %s | llvm-split -o %t-nomd -j 3 -mtriple amdgcn-amd-amdhsa
-; RUN: llvm-dis -o - %t-nomd0 | FileCheck --check-prefix=CHECK-NOMD0 --implicit-check-not=define %s
-; RUN: llvm-dis -o - %t-nomd1 | FileCheck --check-prefix=CHECK-NOMD1 --implicit-check-not=define %s
-; RUN: llvm-dis -o - %t-nomd2 | FileCheck --check-prefix=CHECK-NOMD2 --implicit-check-not=define %s
-
-; CHECK0: define internal void @HelperC
-; CHECK0: define amdgpu_kernel void @C
-
-; CHECK1: define hidden void @CallCandidate1
-; CHECK1: define internal void @HelperB
-; CHECK1: define amdgpu_kernel void @B
-
-; CHECK2: define internal void @HelperA
-; CHECK2: define hidden void @CallCandidate0
-; CHECK2: define amdgpu_kernel void @A
-
-; CHECK-NOMD0: define internal void @HelperC
-; CHECK-NOMD0: define amdgpu_kernel void @C
-
-; CHECK-NOMD1: define internal void @HelperB
-; CHECK-NOMD1: define amdgpu_kernel void @B
-
-; CHECK-NOMD2: define internal void @HelperA
-; CHECK-NOMD2: define hidden void @CallCandidate0
-; CHECK-NOMD2: define hidden void @CallCandidate1
-; CHECK-NOMD2: define amdgpu_kernel void @A
-
- at addrthief = global [2 x ptr] [ptr @CallCandidate0, ptr @CallCandidate1]
-
-define internal void @HelperA(ptr %call) {
-  call void %call() _MD_
-  ret void
-}
-
-define internal void @CallCandidate0() {
-  ret void
-}
-
-define internal void @CallCandidate1() {
-  ret void
-}
-
-define internal void @HelperB() {
-  ret void
-}
-
-define internal void @HelperC() {
-  ret void
-}
-
-define amdgpu_kernel void @A(ptr %call) {
-  call void @HelperA(ptr %call)
-  ret void
-}
-
-define amdgpu_kernel void @B() {
-  call void @HelperB()
-  ret void
-}
-
-define amdgpu_kernel void @C() {
-  call void @HelperC()
-  ret void
-}