Skip to content

A
angle
Commit a4a42e6d by Jamie Madill Committed by Commit Bot
Options

Format perf_test.cc.

This was missed when our git cl format protection was temporarily broken. A subsequent change caused the file to get fully formatted so this CL pulls that diff into a split change. Bug: angleproject:3630 Change-Id: I14ed53708783b38039e8fa64cb38837e25911893 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2103085Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 869e901a
Showing with 121 additions and 126 deletions
src/tests/perf_tests/third_party/perf/perf_test.cc
...@@ -8,14 +8,17 @@ ...@@ -8,14 +8,17 @@
#include <stdio.h> #include <stdio.h>
#include <vector> #include <vector>
namespace { namespace
{
std::string FormatString(const char *fmt, va_list vararg) { std::string FormatString(const char *fmt, va_list vararg)
{
static std::vector<char> buffer(512); static std::vector<char> buffer(512);
// Attempt to just print to the current buffer // Attempt to just print to the current buffer
int len = vsnprintf(&buffer[0], buffer.size(), fmt, vararg); int len = vsnprintf(&buffer[0], buffer.size(), fmt, vararg);
if (len < 0 || static_cast<size_t>(len) >= buffer.size()) { if (len < 0 || static_cast<size_t>(len) >= buffer.size())
{
// Buffer was not large enough, calculate the required size and resize the buffer // Buffer was not large enough, calculate the required size and resize the buffer
len = vsnprintf(NULL, 0, fmt, vararg); len = vsnprintf(NULL, 0, fmt, vararg);
buffer.resize(len + 1); buffer.resize(len + 1);
...@@ -27,7 +30,8 @@ std::string FormatString(const char *fmt, va_list vararg) { ...@@ -27,7 +30,8 @@ std::string FormatString(const char *fmt, va_list vararg) {
return std::string(buffer.data(), len); return std::string(buffer.data(), len);
} }
std::string StringPrintf(const char *fmt, ...) { std::string StringPrintf(const char *fmt, ...)
{
va_list vararg; va_list vararg;
va_start(vararg, fmt); va_start(vararg, fmt);
std::string result = FormatString(fmt, vararg); std::string result = FormatString(fmt, vararg);
...@@ -45,14 +49,15 @@ std::string NumberToString(double value) ...@@ -45,14 +49,15 @@ std::string NumberToString(double value)
return StringPrintf("%.10lf", value); return StringPrintf("%.10lf", value);
} }
std::string ResultsToString(const std::string& measurement, std::string ResultsToString(const std::string &measurement,
const std::string& modifier, const std::string &modifier,
const std::string& trace, const std::string &trace,
const std::string& values, const std::string &values,
const std::string& prefix, const std::string &prefix,
const std::string& suffix, const std::string &suffix,
const std::string& units, const std::string &units,
bool important) { bool important)
{
// <*>RESULT <graph_name>: <trace_name>= <value> <units> // <*>RESULT <graph_name>: <trace_name>= <value> <units>
// <*>RESULT <graph_name>: <trace_name>= {<mean>, <std deviation>} <units> // <*>RESULT <graph_name>: <trace_name>= {<mean>, <std deviation>} <units>
// <*>RESULT <graph_name>: <trace_name>= [<value>,value,value,...,] <units> // <*>RESULT <graph_name>: <trace_name>= [<value>,value,value,...,] <units>
...@@ -61,155 +66,145 @@ std::string ResultsToString(const std::string& measurement, ...@@ -61,155 +66,145 @@ std::string ResultsToString(const std::string& measurement,
suffix.c_str(), units.c_str()); suffix.c_str(), units.c_str());
} }
void PrintResultsImpl(const std::string& measurement, void PrintResultsImpl(const std::string &measurement,
const std::string& modifier, const std::string &modifier,
const std::string& trace, const std::string &trace,
const std::string& values, const std::string &values,
const std::string& prefix, const std::string &prefix,
const std::string& suffix, const std::string &suffix,
const std::string& units, const std::string &units,
bool important) { bool important)
{
fflush(stdout); fflush(stdout);
printf("%s", ResultsToString(measurement, modifier, trace, values, printf("%s",
prefix, suffix, units, important).c_str()); ResultsToString(measurement, modifier, trace, values, prefix, suffix, units, important)
.c_str());
fflush(stdout); fflush(stdout);
} }
} // namespace } // namespace
namespace perf_test { namespace perf_test
{
void PrintResult(const std::string& measurement, void PrintResult(const std::string &measurement,
const std::string& modifier, const std::string &modifier,
const std::string& trace, const std::string &trace,
size_t value, size_t value,
const std::string& units, const std::string &units,
bool important) { bool important)
{
PrintResultsImpl(measurement, modifier, trace, NumberToString(value), std::string(), PrintResultsImpl(measurement, modifier, trace, NumberToString(value), std::string(),
std::string(), units, important); std::string(), units, important);
} }
void PrintResult(const std::string& measurement, void PrintResult(const std::string &measurement,
const std::string& modifier, const std::string &modifier,
const std::string& trace, const std::string &trace,
double value, double value,
const std::string& units, const std::string &units,
bool important) { bool important)
{
PrintResultsImpl(measurement, modifier, trace, NumberToString(value), std::string(), PrintResultsImpl(measurement, modifier, trace, NumberToString(value), std::string(),
std::string(), units, important); std::string(), units, important);
} }
void AppendResult(std::string& output, void AppendResult(std::string &output,
const std::string& measurement, const std::string &measurement,
const std::string& modifier, const std::string &modifier,
const std::string& trace, const std::string &trace,
size_t value, size_t value,
const std::string& units, const std::string &units,
bool important) { bool important)
{
output += ResultsToString(measurement, modifier, trace, NumberToString(value), std::string(), output += ResultsToString(measurement, modifier, trace, NumberToString(value), std::string(),
std::string(), units, important); std::string(), units, important);
} }
void PrintResult(const std::string& measurement, void PrintResult(const std::string &measurement,
const std::string& modifier, const std::string &modifier,
const std::string& trace, const std::string &trace,
const std::string& value, const std::string &value,
const std::string& units, const std::string &units,
bool important) { bool important)
PrintResultsImpl(measurement, {
modifier, PrintResultsImpl(measurement, modifier, trace, value, std::string(), std::string(), units,
trace,
value,
std::string(),
std::string(),
units,
important); important);
} }
void AppendResult(std::string& output, void AppendResult(std::string &output,
const std::string& measurement, const std::string &measurement,
const std::string& modifier, const std::string &modifier,
const std::string& trace, const std::string &trace,
const std::string& value, const std::string &value,
const std::string& units, const std::string &units,
bool important) { bool important)
output += ResultsToString(measurement, {
modifier, output += ResultsToString(measurement, modifier, trace, value, std::string(), std::string(),
trace, units, important);
value,
std::string(),
std::string(),
units,
important);
} }
void PrintResultMeanAndError(const std::string& measurement, void PrintResultMeanAndError(const std::string &measurement,
const std::string& modifier, const std::string &modifier,
const std::string& trace, const std::string &trace,
const std::string& mean_and_error, const std::string &mean_and_error,
const std::string& units, const std::string &units,
bool important) { bool important)
PrintResultsImpl(measurement, modifier, trace, mean_and_error, {
"{", "}", units, important); PrintResultsImpl(measurement, modifier, trace, mean_and_error, "{", "}", units, important);
} }
void AppendResultMeanAndError(std::string& output, void AppendResultMeanAndError(std::string &output,
const std::string& measurement, const std::string &measurement,
const std::string& modifier, const std::string &modifier,
const std::string& trace, const std::string &trace,
const std::string& mean_and_error, const std::string &mean_and_error,
const std::string& units, const std::string &units,
bool important) { bool important)
output += ResultsToString(measurement, modifier, trace, mean_and_error, {
"{", "}", units, important); output +=
} ResultsToString(measurement, modifier, trace, mean_and_error, "{", "}", units, important);
}
void PrintResultList(const std::string& measurement,
const std::string& modifier, void PrintResultList(const std::string &measurement,
const std::string& trace, const std::string &modifier,
const std::string& values, const std::string &trace,
const std::string& units, const std::string &values,
bool important) { const std::string &units,
PrintResultsImpl(measurement, modifier, trace, values, bool important)
"[", "]", units, important); {
} PrintResultsImpl(measurement, modifier, trace, values, "[", "]", units, important);
}
void AppendResultList(std::string& output,
const std::string& measurement, void AppendResultList(std::string &output,
const std::string& modifier, const std::string &measurement,
const std::string& trace, const std::string &modifier,
const std::string& values, const std::string &trace,
const std::string& units, const std::string &values,
bool important) { const std::string &units,
output += ResultsToString(measurement, modifier, trace, values, bool important)
"[", "]", units, important); {
} output += ResultsToString(measurement, modifier, trace, values, "[", "]", units, important);
}
void PrintSystemCommitCharge(const std::string& test_name,
size_t charge, void PrintSystemCommitCharge(const std::string &test_name, size_t charge, bool important)
bool important) { {
PrintSystemCommitCharge(stdout, test_name, charge, important); PrintSystemCommitCharge(stdout, test_name, charge, important);
} }
void PrintSystemCommitCharge(FILE* target, void PrintSystemCommitCharge(FILE *target,
const std::string& test_name, const std::string &test_name,
size_t charge, size_t charge,
bool important) { bool important)
fprintf(target, "%s", SystemCommitChargeToString(test_name, charge, {
important).c_str()); fprintf(target, "%s", SystemCommitChargeToString(test_name, charge, important).c_str());
} }
std::string SystemCommitChargeToString(const std::string& test_name, std::string SystemCommitChargeToString(const std::string &test_name, size_t charge, bool important)
size_t charge, {
bool important) {
std::string trace_name(test_name); std::string trace_name(test_name);
std::string output; std::string output;
AppendResult(output, AppendResult(output, "commit_charge", std::string(), "cc" + trace_name, charge, "kb",
"commit_charge",
std::string(),
"cc" + trace_name,
charge,
"kb",
important); important);
return output; return output;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment