From a412d3ea69618960d6cfd900b5b4e99a9161992f Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Wed, 13 Sep 2017 18:45:57 +0200
Subject: [PATCH] Add "make test_rvf"

---
 .gitignore  |  1 +
 Makefile    | 33 ++++++++++++++++++++-------------
 testbench.v | 48 +++++++++++++++++++++++++++---------------------
 3 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7baf112..71fa228 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@
 /testbench_wb.vvp
 /testbench_ez.vvp
 /testbench_sp.vvp
+/testbench_rvf.vvp
 /testbench_synth.vvp
 /testbench.gtkw
 /testbench.vcd
diff --git a/Makefile b/Makefile
index af4b7ab..a8e56a5 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,9 @@ test: testbench.vvp firmware/firmware.hex
 test_vcd: testbench.vvp firmware/firmware.hex
 	vvp -N $< +vcd +trace +noerror
 
+test_rvf: testbench_rvf.vvp firmware/firmware.hex
+	vvp -N $< +vcd +trace +noerror
+
 test_wb: testbench_wb.vvp firmware/firmware.hex
 	vvp -N $<
 
@@ -31,18 +34,6 @@ test_ez: testbench_ez.vvp
 test_ez_vcd: testbench_ez.vvp
 	vvp -N $< +vcd
 
-check: check-yices
-
-check-%: check.smt2
-	yosys-smtbmc -s $(subst check-,,$@) -t 30 --dump-vcd check.vcd check.smt2
-	yosys-smtbmc -s $(subst check-,,$@) -t 25 --dump-vcd check.vcd -i check.smt2
-
-check.smt2: picorv32.v
-	yosys -v2 -p 'read_verilog -formal picorv32.v' \
-	          -p 'prep -top picorv32 -nordff' \
-		  -p 'assertpmux -noinit; opt -fast' \
-		  -p 'write_smt2 -wires check.smt2'
-
 test_sp: testbench_sp.vvp firmware/firmware.hex
 	vvp -N $<
 
@@ -56,6 +47,10 @@ testbench.vvp: testbench.v picorv32.v
 	iverilog -o $@ $(subst C,-DCOMPRESSED_ISA,$(COMPRESSED_ISA)) $^
 	chmod -x $@
 
+testbench_rvf.vvp: testbench.v picorv32.v rvfimon.v
+	iverilog -o $@ -D RISCV_FORMAL $(subst C,-DCOMPRESSED_ISA,$(COMPRESSED_ISA)) $^
+	chmod -x $@
+
 testbench_wb.vvp: testbench_wb.v picorv32.v
 	iverilog -o $@ $(subst C,-DCOMPRESSED_ISA,$(COMPRESSED_ISA)) $^
 	chmod -x $@
@@ -72,6 +67,18 @@ testbench_synth.vvp: testbench.v synth.v
 	iverilog -o $@ -DSYNTH_TEST $^
 	chmod -x $@
 
+check: check-yices
+
+check-%: check.smt2
+	yosys-smtbmc -s $(subst check-,,$@) -t 30 --dump-vcd check.vcd check.smt2
+	yosys-smtbmc -s $(subst check-,,$@) -t 25 --dump-vcd check.vcd -i check.smt2
+
+check.smt2: picorv32.v
+	yosys -v2 -p 'read_verilog -formal picorv32.v' \
+	          -p 'prep -top picorv32 -nordff' \
+		  -p 'assertpmux -noinit; opt -fast' \
+		  -p 'write_smt2 -wires check.smt2'
+
 synth.v: picorv32.v scripts/yosys/synth_sim.ys
 	yosys -qv3 -l synth.log scripts/yosys/synth_sim.ys
 
@@ -155,6 +162,6 @@ clean:
 	rm -vrf $(FIRMWARE_OBJS) $(TEST_OBJS) check.smt2 check.vcd synth.v synth.log \
 		firmware/firmware.elf firmware/firmware.bin firmware/firmware.hex firmware/firmware.map \
 		testbench.vvp testbench_sp.vvp testbench_synth.vvp testbench_ez.vvp \
-		testbench_wb.vvp testbench.vcd testbench.trace
+		testbench_rvf.vvp testbench_wb.vvp testbench.vcd testbench.trace
 
 .PHONY: test test_vcd test_sp test_axi test_wb test_wb_vcd test_ez test_ez_vcd test_synth download-tools build-tools toc clean
