Fix multiple top levels with Icarus

olofk · Nov 3, 2022 · 457f7d0 · 457f7d0
1 parent 4044f2d
commit 457f7d0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/edalize/icarus.py b/edalize/icarus.py
@@ -13,7 +13,7 @@
 all: $(VPI_MODULES) $(TARGET)
 
 $(TARGET):
-	iverilog -s$(TOPLEVEL) -c $(TARGET).scr -o $@ $(IVERILOG_OPTIONS)
+	iverilog $(TOPLEVEL) -c $(TARGET).scr -o $@ $(IVERILOG_OPTIONS)
 
 run: $(VPI_MODULES) $(TARGET)
 	vvp -n -M. -l icarus.log $(patsubst %.vpi,-m%,$(VPI_MODULES)) $(VVP_OPTIONS) $(TARGET) -fst $(EXTRA_OPTIONS)
@@ -109,7 +109,11 @@ def configure_main(self):
             _vpi_modules = " ".join([m["name"] + ".vpi" for m in self.vpi_modules])
             if _vpi_modules:
                 f.write("VPI_MODULES      := {}\n".format(_vpi_modules))
-            f.write("TOPLEVEL         := {}\n".format(self.toplevel))
+            f.write(
+                "TOPLEVEL         := {}\n".format(
+                    " ".join(["-s" + x for x in self.toplevel.split()])
+                )
+            )
             f.write(
                 "IVERILOG_OPTIONS := {}\n".format(
                     " ".join(self.tool_options.get("iverilog_options", []))

diff --git a/tests/test_icarus/Makefile b/tests/test_icarus/Makefile
@@ -1,14 +1,14 @@
 TARGET           := test_icarus_0
 VPI_MODULES      := vpi1.vpi vpi2.vpi
-TOPLEVEL         := top_module
+TOPLEVEL         := -stop_module
 IVERILOG_OPTIONS := some iverilog_options
 VVP_OPTIONS := 
 EXTRA_OPTIONS    ?= +plusarg_bool=1 +plusarg_int=42 +plusarg_str=hello
 
 all: $(VPI_MODULES) $(TARGET)
 
 $(TARGET):
-	iverilog -s$(TOPLEVEL) -c $(TARGET).scr -o $@ $(IVERILOG_OPTIONS)
+	iverilog $(TOPLEVEL) -c $(TARGET).scr -o $@ $(IVERILOG_OPTIONS)
 
 run: $(VPI_MODULES) $(TARGET)
 	vvp -n -M. -l icarus.log $(patsubst %.vpi,-m%,$(VPI_MODULES)) $(VVP_OPTIONS) $(TARGET) -fst $(EXTRA_OPTIONS)

diff --git a/tests/test_icarus/minimal/Makefile b/tests/test_icarus/minimal/Makefile
@@ -1,12 +1,12 @@
 TARGET           := test_icarus_minimal_0
-TOPLEVEL         := top
+TOPLEVEL         := -stop
 IVERILOG_OPTIONS := 
 VVP_OPTIONS := 
 
 all: $(VPI_MODULES) $(TARGET)
 
 $(TARGET):
-	iverilog -s$(TOPLEVEL) -c $(TARGET).scr -o $@ $(IVERILOG_OPTIONS)
+	iverilog $(TOPLEVEL) -c $(TARGET).scr -o $@ $(IVERILOG_OPTIONS)
 
 run: $(VPI_MODULES) $(TARGET)
 	vvp -n -M. -l icarus.log $(patsubst %.vpi,-m%,$(VPI_MODULES)) $(VVP_OPTIONS) $(TARGET) -fst $(EXTRA_OPTIONS)