haraldwolff
/
CLBlast
mirror of https://github.com/CNugteren/CLBlast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added compilation timing and better compilation error reporting

pull/216/head
Cedric Nugteren 2017-11-19 16:58:13 +01:00
parent a3a8b44f59
commit 4e0d08c3bc
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tuning/tuning.cpp
View File

@ -81,7 +81,7 @@ void PrintTimingsToFileAsJSON(const std::string &filename,
void print_separator(const size_t parameters_size) {
printf("x------x-------x");
for (auto i = size_t{0}; i < parameters_size; ++i) { printf("-----"); }
printf("-x----------x--------------x--------x-------------------x\n");
printf("-x----------------x--------------x--------x-------------------x\n");
}
// =================================================================================================

20
src/tuning/tuning.hpp
View File

@ -21,6 +21,7 @@
#include <utility>
#include <algorithm>
#include <iostream>
#include <chrono>
#include "utilities/utilities.hpp"
#include "utilities/compile.hpp"
@ -211,7 +212,7 @@ void Tuner(int argc, char* argv[]) {
printf("\n");
printf("| ID | total |");
for (auto i = size_t{0}; i < settings.parameters.size() - 1; ++i) { printf(" "); }
printf("param | compiles | time | %6s | status |\n", settings.performance_unit.c_str());
printf("param | compiles | time | %6s | status |\n", settings.performance_unit.c_str());
print_separator(settings.parameters.size());
// First runs a reference example to compare against
@ -232,7 +233,7 @@ void Tuner(int argc, char* argv[]) {
device, context, compiler_options);
auto kernel = Kernel(program, settings.kernel_name);
C::SetArguments(kernel, args, device_buffers);
printf(" %sOK%s |", kPrintSuccess.c_str(), kPrintEnd.c_str());
printf(" %sOK%s |", kPrintSuccess.c_str(), kPrintEnd.c_str());
// Runs the kernel
const auto time_ms = TimeKernel(args.num_runs, kernel, queue, device,
@ -248,7 +249,6 @@ void Tuner(int argc, char* argv[]) {
}
catch (...) {
const auto status_code = DispatchExceptionCatchAll(true);
printf(" %d |\n", static_cast<int>(status_code));
printf("* Exception caught with status %d while running the reference, aborting\n",
static_cast<int>(status_code));
return;
@ -286,11 +286,14 @@ void Tuner(int argc, char* argv[]) {
kernel_source += settings.sources;
// Compiles the kernel
const auto start_time = std::chrono::steady_clock::now();
auto compiler_options = std::vector<std::string>();
const auto program = CompileFromSource(kernel_source, args.precision, settings.kernel_name,
device, context, compiler_options);
device, context, compiler_options, true);
auto kernel = Kernel(program, settings.kernel_name);
printf(" %sOK%s |", kPrintSuccess.c_str(), kPrintEnd.c_str());
const auto elapsed_time = std::chrono::steady_clock::now() - start_time;
const auto timing = std::chrono::duration<double,std::milli>(elapsed_time).count();
printf(" %sOK%s %5.0lf ms |", kPrintSuccess.c_str(), kPrintEnd.c_str(), timing);
// Runs the kernel
C::SetArguments(kernel, args, device_buffers);
@ -326,6 +329,12 @@ void Tuner(int argc, char* argv[]) {
printf(" %6.1lf |", settings.metric_amount / (time_ms * 1.0e6));
printf(" %sresults match%s |\n", kPrintSuccess.c_str(), kPrintEnd.c_str());
}
catch (const CLCudaAPIBuildError &e) {
const auto status_code = DispatchExceptionCatchAll(true);
printf(" %scompilation error: %5d%s |",
kPrintError.c_str(), static_cast<int>(status_code), kPrintEnd.c_str());
printf(" - | - | <-- skipping\n");
}
catch (...) {
const auto status_code = DispatchExceptionCatchAll(true);
if (status_code != StatusCode::kUnknownError) {
@ -384,7 +393,6 @@ void Tuner(int argc, char* argv[]) {
printf("* Completed tuning process\n");
printf("\n");
}
// =================================================================================================

6
src/utilities/compile.cpp
View File

@ -23,7 +23,7 @@ namespace clblast {
Program CompileFromSource(const std::string &source_string, const Precision precision,
const std::string &routine_name,
const Device& device, const Context& context,
std::vector<std::string>& options) {
std::vector<std::string>& options, const bool silent) {
auto header_string = std::string{""};
header_string += "#define PRECISION " + ToString(static_cast<int>(precision)) + "\n";
@ -78,8 +78,8 @@ Program CompileFromSource(const std::string &source_string, const Precision prec
try {
program.Build(device, options);
} catch (const CLCudaAPIBuildError &e) {
if (program.StatusIsCompilationWarningOrError(e.status())) {
fprintf(stdout, "OpenCL compiler error/warning: %s\n",
if (program.StatusIsCompilationWarningOrError(e.status()) && !silent) {
fprintf(stdout, "OpenCL compiler error/warning:\n%s\n",
program.GetBuildInfo(device).c_str());
}
throw;

2
src/utilities/compile.hpp
View File

@ -27,7 +27,7 @@ namespace clblast {
Program CompileFromSource(const std::string &source_string, const Precision precision,
const std::string &routine_name,
const Device& device, const Context& context,
std::vector<std::string>& options);
std::vector<std::string>& options, const bool silent = false);
// =================================================================================================
} // namespace clblast