ibuffer addition

driver/common/vx_utils.cpp

@@ -89,4 +89,26 @@ extern int vx_upload_kernel_file(vx_device_h device, const char* filename) {
   delete[] content;
 
   return err;
+}
+
+extern int vx_get_perf(vx_device_h device, uint64_t* cycles, uint64_t* instrs) {
+  int ret = 0;
+
+  unsigned value;
+
+  if (cycles) {
+    ret |= vx_csr_get(device, 0, CSR_CYCLE_H, &value);
+    *cycles = value;
+    ret |= vx_csr_get(device, 0, CSR_CYCLE, &value);
+    *cycles = (*cycles << 32) | value;
+  }
+  
+  if (instrs) {
+    ret |= vx_csr_get(device, 0, CSR_INSTRET_H, &value);
+    *instrs = value;
+    ret |= vx_csr_get(device, 0, CSR_INSTRET, &value);
+    *instrs = (*instrs << 32) | value;
+  }
+
+  return ret;
 }

driver/include/vortex.h

@@ -71,6 +71,9 @@ int vx_upload_kernel_bytes(vx_device_h device, const void* content, size_t size)
 // upload kernel file to device
 int vx_upload_kernel_file(vx_device_h device, const char* filename);
 
+// get performance counters
+int vx_get_perf(vx_device_h device, uint64_t* cycles, uint64_t* instrs);
+
 #ifdef __cplusplus
 }
 #endif

driver/opae/vortex.cpp

@@ -212,25 +212,11 @@ extern int vx_dev_close(vx_device_h hdevice) {
 #endif
 
     {   
-        // Dump performance stats
+        // Dump perf stats
         uint64_t instrs, cycles;
-        unsigned value;
-
-        int ret = 0;
-        ret |= vx_csr_get(hdevice, 0, CSR_INSTRET_H, &value);
-        instrs = value;
-        ret |= vx_csr_get(hdevice, 0, CSR_INSTRET, &value);
-        instrs = (instrs << 32) | value;
-      
-        ret |= vx_csr_get(hdevice, 0, CSR_CYCLE_H, &value);
-        cycles = value;
-        ret |= vx_csr_get(hdevice, 0, CSR_CYCLE, &value);
-        cycles = (cycles << 32) | value;
-
+        int ret = vx_get_perf(hdevice, &instrs, &cycles);
         float IPC = (float)(double(instrs) / double(cycles));
-
         fprintf(stdout, "PERF: instrs=%ld, cycles=%ld, IPC=%f\n", instrs, cycles, IPC);
-
         assert(ret == 0);
     }
 

driver/rtlsim/vortex.cpp

@@ -68,7 +68,8 @@ public:
         simulator_.attach_ram(&ram_);
     } 
 
