diff --git a/common.mk b/common.mk index e1120061ac..7f1b9669c4 100644 --- a/common.mk +++ b/common.mk @@ -218,6 +218,7 @@ $(TOP_MODS_FILELIST) $(MODEL_MODS_FILELIST) $(ALL_MODS_FILELIST) $(BB_MODS_FILEL --model-hier-json $(MFC_MODEL_HRCHY_JSON) \ --top-hier-json $(MFC_TOP_HRCHY_JSON) \ --in-all-filelist $(MFC_FILELIST) \ + --in-bb-filelist $(MFC_BB_MODS_FILELIST) \ --dut $(TOP) \ --model $(MODEL) \ --target-dir $(GEN_COLLATERAL_DIR) \ diff --git a/conda-reqs/circt.json b/conda-reqs/circt.json index 1eb54a4391..020fe373a3 100644 --- a/conda-reqs/circt.json +++ b/conda-reqs/circt.json @@ -1,3 +1,3 @@ { - "version": "firtool-1.66.0" + "version": "firtool-1.75.0" } diff --git a/scripts/uniquify-module-names.py b/scripts/uniquify-module-names.py index d2131c33e2..5c6a9613fb 100755 --- a/scripts/uniquify-module-names.py +++ b/scripts/uniquify-module-names.py @@ -11,6 +11,7 @@ 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("--top-hier-json", type=str, required=True, help="Path to hierarchy JSON emitted by firtool. Must include DUT as a module.") parser.add_argument('--in-all-filelist', type=str, required=True, help='Path to input filelist that has all modules (relative paths).') +parser.add_argument('--in-bb-filelist', type=str, required=True, help='Path to input blackbox filelist') 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.") parser.add_argument('--out-dut-filelist', type=str, required=True, help='Path to output filelist including all modules under the DUT.') @@ -57,8 +58,8 @@ def get_modules_in_verilog_file(file): module_names.append(words[1].replace("(", "").replace(")", "").replace(";", "")) return module_names -def get_modules_in_filelist(verilog_module_filename, cc_filelist): - with open(args.in_all_filelist) as fl: +def get_modules_in_filelist(filelist, verilog_module_filename, cc_filelist): + with open(filelist) as fl: lines = fl.readlines() for line in lines: path = line.strip() @@ -186,7 +187,8 @@ def uniquify_modules_under_model(modules_under_model, common_modules, verilog_mo def main(): verilog_module_filename = dict() cc_filelist = list() - get_modules_in_filelist(verilog_module_filename, cc_filelist) + get_modules_in_filelist(args.in_all_filelist, verilog_module_filename, cc_filelist) + get_modules_in_filelist(args.in_bb_filelist , verilog_module_filename, cc_filelist) modules_under_model = get_modules_under_hier(args.model_hier_json, args.dut) modules_under_top = get_modules_under_hier(args.top_hier_json) diff --git a/tools/circt b/tools/circt index 9e0c1696f3..481cb60add 160000 --- a/tools/circt +++ b/tools/circt @@ -1 +1 @@ -Subproject commit 9e0c1696f3caef4059c65774ad6b8efee91d9d9e +Subproject commit 481cb60add7358934414a3c6b396f5d29ad934fe