From 76d2b7f0b6fecb81ddc6912f5aae3e1ee9b89b29 Mon Sep 17 00:00:00 2001
From: Cedric Nugteren <web@cedricnugteren.nl>
Date: Sun, 19 Nov 2017 12:59:52 +0100
Subject: Revived the GEMM routine tuner; minor formatting changes

---
 src/utilities/timing.cpp |  4 ++--
 src/utilities/timing.hpp | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/utilities')

diff --git a/src/utilities/timing.cpp b/src/utilities/timing.cpp
index 188e4487..af6a8ff2 100644
--- a/src/utilities/timing.cpp
+++ b/src/utilities/timing.cpp
@@ -65,12 +65,12 @@ double TimeKernel(const size_t num_runs, Kernel &kernel, Queue &queue, const Dev
                   std::vector<size_t> global, const std::vector<size_t> &local) {
   try {
     const auto time_ms = RunKernelTimed(num_runs, kernel, queue, device, global, local);
-    printf(" %7.2lf ms |", time_ms);
+    printf(" %9.2lf ms |", time_ms);
     return time_ms;
   }
   catch (...) {
     const auto status_code = DispatchExceptionCatchAll(true);
-    printf("  error %3d |", static_cast<int>(status_code));
+    printf("  error %-5d |", static_cast<int>(status_code));
     return -1.0; // invalid
   }
 }
diff --git a/src/utilities/timing.hpp b/src/utilities/timing.hpp
index e8040058..a66aba4b 100644
--- a/src/utilities/timing.hpp
+++ b/src/utilities/timing.hpp
@@ -55,19 +55,23 @@ std::vector<Timing> TimeRoutine(const size_t from, const size_t to, const size_t
                                 const size_t num_runs, const Queue& queue,
                                 const std::vector<Buffer<T>>& buffers, F const &routine) {
   auto timings = std::vector<Timing>();
+  printf("|  value |         time |\n");
+  printf("x--------x--------------x\n");
   for (auto value = from; value < to; value += step) {
-    printf("[ RUN      ] Running with value %zu\n", value);
+    printf("| %6zu |", value);
     try {
       const auto FunctionToTune = [&]() { routine(value, queue, buffers); };
       const auto time_ms = TimeFunction(num_runs, FunctionToTune);
-      printf("[       OK ] Took %.2lf ms\n", time_ms);
+      printf(" %9.2lf ms |\n", time_ms);
       timings.push_back({value, time_ms});
     }
     catch (...) {
-      printf("[    ERROR ] Exception caught\n");
+      const auto status_code = DispatchExceptionCatchAll(true);
+      printf("  error %-5d |\n", static_cast<int>(status_code));
       timings.push_back({value, -1.0}); // invalid
     }
   }
+  printf("x--------x--------------x\n");
   return timings;
 }
 
-- 
cgit v1.2.3