From ab9ec1650e5fc0e24295e165e0625c31c791d2b5 Mon Sep 17 00:00:00 2001
From: joey0320 <joonho0320@gmail.com>
Date: Fri, 28 Apr 2023 09:15:33 -0700
Subject: [PATCH] fixes

---
 common.mk                                     |  2 +-
 ...dule-names.py => uniquify-module-names.py} | 31 ++++++++++---------
 2 files changed, 17 insertions(+), 16 deletions(-)
 rename scripts/{uniqify-module-names.py => uniquify-module-names.py} (91%)

diff --git a/common.mk b/common.mk
index 4aeb44aa..7afdf57b 100644
--- a/common.mk
+++ b/common.mk
@@ -232,7 +232,7 @@ $(SFC_MFC_TARGETS) &: $(FIRRTL_FILE) $(FINAL_ANNO_FILE) $(SFC_LEVEL) $(EXTRA_FIR
 # DOC include end: FirrtlCompiler
 
 $(TOP_MODS_FILELIST) $(MODEL_MODS_FILELIST) $(ALL_MODS_FILELIST) $(BB_MODS_FILELIST) $(MFC_MODEL_HRCHY_JSON_UNIQUIFIED) &: $(MFC_MODEL_HRCHY_JSON) $(MFC_TOP_HRCHY_JSON) $(MFC_FILELIST) $(MFC_BB_MODS_FILELIST)
-	$(base_dir)/scripts/uniqify-module-names.py \
+	$(base_dir)/scripts/uniquify-module-names.py \
 		--model-hier-json $(MFC_MODEL_HRCHY_JSON) \
 		--top-hier-json $(MFC_TOP_HRCHY_JSON) \
 		--in-all-filelist $(MFC_FILELIST) \
diff --git a/scripts/uniqify-module-names.py b/scripts/uniquify-module-names.py
similarity index 91%
rename from scripts/uniqify-module-names.py
rename to scripts/uniquify-module-names.py
index 28d5f971..7eb03a7c 100755
--- a/scripts/uniqify-module-names.py
+++ b/scripts/uniquify-module-names.py
@@ -97,14 +97,13 @@ def bfs_update(tree, common_fnames, ext_dict, filelist):
     if mod in common_fnames:
       mod_updated = True
       new_file = generate_copy(cur_file, MODEL_SFX)
-      filelist.append(new_file)
+      filelist.append((mod, new_file))
       if parent is not None and ((parent, mod) not in updated_submodule):
-        print(mod, parent)
         parent_file = os.path.join(args.gcpath, parent + "." + ext_dict[parent])
-        bash(f"sed -i s/\"{mod}\"/\"{mod}_{MODEL_SFX}\"/ {parent_file}")
+        bash(f"sed -i s/\"{mod} \"/\"{mod}_{MODEL_SFX} \"/ {parent_file}")
         updated_submodule.add((parent, mod))
     else:
-      filelist.append(cur_file)
+      filelist.append((mod, cur_file))
 
     # set the parent module name
     new_mod = mod
@@ -150,20 +149,24 @@ def write_filelist(modules, out_file):
             else:
                 df.write(f"{path}")
 
-def write_filelist_model(modules, out_file):
+def write_filelist_model(modules, out_file, ext_dict):
   with open(out_file, "w") as df:
-    for m in modules:
-      if not args.target_dir in m:
-        df.write(f"{args.target_dir}/{m}\n")
-      else:
-        df.write(f"{m}\n")
+    for (m, fname) in modules:
+      if m in ext_dict.keys():
+        if not args.target_dir in fname:
+          df.write(f"{args.target_dir}/{fname}\n")
+        else:
+          df.write(f"{fname}\n")
 
 def get_file_ext(all_filelist):
   ext_dict = dict()
-  with open(args.in_all_filelist) as fl:
+  with open(all_filelist) as fl:
     for path in fl:
       fname = os.path.basename(path)
-      (module, ext) = fname.strip().split(".")
+      fname_strip = fname.strip().split(".")
+      ext = fname_strip[-1]
+      fname_strip.pop()
+      module = ".".join(fname_strip)
       ext_dict[module] = ext
   return ext_dict
 
@@ -189,9 +192,7 @@ def main():
       bfs_update(imhj_data, common_modules, ext_dict, filelist)
       dfs_update_modules(imhj_data, common_modules, visited, ext_dict)
       json.dump(imhj_data, out_file, indent=2)
-
-      updated_modules_under_model = set(bfs_collect_modules(imhj_data, child_to_ignore=args.dut))
-      write_filelist_model(set(filelist), args.out_model_filelist)
+      write_filelist_model(set(filelist), args.out_model_filelist, ext_dict)
 
 if __name__ == "__main__":
   main()