diff options
author | Andrew Waterman <waterman@eecs.berkeley.edu> | 2014-02-06 01:36:26 -0800 |
---|---|---|
committer | Andrew Waterman <waterman@eecs.berkeley.edu> | 2014-02-06 01:36:26 -0800 |
commit | 71330800b89cb4c6ae8716a7e78bdcf574fe04ab (patch) | |
tree | 5395bdf46cccee8f6c94538b63ab161fa41648db /benchmarks/vvadd | |
parent | 6fdd12c130d0c0c13934364a4dfe12d8dcf28e27 (diff) | |
download | riscv-tests-71330800b89cb4c6ae8716a7e78bdcf574fe04ab.zip riscv-tests-71330800b89cb4c6ae8716a7e78bdcf574fe04ab.tar.gz riscv-tests-71330800b89cb4c6ae8716a7e78bdcf574fe04ab.tar.bz2 |
Clean up benchmarks; support uarch-specific counters
Diffstat (limited to 'benchmarks/vvadd')
-rw-r--r-- | benchmarks/vvadd/bmark.mk | 3 | ||||
-rw-r--r-- | benchmarks/vvadd/vvadd_main.c | 88 |
2 files changed, 4 insertions, 87 deletions
diff --git a/benchmarks/vvadd/bmark.mk b/benchmarks/vvadd/bmark.mk index d03cb96..5ab99de 100644 --- a/benchmarks/vvadd/bmark.mk +++ b/benchmarks/vvadd/bmark.mk @@ -10,6 +10,7 @@ vvadd_c_src = \ vvadd_main.c \ + syscalls.c \ vvadd_riscv_src = \ crt.S \ @@ -23,7 +24,7 @@ $(vvadd_host_bin) : $(vvadd_c_src) vvadd_riscv_bin = vvadd.riscv $(vvadd_riscv_bin) : $(vvadd_c_objs) $(vvadd_riscv_objs) - $(RISCV_LINK) $(vvadd_c_objs) $(vvadd_riscv_objs) -o $(vvadd_riscv_bin) + $(RISCV_LINK) $(vvadd_c_objs) $(vvadd_riscv_objs) -o $(vvadd_riscv_bin) $(RISCV_LINK_OPTS) junk += $(vvadd_c_objs) $(vvadd_riscv_objs) \ $(vvadd_host_bin) $(vvadd_riscv_bin) diff --git a/benchmarks/vvadd/vvadd_main.c b/benchmarks/vvadd/vvadd_main.c index 0be3051..9c47617 100644 --- a/benchmarks/vvadd/vvadd_main.c +++ b/benchmarks/vvadd/vvadd_main.c @@ -11,35 +11,7 @@ // anything except the HOST_DEBUG and PREALLOCATE macros for your timing // runs. -int ncores = 1; #include "util.h" - -//-------------------------------------------------------------------------- -// 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 //-------------------------------------------------------------------------- // Input/Reference Data @@ -47,52 +19,6 @@ int ncores = 1; #include "dataset1.h" //-------------------------------------------------------------------------- -// Helper functions - -int verify( int n, int test[], int correct[] ) -{ - int i; - for ( i = 0; i < n; i++ ) { - if ( test[i] != correct[i] ) { - return 2; - } - } - return 1; -} - -#if HOST_DEBUG -void printArray( char name[], int n, int arr[] ) -{ - int i; - printf( " %10s :", name ); - for ( i = 0; i < n; i++ ) - printf( " %3d ", arr[i] ); - printf( "\n" ); -} -#endif - -//void finishTest( int toHostValue ) -//{ -//#if HOST_DEBUG -// if ( toHostValue == 1 ) -// printf( "*** PASSED ***\n" ); -// else -// printf( "*** FAILED *** (tohost = %d)\n", toHostValue ); -// exit(0); -//#else -// asm( "mtpcr %0, tohost" : : "r" (toHostValue) ); -// while ( 1 ) { } -//#endif -//} - -void setStats( int enable ) -{ -#if ( !HOST_DEBUG && SET_STATS ) - asm( "mtpcr %0, cr10" : : "r" (enable) ); -#endif -} - -//-------------------------------------------------------------------------- // vvadd function void vvadd( int n, int a[], int b[], int c[] ) @@ -110,33 +36,23 @@ int main( int argc, char* argv[] ) int results_data[DATA_SIZE]; // Output the input array - -#if HOST_DEBUG printArray( "input1", DATA_SIZE, input1_data ); printArray( "input2", DATA_SIZE, input2_data ); printArray( "verify", DATA_SIZE, verify_data ); -#endif - - // If needed we preallocate everything in the caches #if PREALLOCATE + // If needed we preallocate everything in the caches vvadd( DATA_SIZE, input1_data, input2_data, results_data ); #endif // Do the vvadd - setStats(1); vvadd( DATA_SIZE, input1_data, input2_data, results_data ); setStats(0); // Print out the results - -#if HOST_DEBUG printArray( "results", DATA_SIZE, results_data ); -#endif // Check the results - - finishTest(verify( DATA_SIZE, results_data, verify_data )); - + return verify( DATA_SIZE, results_data, verify_data ); } |