wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1883 from ucb-bar/mergify/copy/main/pr-1878

Browse Source 
[cd] Bump CIRCT from firtool-1.66.0 to firtool-1.75.0 (copy #1878)
This commit is contained in:
Jerry Zhao
2024-06-12 13:46:31 -07:00
committed by GitHub
parent 78737b9ab9 eee405331b
commit 44a77b55f7
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common.mk
View File

@@ -218,6 +218,7 @@ $(TOP_MODS_FILELIST) $(MODEL_MODS_FILELIST) $(ALL_MODS_FILELIST) $(BB_MODS_FILEL
--model-hier-json $(MFC_MODEL_HRCHY_JSON) \ --model-hier-json $(MFC_MODEL_HRCHY_JSON) \
--top-hier-json $(MFC_TOP_HRCHY_JSON) \ --top-hier-json $(MFC_TOP_HRCHY_JSON) \
--in-all-filelist $(MFC_FILELIST) \ --in-all-filelist $(MFC_FILELIST) \
--in-bb-filelist $(MFC_BB_MODS_FILELIST) \
--dut $(TOP) \ --dut $(TOP) \
--model $(MODEL) \ --model $(MODEL) \
--target-dir $(GEN_COLLATERAL_DIR) \ --target-dir $(GEN_COLLATERAL_DIR) \

2
conda-reqs/circt.json
View File

@@ -1,3 +1,3 @@
{ {
"version": "firtool-1.66.0" "version": "firtool-1.75.0"
} }

8
scripts/uniquify-module-names.py
View File

@@ -11,6 +11,7 @@ parser = argparse.ArgumentParser(description="")
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("--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("--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-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("--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("--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.') 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(";", "")) module_names.append(words[1].replace("(", "").replace(")", "").replace(";", ""))
return module_names return module_names
def get_modules_in_filelist(verilog_module_filename, cc_filelist): def get_modules_in_filelist(filelist, verilog_module_filename, cc_filelist):
with open(args.in_all_filelist) as fl: with open(filelist) as fl:
lines = fl.readlines() lines = fl.readlines()
for line in lines: for line in lines:
path = line.strip() path = line.strip()
@@ -186,7 +187,8 @@ def uniquify_modules_under_model(modules_under_model, common_modules, verilog_mo
def main(): def main():
verilog_module_filename = dict() verilog_module_filename = dict()
cc_filelist = list() 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_model = get_modules_under_hier(args.model_hier_json, args.dut)
modules_under_top = get_modules_under_hier(args.top_hier_json) modules_under_top = get_modules_under_hier(args.top_hier_json)

2
tools/circt

Submodule tools/circt updated: 9e0c1696f3...481cb60add