[nfc][ctx_prof] Don't try finding callsite annotation for un-instrumentable callsites

[mtrofin]

Reinforcing properties ensured at instrumentation time.

[llvmbot]

@llvm/pr-subscribers-llvm-analysis

Author: Mircea Trofin (mtrofin)

Changes

Reinforcing properties ensured at instrumentation time.

---

Full diff: https://github.com/llvm/llvm-project/pull/109184.diff

1 Files Affected:

• (modified) llvm/lib/Analysis/CtxProfAnalysis.cpp (+9-2)

diff --git a/llvm/lib/Analysis/CtxProfAnalysis.cpp b/llvm/lib/Analysis/CtxProfAnalysis.cpp
index c29709b613410e..3df72983862d98 100644
--- a/llvm/lib/Analysis/CtxProfAnalysis.cpp
+++ b/llvm/lib/Analysis/CtxProfAnalysis.cpp
@@ -234,16 +234,23 @@ PreservedAnalyses CtxProfAnalysisPrinterPass::run(Module &M,
 }
 
 InstrProfCallsite *CtxProfAnalysis::getCallsiteInstrumentation(CallBase &CB) {
-  for (auto *Prev = CB.getPrevNode(); Prev; Prev = Prev->getPrevNode())
+  if (!InstrProfCallsite::canInstrumentCallsite(CB))
+    return nullptr;
+  for (auto *Prev = CB.getPrevNode(); Prev; Prev = Prev->getPrevNode()) {
     if (auto *IPC = dyn_cast<InstrProfCallsite>(Prev))
       return IPC;
+    assert(!isa<CallBase>(Prev) &&
+           "didn't expect to find another call, that's not the callsite "
+           "instrumentation, before an instrumentable callsite");
+  }
   return nullptr;
 }
 
 InstrProfIncrementInst *CtxProfAnalysis::getBBInstrumentation(BasicBlock &BB) {
   for (auto &I : BB)
     if (auto *Incr = dyn_cast<InstrProfIncrementInst>(&I))
-      return Incr;
+      if (!isa<InstrProfIncrementInstStep>(&I))
+        return Incr;
   return nullptr;
 }
 

[mtrofin]

• [ctx_prof] Automatically convert available external linkage to local for modules with contextual roots #109203
• [ctx_prof] Handle select and its step instrumentation #109185
• [nfc][ctx_prof] Don't try finding callsite annotation for un-instrumentable callsites #109184 👈
• [ctx_prof] Fix ProfileAnnotator::allTakenPathsExit #109183
• main

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @mtrofin and the rest of your teammates on Graphite

[mtrofin]

Merge activity

• Sep 19, 12:13 AM EDT: @mtrofin merged this pull request with Graphite.