Clean up benchmarks; support uarch-specific counters

[riscv-tests.git] / benchmarks / vec-matmul / vec_matmul_main.c

diff --git a/benchmarks/vec-matmul/vec_matmul_main.c b/benchmarks/vec-matmul/vec_matmul_main.c
index 5de377ed8620f747efc99ecfa378fe95a7c9e813..6613902a5435a2d9d49713ed128016881f3f7470 100644 (file)
--- a/benchmarks/vec-matmul/vec_matmul_main.c
+++ b/benchmarks/vec-matmul/vec_matmul_main.c
@@ -5,13 +5,9 @@
 // This benchmark multiplies two 2-D arrays together and writes the results to
 // a third vector. The input data (and reference data) should be generated
 // using the matmul_gendata.pl perl script and dumped to a file named
-// dataset.h. The riscv-gcc toolchain does not support system calls so printf's
-// can only be used on a host system, not on the riscv-v processor simulator
-// itself. 
-//
-// HOWEVER: printstr() and printhex() are provided, for a primitive form of
-// printing strings and hexadecimal values to stdout.
+// dataset.h.
 
+#include "util.h"
 
 // Choose which implementation you wish to test... but leave only one on!
 // (only the first one will be executed).
@@ -19,45 +15,6 @@
 //#define SCALAR_ASM
 #define VT_ASM
 
-//--------------------------------------------------------------------------
-// Macros
-
-// Set HOST_DEBUG to 1 if you are going to compile this for a host
-// machine (ie Athena/Linux) for debug purposes and set HOST_DEBUG
-// to 0 if you are compiling with the smips-gcc toolchain.
-
-#ifndef HOST_DEBUG
-#define HOST_DEBUG 0
-#endif
-
-// Set PREALLOCATE to 1 if you want to preallocate the benchmark
-// function before starting stats. If you have instruction/data
-// caches and you don't want to count the overhead of misses, then
-// you will need to use preallocation.
-
-#ifndef PREALLOCATE
-#define PREALLOCATE 0
-#endif
-
-// Set SET_STATS to 1 if you want to carve out the piece that actually
-// does the computation.
-
-#ifndef SET_STATS
-#define SET_STATS 0
-#endif
-
-//--------------------------------------------------------------------------
-// Host Platform Includes
-
-#if HOST_DEBUG
-   #include <stdio.h>
-   #include <stdlib.h>
-#else
-void printstr(const char*);
-void exit();
-#endif
-
-
 //--------------------------------------------------------------------------
 // Input/Reference Data
 
@@ -86,18 +43,6 @@ int verify( int n, float test[], float correct[] )
   return 1;
 }
 
-#if HOST_DEBUG
-void printArray( char name[], int n, float arr[] )
-{
-  int i;
-  printf( " %10s :", name );
-  for ( i = 0; i < n; i++ )
-    printf( " %03.2f ", arr[i] );
-  printf( "\n" );
-}
-#endif
- 
-
 void finishTest( int correct, long long num_cycles, long long num_retired )
 {
    int toHostValue = correct;