Alternative to D137149

[aeubanks]

llvm/lib/Passes/StandardInstrumentations.cpp

781

needs rest of D137149

llvm/include/llvm/Passes/StandardInstrumentations.h

public:
   void registerCallbacks(PassInstrumentationCallbacks &PIC);
 
 private:
   bool DebugLogging;
   bool shouldRun(StringRef PassID, Any IR);
 };
 
 class OptBisectInstrumentation {
+  bool IsEnabled = false;
   bool HasWrittenIR = false;
+  LLVMContext *CachedContext = nullptr;
 
 public:
   OptBisectInstrumentation() = default;
+  bool shouldRun(StringRef PassID, Any IR);
   void registerCallbacks(PassInstrumentationCallbacks &PIC);
 };
 
 struct PrintPassOptions {
   /// Print adaptors and pass managers.
   bool Verbose = false;
   /// Don't print information for analyses.
   bool SkipAnalyses = false;

llvm/lib/Passes/StandardInstrumentations.cpp

bool OptNoneInstrumentation::shouldRun(StringRef PassID, Any IR) {
   bool ShouldRun = !(F && F->hasOptNone());
   if (!ShouldRun && DebugLogging) {
     errs() << "Skipping pass " << PassID << " on " << F->getName()
            << " due to optnone attribute\n";
   }
   return ShouldRun;
 }
 
-void OptBisectInstrumentation::registerCallbacks(
-    PassInstrumentationCallbacks &PIC) {
-  if (!getOptBisector().isEnabled())
-    return;
-  PIC.registerShouldRunOptionalPassCallback([this](StringRef PassID, Any IR) {
-    if (isIgnored(PassID))
-      return true;
-    bool ShouldRun = getOptBisector().checkPass(PassID, getIRName(IR));
-    if (!ShouldRun && !this->HasWrittenIR && !OptBisectPrintIRPath.empty()) {
-      // FIXME: print IR if limit is higher than number of opt-bisect
-      // invocations
-      this->HasWrittenIR = true;
-      const Module *M = unwrapModule(IR, /*Force=*/true);
-      assert(M && "expected Module");
-      std::error_code EC;
-      raw_fd_ostream OS(OptBisectPrintIRPath, EC);
-      if (EC)
-        report_fatal_error(errorCodeToError(EC));
-      M->print(OS, nullptr);
-    }
-    return ShouldRun;
-  });
+bool OptBisectInstrumentation::shouldRun(StringRef PassID, Any IR) {
+  if (!CachedContext) {
+    CachedContext = &unwrapModule(IR, /*Force*/ true)->getContext();
+    IsEnabled = CachedContext->getOptPassGate().isEnabled();
+  }
+  if (!IsEnabled)
+    return true;
+
+  assert(&unwrapModule(IR, /*Force*/ true)->getContext() == CachedContext);
+
+  bool ShouldRun = CachedContext->getOptPassGate().checkPass(PassID, getIRName(IR));
+}
+void OptBisectInstrumentation::registerCallbacks(
+    PassInstrumentationCallbacks &PIC) {
+  PIC.registerShouldRunOptionalPassCallback(
+      [this](StringRef PassID, Any IR) { return this->shouldRun(PassID, IR); });
 }
 
 raw_ostream &PrintPassInstrumentation::print() {
   if (Opts.Indent) {
     assert(Indent >= 0);
     dbgs().indent(Indent);
   }
   return dbgs();