working with hack

Author: cjappl

clang/lib/CodeGen/BackendUtil.cpp

@@ -86,6 +86,7 @@
 #include "llvm/Transforms/Scalar/EarlyCSE.h"
 #include "llvm/Transforms/Scalar/GVN.h"
 #include "llvm/Transforms/Scalar/JumpThreading.h"
+#include "llvm/Transforms/Scalar/SROA.h"
 #include "llvm/Transforms/Utils/Debugify.h"
 #include "llvm/Transforms/Utils/ModuleUtils.h"
 #include <memory>
@@ -992,13 +993,10 @@ void EmitAssemblyHelper::RunOptimizationPipeline(
           });
 
     if (LangOpts.Sanitize.has(SanitizerKind::Realtime)) {
-      PB.registerLoopOptimizerEndEPCallback(
-          [](LoopPassManager &LPM, OptimizationLevel Level) {
-            LPM.addPass(RealtimeSanitizerLoopPass());
-          });
       PB.registerScalarOptimizerLateEPCallback(
           [](FunctionPassManager &FPM, OptimizationLevel Level) {
             RealtimeSanitizerOptions Opts;
+            FPM.addPass(SROAPass(SROAOptions::PreserveCFG));
             FPM.addPass(RealtimeSanitizerPass(Opts));
           });
     }

llvm/include/llvm/Transforms/Instrumentation/RealtimeSanitizer.h

@@ -20,7 +20,6 @@
 #define LLVM_TRANSFORMS_INSTRUMENTATION_REALTIMESANITIZER_H
 
 #include "llvm/IR/PassManager.h"
-#include "llvm/Transforms/Scalar/LoopPassManager.h"
 
 namespace llvm {
 
@@ -34,12 +33,6 @@ class RealtimeSanitizerPass : public PassInfoMixin<RealtimeSanitizerPass> {
   static bool isRequired() { return true; }
 };
 
-struct RealtimeSanitizerLoopPass : PassInfoMixin<RealtimeSanitizerLoopPass> {
-  PreservedAnalyses run(Loop &L, LoopAnalysisManager &AM,
-                        LoopStandardAnalysisResults &AR, LPMUpdater &U);
-  static bool isRequired() { return true; }
-};
-
 } // namespace llvm
 
 #endif // LLVM_TRANSFORMS_INSTRUMENTATION_REALTIMESANITIZER_H

llvm/lib/Passes/PassRegistry.def

@@ -659,7 +659,6 @@ LOOP_PASS("print<ddg>", DDGAnalysisPrinterPass(dbgs()))
 LOOP_PASS("print<iv-users>", IVUsersPrinterPass(dbgs()))
 LOOP_PASS("print<loop-cache-cost>", LoopCachePrinterPass(dbgs()))
 LOOP_PASS("print<loopnest>", LoopNestPrinterPass(dbgs()))
-LOOP_PASS("sanitize-unbound-loops", RealtimeSanitizerLoopPass())
 #undef LOOP_PASS
 
 #ifndef LOOP_PASS_WITH_PARAMS

llvm/lib/Transforms/Instrumentation/RealtimeSanitizer.cpp

