From 668a79cf77931379c54cb7abf4f1d8306d63f473 Mon Sep 17 00:00:00 2001
From: Ross Thompson <stephen.thompson.37@us.af.mil>
Date: Thu, 27 May 2021 11:48:29 -0500
Subject: [PATCH] Updated benchmarking code.

---
 testsBP/crt0/Makefile          |  4 ++--
 testsBP/crt0/start.s           |  7 +++----
 testsBP/mibench_qsort/Makefile |  2 +-
 testsBP/sieve/Makefile         |  2 +-
 testsBP/sieve/sieve.c          | 20 ++++++++++----------
 testsBP/simple/Makefile        |  2 +-
 testsBP/simple/header.h        |  1 +
 testsBP/simple/main.c          |  1 +
 8 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/testsBP/crt0/Makefile b/testsBP/crt0/Makefile
index ab47384fc..b42e86cb8 100644
--- a/testsBP/crt0/Makefile
+++ b/testsBP/crt0/Makefile
@@ -9,7 +9,7 @@ MABI            :=-mabi=lp64
 LINK_FLAGS      :=$(MARCH) $(MABI) -nostartfiles
 
 AFLAGS =$(MARCH) $(MABI) -march=rv64ic -mabi=lp64 -W
-CFLAGS =$(MARCH) $(MABI) -march=rv64ic -mabi=lp64  -mcmodel=medany 
+CFLAGS =$(MARCH) $(MABI) -march=rv64ic -mabi=lp64  -mcmodel=medany  -O2
 AS=riscv64-unknown-elf-as
 CC=riscv64-unknown-elf-gcc
 AR=riscv64-unknown-elf-ar
@@ -19,7 +19,7 @@ all: libcrt0.a
 %.o: %.s
 	${AS} ${AFLAGS} -c $< -o $@
 
-libcrt0.a: start.o
+libcrt0.a: start.o pcnt_driver.o pre_main.o
 	${AR} -r $@ $^
 
 clean:
diff --git a/testsBP/crt0/start.s b/testsBP/crt0/start.s
index 19a240d87..731a61e34 100644
--- a/testsBP/crt0/start.s
+++ b/testsBP/crt0/start.s
@@ -43,11 +43,10 @@ _start:
 
 
 
-	# set the stack pointer to the top of memory
-	# 0x8000_0000 + 64K - 8 bytes
-	li sp, 0x007FFFF8
+	# set the stack pointer to the top of memory - 8 bytes (pointer size)
+	li sp, 0x07FFFFF8
 
-	jal ra, main
+	jal ra, pre_main
 	jal ra, _halt
 
 .section .text
diff --git a/testsBP/mibench_qsort/Makefile b/testsBP/mibench_qsort/Makefile
index f4d368392..b1cf7b679 100644
--- a/testsBP/mibench_qsort/Makefile
+++ b/testsBP/mibench_qsort/Makefile
@@ -8,7 +8,7 @@ MARCH           :=-march=rv64ic
 MABI            :=-mabi=lp64
 LINK_FLAGS      :=$(MARCH) $(MABI) -nostartfiles -Wl,-Map=$(TARGET).map
 
-CFLAGS =$(MARCH) $(MABI) -Wa,-alhs -Wa,-L -mcmodel=medany  -mstrict-align
+CFLAGS =$(MARCH) $(MABI) -Wa,-alhs -Wa,-L -mcmodel=medany  -mstrict-align -O2
 
 CC=riscv64-unknown-elf-gcc
 DA=riscv64-unknown-elf-objdump -d
diff --git a/testsBP/sieve/Makefile b/testsBP/sieve/Makefile
index 1d38d123d..9c884f48a 100644
--- a/testsBP/sieve/Makefile
+++ b/testsBP/sieve/Makefile
@@ -8,7 +8,7 @@ MARCH           :=-march=rv64ic
 MABI            :=-mabi=lp64
 LINK_FLAGS      :=$(MARCH) $(MABI) -nostartfiles -Wl,-Map=$(TARGET).map
 
