Revert 165685 - Revert 163638 - Adds units for all Chromium perf tests. These units are recorded in the graphs.dat file, and can then be used to determine whether the test has improved or regressed when the graph goes up.

Review URL: https://chromiumcodereview.appspot.com/11234012

TBR=sullivan@chromium.org
Review URL: https://codereview.chromium.org/11365067

TBR=sullivan@chromium.org
Review URL: https://codereview.chromium.org/11361218

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167180 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 20 insertions, 19 deletions

diff --git a/build/common.croc b/build/common.croc
index 7281bb4..ecf29f2 100644
--- a/build/common.croc
+++ b/build/common.croc
@@ -89,7 +89,7 @@
     },
     {
       'stat' : '100.0 * files_instrumented / files_executable',
-      'format' : '*RESULT FilesInstrumentedPercent: files_instrumented_percent= %g',
+      'format' : '*RESULT FilesInstrumentedPercent: files_instrumented_percent= %g percent',
     },
     {
       'stat' : 'lines_executable',
@@ -111,16 +111,16 @@
     },
     {
       'stat' : '100.0 * lines_covered / lines_executable',
-      'format' : '*RESULT PercentCovered: percent_covered= %g',
+      'format' : '*RESULT PercentCovered: percent_covered= %g percent',
     },
     {
       'stat' : '100.0 * lines_covered / lines_executable',
-      'format' : '*RESULT PercentCoveredSource: percent_covered_source= %g',
+      'format' : '*RESULT PercentCoveredSource: percent_covered_source= %g percent',
       'group' : 'source',
     },
     {
       'stat' : '100.0 * lines_covered / lines_executable',
-      'format' : '*RESULT PercentCoveredTest: percent_covered_test= %g',
+      'format' : '*RESULT PercentCoveredTest: percent_covered_test= %g percent',
       'group' : 'test',
     },
   ],
diff --git a/chrome/test/perf/page_cycler_test.cc b/chrome/test/perf/page_cycler_test.cc
index 840a852..670380c 100644
--- a/chrome/test/perf/page_cycler_test.cc
+++ b/chrome/test/perf/page_cycler_test.cc
@@ -269,7 +269,8 @@ class PageCyclerTest : public UIPerfTest {
   }
 
  private:
-  void PrintMemoryHistogram(const std::string& name) {
+  void PrintMemoryHistogram(const std::string& name,
+                            const std::string& units) {
     scoped_refptr<TabProxy> tab(GetActiveTab());
     ASSERT_TRUE(tab.get());
     std::wstring whistogram;
@@ -281,17 +282,17 @@ class PageCyclerTest : public UIPerfTest {
         base::SysUTF8ToWide(name) + L"\") : '')",
         &whistogram));
     std::string histogram = base::SysWideToNativeMB(whistogram);
-    printf("HISTOGRAM %s: %s = %s\n",
-           name.c_str(), name.c_str(), histogram.c_str());
+    printf("HISTOGRAM %s: %s = %s %s\n",
+           name.c_str(), name.c_str(), histogram.c_str(), units.c_str());
   }
 
   void PrintMemoryHistograms() {
     ASSERT_NO_FATAL_FAILURE(PrintMemoryHistogram(
-        "V8.MemoryExternalFragmentationTotal"));
+        "V8.MemoryExternalFragmentationTotal", "percent"));
     ASSERT_NO_FATAL_FAILURE(PrintMemoryHistogram(
-        "V8.MemoryHeapSampleTotalCommitted"));
+        "V8.MemoryHeapSampleTotalCommitted", "kb"));
     ASSERT_NO_FATAL_FAILURE(PrintMemoryHistogram(
-        "V8.MemoryHeapSampleTotalUsed"));
+        "V8.MemoryHeapSampleTotalUsed", "kb"));
   }
 
  protected:
diff --git a/chrome/test/perf/perf_test.cc b/chrome/test/perf/perf_test.cc
index 1e29009..3423e9f 100644
--- a/chrome/test/perf/perf_test.cc
+++ b/chrome/test/perf/perf_test.cc
@@ -231,13 +231,13 @@ std::string IOPerfInfoToString(const std::string& test_name,
   }
 
   std::string t_name(test_name);
-  AppendResult(output, "read_op_b", "", "r_op_b" + t_name, read_op_b, "",
+  AppendResult(output, "read_op_b", "", "r_op_b" + t_name, read_op_b, "ops",
                false);
-  AppendResult(output, "write_op_b", "", "w_op_b" + t_name, write_op_b, "",
+  AppendResult(output, "write_op_b", "", "w_op_b" + t_name, write_op_b, "ops",
                false);
-  AppendResult(output, "other_op_b", "", "o_op_b" + t_name, other_op_b, "",
+  AppendResult(output, "other_op_b", "", "o_op_b" + t_name, other_op_b, "ops",
                false);
-  AppendResult(output, "total_op_b", "", "IO_op_b" + t_name, total_op_b, "",
+  AppendResult(output, "total_op_b", "", "IO_op_b" + t_name, total_op_b, "ops",
                false);
 
   AppendResult(output, "read_byte_b", "", "r_b" + t_name, read_byte_b, "kb",
@@ -249,13 +249,13 @@ std::string IOPerfInfoToString(const std::string& test_name,
   AppendResult(output, "total_byte_b", "", "IO_b" + t_name, total_byte_b, "kb",
                false);
 
-  AppendResult(output, "read_op_r", "", "r_op_r" + t_name, read_op_r, "",
+  AppendResult(output, "read_op_r", "", "r_op_r" + t_name, read_op_r, "ops",
                false);
-  AppendResult(output, "write_op_r", "", "w_op_r" + t_name, write_op_r, "",
+  AppendResult(output, "write_op_r", "", "w_op_r" + t_name, write_op_r, "ops",
                false);
-  AppendResult(output, "other_op_r", "", "o_op_r" + t_name, other_op_r, "",
+  AppendResult(output, "other_op_r", "", "o_op_r" + t_name, other_op_r, "ops",
                false);
-  AppendResult(output, "total_op_r", "", "IO_op_r" + t_name, total_op_r, "",
+  AppendResult(output, "total_op_r", "", "IO_op_r" + t_name, total_op_r, "ops",
                false);
 
   AppendResult(output, "read_byte_r", "", "r_r" + t_name, read_byte_r, "kb",
@@ -412,7 +412,7 @@ std::string MemoryUsageInfoToString(const std::string& test_name,
   NOTIMPLEMENTED();
 #endif
   AppendResult(output, "processes", "", "proc_" + trace_name,
-               chrome_processes.size(), "",
+               chrome_processes.size(), "count",
                false /* not important */);
 
   return output;