From 6d1afe0904ff21670519d5298c6b72bbe02879b5 Mon Sep 17 00:00:00 2001 From: Alex Forencich Date: Sun, 29 Jan 2023 19:54:10 -0800 Subject: [PATCH] Rework parameter handling in makefiles Signed-off-by: Alex Forencich --- tests/eth_mac/Makefile | 4 ++++ tests/gmii/Makefile | 4 ++++ tests/gmii_phy/Makefile | 4 ++++ tests/mii/Makefile | 4 ++++ tests/mii_phy/Makefile | 4 ++++ tests/ptp_clock/Makefile | 4 ++++ tests/ptp_clock_sim_time/Makefile | 4 ++++ tests/rgmii/Makefile | 4 ++++ tests/rgmii_phy/Makefile | 4 ++++ tests/xgmii/Makefile | 6 ++---- 10 files changed, 38 insertions(+), 4 deletions(-) diff --git a/tests/eth_mac/Makefile b/tests/eth_mac/Makefile index 8002e5a..c8be4f9 100644 --- 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 diff --git a/tests/gmii/Makefile b/tests/gmii/Makefile index 4e58f31..617d69e 100644 --- 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 diff --git a/tests/gmii_phy/Makefile b/tests/gmii_phy/Makefile index 8df36c0..ffa7dbd 100644 --- 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 diff --git a/tests/mii/Makefile b/tests/mii/Makefile index 00cac64..69f0799 100644 --- 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 diff --git a/tests/mii_phy/Makefile b/tests/mii_phy/Makefile index 063d360..1301d98 100644 --- 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 diff --git a/tests/ptp_clock/Makefile b/tests/ptp_clock/Makefile index 9ed43ec..d757424 100644 --- 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 diff --git a/tests/ptp_clock_sim_time/Makefile b/tests/ptp_clock_sim_time/Makefile index 019cc3c..1b239e5 100644 --- 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 diff --git a/tests/rgmii/Makefile b/tests/rgmii/Makefile index 20e1e51..4327011 100644 --- 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 diff --git a/tests/rgmii_phy/Makefile b/tests/rgmii_phy/Makefile index 0e61ca4..7b57c45 100644 --- 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 diff --git a/tests/xgmii/Makefile b/tests/xgmii/Makefile index 1b6f4a4..7ed82f6 100644 --- 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