cory-master/BabelStream
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use ternary operator for simpler base 2 output checks

Browse Source
This commit is contained in:
Tom Deakin 2019-04-10 14:06:05 +01:00
parent c50eba9caf
commit 08348d1f0f
1 changed files with 8 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
main.cpp
View File

@ -224,35 +224,23 @@ void run()
check_solution<T>(num_times, a, b, c, sum); check_solution<T>(num_times, a, b, c, sum);
// Display timing results // Display timing results
std::string units;
if (output_as_csv) if (output_as_csv)
{ {
if (mibibytes)
units = "max_mibytes_per_sec";
else
units = "max_mbytes_per_sec";
std::cout std::cout
<< "function" << csv_separator << "function" << csv_separator
<< "num_times" << csv_separator << "num_times" << csv_separator
<< "n_elements" << csv_separator << "n_elements" << csv_separator
<< "sizeof" << csv_separator << "sizeof" << csv_separator
<< units << csv_separator << ((mibibytes) ? "max_mibytes_per_sec" : "max_mbytes_per_sec") << csv_separator
<< "min_runtime" << csv_separator << "min_runtime" << csv_separator
<< "max_runtime" << csv_separator << "max_runtime" << csv_separator
<< "avg_runtime" << std::endl; << "avg_runtime" << std::endl;
} }
else else
{ {
if (mibibytes)
units = "MiBytes/sec";
else
units = "MBytes/sec";
std::cout std::cout
<< std::left << std::setw(12) << "Function" << std::left << std::setw(12) << "Function"
<< std::left << std::setw(12) << units << std::left << std::setw(12) << ((mibibytes) ? "MiBytes/sec" : "MBytes/sec")
<< std::left << std::setw(12) << "Min (sec)" << std::left << std::setw(12) << "Min (sec)"
<< std::left << std::setw(12) << "Max" << std::left << std::setw(12) << "Max"
<< std::left << std::setw(12) << "Average" << std::left << std::setw(12) << "Average"
@ -286,18 +274,8 @@ void run()
<< labels[i] << csv_separator << labels[i] << csv_separator
<< num_times << csv_separator << num_times << csv_separator
<< ARRAY_SIZE << csv_separator << ARRAY_SIZE << csv_separator
<< sizeof(T) << csv_separator; << sizeof(T) << csv_separator
if (mibibytes) << ((mibibytes) ? pow(2.0, -20.0) : 1.0E-6) * sizes[i] / (*minmax.first) << csv_separator
{
std::cout
<< pow(2.0, -20.0) * sizes[i] / (*minmax.first) << csv_separator;
}
else
{
std::cout
<< 1.0E-6 * sizes[i] / (*minmax.first) << csv_separator;
}
std::cout
<< *minmax.first << csv_separator << *minmax.first << csv_separator
<< *minmax.second << csv_separator << *minmax.second << csv_separator
<< average << average
@ -417,26 +395,16 @@ void run_triad()
// Display timing results // Display timing results
double total_bytes = 3 * sizeof(T) * ARRAY_SIZE * num_times; double total_bytes = 3 * sizeof(T) * ARRAY_SIZE * num_times;
double bandwidth; double bandwidth = ((mibibytes) ? pow(2.0, -30.0) : 1.0E-9) * (total_bytes / runtime);
std::string units;
if (mibibytes)
bandwidth = pow(2.0, -30.0) * (total_bytes / runtime);
else
bandwidth = 1.0E-9 * (total_bytes / runtime);
if (output_as_csv) if (output_as_csv)
{ {
if (mibibytes)
units = "gibytes_per_sec";
else
units = "gbytes_per_sec";
std::cout std::cout
<< "function" << csv_separator << "function" << csv_separator
<< "num_times" << csv_separator << "num_times" << csv_separator
<< "n_elements" << csv_separator << "n_elements" << csv_separator
<< "sizeof" << csv_separator << "sizeof" << csv_separator
<< units << csv_separator << ((mibibytes) ? "gibytes_per_sec" : "gbytes_per_sec") << csv_separator
<< "runtime" << "runtime"
<< std::endl; << std::endl;
std::cout std::cout
@ -450,17 +418,13 @@ void run_triad()
} }
else else
{ {
if (mibibytes)
units = "GiB/s";
else
units = "GB/s";
std::cout std::cout
<< "--------------------------------" << "--------------------------------"
<< std::endl << std::fixed << std::endl << std::fixed
<< "Runtime (seconds): " << std::left << std::setprecision(5) << "Runtime (seconds): " << std::left << std::setprecision(5)
<< runtime << std::endl << runtime << std::endl
<< "Bandwidth (" << units << "): " << std::left << std::setprecision(3) << "Bandwidth (" << ((mibibytes) ? "GiB/s" : "GB/s") << "): "
<< std::left << std::setprecision(3)
<< bandwidth << std::endl; << bandwidth << std::endl;
} }