address comments

common.mk

@@ -249,7 +249,8 @@ $(TOP_MODS_FILELIST) $(MODEL_MODS_FILELIST) $(ALL_MODS_FILELIST) $(BB_MODS_FILEL
 		--gen-collateral-path $(GEN_COLLATERAL_DIR) \
 		--model-hier-json $(MFC_MODEL_HRCHY_JSON) \
 		--out-model-hier-json $(MFC_MODEL_HRCHY_JSON_UNIQUIFIED) \
-		--dut $(TOP)
+		--dut $(TOP) \
+		--model $(MODEL)
 	sort -u $(TOP_MODS_FILELIST) $(MODEL_MODS_FILELIST) $(BB_MODS_FILELIST) > $(ALL_MODS_FILELIST)
 
 $(TOP_BB_MODS_FILELIST) $(MODEL_BB_MODS_FILELIST) &: $(BB_MODS_FILELIST) $(MFC_TOP_HRCHY_JSON) $(FINAL_ANNO_FILE)

scripts/uniqify-module-names.py

@@ -4,7 +4,6 @@
 import argparse
 import shutil
 import os
-import sh
 import datetime
 
 
@@ -14,11 +13,12 @@
 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.')
+parser.add_argument("--dut", type=str, required=True, help="Name of the DUT module.")
+parser.add_argument("--model", type=str, required=True, help="Name of the Model module.")
 args = parser.parse_args()
 
 
-MODEL_SFX=str(datetime.date.today().year)
+MODEL_SFX=args.model + "_UNIQUIFIED"
 
 def bash(cmd):
   fail = os.system(cmd)