Merge branch 'master' into feat_add_command_history

persimmonsai · Nov 15, 2023 · 11f1d1a · 11f1d1a
2 parents 79e04fe + 04f85bd
commit 11f1d1a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/FABulous.py b/FABulous.py
@@ -763,7 +763,7 @@ def do_place_and_route_npnr(self, args):
                           f"nextpnr-generic",
                           "--uarch", "fabulous",
                           "--json", f"{self.projectDir}/{path}/{name}.json",
-                          "-o", f"fasm={self.projectDir}/{path}/{name}_des.fasm",
+                          "-o", f"fasm={self.projectDir}/{path}/{name}.fasm",
                           "--verbose",
                           "--log", f"{self.projectDir}/{path}/{name}_npnr_log.txt"]
                 sp.run(" ".join(runCmd), stdout=sys.stdout,
@@ -830,9 +830,9 @@ def do_gen_bitStream_binary(self, args):
                 "Cannot find bitStreamSpec.bin file, which is generated by running gen_bitStream_spec")
             return
 
-        if not os.path.exists(f"{self.projectDir}/{path}/{name}_des.fasm"):
+        if not os.path.exists(f"{self.projectDir}/{path}/{name}.fasm"):
             logger.error(
-                f"Cannot find {self.projectDir}/{path}/{name}_des.fasm file which is generated by running place_and_route_npnr or place_and_route_vpr. Potentially Place and Route Failed.")
+                f"Cannot find {self.projectDir}/{path}/{name}.fasm file which is generated by running place_and_route_npnr or place_and_route_vpr. Potentially Place and Route Failed.")
             return
 
         logger.info(
@@ -841,7 +841,7 @@ def do_gen_bitStream_binary(self, args):
         name = name.split('.')[0]
         runCmd = ["python3", f"{fabulousRoot}/fabric_cad/bit_gen.py",
                   "-genBitstream",
-                  f"{self.projectDir}/{path}/{name}_des.fasm",
+                  f"{self.projectDir}/{path}/{name}.fasm",
                   f"{self.projectDir}/.FABulous/bitStreamSpec.bin",
                   f"{self.projectDir}/{path}/{name}.bin"]