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

fixes

Browse Source
This commit is contained in:
joey0320
2023-04-28 09:15:33 -07:00
parent 85abce536a
commit ab9ec1650e
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common.mk
View File

@@ -232,7 +232,7 @@ $(SFC_MFC_TARGETS) &: $(FIRRTL_FILE) $(FINAL_ANNO_FILE) $(SFC_LEVEL) $(EXTRA_FIR
# DOC include end: FirrtlCompiler # 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) $(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) \ --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) \

31
scripts/uniqify-module-names.py → scripts/uniquify-module-names.py
View File

@@ -97,14 +97,13 @@ def bfs_update(tree, common_fnames, ext_dict, filelist):
if mod in common_fnames: if mod in common_fnames:
mod_updated = True mod_updated = True
new_file = generate_copy(cur_file, MODEL_SFX) 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): 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]) 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)) updated_submodule.add((parent, mod))
else: else:
filelist.append(cur_file) filelist.append((mod, cur_file))
# set the parent module name # set the parent module name
new_mod = mod new_mod = mod
@@ -150,20 +149,24 @@ def write_filelist(modules, out_file):
else: else:
df.write(f"{path}") 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: with open(out_file, "w") as df:
for m in modules: for (m, fname) in modules:
if not args.target_dir in m: if m in ext_dict.keys():
df.write(f"{args.target_dir}/{m}\n") if not args.target_dir in fname:
else: df.write(f"{args.target_dir}/{fname}\n")
df.write(f"{m}\n") else:
df.write(f"{fname}\n")
def get_file_ext(all_filelist): def get_file_ext(all_filelist):
ext_dict = dict() ext_dict = dict()
with open(args.in_all_filelist) as fl: with open(all_filelist) as fl:
for path in fl: for path in fl:
fname = os.path.basename(path) 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 ext_dict[module] = ext
return ext_dict return ext_dict
@@ -189,9 +192,7 @@ def main():
bfs_update(imhj_data, common_modules, ext_dict, filelist) bfs_update(imhj_data, common_modules, ext_dict, filelist)
dfs_update_modules(imhj_data, common_modules, visited, ext_dict) dfs_update_modules(imhj_data, common_modules, visited, ext_dict)
json.dump(imhj_data, out_file, indent=2) json.dump(imhj_data, out_file, indent=2)
write_filelist_model(set(filelist), args.out_model_filelist, ext_dict)
updated_modules_under_model = set(bfs_collect_modules(imhj_data, child_to_ignore=args.dut))
write_filelist_model(set(filelist), args.out_model_filelist)
if __name__ == "__main__": if __name__ == "__main__":
main() main()