-CFLAGS =$(MARCH) $(MABI) -Wa,-alhs -Wa,-L -mcmodel=medany  -mstrict-align
+CFLAGS =$(MARCH) $(MABI) -Wa,-alhs -Wa,-L -mcmodel=medany  -mstrict-align -O2
 
 CC=riscv64-unknown-elf-gcc
 DA=riscv64-unknown-elf-objdump -d
diff --git a/testsBP/sieve/sieve.c b/testsBP/sieve/sieve.c
index e82074045..f7d36d957 100644
--- a/testsBP/sieve/sieve.c
+++ b/testsBP/sieve/sieve.c
@@ -66,21 +66,21 @@ int main () {
     
   ans = sieve ();
   //gettimeofday(&after , NULL);
-  if (ans != 1899)
-    printf ("Sieve result wrong, ans = %d, expected 1899", ans);
+  /* /\* /\\* if (ans != 1899) *\\/ *\/ */
+  /* /\* /\\*   printf ("Sieve result wrong, ans = %d, expected 1899", ans); *\\/ *\/ */
 
-  //printf("Total time elapsed : %.0lf us\n" , time_diff(before , after) );
+  /* /\* //printf("Total time elapsed : %.0lf us\n" , time_diff(before , after) ); *\/ */
 
 
-  printf("Round 2\n");
-  //gettimeofday(&before , NULL);
+  /* /\* printf("Round 2\n"); *\/ */
+  /* //gettimeofday(&before , NULL); */
     
-  ans = sieve ();
-  //gettimeofday(&after , NULL);
-  if (ans != 1899)
-    printf ("Sieve result wrong, ans = %d, expected 1899", ans);
+  /* ans = sieve (); */
+  /* //gettimeofday(&after , NULL); */
+  /* if (ans != 1899) */
+  /*   printf ("Sieve result wrong, ans = %d, expected 1899", ans); */
 
-  //printf("Total time elapsed : %.0lf us\n" , time_diff(before , after) ); 
+  /* //printf("Total time elapsed : %.0lf us\n" , time_diff(before , after) );  */
   
   return 0;
 
diff --git a/testsBP/simple/Makefile b/testsBP/simple/Makefile
index 450aacaa4..4447f2843 100644
--- a/testsBP/simple/Makefile
+++ b/testsBP/simple/Makefile
@@ -8,7 +8,7 @@ MARCH           :=-march=rv64ic
 MABI            :=-mabi=lp64
 LINK_FLAGS      :=$(MARCH) $(MABI) -nostartfiles -Wl,-Map=$(TARGET).map
 
-CFLAGS =$(MARCH) $(MABI) -Wa,-alhs -Wa,-L -mcmodel=medany  -mstrict-align
+CFLAGS =$(MARCH) $(MABI) -Wa,-alhs -Wa,-L -mcmodel=medany  -mstrict-align -O2
 CC=riscv64-unknown-elf-gcc
 DA=riscv64-unknown-elf-objdump -d
 
diff --git a/testsBP/simple/header.h b/testsBP/simple/header.h
index bfe014a4b..6def656f8 100644
--- a/testsBP/simple/header.h
+++ b/testsBP/simple/header.h
@@ -5,4 +5,5 @@ int fail();
 int simple_csrbr_test();
 int lbu_test();
 int icache_spill_test();
+void global_hist_test();
 #endif
diff --git a/testsBP/simple/main.c b/testsBP/simple/main.c
index 0d14fcfb8..036a351d1 100644
--- a/testsBP/simple/main.c
+++ b/testsBP/simple/main.c
@@ -2,6 +2,7 @@
 
 int main(){
   //int res = icache_spill_test();
+  global_hist_test();
   int res = 1;
   if (res < 0) {
     fail();