From 6f6b1fd1fd21dc74f80acac8fadd8705de8647d1 Mon Sep 17 00:00:00 2001
From: Kunlin Han <hi@iwktd.com>
Date: Tue, 16 Apr 2024 18:45:21 -0700
Subject: [PATCH] Add extra path to search for deriv/buildroot.

---
 sim/verilator/Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sim/verilator/Makefile b/sim/verilator/Makefile
index 4042326a8..f4a9ff8a8 100644
--- a/sim/verilator/Makefile
+++ b/sim/verilator/Makefile
@@ -5,7 +5,7 @@ PARAMS?=-DVERILATOR=1 --no-trace-top
 NONPROF?=--stats
 WORKING_DIR=${WALLY}/sim/verilator
 TARGET=$(WORKING_DIR)/target
-SOURCE=${WALLY}/config/shared/*.vh ${WALLY}/config/${WALLYCONF} ${WALLY}/src/cvw.sv ${WALLY}/testbench/testbench.sv ${WALLY}/testbench/common/*.sv ${WALLY}/src/*/*.sv ${WALLY}/src/*/*/*.sv
+SOURCE=${WALLY}/config/shared/*.vh ${WALLY}/src/cvw.sv ${WALLY}/testbench/testbench.sv ${WALLY}/testbench/common/*.sv ${WALLY}/src/*/*.sv ${WALLY}/src/*/*/*.sv
 
 WALLYCONF?=rv64gc
 TEST?=arch64i
@@ -33,7 +33,7 @@ obj_dir_non_profiling/Vtestbench_$(WALLYCONF): $(SOURCE)
 	-cc --binary \
 	$(OPT) $(PARAMS) $(NONPROF) \
 	--timescale "1ns/1ns" --timing --top-module testbench  --relative-includes \
-	"-I${WALLY}/config/shared" "-I${WALLY}/config/$(WALLYCONF)" \
+	"-I${WALLY}/config/shared" "-I${WALLY}/config/$(WALLYCONF)" "-I${WALLY}/config/deriv/$(WALLYCONF)" \
 	wrapper.c \
 	${WALLY}/src/cvw.sv ${WALLY}/testbench/testbench.sv ${WALLY}/testbench/common/*.sv ${WALLY}/src/*/*.sv ${WALLY}/src/*/*/*.sv
 	
@@ -44,8 +44,9 @@ obj_dir_profiling/Vtestbench_$(WALLYCONF): $(SOURCE)
 	-cc --binary \
 	--prof-cfuncs $(OPT) $(PARAMS) \
 	--timescale "1ns/1ns" --timing --top-module testbench  --relative-includes \
+	"-I${WALLY}/config/shared" "-I${WALLY}/config/$(WALLYCONF)" "-I${WALLY}/config/deriv/$(WALLYCONF)" \
 	wrapper.c \
-	"-I${WALLY}/config/shared" "-I${WALLY}/config/$(WALLYCONF)" ${WALLY}/src/cvw.sv ${WALLY}/testbench/testbench.sv ${WALLY}/testbench/common/*.sv ${WALLY}/src/*/*.sv ${WALLY}/src/*/*/*.sv
+	${WALLY}/src/cvw.sv ${WALLY}/testbench/testbench.sv ${WALLY}/testbench/common/*.sv ${WALLY}/src/*/*.sv ${WALLY}/src/*/*/*.sv
 
 questa:
 	time vsim -c -do "do ${WALLY}/sim/wally-batch.do $(WALLYCONF) $(TEST)"