Stronger cleanup of switches

deploy/runtools/firesim_topology_with_passes.py

@@ -545,6 +545,7 @@ class FireSimTopologyWithPasses:
                 rootLogger.info("Confirming exit...")
                 # keep checking screen until it reports that there are no screens left
                 while True:
+                    run("screen -wipe || true") # wipe any potentially dead screens
                     screenoutput = run("screen -ls")
                     # If AutoILA is enabled, use the following condition
                     if "2 Sockets in" in screenoutput and "hw_server" in screenoutput and "virtual_jtag" in screenoutput:

deploy/runtools/switch_model_config.py

@@ -176,7 +176,7 @@ class AbstractSwitchToSwitchConfig:
 
     def kill_switch_simulation_command(self) -> str:
         """ Return the command to kill the switch. """
-        return """pkill {}""".format(self.switch_binary_name())
+        return """pkill -f -SIGKILL {}""".format(self.switch_binary_name())
 
     def switch_build_local_dir(self) -> str:
         """ get local build dir of the switch. """