fixes

scripts/uniqify-module-names.py

@@ -5,7 +5,7 @@ import argparse
 import shutil
 import os
 import sh
-
+import datetime
 
 
 parser = argparse.ArgumentParser(description="")
@@ -13,28 +13,35 @@ parser.add_argument("--top-filelist", type=str, required=True, help="Abs path to
 parser.add_argument("--mod-filelist", type=str, required=True, help="Abs path to <top>.<model>.model.f")
 parser.add_argument("--gen-collateral-path", dest="gcpath", type=str, required=True, help="Abs path to the gen-collateral directory")
 parser.add_argument("--model-hier-json", type=str, required=True, help="Path to hierarchy JSON emitted by firtool. Must include DUT as a module.")
+parser.add_argument("--out-model-hier-json", type=str, required=True, help="Path to updated hierarchy JSON emitted by this script.")
 parser.add_argument('--dut', type=str, required=True, help='Name of the DUT module.')
 args = parser.parse_args()
 
 
+MODEL_SFX=str(datetime.date.today().year)
+
+def bash(cmd):
+  fail = os.system(cmd)
+  if fail:
+    print(f'[*] failed to execute {cmd}')
+    sys.exit(1)
+  else:
+    print(cmd)
+
 def get_filelist(filelist):
-  f = open(filelist, "r")
-  lines = f.readlines()
-  f.close()
-
   fnames = []
-  for line in lines:
-    try:
-      fname = line.split("/")[-1].replace("\n", "")
-      fnames.append(fname)
-    except:
-      print(f"Something is wrong about this line {line}")
-
+  with open(filelist) as f:
+    lines = f.readlines()
+    for line in lines:
+      try:
+        fname = line.split("/")[-1].strip()
+        fnames.append(fname)
+      except:
+        print(f"Something is wrong about this line '{line}'")
   return fnames
 
 def update_filelist(cur_file, new_file):
-  sh.sed("-i", f"s/\b{cur_file}\b/{new_file}/", os.path.join(args.gcpath, args.mod_filelist))
-
+  bash(f"echo \"{args.gcpath}/{new_file}\" >> {os.path.join(args.gcpath, args.mod_filelist)}")
 
 def generate_copy(c, sfx):
   (cur_name, ext) = os.path.splitext(c)
@@ -45,23 +52,20 @@ def generate_copy(c, sfx):
   new_file = os.path.join(args.gcpath, new_file)
 
   shutil.copy(cur_file, new_file)
-  sh.sed("-i", f"s/\b{cur_name}\b/{new_name}/", new_file)
+  bash(f"sed -i s/\"module {cur_name}\"/\"module {new_name}\"/ {new_file}")
   return new_file
 
-
-
-def dfs_update_modules(tree, common_fnames, visited, top_fnames, updated_modules):
+def dfs_update_modules(tree, common_fnames, visited, top_fnames):
   # List of direct submodules to update
   childs_to_update = list()
   for child in tree['instances']:
     # We don't have to change stuff that are under the dut
     if (child['module_name'] == args.dut) or (child['module_name'] in visited):
       continue
-    if dfs_update_modules(child, common_fnames, visited, top_fnames, updated_modules):
+    if dfs_update_modules(child, common_fnames, visited, top_fnames):
       childs_to_update.append(child['module_name'])
       if (child['module_name'] + ".sv") in common_fnames:
-        child['module_name'] = child['module_name'] + "_Model"
-        updated_modules.append(child['module_name'])
+        child['module_name'] = child['module_name'] + "_" + MODEL_SFX
 
   cur_module = tree['module_name']
   cur_file = cur_module + ".sv"
@@ -69,7 +73,7 @@ def dfs_update_modules(tree, common_fnames, visited, top_fnames, updated_modules
 
   # cur_file is in the common list, generate a new file
   if cur_file in common_fnames:
-    new_file = generate_copy(cur_file, "Model")
+    new_file = generate_copy(cur_file, MODEL_SFX)
     update_filelist(cur_file, os.path.basename(new_file))
 
   # has some child to update, but new_file wasn't generated
@@ -78,29 +82,23 @@ def dfs_update_modules(tree, common_fnames, visited, top_fnames, updated_modules
 
   for submodule_name in childs_to_update:
     if (submodule_name + ".sv") in common_fnames:
-      sh.sed("-i", f"s/\b{submodule_name}\b/{submodule_name}_Model/", new_file)
+      bash(f"sed -i s/\"{submodule_name}\"/\"{submodule_name}_{MODEL_SFX}\"/ {new_file}")
 
   visited.add(cur_module)
   return (new_file is not None)
 
-
 def main():
   top_fnames = set(get_filelist(args.top_filelist))
   mod_fnames = set(get_filelist(args.mod_filelist))
   common_fnames = top_fnames.intersection(mod_fnames)
 
-  imhj = open(args.model_hier_json, "r")
-  imhj_data = json.load(imhj)
-
-  visited = set()
-  updated_modules = list()
-  dfs_update_modules(imhj_data, common_fnames, visited, top_fnames, updated_modules)
-
-  out_file = open(args.model_hier_json, "w")
-  json.dump(imhj_data, out_file, indent=2)
-  out_file.close()
-
+  with open(args.model_hier_json) as imhj:
+    imhj_data = json.load(imhj)
 
+    with open(args.out_model_hier_json, "w+") as out_file:
+      visited = set()
+      dfs_update_modules(imhj_data, common_fnames, visited, top_fnames)
+      json.dump(imhj_data, out_file, indent=2)
 
 if __name__ == "__main__":
   main()