[llvm] r334651 - Revert r334649 "[Timers] Use the pass argument name for JSON keys in time-passes"

[Francis Visoiu Mistrih via llvm-commits]

Author: thegameg
Date: Wed Jun 13 13:44:02 2018
New Revision: 334651

URL: http://llvm.org/viewvc/llvm-project?rev=334651&view=rev
Log:
Revert r334649 "[Timers] Use the pass argument name for JSON keys in time-passes"

This reverts commit r334649.

This breaks a test.

Removed:
    llvm/trunk/test/CodeGen/X86/time-passes-json-stats.ll
Modified:
    llvm/trunk/lib/IR/LegacyPassManager.cpp

Modified: llvm/trunk/lib/IR/LegacyPassManager.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/LegacyPassManager.cpp?rev=334651&r1=334650&r2=334651&view=diff
==============================================================================
--- llvm/trunk/lib/IR/LegacyPassManager.cpp (original)
+++ llvm/trunk/lib/IR/LegacyPassManager.cpp Wed Jun 13 13:44:02 2018
@@ -545,11 +545,7 @@ public:
     Timer *&T = TimingData[P];
     if (!T) {
       StringRef PassName = P->getPassName();
-      StringRef PassArgument;
-      if (const PassInfo *PI = Pass::lookupPassInfo(P->getPassID()))
-        PassArgument = PI->getPassArgument();
-      T = new Timer(PassArgument.empty() ? PassName : PassArgument, PassName,
-                    TG);
+      T = new Timer(PassName, PassName, TG);
     }
     return T;
   }

Removed: llvm/trunk/test/CodeGen/X86/time-passes-json-stats.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/time-passes-json-stats.ll?rev=334650&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/X86/time-passes-json-stats.ll (original)
+++ llvm/trunk/test/CodeGen/X86/time-passes-json-stats.ll (removed)
@@ -1,14 +0,0 @@
-; RUN: llc -mtriple=x86_64-- -stats-json=true -stats -time-passes %s -o /dev/null 2>&1 | FileCheck %s
-
-; Verify that we use the argument pass name instead of the full name as a json
-; key for timers.
-;
-; CHECK: {
-; CHECK-NEXT: "asm-printer.EmittedInsts":
-; CHECK-NOT: Virtual Register Map
-; CHECK: "time.pass.virtregmap.wall":
-; CHECK: "time.pass.virtregmap.user":
-; CHECK: "time.pass.virtregmap.sys":
-; CHECK: Virtual Register Map
-
-define void @test_stats() { ret void }