From 0dc2c7d16a28174d62841c2e3089f463a2e62a6d Mon Sep 17 00:00:00 2001
From: David Harris <David_Harris@hmc.edu>
Date: Tue, 23 Apr 2024 10:19:08 -0700
Subject: [PATCH] Fixed deriv path in Verilator makefile

---
 sim/verilator/Makefile | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/sim/verilator/Makefile b/sim/verilator/Makefile
index 505818f30..7acce82b8 100644
--- a/sim/verilator/Makefile
+++ b/sim/verilator/Makefile
@@ -10,7 +10,7 @@ OPT=
 PARAMS?=-DVERILATOR=1 --no-trace-top
 NONPROF?=--stats
 VERILATOR_DIR=${WALLY}/sim/verilator
-SOURCE=${WALLY}/config/shared/*.vh ${WALLY}/config/${WALLYCONF} ${WALLY}/src/cvw.sv ${WALLY}/testbench/*.sv ${WALLY}/testbench/common/*.sv ${WALLY}/src/*/*.sv ${WALLY}/src/*/*/*.sv
+SOURCE=${WALLY}/config/shared/*.vh ${WALLY}/config/${WALLYCONF} ${WALLY}/config/deriv/${WALLYCONF} ${WALLY}/src/cvw.sv ${WALLY}/testbench/*.sv ${WALLY}/testbench/common/*.sv ${WALLY}/src/*/*.sv ${WALLY}/src/*/*/*.sv
 EXTRA_ARGS=
 
 
@@ -41,23 +41,19 @@ profile: obj_dir_profiling/Vtestbench_$(WALLYCONF)
 
 run: wkdir/$(WALLYCONF)_$(TEST)/Vtestbench
 	mkdir -p $(VERILATOR_DIR)/logs
-#	wkdir/$(WALLYCONF)_$(TEST)/Vtestbench +TEST=$(TEST) 2>&1 > $(VERILATOR_DIR)/logs/$(WALLYCONF)_$(TEST).log
 	wkdir/$(WALLYCONF)_$(TEST)/Vtestbench +TEST=$(TEST)
-#	echo "Please check $(VERILATOR_DIR)/logs/$(WALLYCONF)_$(TEST).log for logs and output files."
 	
-
-wkdir/$(WALLYCONF)_$(TEST)/Vtestbench: $(SOURCE)
+wkdir/$(WALLYCONF)_$(TEST)/Vtestbench: $(DEPENDENCIES)
 	verilator \
 	--Mdir wkdir/$(WALLYCONF)_$(TEST) -o Vtestbench \
 	--binary --trace \
 	$(OPT) $(PARAMS) $(NONPROF) \
 	$(EXTRA_ARGS) \
 	--timescale "1ns/1ns" --timing --top-module testbench  --relative-includes \
-	"-I${WALLY}/config/shared" "-I${WALLY}/config/$(WALLYCONF)" \
+	$(INCLUDE_PATH) \
 	${WALLY}/sim/verilator/wrapper.c \
-	${WALLY}/src/cvw.sv ${WALLY}/testbench/testbench.sv ${WALLY}/testbench/common/*.sv ${WALLY}/src/*/*.sv ${WALLY}/src/*/*/*.sv
+	$(SOURCES)
 
-	
 obj_dir_profiling/Vtestbench_$(WALLYCONF): $(DEPENDENCIES)
 	mkdir -p obj_dir_profiling
 	verilator \
@@ -67,7 +63,7 @@ obj_dir_profiling/Vtestbench_$(WALLYCONF): $(DEPENDENCIES)
 	$(EXTRA_ARGS) \
 	--timescale "1ns/1ns" --timing --top-module testbench  --relative-includes \
 	$(INCLUDE_PATH) \
-	wrapper.c \
+	${WALLY}/sim/verilator/wrapper.c \
 	$(SOURCES)
 
 questa: