Rework parameter handling in makefiles

Signed-off-by: Alex Forencich <alex@alexforencich.com>
2023-01-29 19:54:10 -08:00
parent d61362e79b
commit 6d1afe0904
10 changed files with 38 additions and 4 deletions
--- a/tests/eth_mac/Makefile
+++ b/tests/eth_mac/Makefile
@@ -34,6 +34,8 @@ VERILOG_SOURCES += $(DUT).v
 ifeq ($(SIM), icarus)
 	PLUSARGS += -fst

+	COMPILE_ARGS += $(foreach v,$(filter PARAM_%,$(.VARIABLES)),-P $(TOPLEVEL).$(subst PARAM_,,$(v))=$($(v)))
+
 	ifeq ($(WAVES), 1)
 		VERILOG_SOURCES += iverilog_dump.v
 		COMPILE_ARGS += -s iverilog_dump
@@ -41,6 +43,8 @@ ifeq ($(SIM), icarus)
 else ifeq ($(SIM), verilator)
 	COMPILE_ARGS += -Wno-SELRANGE -Wno-WIDTH

+	COMPILE_ARGS += $(foreach v,$(filter PARAM_%,$(.VARIABLES)),-G$(subst PARAM_,,$(v))=$($(v)))
+
 	ifeq ($(WAVES), 1)
 		COMPILE_ARGS += --trace-fst
 	endif
--- a/tests/gmii/Makefile
+++ b/tests/gmii/Makefile
@@ -34,6 +34,8 @@ VERILOG_SOURCES += $(DUT).v
 ifeq ($(SIM), icarus)
 	PLUSARGS += -fst

+	COMPILE_ARGS += $(foreach v,$(filter PARAM_%,$(.VARIABLES)),-P $(TOPLEVEL).$(subst PARAM_,,$(v))=$($(v)))
+
 	ifeq ($(WAVES), 1)
 		VERILOG_SOURCES += iverilog_dump.v
 		COMPILE_ARGS += -s iverilog_dump
@@ -41,6 +43,8 @@ ifeq ($(SIM), icarus)
 else ifeq ($(SIM), verilator)
 	COMPILE_ARGS += -Wno-SELRANGE -Wno-WIDTH

+	COMPILE_ARGS += $(foreach v,$(filter PARAM_%,$(.VARIABLES)),-G$(subst PARAM_,,$(v))=$($(v)))
+
 	ifeq ($(WAVES), 1)
 		COMPILE_ARGS += --trace-fst
 	endif
--- a/tests/gmii_phy/Makefile
+++ b/tests/gmii_phy/Makefile
@@ -34,6 +34,8 @@ VERILOG_SOURCES += $(DUT).v
 ifeq ($(SIM), icarus)
 	PLUSARGS += -fst

+	COMPILE_ARGS += $(foreach v,$(filter PARAM_%,$(.VARIABLES)),-P $(TOPLEVEL).$(subst PARAM_,,$(v))=$($(v)))
+
 	ifeq ($(WAVES), 1)
 		VERILOG_SOURCES += iverilog_dump.v
 		COMPILE_ARGS += -s iverilog_dump
@@ -41,6 +43,8 @@ ifeq ($(SIM), icarus)
 else ifeq ($(SIM), verilator)
 	COMPILE_ARGS += -Wno-SELRANGE -Wno-WIDTH

+	COMPILE_ARGS += $(foreach v,$(filter PARAM_%,$(.VARIABLES)),-G$(subst PARAM_,,$(v))=$($(v)))
+
 	ifeq ($(WAVES), 1)
 		COMPILE_ARGS += --trace-fst
 	endif
--- a/tests/mii/Makefile
+++ b/tests/mii/Makefile
@@ -34,6 +34,8 @@ VERILOG_SOURCES += $(DUT).v
 ifeq ($(SIM), icarus)
 	PLUSARGS += -fst

