.

Created using spr 1.3.5-bogner

Author: MaskRay

clang/include/clang/Frontend/CompilerInstance.h

@@ -118,7 +118,7 @@ class CompilerInstance : public ModuleLoader {
   std::unique_ptr<Sema> TheSema;
 
   /// The frontend timer group.
-  std::unique_ptr<llvm::TimerGroup> FrontendTimerGroup;
+  std::unique_ptr<llvm::TimerGroup> timerGroup;
 
   /// The frontend timer.
   std::unique_ptr<llvm::Timer> FrontendTimer;
@@ -630,9 +630,7 @@ class CompilerInstance : public ModuleLoader {
   /// @name Frontend timer
   /// @{
 
-  llvm::TimerGroup &getFrontendTimerGroup() const {
-    return *FrontendTimerGroup;
-  }
+  llvm::TimerGroup &getTimerGroup() const { return *timerGroup; }
 
   bool hasFrontendTimer() const { return (bool)FrontendTimer; }
 

clang/lib/CodeGen/BackendUtil.cpp

@@ -16,6 +16,7 @@
 #include "clang/Frontend/FrontendDiagnostic.h"
 #include "clang/Frontend/Utils.h"
 #include "clang/Lex/HeaderSearchOptions.h"
+#include "llvm/ADT/ScopeExit.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Analysis/GlobalsModRef.h"
@@ -1213,10 +1214,6 @@ void EmitAssemblyHelper::emitAssembly(const CompilerInstance &CI,
                                       BackendAction Action,
                                       std::unique_ptr<raw_pwrite_stream> OS,
                                       BackendConsumer *BC) {
-  Timer timer;
-  if (CodeGenOpts.TimePasses)
-    timer.init("codegen", "Code Generation Time");
-  TimeRegion Region(CodeGenOpts.TimePasses ? &timer : nullptr);
   setCommandLineOpts(CodeGenOpts);
 
   bool RequiresCodeGen = actionRequiresCodeGen(Action);
@@ -1359,6 +1356,19 @@ void clang::emitBackendOutput(CompilerInstance &CI, StringRef TDesc,
   const auto &TOpts = CI.getTargetOpts();
   const auto &LOpts = CI.getLangOpts();
 
+  Timer timer;
+  if (CGOpts.TimePasses) {
+    CI.getFrontendTimer().stopTimer();
+    timer.init("backend", "Backend", CI.getTimerGroup());
+    timer.startTimer();
+  }
+  auto _ = llvm::make_scope_exit([&] {
+    if (!CGOpts.TimePasses)
+      return;
+    timer.stopTimer();
+    CI.getFrontendTimer().startTimer();
+  });
+
   std::unique_ptr<llvm::Module> EmptyModule;
   if (!CGOpts.ThinLTOIndexFile.empty()) {
     // If we are performing a ThinLTO importing compile, load the function index

clang/lib/CodeGen/CodeGenAction.cpp

@@ -124,8 +124,7 @@ BackendConsumer::BackendConsumer(CompilerInstance &CI, BackendAction Action,
   llvm::TimePassesIsEnabled = CodeGenOpts.TimePasses;
   llvm::TimePassesPerRun = CodeGenOpts.TimePassesPerRun;
   if (CodeGenOpts.TimePasses)
-    LLVMIRGeneration.init("irgen", "LLVM IR Generation Time",
-                          CI.getFrontendTimerGroup());
+    LLVMIRGeneration.init("irgen", "LLVM IR Generation", CI.getTimerGroup());
 }
 
 llvm::Module* BackendConsumer::getModule() const {

clang/lib/Frontend/CompilerInstance.cpp

@@ -722,11 +722,9 @@ void CompilerInstance::createCodeCompletionConsumer() {
 }
 
 void CompilerInstance::createFrontendTimer() {
-  FrontendTimerGroup.reset(
-      new llvm::TimerGroup("frontend", "Clang front-end time report"));
+  timerGroup.reset(new llvm::TimerGroup("clang", "Clang time report"));
   FrontendTimer.reset(
-      new llvm::Timer("frontend", "Clang front-end timer",
-                      *FrontendTimerGroup));
+      new llvm::Timer("frontend", "Clang front-end", *timerGroup));
 }
 
 CodeCompleteConsumer *
@@ -1726,10 +1724,9 @@ void CompilerInstance::createASTReader() {
   const FrontendOptions &FEOpts = getFrontendOpts();
   std::unique_ptr<llvm::Timer> ReadTimer;
 
-  if (FrontendTimerGroup)
+  if (timerGroup)
     ReadTimer = std::make_unique<llvm::Timer>("reading_modules",
-                                                "Reading modules",
-                                                *FrontendTimerGroup);
+                                              "Reading modules", *timerGroup);
   TheASTReader = new ASTReader(
       getPreprocessor(), getModuleCache(), &getASTContext(),
       getPCHContainerReader(), getFrontendOpts().ModuleFileExtensions,
@@ -1758,10 +1755,10 @@ void CompilerInstance::createASTReader() {
 bool CompilerInstance::loadModuleFile(
     StringRef FileName, serialization::ModuleFile *&LoadedModuleFile) {
   llvm::Timer Timer;
-  if (FrontendTimerGroup)
+  if (timerGroup)
     Timer.init("preloading." + FileName.str(), "Preloading " + FileName.str(),
-               *FrontendTimerGroup);
-  llvm::TimeRegion TimeLoading(FrontendTimerGroup ? &Timer : nullptr);
+               *timerGroup);
+  llvm::TimeRegion TimeLoading(timerGroup ? &Timer : nullptr);
 
   // If we don't already have an ASTReader, create one now.
   if (!TheASTReader)
@@ -1892,10 +1889,10 @@ ModuleLoadResult CompilerInstance::findOrCompileModuleAndReadAST(
 
   // Time how long it takes to load the module.
   llvm::Timer Timer;
-  if (FrontendTimerGroup)
+  if (timerGroup)
     Timer.init("loading." + ModuleFilename, "Loading " + ModuleFilename,
-               *FrontendTimerGroup);
-  llvm::TimeRegion TimeLoading(FrontendTimerGroup ? &Timer : nullptr);
+               *timerGroup);
+  llvm::TimeRegion TimeLoading(timerGroup ? &Timer : nullptr);
   llvm::TimeTraceScope TimeScope("Module Load", ModuleName);
 
   // Try to load the module file. If we are not trying to load from the

clang/test/Frontend/ftime-report-template-decl.cpp

@@ -150,10 +150,8 @@ struct _Wrap_alloc {
 };
 _Wrap_alloc<int>::rebind<int> w;
 
-// CHECK: Miscellaneous Ungrouped Timers
-// CHECK:     Code Generation Time
-// CHECK: Total
-// CHECK: Clang front-end time report
-// CHECK:      Clang front-end timer
-// CHECK-NEXT: LLVM IR Generation Time
+// CHECK: Clang time report
+// CHECK:      Clang front-end
+// CHECK-NEXT: LLVM IR Generation
+// CHECK-NEXT: Backend
 // CHECK-NEXT: Total