Included the DebugRecordDeleter pass into the -O2 pipeline.

Author: anamaoh

llvm/lib/Passes/PassBuilderPipelines.cpp

@@ -148,6 +148,8 @@
 #include "llvm/Transforms/Vectorize/SLPVectorizer.h"
 #include "llvm/Transforms/Vectorize/VectorCombine.h"
 
+#include "llvm/Transforms/Utils/DebugRecordDeleter.h"
+
 using namespace llvm;
 
 namespace llvm {
@@ -1676,6 +1678,11 @@ PassBuilder::buildPerModuleDefaultPipeline(OptimizationLevel Level,
   // Now add the optimization pipeline.
   MPM.addPass(buildModuleOptimizationPipeline(Level, Phase));
 
+  // Include the DebugRecordDeleter passinto the -O2 pipeline.
+  if(Level == OptimizationLevel::O2) {
+    MPM.addPass(DebugRecordDeleterPass());
+  }
+
   if (PGOOpt && PGOOpt->PseudoProbeForProfiling &&
       PGOOpt->Action == PGOOptions::SampleUse)
     MPM.addPass(PseudoProbeUpdatePass());
@@ -1684,7 +1691,7 @@ PassBuilder::buildPerModuleDefaultPipeline(OptimizationLevel Level,
   addAnnotationRemarksPass(MPM);
 
   if (isLTOPreLink(Phase))
-    addRequiredLTOPreLinkPasses(MPM);
+    addRequiredLTOPreLinkPasses(MPM); 
   return MPM;
 }
 

llvm/lib/Transforms/Utils/DebugRecordCounter.cpp

@@ -18,14 +18,14 @@ PreservedAnalyses DebugRecordCounterPass::run(Module &M, ModuleAnalysisManager &
             for(Instruction &I : BB) {
                 for(DbgVariableRecord &DVR : filterDbgVars(I.getDbgRecordRange())) {
                     if(DVR.isDbgDeclare()) dbg_declares++;
-                    if(DVR.isDbgValue()) dbg_values++;
-                    if(DVR.isDbgAssign()) dbg_assigns++;
+                    if(DVR.isDbgValue())   dbg_values++;
+                    if(DVR.isDbgAssign())  dbg_assigns++;
                 }
             }
         }
-        errs() << "\t#dbg_value: " << dbg_values << "\n";  
+        errs() << "\t#dbg_value:   " << dbg_values   << "\n";  
         errs() << "\t#dbg_declare: " << dbg_declares << "\n";  
-        errs() << "\t#dbg_assign: " << dbg_assigns << "\n"; 
+        errs() << "\t#dbg_assign:  " << dbg_assigns  << "\n"; 
     }
     return PreservedAnalyses::all(); 
 }

llvm/lib/Transforms/Utils/DebugRecordDeleter.cpp

@@ -4,6 +4,10 @@
 #include "llvm/IR/DebugInfo.h"
 #include "llvm/IR/DebugInfoMetadata.h"
 
+#include "llvm/Passes/PassBuilder.h"
+#include "llvm/Passes/PassPlugin.h" 
+#include "llvm/Passes/OptimizationLevel.h" 
+
 using namespace llvm;
 
 // build/bin/opt -S /home/ana-marija/Documents/foo_00.ll -passes=dbg-deleter