Timer: Track name and description.

The previously used "names" are rather descriptions (they use multiple
words and contain spaces), use short programming language identifier
like strings for the "names" which should be used when exporting to
machine parseable formats.

Also removed a unused TimerGroup from Hexxagon.

Differential Revision: https://reviews.llvm.org/D25583

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@287369 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 16 insertions, 12 deletions

diff --git a/utils/yaml-bench/YAMLBench.cpp b/utils/yaml-bench/YAMLBench.cpp
index 634622a710c..721eeeecfd9 100644
--- a/utils/yaml-bench/YAMLBench.cpp
+++ b/utils/yaml-bench/YAMLBench.cpp
@@ -143,10 +143,10 @@ static void dumpStream(yaml::Stream &stream) {
   }
 }
 
-static void benchmark( llvm::TimerGroup &Group
-                     , llvm::StringRef Name
-                     , llvm::StringRef JSONText) {
-  llvm::Timer BaseLine((Name + ": Loop").str(), Group);
+static void benchmark(llvm::TimerGroup &Group, llvm::StringRef Name,
+                      llvm::StringRef Description, llvm::StringRef JSONText) {
+  llvm::Timer BaseLine((Name + ".loop").str(), (Description + ": Loop").str(),
+                       Group);
   BaseLine.startTimer();
   char C = 0;
   for (llvm::StringRef::iterator I = JSONText.begin(),
@@ -155,14 +155,16 @@ static void benchmark( llvm::TimerGroup &Group
   BaseLine.stopTimer();
   volatile char DontOptimizeOut = C; (void)DontOptimizeOut;
 
-  llvm::Timer Tokenizing((Name + ": Tokenizing").str(), Group);
+  llvm::Timer Tokenizing((Name + ".tokenizing").str(),
+                         (Description + ": Tokenizing").str(), Group);
   Tokenizing.startTimer();
   {
     yaml::scanTokens(JSONText);
   }
   Tokenizing.stopTimer();
 
-  llvm::Timer Parsing((Name + ": Parsing").str(), Group);
+  llvm::Timer Parsing((Name + ".parsing").str(),
+                      (Description + ": Parsing").str(), Group);
   Parsing.startTimer();
   {
     llvm::SourceMgr SM;
@@ -218,13 +220,15 @@ int main(int argc, char **argv) {
   }
 
   if (Verify) {
-    llvm::TimerGroup Group("YAML parser benchmark");
-    benchmark(Group, "Fast", createJSONText(10, 500));
+    llvm::TimerGroup Group("yaml", "YAML parser benchmark");
+    benchmark(Group, "Fast", "Fast", createJSONText(10, 500));
   } else if (!DumpCanonical && !DumpTokens) {
-    llvm::TimerGroup Group("YAML parser benchmark");
-    benchmark(Group, "Small Values", createJSONText(MemoryLimitMB, 5));
-    benchmark(Group, "Medium Values", createJSONText(MemoryLimitMB, 500));
-    benchmark(Group, "Large Values", createJSONText(MemoryLimitMB, 50000));
+    llvm::TimerGroup Group("yaml", "YAML parser benchmark");
+    benchmark(Group, "Small", "Small Values", createJSONText(MemoryLimitMB, 5));
+    benchmark(Group, "Medium", "Medium Values",
+              createJSONText(MemoryLimitMB, 500));
+    benchmark(Group, "Large", "Large Values",
+              createJSONText(MemoryLimitMB, 50000));
   }
 
   return 0;