-    ~vx_device() {     
+    ~vx_device() {
+        simulator_.print_stats(std::cout);     
         if (future_.valid()) {
             future_.wait();
         }

driver/tests/basic/basic.cpp

@@ -155,7 +155,7 @@ int run_kernel_test(const kernel_arg_t& kernel_arg,
     int32_t curr = ((int32_t*)vx_host_ptr(buffer))[i];
     int32_t ref = i;
     if (curr != ref) {
-      std::cout << "error at value " << i
+      std::cout << "error at result #" << i
                 << ": actual 0x" << curr << ", expected 0x" << ref << std::endl;
       ++errors;
     }
@@ -238,7 +238,7 @@ int main(int argc, char *argv[]) {
   std::cout << "cleanup" << std::endl;  
   cleanup();
 
-  std::cout << "Test PASSED" << std::endl;
-
+  std::cout << "Test PASSED" << std::endl;  
+  
   return 0;
 }

driver/tests/demo/demo.cpp

@@ -86,7 +86,7 @@ int run_test(const kernel_arg_t& kernel_arg,
       int ref = i + i; 
       int cur = buf_ptr[i];
       if (cur != ref) {
-        std::cout << "error at value " << i
+        std::cout << "error at result #" << i
                   << ": actual 0x" << cur << ", expected 0x" << ref << std::endl;
         ++errors;
       }

driver/tests/dogfood/testcases.h

@@ -57,7 +57,7 @@ public:
     for (int i = 0; i < n; ++i) {
       auto ref = a[i] + b[i]; 
       if (c[i] != ref) {
-        std::cout << "error at value " << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
+        std::cout << "error at result #" << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
         ++errors;
       }
     }
@@ -85,7 +85,7 @@ public:
     for (int i = 0; i < n; ++i) {
       auto ref = a[i] * b[i]; 
       if (c[i] != ref) {
-        std::cout << "error at value " << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
+        std::cout << "error at result #" << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
         ++errors;
       }
     }
@@ -113,7 +113,7 @@ public:
     for (int i = 0; i < n; ++i) {
       auto ref = a[i] / b[i]; 
       if (c[i] != ref) {
-        std::cout << "error at value " << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
+        std::cout << "error at result #" << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
         ++errors;
       }
     }
@@ -143,7 +143,7 @@ public:
       auto y = a[i] * b[i]; 
       auto ref = x + y; 
       if (c[i] != ref) {
-        std::cout << "error at value " << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
+        std::cout << "error at result #" << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
         ++errors;
       }
     }
@@ -171,7 +171,7 @@ public:
     for (int i = 0; i < n; ++i) {
       auto ref = a[i] + b[i]; 
       if (!almost_equal(c[i], ref)) {
-        std::cout << "error at value " << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
+        std::cout << "error at result #" << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
         ++errors;
       }
     }
@@ -199,7 +199,7 @@ public:
     for (int i = 0; i < n; ++i) {
       auto ref = a[i] - b[i]; 
       if (!almost_equal(c[i], ref)) {
-        std::cout << "error at value " << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
+        std::cout << "error at result #" << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
         ++errors;
       }
     }
@@ -227,7 +227,7 @@ public:
     for (int i = 0; i < n; ++i) {
       auto ref = a[i] * b[i]; 
       if (!almost_equal(c[i], ref)) {
-        std::cout << "error at value " << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
+        std::cout << "error at result #" << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
         ++errors;
       }
     }
@@ -255,7 +255,7 @@ public:
     for (int i = 0; i < n; ++i) {
       auto ref = a[i] * b[i] + 0.5f;
       if (!almost_equal(c[i], ref)) {
-        std::cout << "error at value " << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
+        std::cout << "error at result #" << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
         ++errors;
       }
     }
@@ -283,7 +283,7 @@ public:
     for (int i = 0; i < n; ++i) {
       auto ref = a[i] * b[i] - 0.5f;
       if (!almost_equal(c[i], ref)) {
-        std::cout << "error at value " << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
+        std::cout << "error at result #" << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
         ++errors;
       }
     }
@@ -311,7 +311,7 @@ public:
     for (int i = 0; i < n; ++i) {
       auto ref = -a[i] * b[i] - 0.5f;
       if (!almost_equal(c[i], ref)) {
-        std::cout << "error at value " << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
+        std::cout << "error at result #" << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
         ++errors;
       }
     }
@@ -339,7 +339,7 @@ public:
     for (int i = 0; i < n; ++i) {
       auto ref = -a[i] * b[i] + 0.5f;
       if (!almost_equal(c[i], ref)) {
-        std::cout << "error at value " << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
+        std::cout << "error at result #" << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
         ++errors;
       }
     }
@@ -369,7 +369,7 @@ public:
       auto y =  a[i] * b[i] + 0.5f;
       auto ref = x + y;
       if (!almost_equal(c[i], ref)) {
-        std::cout << "error at value " << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
+        std::cout << "error at result #" << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
         ++errors;
       }
     }
@@ -397,7 +397,7 @@ public:
     for (int i = 0; i < n; ++i) {
       auto ref = a[i] / b[i];
       if (!almost_equal(c[i], ref)) {
-        std::cout << "error at value " << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
+        std::cout << "error at result #" << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
         ++errors;
       }
     }
@@ -427,7 +427,7 @@ public:
       auto y = b[i] / a[i];
       auto ref = x + y;
       if (!almost_equal(c[i], ref)) {
-        std::cout << "error at value " << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
+        std::cout << "error at result #" << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
         ++errors;
       }
     }
@@ -456,7 +456,7 @@ public:
     for (int i = 0; i < n; ++i) {
       auto ref = sqrt(a[i] * b[i]);
       if (!almost_equal(c[i], ref)) {
-        std::cout << "error at value " << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
+        std::cout << "error at result #" << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
         ++errors;
       }
     }
@@ -485,7 +485,7 @@ public:
       auto x = a[i] + b[i];
       auto ref = (int32_t)x;
       if (c[i] != ref) {
-        std::cout << "error at value " << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
+        std::cout << "error at result #" << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
         ++errors;
       }
     }
@@ -514,7 +514,7 @@ public:
       auto x = a[i] + b[i];
       auto ref = (uint32_t)x;
       if (c[i] != ref) {
-        std::cout << "error at value " << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
+        std::cout << "error at result #" << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
         ++errors;
       }
     }
@@ -543,7 +543,7 @@ public:
       auto x = a[i] + b[i];
       auto ref = (float)x;
       if (!almost_equal(c[i], ref)) {
-        std::cout << "error at value " << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
+        std::cout << "error at result #" << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
         ++errors;
       }
     }
@@ -572,7 +572,7 @@ public:
       auto x = a[i] + b[i];
       auto ref = (float)x;
       if (!almost_equal(c[i], ref)) {
-        std::cout << "error at value " << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
+        std::cout << "error at result #" << i << ": expected " << ref << ", actual " << c[i] << ", a=" << a[i] << ", b=" << b[i] << std::endl;
         ++errors;
       }
     }