Improve ftime-trace implementation.

CMakeLists.txt

@@ -382,7 +382,6 @@ set(DRV_SRC
     driver/dcomputecodegenerator.cpp
     driver/exe_path.cpp
     driver/targetmachine.cpp
-    driver/timetrace.cpp
     driver/toobj.cpp
     driver/tool.cpp
     driver/archiver.cpp

dmd/root/rmem.d

@@ -157,6 +157,7 @@ enum CHUNK_SIZE = (256 * 4096 - 64);
 
 __gshared size_t heapleft = 0;
 __gshared void* heapp;
+version (IN_LLVM) __gshared size_t heaptotal = 0; // Total amount of memory allocated using malloc
 
 extern (D) void* allocmemoryNoFree(size_t m_size) nothrow @nogc
 {
@@ -175,11 +176,13 @@ extern (D) void* allocmemoryNoFree(size_t m_size) nothrow @nogc
 
     if (m_size > CHUNK_SIZE)
     {
+        version (IN_LLVM) heaptotal += m_size;
         return Mem.check(malloc(m_size));
     }
 
     heapleft = CHUNK_SIZE;
     heapp = Mem.check(malloc(CHUNK_SIZE));
+    version (IN_LLVM) heaptotal += CHUNK_SIZE;
     goto L1;
 }
 

driver/cl_options.cpp

@@ -622,7 +622,7 @@ cl::opt<bool> fTimeTrace(
     cl::desc("Turn on time profiler. Generates JSON file "
              "based on the output filename (also see --ftime-trace-file)."));
 cl::opt<unsigned> fTimeTraceGranularity(
-    "ftime-trace-granularity", cl::ZeroOrMore,
+    "ftime-trace-granularity", cl::ZeroOrMore, cl::init(500),
     cl::desc(
         "Minimum time granularity (in microseconds) traced by time profiler"));
 cl::opt<std::string>

driver/main.cpp

@@ -1037,7 +1037,9 @@ int cppmain() {
     fatal();
   }
 
-  initializeTimeTracer();
+  if (opts::fTimeTrace) {
+    initializeTimeTrace(opts::fTimeTraceGranularity, 0, opts::allArguments[0]);
+  }
 
   // Set up the TargetMachine.
   const auto arch = getArchStr();
@@ -1120,8 +1122,9 @@ int cppmain() {
   if (!tempObjectsDir.empty())
     llvm::sys::fs::remove(tempObjectsDir);
 
-  writeTimeTraceProfile();
-  deinitializeTimeTracer();
+  std::string fTimeTraceFile = opts::fTimeTraceFile;
+  writeTimeTraceProfile(fTimeTraceFile.empty() ? "" : fTimeTraceFile.c_str());
+  deinitializeTimeTrace();
 
   llvm::llvm_shutdown();
 
@@ -1162,7 +1165,11 @@ void codegenModules(Modules &modules) {
       const auto atCompute = hasComputeAttr(m);
       if (atCompute == DComputeCompileFor::hostOnly ||
           atCompute == DComputeCompileFor::hostAndDevice) {
-        TimeTraceScope timeScope(("Codegen module " + llvm::SmallString<20>(m->toChars())).str());
+        TimeTraceScope timeScope(
+            ("Codegen module " + llvm::SmallString<20>(m->toChars()))
+                .str()
+                .c_str(),
+            m->loc);
 #if LDC_MLIR_ENABLED
         if (global.params.output_mlir == OUTPUTFLAGset)
           cg.emitMLIR(m);
@@ -1190,7 +1197,11 @@ void codegenModules(Modules &modules) {
     if (!computeModules.empty()) {
       TimeTraceScope timeScope("Codegen DCompute device modules");
       for (auto &mod : computeModules) {
-        TimeTraceScope timeScope(("Codegen DCompute device module " + llvm::SmallString<20>(mod->toChars())).str());
+        TimeTraceScope timeScope(("Codegen DCompute device module " +
+                                  llvm::SmallString<20>(mod->toChars()))
+                                     .str()
+                                     .c_str(),
+                                 mod->loc);
         dccg.emit(mod);
       }
     }