rivierapro: Add vcom_options

Author: olofk

edalize/rivierapro.py

@@ -17,7 +17,7 @@
 
 class Rivierapro(Edatool):
 
-    argtypes = ["plusarg", "vlogdefine", "vlogparam"]
+    argtypes = ["plusarg", "vlogdefine", "vlogparam", "generic"]
 
     @classmethod
     def get_doc(cls, api_ver):
@@ -37,6 +37,11 @@ def get_doc(cls, api_ver):
                         "type": "String",
                         "desc": "Additional options for compilation with vlog",
                     },
+                    {
+                        "name": "vcom_options",
+                        "type": "String",
+                        "desc": "Additional options for compilation with vcom",
+                    },
                     {
                         "name": "vsim_options",
                         "type": "String",
@@ -90,6 +95,7 @@ def _write_build_rtl_tcl_file(self, tcl_main):
                     args = ["-2008"]
                 else:
                     args = []
+                args += self.tool_options.get("vcom_options", [])
             elif f.file_type == "tclSource":
                 cmd = None
                 tcl_main.write("do {}\n".format(f.name))
@@ -122,6 +128,9 @@ def _write_build_rtl_tcl_file(self, tcl_main):
                 elif cmd == "vcom":
                     if not common_compilation_vhdl:
                         common_compilation_vhdl += ["vcom"]
+                        common_compilation_vhdl += self.tool_options.get(
+                            "vcom_options", []
+                        )
                         common_compilation_vhdl += [f.name, "\\\n"]
                     else:
                         common_compilation_vhdl += [f.name, "\\\n"]
@@ -164,6 +173,8 @@ def _write_run_tcl_file(self):
         # Top-level parameters
         for key, value in self.vlogparam.items():
             args += ["-g{}={}".format(key, self._param_value_str(value))]
+        for key, value in self.generic.items():
+            args += ["-g{}={}".format(key, self._param_value_str(value))]
         tcl_launch.write(" ".join(args) + "\n")
         tcl_launch.close()
 

tests/test_rivierapro.py

@@ -6,6 +6,7 @@
 def test_rivierapro(make_edalize_test):
     tool_options = {
         "vlog_options": ["some", "vlog_options"],
+        "vcom_options": ["have", "number", "of", "vcom_options"],
         "vsim_options": ["a", "few", "vsim_options"],
     }
 

tests/test_rivierapro/edalize_build_rtl.tcl

@@ -3,8 +3,8 @@ vlog some vlog_options -sv +define+vlogdefine_bool=1 +define+vlogdefine_int=42 +
 vlog some vlog_options +define+vlogdefine_bool=1 +define+vlogdefine_int=42 +define+vlogdefine_str=hello +incdir+. -quiet -work work vlog_file.v
 vlog some vlog_options +define+vlogdefine_bool=1 +define+vlogdefine_int=42 +define+vlogdefine_str=hello +incdir+. -quiet -work work vlog_with_define.v
 vlog some vlog_options -v2k5 +define+vlogdefine_bool=1 +define+vlogdefine_int=42 +define+vlogdefine_str=hello +incdir+. -quiet -work work vlog05_file.v
-vcom -quiet -work work vhdl_file.vhd
+vcom have number of vcom_options -quiet -work work vhdl_file.vhd
 vlib libx
-vcom -quiet -work libx vhdl_lfile
-vcom -2008 -quiet -work work vhdl2008_file
+vcom have number of vcom_options -quiet -work libx vhdl_lfile
+vcom -2008 have number of vcom_options -quiet -work work vhdl2008_file
 vlog some vlog_options -sv +define+vlogdefine_bool=1 +define+vlogdefine_int=42 +define+vlogdefine_str=hello +incdir+. -quiet -work work another_sv_file.sv