compile with verilator -WallHEADmaster

+ I also found out that iverilog does not agree with Verilator that the
  testbenches work (the ones that iverilog can compile, anyway). That's
  rather annoying, I'm not quite sure what the root cause is. Timing
  difference in when registers are evaluated versus clock edges or
  something along those lines?

5 files changed, 32 insertions, 14 deletions

diff --git a/tb/Makefile b/tb/Makefile
index 9f51302..90dbab6 100644
--- a/tb/Makefile
+++ b/tb/Makefile
@@ -2,7 +2,9 @@ all: rv2insn sched arb ttarv32 router
 
 .PHONY: sched
 sched: sched_tb.sv ../src/sched.sv ../src/common.svh
-	verilator --Mdir sched_objdir --assert --trace --binary -I../src sched_tb.sv
+	verilator -Wall --Mdir sched_objdir \
+		--assert --trace-fst --trace-structs \
+		--binary -I../src sched_tb.sv
 	./sched_objdir/Vsched_tb
 
 .PHONY: rv2insn
@@ -10,17 +12,23 @@ rv2insn: rv2insn_tb.sv ../src/rv2insn.sv ../src/common.svh
 	riscv32-unknown-elf-gcc -ffreestanding -nostdlib -march=rv32i -mabi=ilp32 \
 		-Wl,-Ttext=0 data/rv2insn.S -o rv2insn
 	riscv32-unknown-elf-objcopy -O verilog rv2insn rv2insn.hex
-	verilator --Mdir rv2insn_objdir --assert --trace --binary -I../src rv2insn_tb.sv
+	verilator -Wall --Mdir rv2insn_objdir \
+		--assert --trace-fst --trace-structs \
+		--binary -I../src rv2insn_tb.sv
 	./rv2insn_objdir/Vrv2insn_tb
 
 .PHONY: arb
 arb: arb_tb.sv ../src/arb.sv
-	verilator --Mdir arb_objdir --assert --trace --binary -I../src arb_tb.sv
+	verilator -Wall --Mdir arb_objdir \
+		--assert --trace-fst --trace-structs \
+		--binary -I../src arb_tb.sv
 	./arb_objdir/Varb_tb
 
 .PHONY: router
 router: router_tb.sv ../src/router.sv
-	verilator --Mdir router_objdir --assert --trace --binary -I../src router_tb.sv
+	verilator -Wall --Mdir router_objdir \
+		--assert --trace-fst --trace-structs \
+		--binary -I../src router_tb.sv
 	./router_objdir/Vrouter_tb
 
 .PHONY: ttarv32
@@ -28,5 +36,11 @@ ttarv32: ttarv32_tb.sv ../src/ttarv32.sv ../src/rv2insn.sv ../src/sched.sv ../sr
 	riscv32-unknown-elf-gcc -ffreestanding -nostdlib -march=rv32i -mabi=ilp32 \
 		-Wl,-Ttext=0 data/rv2insn.S -o ttarv32
 	riscv32-unknown-elf-objcopy -O verilog rv2insn ttarv32.hex
-	verilator --Mdir ttarv32_objdir --assert --trace --binary -I../src ttarv32_tb.sv
+	verilator -Wall --Mdir ttarv32_objdir \
+		--assert --trace-fst --trace-structs \
+		--binary -I../src ttarv32_tb.sv
 	./ttarv32_objdir/Vttarv32_tb
+
+.PHONY: clean
+clean:
+	rm -rf *_objdir *.hex *.fst rv2insn ttarv32
diff --git a/tb/router_tb.sv b/tb/router_tb.sv
index ba83568..10bcfdd 100644
--- a/tb/router_tb.sv
+++ b/tb/router_tb.sv
@@ -79,9 +79,11 @@ assign ready_i[0][0] = ready_o[1][1];
 
 
 initial begin :test
-	logic found = 0;
+	logic found;
 
-	$dumpfile("router_tb.vcd");
+	found = 0;
+
+	$dumpfile("router_tb.fst");
 	$dumpvars();
 
 	for (int i = 0; i < M; ++i)
diff --git a/tb/rv2insn_tb.sv b/tb/rv2insn_tb.sv
index 14a0249..243a215 100644
--- a/tb/rv2insn_tb.sv
+++ b/tb/rv2insn_tb.sv
@@ -7,7 +7,9 @@ logic rst_n;
 
 xlen_t pc;
 logic[7:0] rv[4*4];
-insn_t[3:0] que;
+insn_t[3:0] unused_que;
+
+assign pc = '0;
 
 function automatic rv_t[3:0] unp2p(logic[7:0] in[4*4]);
 	logic [15:0][7:0] conversion;
@@ -25,11 +27,11 @@ rv2insn #(
 	.rst_ni(rst_n),
 	.pc_i(pc),
 	.rv_i(unp2p(rv)),
-	.que_o(que)
+	.que_o(unused_que)
 );
 
 initial begin
-	$dumpfile("rv2insn_tb.vcd");
+	$dumpfile("rv2insn_tb.fst");
 	$dumpvars();
 	$readmemh("rv2insn.hex", rv);
 
diff --git a/tb/sched_tb.sv b/tb/sched_tb.sv
index 13c032e..fb79bd3 100644
--- a/tb/sched_tb.sv
+++ b/tb/sched_tb.sv
@@ -41,7 +41,7 @@ slot_t[1:0] second_check = {
 	};
 
 initial begin
-	$dumpfile("sched_tb.vcd");
+	$dumpfile("sched_tb.fst");
 	$dumpvars();
 
 	clk = 0;
diff --git a/tb/ttarv32_tb.sv b/tb/ttarv32_tb.sv
index 5b30f25..9ff089d 100644
--- a/tb/ttarv32_tb.sv
+++ b/tb/ttarv32_tb.sv
@@ -10,7 +10,7 @@ function automatic rv_t[3:0] unp2p(logic[7:0] in[4*4]);
 	return conversion;
 endfunction
 
-xlen_t pc;
+xlen_t unused_pc;
 logic[7:0] rv[4*4];
 
 logic clk;
@@ -23,11 +23,11 @@ ttarv32 #(
 	.clk_i(clk),
 	.rst_ni(rst_n),
 	.rv_i(unp2p(rv)),
-	.pc_o(pc)
+	.pc_o(unused_pc)
 );
 
 initial begin
-	$dumpfile("ttarv32_tb.vcd");
+	$dumpfile("ttarv32_tb.fst");
 	$dumpvars();
 	$readmemh("ttarv32.hex", rv);