Remove SharedTimer Infrastructure

Teach the UnifiedStatsReporter to directly construct
llvm::NamedRegionTimer for itself.

Author: CodaFi

include/swift/Basic/Statistic.h

@@ -15,8 +15,8 @@
 
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/Statistic.h"
+#include "llvm/Support/Timer.h"
 #include "swift/Basic/LLVM.h"
-#include "swift/Basic/Timer.h"
 
 #include <thread>
 #include <tuple>

include/swift/Basic/Timer.h

@@ -62,7 +62,6 @@ add_swift_host_library(swiftBasic STATIC
   StringExtras.cpp
   TaskQueue.cpp
   ThreadSafeRefCounted.cpp
-  Timer.cpp
   Unicode.cpp
   UUID.cpp
   Version.cpp

lib/Basic/CMakeLists.txt

@@ -14,7 +14,6 @@
 #include "clang/Basic/SourceLocation.h"
 #include "clang/Basic/SourceManager.h"
 #include "swift/Basic/Statistic.h"
-#include "swift/Basic/Timer.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/Expr.h"
 #include "llvm/ADT/DenseMap.h"
@@ -146,9 +145,8 @@ auxName(StringRef ModuleName,
 }
 
 class UnifiedStatsReporter::RecursionSafeTimers {
-
   struct RecursionSafeTimer {
-    llvm::Optional<SharedTimer> Timer;
+    llvm::Optional<llvm::NamedRegionTimer> Timer;
     size_t RecursionDepth;
   };
 
@@ -159,7 +157,7 @@ class UnifiedStatsReporter::RecursionSafeTimers {
   void beginTimer(StringRef Name) {
     RecursionSafeTimer &T = Timers[Name];
     if (T.RecursionDepth == 0) {
-      T.Timer.emplace(Name);
+      T.Timer.emplace(Name, Name, "swift", "Swift compilation");
     }
     ++T.RecursionDepth;
   }
@@ -354,7 +352,6 @@ UnifiedStatsReporter::UnifiedStatsReporter(StringRef ProgramName,
   path::append(TraceFilename, makeTraceFileName(ProgramName, AuxName));
   path::append(ProfileDirname, makeProfileDirName(ProgramName, AuxName));
   EnableStatistics(/*PrintOnExit=*/false);
-  SharedTimer::enableCompilationTimers();
   if (TraceEvents || ProfileEvents || ProfileEntities)
     LastTracedFrontendCounters.emplace();
   if (TraceEvents)

lib/Basic/Statistic.cpp

@@ -45,7 +45,6 @@
 #include "swift/Basic/PrettyStackTrace.h"
 #include "swift/Basic/SourceManager.h"
 #include "swift/Basic/Statistic.h"
-#include "swift/Basic/Timer.h"
 #include "swift/Basic/UUID.h"
 #include "swift/Frontend/DiagnosticVerifier.h"
 #include "swift/Frontend/Frontend.h"

lib/Basic/Timer.cpp

@@ -26,7 +26,6 @@
 #include "swift/Basic/Dwarf.h"
 #include "swift/Basic/Platform.h"
 #include "swift/Basic/Statistic.h"
-#include "swift/Basic/Timer.h"
 #include "swift/Basic/Version.h"
 #include "swift/ClangImporter/ClangImporter.h"
 #include "swift/ClangImporter/ClangModule.h"

lib/FrontendTool/FrontendTool.cpp

@@ -24,7 +24,6 @@
 #include "swift/AST/SourceFile.h"
 #include "swift/Basic/Defer.h"
 #include "swift/Basic/SourceManager.h"
-#include "swift/Basic/Timer.h"
 #include "swift/Parse/Lexer.h"
 #include "swift/Parse/CodeCompletionCallbacks.h"
 #include "swift/Parse/ParseSILSupport.h"

lib/IRGen/IRGen.cpp

@@ -21,7 +21,6 @@
 #include "swift/AST/SourceFile.h"
 #include "swift/AST/TypeCheckRequests.h"
 #include "swift/Basic/Defer.h"
-#include "swift/Basic/Timer.h"
 #include "swift/Demangling/Demangle.h"
 #include "swift/Parse/Lexer.h"
 #include "swift/Parse/ParseSILSupport.h"

lib/Parse/Parser.cpp

@@ -29,7 +29,6 @@
 #include "swift/AST/SourceFile.h"
 #include "swift/AST/TypeCheckRequests.h"
 #include "swift/Basic/Statistic.h"
-#include "swift/Basic/Timer.h"
 #include "swift/ClangImporter/ClangModule.h"
 #include "swift/SIL/PrettyStackTrace.h"
 #include "swift/SIL/SILArgument.h"

lib/SIL/Parser/ParseSIL.cpp

@@ -39,7 +39,6 @@
 #include "swift/AST/TypeCheckRequests.h"
 #include "swift/Basic/Statistic.h"
 #include "swift/Basic/STLExtras.h"
-#include "swift/Basic/Timer.h"
 #include "swift/Parse/Lexer.h"
 #include "swift/Sema/IDETypeChecking.h"
 #include "swift/Strings.h"

lib/SILGen/SILGen.cpp

@@ -38,7 +38,6 @@
 #include "swift/AST/TypeCheckRequests.h"
 #include "swift/Basic/Statistic.h"
 #include "swift/Basic/STLExtras.h"
-#include "swift/Basic/Timer.h"
 #include "swift/Parse/Lexer.h"
 #include "swift/Sema/IDETypeChecking.h"
 #include "swift/Strings.h"

lib/Sema/TypeCheckCodeCompletion.cpp

@@ -39,7 +39,6 @@
 #include "swift/Basic/Dwarf.h"
 #include "swift/Basic/FileSystem.h"
 #include "swift/Basic/STLExtras.h"
-#include "swift/Basic/Timer.h"
 #include "swift/Basic/Version.h"
 #include "swift/ClangImporter/ClangImporter.h"
 #include "swift/ClangImporter/ClangModule.h"