icarus: Fix missing vvp_options

olofk · Apr 18, 2023 · 246fb3e · 246fb3e
1 parent 19736c9
commit 246fb3e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/edalize/tools/icarus.py b/edalize/tools/icarus.py
@@ -22,6 +22,10 @@ class Icarus(Edatool):
             "type": "str",
             "desc": "Additional options for iverilog",
         },
+        "vvp_options": {
+            "type": "str",
+            "desc": "Additional options for vvp",
+        },
     }
 
     def setup(self, edam):
@@ -100,7 +104,9 @@ def setup(self, edam):
         # How should the run target be handled?
         # Add VPI support
         commands.add(
-            ["vvp", "-n", "-M.", self.name, "-fst", "$(EXTRA_OPTIONS)"],
+            ["vvp", "-n", "-M."]
+            + self.tool_options.get("vvp_options", [])
+            + [self.name, "-fst", "$(EXTRA_OPTIONS)"],
             ["run"],
             [self.name],
         )

diff --git a/tests/test_tool_icarus.py b/tests/test_tool_icarus.py
@@ -4,7 +4,12 @@
 def test_tool_icarus(tool_fixture):
     tool_name = "icarus"
 
-    tf = tool_fixture(tool_name)
+    tool_options = {
+        "timescale": "1ns/1ps",
+        "iverilog_options": ["a", "few", "iverilog", "options"],
+        "vvp_options": ["some", "vvp", "options"],
+    }
+    tf = tool_fixture(tool_name, tool_options=tool_options)
 
     tf.tool.configure()
     tf.compare_config_files(["design.scr"])

diff --git a/tests/tools/icarus/Makefile b/tests/tools/icarus/Makefile
@@ -3,7 +3,7 @@
 all: design
 
 design: sv_file.sv vlog_file.v vlog05_file.v vlog_incfile another_sv_file.sv design.scr
-	$(EDALIZE_LAUNCHER) iverilog -stop_module -c design.scr -o design
+	$(EDALIZE_LAUNCHER) iverilog -stop_module -c design.scr -o design a few iverilog options
 
 run: design
-	$(EDALIZE_LAUNCHER) vvp -n -M. design -fst $(EXTRA_OPTIONS)
+	$(EDALIZE_LAUNCHER) vvp -n -M. some vvp options design -fst $(EXTRA_OPTIONS)
diff --git a/tests/tools/icarus/design.scr b/tests/tools/icarus/design.scr
@@ -4,6 +4,7 @@
 +parameter+top_module.vlogparam_bool=1
 +parameter+top_module.vlogparam_int=42
 +parameter+top_module.vlogparam_str="hello"
+timescale.v
 +incdir+.
 sv_file.sv
 vlog_file.v