Fix regex for similar module names that are uniquified

This commit is contained in:
Abraham Gonzalez
2023-11-01 17:47:31 -07:00
committed by GitHub
parent ac271dc3eb
commit 2ced8f1753

View File

@@ -109,7 +109,7 @@ def generate_copy(c, sfx):
new_file = os.path.join(args.gcpath, new_file) new_file = os.path.join(args.gcpath, new_file)
shutil.copy(cur_file, new_file) shutil.copy(cur_file, new_file)
bash(f"sed -i s/\"module {cur_name}\"/\"module {new_name}\"/ {new_file}") bash(f"sed -i 's/module\( \+\){cur_name}/module\\1{new_name}/' {new_file}")
return new_file return new_file
def bfs_uniquify_modules(tree, common_fnames, verilog_module_filename): def bfs_uniquify_modules(tree, common_fnames, verilog_module_filename):
@@ -136,7 +136,7 @@ def bfs_uniquify_modules(tree, common_fnames, verilog_module_filename):
new_file = generate_copy(cur_file, MODEL_SFX) new_file = generate_copy(cur_file, MODEL_SFX)
if parent is not None and ((parent, mod) not in updated_submodule): if parent is not None and ((parent, mod) not in updated_submodule):
parent_file = os.path.join(args.gcpath, verilog_module_filename[parent]) parent_file = os.path.join(args.gcpath, verilog_module_filename[parent])
bash(f"sed -i s/\"{mod} \"/\"{mod}_{MODEL_SFX} \"/ {parent_file}") bash(f"sed -i 's/\( \*\){mod}\( \+\)/\\1{mod}_{MODEL_SFX}\\2/' {parent_file}")
updated_submodule.add((parent, mod)) updated_submodule.add((parent, mod))
# add the uniquified module to the verilog_modul_filename dict # add the uniquified module to the verilog_modul_filename dict