From 39d318fb2a934f9e103c0c95e6bd99051803f1fd Mon Sep 17 00:00:00 2001
From: David Harris <david_harris@hmc.edu>
Date: Fri, 21 Jan 2022 00:12:14 +0000
Subject: [PATCH] Fixed path to riscvOVPsimPlus

---
 Makefile                                    |  4 ++-
 examples/asm/sumtest/fir.c                  | 38 ---------------------
 examples/verilog/riscvsingle/riscvsingle.sv |  4 +--
 pipelined/regression/Makefile               |  4 +--
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 100644 examples/asm/sumtest/fir.c

diff --git a/Makefile b/Makefile
index 108fa3ff..0544fb8d 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,9 @@ install:
 	cp ${RISCV}/riscv-isa-sim/arch_test_target/spike/Makefile.include addins/riscv-arch-test/
 	sed -i '/export TARGETDIR ?=/c\export TARGETDIR ?= ${RISCV}/riscv-isa-sim/arch_test_target' addins/riscv-arch-test/Makefile.include
 	echo export RISCV_PREFIX = riscv64-unknown-elf- >> addins/riscv-arch-test/Makefile.include
-	# tests/linux-testgen/linux-testvectors/tvLinker.sh # needs to be run in local directory
+	cd tests/linux-testgen/linux-testvectors; source ./tvLinker.sh # needs to be run in local directory
+	rm tests/imperas-riscv-tests/riscv-ovpsim-plus/bin/Linux64/riscvOVPsimPlus.exe
+	ln -s ${RISCV}/imperas-riscv-tests/riscv-ovpsim-plus/bin/Linux64/riscvOVPsimPlus.exe tests/imperas-riscv-tests/riscv-ovpsim-plus/bin/Linux64/riscvOVPsimPlus.exe
 
 regression:
 	make -C pipelined/regression
diff --git a/examples/asm/sumtest/fir.c b/examples/asm/sumtest/fir.c
deleted file mode 100644
index cb3bb592..00000000
--- a/examples/asm/sumtest/fir.c
+++ /dev/null
@@ -1,38 +0,0 @@
-// fir.C
-// David_Harris@hmc.edu 25 December 2021
-// Finite Impulse Response Filter
-
-#include <math.h>
-
-#define N 2000
-#define M 100
-#define PI 3.14159
-
-double fir(double a[], double c[], double y[], int N, int M) {
-    int i, j
-    for (i=0; i<N-M; i++) {
-        y[i] = 0;
-        for (j=0; j<M; j++) {
-            y[i] += c[j] * a[M+i-j];
-        }
-    }
-}
-
-int main(void) {
-    double a[N], c[M], y[N-M];
-
-    int i;
-
-    // // step input with overlying high frequency sinusoid
-    for (i=0; i<N; i++) a[i] = (i < N/2) + 0.5 * cos(2*PI*i/50); 
-
-    // filter coeffieints: replace with a sinc function with sharper response
-    //for (i=0; i<M; i++) c[i] = 1.0/M; // low pass filter with equal coefficients
-    for (i=0; i<M; i++) c[i] = 2.0*B*(sin(2.0*B*i/10)/(2.0*B*i/10)); // low pass filter with equal coefficients
-
-    // inline assembly to measure time, with macro
-    fir(a, c, y, N, M);
-    // measure time again
-    // *** generate signature
-    // *** write_tohost
-}
\ No newline at end of file
diff --git a/examples/verilog/riscvsingle/riscvsingle.sv b/examples/verilog/riscvsingle/riscvsingle.sv
index 85735b92..b3adb8dd 100644
--- a/examples/verilog/riscvsingle/riscvsingle.sv
+++ b/examples/verilog/riscvsingle/riscvsingle.sv
@@ -117,7 +117,7 @@ module testbench();
   logic        MemWrite;
 
   // instantiate device to be tested
-  riscvsinglehart dut(clk, reset, WriteData, IEUAdr, MemWrite);
+  riscvsinglecore dut(clk, reset, WriteData, IEUAdr, MemWrite);
   
   // initialize test
   initial begin
@@ -143,7 +143,7 @@ module testbench();
   end
 endmodule
 
-module riscvsinglehart(
+module riscvsinglecore(
   input  logic        clk, reset, 
   output logic [31:0] WriteData, IEUAdr, 
   output logic        MemWrite);
diff --git a/pipelined/regression/Makefile b/pipelined/regression/Makefile
index d9298e7b..8bcb403c 100644
--- a/pipelined/regression/Makefile
+++ b/pipelined/regression/Makefile
@@ -11,8 +11,8 @@ make all:
 	# *** Build old tests/imperas-riscv-tests for now;
 	# Delete this part when the privileged tests transition over to tests/wally-riscv-arch-test
 	# Also delete bin/exe2memfile at that point
-#	make -C ../../tests/imperas-riscv-tests
-#	make -C ../../tests/imperas-riscv-tests XLEN=64
+	make -C ../../tests/imperas-riscv-tests
+	make -C ../../tests/imperas-riscv-tests XLEN=64
 	cd ../../tests/imperas-riscv-tests; exe2memfile.pl work/*/*.elf