@@ -63,54 +63,49 @@ RealtimeSanitizerPass::RealtimeSanitizerPass(
 
 PreservedAnalyses RealtimeSanitizerPass::run(Function &F,
                                              AnalysisManager<Function> &AM) {
+  PreservedAnalyses PA = PreservedAnalyses::all();
   if (F.hasFnAttribute(Attribute::SanitizeRealtime)) {
     insertCallAtFunctionEntryPoint(F, "__rtsan_realtime_enter");
     insertCallAtAllFunctionExitPoints(F, "__rtsan_realtime_exit");
-
-    PreservedAnalyses PA;
+    PA = PreservedAnalyses::none();
     PA.preserveSet<CFGAnalyses>();
-    return PA;
   }
 
-  return PreservedAnalyses::all();
-}
-
-PreservedAnalyses
-RealtimeSanitizerLoopPass::run(Loop &L, LoopAnalysisManager &AM,
-                               LoopStandardAnalysisResults &AR, LPMUpdater &U) {
-  BasicBlock *Context =
-      L.getLoopPreheader() ? L.getLoopPreheader() : L.getHeader();
-  assert(Context && "Loop has no preheader or header block");
+  const LoopInfo &LI = AM.getResult<LoopAnalysis>(F);
+  ScalarEvolution &SE = AM.getResult<ScalarEvolutionAnalysis>(F);
+  for (Loop *L : LI) {
+      BasicBlock *Context =
+          L->getLoopPreheader() ? L->getLoopPreheader() : L->getHeader();
+      assert(Context && "Loop has no preheader or header block");
 
-  Function *F = Context->getParent();
-  assert(F && "Loop has no parent function");
+    const bool HasNoExits = L->hasNoExitBlocks();
+    const bool CannotPredictLoopCount =
+        isa<SCEVCouldNotCompute>(SE.getConstantMaxBackedgeTakenCount(L)) ||
+        isa<SCEVCouldNotCompute>(SE.getBackedgeTakenCount(L));
+    const bool LoopIsPotentiallyUnbound = HasNoExits || CannotPredictLoopCount;
 
-  const bool HasNoExits = L.hasNoExitBlocks();
-  const bool CannotPredictLoopCount =
-      isa<SCEVCouldNotCompute>(AR.SE.getConstantMaxBackedgeTakenCount(&L)) ||
-      isa<SCEVCouldNotCompute>(AR.SE.getBackedgeTakenCount(&L));
-  const bool LoopIsPotentiallyUnbound = HasNoExits || CannotPredictLoopCount;
+    if (LoopIsPotentiallyUnbound) {
+      IRBuilder<> Builder{&Context->back()};
 
-  if (LoopIsPotentiallyUnbound) {
-    IRBuilder<> Builder{&Context->back()};
 
     std::string ReasonStr =
-        demangle(F->getName().str()) + " contains a possibly unbounded loop ";
-
-    if (HasNoExits)
-      ReasonStr += "(reason: no exit blocks).";
-    else if (CannotPredictLoopCount)
-      ReasonStr += "(reason: backedge taken count cannot be computed).";
-    else
-      assert(false);
-
-    Value *Reason = Builder.CreateGlobalStringPtr(ReasonStr);
-    insertCallBeforeInstruction(*F, Builder, "__rtsan_expect_not_realtime",
-                                {Reason});
-
-    // TODO: What is preserved here??
-    return PreservedAnalyses::none();
+        demangle(F.getName().str()) + " contains a possibly unbounded loop ";
+
+      if (HasNoExits)
+        ReasonStr += "(reason: no exit blocks).";
+      else if (CannotPredictLoopCount)
+        ReasonStr += "(reason: backedge taken count cannot be computed).";
+      else
+        assert(false);
+
+      Value *Reason = Builder.CreateGlobalStringPtr(ReasonStr);
+      insertCallBeforeInstruction(F, Builder, "__rtsan_expect_not_realtime",
+                                  {Reason});
+
+      // TODO: What is preserved here??
+      PA = PreservedAnalyses::none();
+    }
   }
 
-  return PreservedAnalyses::all();
+  return PA;
 }

llvm/test/Instrumentation/RealtimeSanitizer/rtsan_bound_loop.ll

@@ -1,4 +1,4 @@
-; RUN: opt < %s -passes='sroa,sanitize-unbound-loops' -S | FileCheck %s
+; RUN: opt < %s -passes='sroa,rtsan' -S | FileCheck %s
 
 
 define void @procces(ptr noundef %buffer, i32 noundef %size) #0 {

llvm/test/Instrumentation/RealtimeSanitizer/rtsan_cas_spinlock.ll

@@ -1,4 +1,4 @@
-; RUN: opt < %s -passes='sanitize-unbound-loops' -S | FileCheck %s
+; RUN: opt < %s -passes=rtsan -S | FileCheck %s
 
 %class.SpinLockTestAndSet = type { %"struct.std::__1::atomic_flag" }
 %"struct.std::__1::atomic_flag" = type { %"struct.std::__1::__cxx_atomic_impl" }

llvm/test/Instrumentation/RealtimeSanitizer/rtsan_infinite_loop.ll

@@ -1,4 +1,4 @@
-; RUN: opt < %s -passes='sanitize-unbound-loops' -S | FileCheck %s
+; RUN: opt < %s -passes=rtsan -S | FileCheck %s
 
 define void @process() #0 {
 entry: