Skip to content

Commit

Permalink
Revert 163638 - Adds units for all Chromium perf tests. These units a…
Browse files Browse the repository at this point in the history 
…re 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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165685 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
sullivan@chromium.org committed Nov 2, 2012
1 parent 3e2f040 commit 3a9ece7
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 20 deletions.
8 changes: 4 additions & 4 deletions build/common.croc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
},
{
'stat' : '100.0 * files_instrumented / files_executable',
'format' : '*RESULT FilesInstrumentedPercent: files_instrumented_percent= %g percent',
'format' : '*RESULT FilesInstrumentedPercent: files_instrumented_percent= %g',
},
{
'stat' : 'lines_executable',
Expand All @@ -111,16 +111,16 @@
},
{
'stat' : '100.0 * lines_covered / lines_executable',
'format' : '*RESULT PercentCovered: percent_covered= %g percent',
'format' : '*RESULT PercentCovered: percent_covered= %g',
},
{
'stat' : '100.0 * lines_covered / lines_executable',
'format' : '*RESULT PercentCoveredSource: percent_covered_source= %g percent',
'format' : '*RESULT PercentCoveredSource: percent_covered_source= %g',
'group' : 'source',
},
{
'stat' : '100.0 * lines_covered / lines_executable',
'format' : '*RESULT PercentCoveredTest: percent_covered_test= %g percent',
'format' : '*RESULT PercentCoveredTest: percent_covered_test= %g',
'group' : 'test',
},
],
Expand Down
13 changes: 6 additions & 7 deletions chrome/test/perf/page_cycler_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,7 @@ class PageCyclerTest : public UIPerfTest {
}

private:
void PrintMemoryHistogram(const std::string& name,
const std::string& units) {
void PrintMemoryHistogram(const std::string& name) {
scoped_refptr<TabProxy> tab(GetActiveTab());
ASSERT_TRUE(tab.get());
std::wstring whistogram;
Expand All @@ -282,17 +281,17 @@ class PageCyclerTest : public UIPerfTest {
base::SysUTF8ToWide(name) + L"\") : '')",
&whistogram));
std::string histogram = base::SysWideToNativeMB(whistogram);
printf("HISTOGRAM %s: %s = %s %s\n",
name.c_str(), name.c_str(), histogram.c_str(), units.c_str());
printf("HISTOGRAM %s: %s = %s\n",
name.c_str(), name.c_str(), histogram.c_str());
}

void PrintMemoryHistograms() {
ASSERT_NO_FATAL_FAILURE(PrintMemoryHistogram(
"V8.MemoryExternalFragmentationTotal", "percent"));
"V8.MemoryExternalFragmentationTotal"));
ASSERT_NO_FATAL_FAILURE(PrintMemoryHistogram(
"V8.MemoryHeapSampleTotalCommitted", "kb"));
"V8.MemoryHeapSampleTotalCommitted"));
ASSERT_NO_FATAL_FAILURE(PrintMemoryHistogram(
"V8.MemoryHeapSampleTotalUsed", "kb"));
"V8.MemoryHeapSampleTotalUsed"));
}

protected:
Expand Down
18 changes: 9 additions & 9 deletions chrome/test/perf/perf_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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, "ops",
AppendResult(output, "read_op_b", "", "r_op_b" + t_name, read_op_b, "",
false);
AppendResult(output, "write_op_b", "", "w_op_b" + t_name, write_op_b, "ops",
AppendResult(output, "write_op_b", "", "w_op_b" + t_name, write_op_b, "",
false);
AppendResult(output, "other_op_b", "", "o_op_b" + t_name, other_op_b, "ops",
AppendResult(output, "other_op_b", "", "o_op_b" + t_name, other_op_b, "",
false);
AppendResult(output, "total_op_b", "", "IO_op_b" + t_name, total_op_b, "ops",
AppendResult(output, "total_op_b", "", "IO_op_b" + t_name, total_op_b, "",
false);

AppendResult(output, "read_byte_b", "", "r_b" + t_name, read_byte_b, "kb",
Expand All @@ -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, "ops",
AppendResult(output, "read_op_r", "", "r_op_r" + t_name, read_op_r, "",
false);
AppendResult(output, "write_op_r", "", "w_op_r" + t_name, write_op_r, "ops",
AppendResult(output, "write_op_r", "", "w_op_r" + t_name, write_op_r, "",
false);
AppendResult(output, "other_op_r", "", "o_op_r" + t_name, other_op_r, "ops",
AppendResult(output, "other_op_r", "", "o_op_r" + t_name, other_op_r, "",
false);
AppendResult(output, "total_op_r", "", "IO_op_r" + t_name, total_op_r, "ops",
AppendResult(output, "total_op_r", "", "IO_op_r" + t_name, total_op_r, "",
false);

AppendResult(output, "read_byte_r", "", "r_r" + t_name, read_byte_r, "kb",
Expand Down Expand Up @@ -412,7 +412,7 @@ std::string MemoryUsageInfoToString(const std::string& test_name,
NOTIMPLEMENTED();
#endif
AppendResult(output, "processes", "", "proc_" + trace_name,
chrome_processes.size(), "count",
chrome_processes.size(), "",
false /* not important */);

return output;
Expand Down

0 comments on commit 3a9ece7

Please sign in to comment.