Clean up run functions

Some backends were overriding run and didn't run pre/post scripts

edalize/ise.py

@@ -146,7 +146,7 @@ def _write_tcl_file(self):
         tcl_file.write('project set top "{}"\n'.format(self.toplevel))
         tcl_file.close()
 
-    def run(self, remaining):
+    def run_main(self):
         pgm_file_name = os.path.join(self.work_root, self.name+'.pgm')
         self._write_pgm_file(pgm_file_name)
         self._run_tool('impact', ['-batch', pgm_file_name])

edalize/quartus.py

@@ -215,7 +215,7 @@ def _handle_tcl(f):
 
     """ Program the FPGA
     """
-    def run(self, remaining):
+    def run_main(self):
         args = ['--mode=jtag']
         args += remaining
         args += ['-o']

edalize/verilator.py

@@ -143,24 +143,23 @@ def build_main(self):
         _s = os.path.join(self.work_root, 'verilator.{}.log')
         self._run_tool('make', args)
 
-    def run(self, args):
+    def run_pre(self, args):
         if self.tool_options['mode'] == 'lint-only':
             return
         if self._managed_parser():
             self.parse_args(args, self.argtypes)
 
-            _args = []
+            self.args = []
             for key, value in self.plusarg.items():
-                _args += ['+{}={}'.format(key, self._param_value_str(value))]
+                self.args += ['+{}={}'.format(key, self._param_value_str(value))]
             for key, value in self.cmdlinearg.items():
-                _args += ['--{}={}'.format(key, self._param_value_str(value))]
+                self.args += ['--{}={}'.format(key, self._param_value_str(value))]
         else:
-            _args = args
+            self.args = args
 
         if 'pre_run' in self.hooks:
             self._run_scripts(self.hooks['pre_run'])
 
+    def run_main(self):
         logger.info("Running simulation")
-        self._run_tool('./V' + self.toplevel, _args)
-
-        self.run_post()
+        self._run_tool('./V' + self.toplevel, self.args)

edalize/vivado.py

@@ -106,7 +106,7 @@ def _vhdl_source(f):
     correct FPGA board and then downloads the bitstream. The tcl script is then
     executed in Vivado's batch mode.
     """
-    def run(self, remaining):
+    def run_main(self):
         tcl_file_name = self.name+"_pgm.tcl"
         self._write_program_tcl_file(tcl_file_name)
         self._run_tool('vivado', ['-mode', 'batch', '-source', tcl_file_name ])