[Stats] Add UnifiedStatsReporter tracing/profiling machinery to request-evaluator.

Author: graydon

include/swift/AST/Evaluator.h

@@ -22,6 +22,7 @@
 #include "swift/Basic/AnyValue.h"
 #include "swift/Basic/CycleDiagnosticKind.h"
 #include "swift/Basic/Defer.h"
+#include "swift/Basic/Statistic.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/SetVector.h"
@@ -338,7 +339,8 @@ class Evaluator {
 
     PrettyStackTraceRequest<Request> prettyStackTrace(request);
 
-    /// Update statistics.
+    // Trace and/or count statistics.
+    FrontendStatsTracer statsTracer = make_tracer(stats, request);
     if (stats) reportEvaluatedRequest(*stats, request);
 
     return getRequestFunction<Request>()(request, *this);

include/swift/AST/SimpleRequest.h

@@ -20,6 +20,7 @@
 #include "swift/AST/DiagnosticEngine.h"
 #include "swift/AST/DiagnosticsCommon.h"
 #include "swift/Basic/SimpleDisplay.h"
+#include "swift/Basic/Statistic.h"
 #include "swift/Basic/TypeID.h"
 #include "llvm/ADT/Hashing.h"
 #include "llvm/ADT/STLExtras.h"
@@ -160,8 +161,12 @@ class SimpleRequest {
     out << TypeID<Derived>::getName();
     simple_display(out, request.storage);
   }
-};
 
+  friend FrontendStatsTracer
+  make_tracer(UnifiedStatsReporter *Reporter, const Derived &request) {
+    return make_tracer(Reporter, TypeID<Derived>::getName(), request.storage);
+  }
+};
 }
 
 #endif // SWIFT_BASIC_SIMPLEREQUEST_H

include/swift/Basic/Statistic.h

@@ -19,6 +19,7 @@
 #include "swift/Basic/Timer.h"
 
 #include <thread>
+#include <tuple>
 
 #define SWIFT_FUNC_STAT                                                 \
   do {                                                                  \
@@ -329,5 +330,68 @@ inline FrontendStatsTracer::FrontendStatsTracer(UnifiedStatsReporter *R,
                                                 const TypeRepr *TR)
     : FrontendStatsTracer(R, S, TR, getTraceFormatter<const TypeRepr *>()) {}
 
+/// Utilities for constructing TraceFormatters from entities in the request-evaluator:
+
+template <typename T>
+typename std::enable_if<
+    std::is_constructible<FrontendStatsTracer, UnifiedStatsReporter *,
+                          StringRef, const T *>::value,
+    FrontendStatsTracer>::type
+make_tracer_direct(UnifiedStatsReporter *Reporter, StringRef Name, T *Value) {
+  return FrontendStatsTracer(Reporter, Name, static_cast<const T *>(Value));
+}
+
+template <typename T>
+typename std::enable_if<
+    std::is_constructible<FrontendStatsTracer, UnifiedStatsReporter *,
+                          StringRef, const T *>::value,
+    FrontendStatsTracer>::type
+make_tracer_direct(UnifiedStatsReporter *Reporter, StringRef Name,
+                   const T *Value) {
+  return FrontendStatsTracer(Reporter, Name, Value);
+}
+
+template <typename T>
+typename std::enable_if<
+    !std::is_constructible<FrontendStatsTracer, UnifiedStatsReporter *,
+                           StringRef, const T *>::value,
+    FrontendStatsTracer>::type
+make_tracer_direct(UnifiedStatsReporter *Reporter, StringRef Name, T *Value) {
+  return FrontendStatsTracer(Reporter, Name);
+}
+
+template <typename T>
+typename std::enable_if<!std::is_pointer<T>::value, FrontendStatsTracer>::type
+make_tracer_direct(UnifiedStatsReporter *Reporter, StringRef Name, T Value) {
+  return FrontendStatsTracer(Reporter, Name);
+}
+
+template <typename T> struct is_pointerunion : std::false_type {};
+template <typename T, typename U>
+struct is_pointerunion<llvm::PointerUnion<T, U>> : std::true_type {};
+
+template <typename T, typename U>
+FrontendStatsTracer make_tracer_pointerunion(UnifiedStatsReporter *Reporter,
+                                             StringRef Name,
+                                             llvm::PointerUnion<T, U> Value) {
+  if (Value.template is<T>())
+    return make_tracer_direct(Reporter, Name, Value.template get<T>());
+  else
+    return make_tracer_direct(Reporter, Name, Value.template get<U>());
+}
+
+template <typename T>
+typename std::enable_if<!is_pointerunion<T>::value, FrontendStatsTracer>::type
+make_tracer_pointerunion(UnifiedStatsReporter *Reporter, StringRef Name,
+                         T Value) {
+  return make_tracer_direct(Reporter, Name, Value);
+}
+
+template <typename First, typename... Rest>
+FrontendStatsTracer make_tracer(UnifiedStatsReporter *Reporter, StringRef Name,
+                                std::tuple<First, Rest...> Value) {
+  return make_tracer_pointerunion(Reporter, Name, std::get<0>(Value));
+}
+
 } // namespace swift
 #endif // SWIFT_BASIC_STATISTIC_H

test/Misc/stats_dir_tracer.swift

@@ -2,8 +2,9 @@
 // RUN: %target-swiftc_driver -o %t/main -module-name main -stats-output-dir %t %s -trace-stats-events
 // RUN: %FileCheck -input-file %t/*.csv %s
 
-// CHECK: {{[0-9]+,[0-9]+,"exit","typecheck-expr","Sema.NumTypesDeserialized",[0-9]+,[0-9]+,"Call","\[.*stats_dir_tracer.swift:9:5 - line:9:18\]"}}
-// CHECK: {{[0-9]+,[0-9]+,"exit","typecheck-expr","Sema.NumConstraintScopes",[0-9]+,[0-9]+,"IntegerLiteral","\[.*stats_dir_tracer.swift:22:13 - line:22:13\]"}}
+// CHECK: {{[0-9]+,[0-9]+,"exit","typecheck-expr","Sema.NumTypesDeserialized",[0-9]+,[0-9]+,"Call","\[.*stats_dir_tracer.swift.*\]"}}
+// CHECK: {{[0-9]+,[0-9]+,"exit","typecheck-expr","Sema.NumConstraintScopes",[0-9]+,[0-9]+,"Sequence","\[.*stats_dir_tracer.swift.*\]"}}
+// CHECK: {{[0-9]+,[0-9]+,"exit","SuperclassDeclRequest","Sema.SuperclassDeclRequest",[0-9]+,[0-9]+,"Bar","\[.*stats_dir_tracer.swift.*\]"}}
 
 public func foo() {
     print("hello")