diff --git a/testbench.v b/testbench.v
index 1eb2e01..664bf02 100644
--- a/testbench.v
+++ b/testbench.v
@@ -137,9 +137,11 @@ module picorv32_wrapper #(
 
 `ifdef RISCV_FORMAL
 	wire        rvfi_valid;
-	wire [7:0]  rvfi_order;
+	wire [63:0] rvfi_order;
 	wire [31:0] rvfi_insn;
 	wire        rvfi_trap;
+	wire        rvfi_halt;
+	wire        rvfi_intr;
 	wire [4:0]  rvfi_rs1_addr;
 	wire [4:0]  rvfi_rs2_addr;
 	wire [31:0] rvfi_rs1_rdata;
@@ -195,6 +197,8 @@ module picorv32_wrapper #(
 		.rvfi_order     (rvfi_order     ),
 		.rvfi_insn      (rvfi_insn      ),
 		.rvfi_trap      (rvfi_trap      ),
+		.rvfi_halt      (rvfi_halt      ),
+		.rvfi_intr      (rvfi_intr      ),
 		.rvfi_rs1_addr  (rvfi_rs1_addr  ),
 		.rvfi_rs2_addr  (rvfi_rs2_addr  ),
 		.rvfi_rs1_rdata (rvfi_rs1_rdata ),
@@ -214,26 +218,28 @@ module picorv32_wrapper #(
 	);
 
 `ifdef RISCV_FORMAL
-	riscv_formal_monitor_rv32ic rvfi_monitor (
-		.clock         (clk           ),
-		.reset         (!resetn       ),
-		.rvfi_valid    (rvfi_valid    ),
-		.rvfi_order    (rvfi_order    ),
-		.rvfi_insn     (rvfi_insn     ),
-		.rvfi_trap     (rvfi_trap     ),
-		.rvfi_rs1_addr (rvfi_rs1_addr ),
-		.rvfi_rs2_addr (rvfi_rs2_addr ),
-		.rvfi_rs1_rdata(rvfi_rs1_rdata),
-		.rvfi_rs2_rdata(rvfi_rs2_rdata),
-		.rvfi_rd_addr  (rvfi_rd_addr  ),
-		.rvfi_rd_wdata (rvfi_rd_wdata ),
-		.rvfi_pc_rdata (rvfi_pc_rdata ),
-		.rvfi_pc_wdata (rvfi_pc_wdata ),
-		.rvfi_mem_addr (rvfi_mem_addr ),
-		.rvfi_mem_rmask(rvfi_mem_rmask),
-		.rvfi_mem_wmask(rvfi_mem_wmask),
-		.rvfi_mem_rdata(rvfi_mem_rdata),
-		.rvfi_mem_wdata(rvfi_mem_wdata)
+	picorv32_rvfimon rvfi_monitor (
+		.clock          (clk           ),
+		.reset          (!resetn       ),
+		.rvfi_valid     (rvfi_valid    ),
+		.rvfi_order     (rvfi_order    ),
+		.rvfi_insn      (rvfi_insn     ),
+		.rvfi_trap      (rvfi_trap     ),
+		.rvfi_halt      (rvfi_halt     ),
+		.rvfi_intr      (rvfi_intr     ),
+		.rvfi_rs1_addr  (rvfi_rs1_addr ),
+		.rvfi_rs2_addr  (rvfi_rs2_addr ),
+		.rvfi_rs1_rdata (rvfi_rs1_rdata),
+		.rvfi_rs2_rdata (rvfi_rs2_rdata),
+		.rvfi_rd_addr   (rvfi_rd_addr  ),
+		.rvfi_rd_wdata  (rvfi_rd_wdata ),
+		.rvfi_pc_rdata  (rvfi_pc_rdata ),
+		.rvfi_pc_wdata  (rvfi_pc_wdata ),
+		.rvfi_mem_addr  (rvfi_mem_addr ),
+		.rvfi_mem_rmask (rvfi_mem_rmask),
+		.rvfi_mem_wmask (rvfi_mem_wmask),
+		.rvfi_mem_rdata (rvfi_mem_rdata),
+		.rvfi_mem_wdata (rvfi_mem_wdata)
 	);
 `endif