+	COMPILE_ARGS += $(foreach v,$(filter PARAM_%,$(.VARIABLES)),-P $(TOPLEVEL).$(subst PARAM_,,$(v))=$($(v)))
+
 	ifeq ($(WAVES), 1)
 		VERILOG_SOURCES += iverilog_dump.v
 		COMPILE_ARGS += -s iverilog_dump
@@ -41,6 +43,8 @@ ifeq ($(SIM), icarus)
 else ifeq ($(SIM), verilator)
 	COMPILE_ARGS += -Wno-SELRANGE -Wno-WIDTH

+	COMPILE_ARGS += $(foreach v,$(filter PARAM_%,$(.VARIABLES)),-G$(subst PARAM_,,$(v))=$($(v)))
+
 	ifeq ($(WAVES), 1)
 		COMPILE_ARGS += --trace-fst
 	endif
--- a/tests/mii_phy/Makefile
+++ b/tests/mii_phy/Makefile
@@ -34,6 +34,8 @@ VERILOG_SOURCES += $(DUT).v
 ifeq ($(SIM), icarus)
 	PLUSARGS += -fst

+	COMPILE_ARGS += $(foreach v,$(filter PARAM_%,$(.VARIABLES)),-P $(TOPLEVEL).$(subst PARAM_,,$(v))=$($(v)))
+
 	ifeq ($(WAVES), 1)
 		VERILOG_SOURCES += iverilog_dump.v
 		COMPILE_ARGS += -s iverilog_dump
@@ -41,6 +43,8 @@ ifeq ($(SIM), icarus)
 else ifeq ($(SIM), verilator)
 	COMPILE_ARGS += -Wno-SELRANGE -Wno-WIDTH

+	COMPILE_ARGS += $(foreach v,$(filter PARAM_%,$(.VARIABLES)),-G$(subst PARAM_,,$(v))=$($(v)))
+
 	ifeq ($(WAVES), 1)
 		COMPILE_ARGS += --trace-fst
 	endif
--- a/tests/ptp_clock/Makefile
+++ b/tests/ptp_clock/Makefile
@@ -34,6 +34,8 @@ VERILOG_SOURCES += $(DUT).v
 ifeq ($(SIM), icarus)
 	PLUSARGS += -fst

+	COMPILE_ARGS += $(foreach v,$(filter PARAM_%,$(.VARIABLES)),-P $(TOPLEVEL).$(subst PARAM_,,$(v))=$($(v)))
+
 	ifeq ($(WAVES), 1)
 		VERILOG_SOURCES += iverilog_dump.v
 		COMPILE_ARGS += -s iverilog_dump
@@ -41,6 +43,8 @@ ifeq ($(SIM), icarus)
 else ifeq ($(SIM), verilator)
 	COMPILE_ARGS += -Wno-SELRANGE -Wno-WIDTH

+	COMPILE_ARGS += $(foreach v,$(filter PARAM_%,$(.VARIABLES)),-G$(subst PARAM_,,$(v))=$($(v)))
+
 	ifeq ($(WAVES), 1)
 		COMPILE_ARGS += --trace-fst
 	endif
--- a/tests/ptp_clock_sim_time/Makefile
+++ b/tests/ptp_clock_sim_time/Makefile
@@ -34,6 +34,8 @@ VERILOG_SOURCES += $(DUT).v
 ifeq ($(SIM), icarus)
 	PLUSARGS += -fst

+	COMPILE_ARGS += $(foreach v,$(filter PARAM_%,$(.VARIABLES)),-P $(TOPLEVEL).$(subst PARAM_,,$(v))=$($(v)))
+
 	ifeq ($(WAVES), 1)
 		VERILOG_SOURCES += iverilog_dump.v
 		COMPILE_ARGS += -s iverilog_dump
@@ -41,6 +43,8 @@ ifeq ($(SIM), icarus)
 else ifeq ($(SIM), verilator)
 	COMPILE_ARGS += -Wno-SELRANGE -Wno-WIDTH

+	COMPILE_ARGS += $(foreach v,$(filter PARAM_%,$(.VARIABLES)),-G$(subst PARAM_,,$(v))=$($(v)))
+
 	ifeq ($(WAVES), 1)
 		COMPILE_ARGS += --trace-fst
 	endif
