Clean up benchmarks; support uarch-specific counters

[riscv-tests.git] / benchmarks / dhrystone / dhrystone_main.c

diff --git a/benchmarks/dhrystone/dhrystone_main.c b/benchmarks/dhrystone/dhrystone_main.c
index 93b79da92b09f25d7ac4f925bac24210868c813f..a7557433c48323b243a5d4d0c27292559ce764ea 100644 (file)
--- a/benchmarks/dhrystone/dhrystone_main.c
+++ b/benchmarks/dhrystone/dhrystone_main.c
@@ -8,9 +8,6 @@
 
 #include "dhrystone.h"
 
-int ncores = 1;
-#include "util.h"
-
 //--------------------------------------------------------------------------
 // Macros
 
@@ -47,12 +44,7 @@ int __attribute__((noinline)) do_fprintf(FILE* f, const char* str, ...)
 }
 #endif
 
-void setStats( int enable )
-{
-#if ( !HOST_DEBUG && SET_STATS )
-  asm( "mtpcr %0, cr10" : : "r" (enable) );
-#endif
-}
+#include "util.h"
 
 #include <alloca.h>
 
@@ -299,7 +291,7 @@ int main (int argc, char** argv)
     do_fprintf (stdout, "\n");
 #endif
 
-  finishTest(1);
+  return 0;
 }