--- a/tests/rgmii/Makefile
+++ b/tests/rgmii/Makefile
@@ -34,6 +34,8 @@ VERILOG_SOURCES += $(DUT).v
 ifeq ($(SIM), icarus)
 	PLUSARGS += -fst

+	COMPILE_ARGS += $(foreach v,$(filter PARAM_%,$(.VARIABLES)),-P $(TOPLEVEL).$(subst PARAM_,,$(v))=$($(v)))
+
 	ifeq ($(WAVES), 1)
 		VERILOG_SOURCES += iverilog_dump.v
 		COMPILE_ARGS += -s iverilog_dump
@@ -41,6 +43,8 @@ ifeq ($(SIM), icarus)
 else ifeq ($(SIM), verilator)
 	COMPILE_ARGS += -Wno-SELRANGE -Wno-WIDTH

+	COMPILE_ARGS += $(foreach v,$(filter PARAM_%,$(.VARIABLES)),-G$(subst PARAM_,,$(v))=$($(v)))
+
 	ifeq ($(WAVES), 1)
 		COMPILE_ARGS += --trace-fst
 	endif
--- a/tests/rgmii_phy/Makefile
+++ b/tests/rgmii_phy/Makefile
@@ -34,6 +34,8 @@ VERILOG_SOURCES += $(DUT).v
 ifeq ($(SIM), icarus)
 	PLUSARGS += -fst

+	COMPILE_ARGS += $(foreach v,$(filter PARAM_%,$(.VARIABLES)),-P $(TOPLEVEL).$(subst PARAM_,,$(v))=$($(v)))
+
 	ifeq ($(WAVES), 1)
 		VERILOG_SOURCES += iverilog_dump.v
 		COMPILE_ARGS += -s iverilog_dump
@@ -41,6 +43,8 @@ ifeq ($(SIM), icarus)
 else ifeq ($(SIM), verilator)
 	COMPILE_ARGS += -Wno-SELRANGE -Wno-WIDTH

+	COMPILE_ARGS += $(foreach v,$(filter PARAM_%,$(.VARIABLES)),-G$(subst PARAM_,,$(v))=$($(v)))
+
 	ifeq ($(WAVES), 1)
 		COMPILE_ARGS += --trace-fst
 	endif
--- a/tests/xgmii/Makefile
+++ b/tests/xgmii/Makefile
@@ -38,8 +38,7 @@ export PARAM_CTRL_WIDTH ?= $(shell expr $(PARAM_DATA_WIDTH) / 8 )
 ifeq ($(SIM), icarus)
 	PLUSARGS += -fst

-	COMPILE_ARGS += -P $(TOPLEVEL).DATA_WIDTH=$(PARAM_DATA_WIDTH)
-	COMPILE_ARGS += -P $(TOPLEVEL).CTRL_WIDTH=$(PARAM_CTRL_WIDTH)
+	COMPILE_ARGS += $(foreach v,$(filter PARAM_%,$(.VARIABLES)),-P $(TOPLEVEL).$(subst PARAM_,,$(v))=$($(v)))

 	ifeq ($(WAVES), 1)
 		VERILOG_SOURCES += iverilog_dump.v
@@ -48,8 +47,7 @@ ifeq ($(SIM), icarus)
 else ifeq ($(SIM), verilator)
 	COMPILE_ARGS += -Wno-SELRANGE -Wno-WIDTH

-	COMPILE_ARGS += -GDATA_WIDTH=$(PARAM_DATA_WIDTH)
-	COMPILE_ARGS += -GCTRL_WIDTH=$(PARAM_CTRL_WIDTH)
+	COMPILE_ARGS += $(foreach v,$(filter PARAM_%,$(.VARIABLES)),-G$(subst PARAM_,,$(v))=$($(v)))

 	ifeq ($(WAVES), 1)
 		COMPILE_ARGS += --trace-fst