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

Fix .f's

Browse Source
This commit is contained in:
abejgonzalez
2022-10-09 23:43:21 -07:00
committed by joey0320
parent f9b938ad55
commit f9965d88b3
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common.mk
View File

@@ -138,7 +138,7 @@ firrtl: $(FIRRTL_FILE) $(FINAL_ANNO_FILE)
######################################################################################### #########################################################################################
# create verilog files rules and variables # create verilog files rules and variables
######################################################################################### #########################################################################################
CIRCT_TARGETS = $(FIRTOOL_SMEMS_CONF) $(FIRTOOL_MOD_HIER_JSON) $(FIRTOOL_TB_MOD_HIER_JSON) $(FIRTOOL_SMEMS_JSON) $(FIRTOOL_TB_SMEMS_JSON) CIRCT_TARGETS = $(FIRTOOL_SMEMS_CONF) $(FIRTOOL_MOD_HIER_JSON) $(FIRTOOL_TB_MOD_HIER_JSON) $(FIRTOOL_SMEMS_JSON) $(FIRTOOL_TB_SMEMS_JSON) $(FIRTOOL_FILELIST)
# DOC include start: FirrtlCompiler # DOC include start: FirrtlCompiler
$(TOP_TARGETS) $(HARNESS_TARGETS) &: $(FIRRTL_FILE) $(ANNO_FILE) $(VLOG_SOURCES) $(TOP_TARGETS) $(HARNESS_TARGETS) &: $(FIRRTL_FILE) $(ANNO_FILE) $(VLOG_SOURCES)
@@ -208,7 +208,7 @@ $(TOP_MODS_FILELIST) $(TB_MODS_FILELIST) $(ALL_MODS_FILELIST) &: $(FIRTOOL_TB_MO
--out-tb-filelist $(TB_MODS_FILELIST) \ --out-tb-filelist $(TB_MODS_FILELIST) \
--in-all-filelist $(FIRTOOL_FILELIST) \ --in-all-filelist $(FIRTOOL_FILELIST) \
--build-dir $(build_dir) --build-dir $(build_dir)
sed -e 's;^;$(build_dir)/;' $(FIRTOOL_FILELIST) > $(ALL_MODS_FILELIST) cat $(TOP_MODS_FILELIST) $(TB_MODS_FILELIST) > $(ALL_MODS_FILELIST)
$(TOP_SMEMS_CONF) $(HARNESS_SMEMS_CONF) &: $(FIRTOOL_SMEMS_JSON) $(FIRTOOL_TB_SMEMS_JSON) $(FIRTOOL_SMEMS_CONF) $(TOP_SMEMS_CONF) $(HARNESS_SMEMS_CONF) &: $(FIRTOOL_SMEMS_JSON) $(FIRTOOL_TB_SMEMS_JSON) $(FIRTOOL_SMEMS_CONF)
$(base_dir)/scripts/split-mems-conf.py \ $(base_dir)/scripts/split-mems-conf.py \

22
scripts/split-module-files.py
View File

@@ -73,34 +73,40 @@ if __name__ == "__main__":
dut_mods = set(get_modules(dut_top)) dut_mods = set(get_modules(dut_top))
tb_mods = set(get_modules(j)) - dut_mods tb_mods = set(get_modules(j)) - dut_mods
both_mods = dut_mods.intersection(tb_mods) both_mods = dut_mods.intersection(tb_mods)
assert len(both_mods) == 0 assert len(both_mods) == 0
with open(args.out_dut_filelist, 'w') as df: with open(args.out_dut_filelist, 'w') as df:
with open(args.in_all_filelist) as fl: with open(args.in_all_filelist) as fl:
# add paths that correspond to modules to output file # add paths that correspond to modules to output file
for path in fl: for path in fl:
writeOut = True writeOut = False
for dm in dut_mods: for dm in dut_mods:
if dm in path: if dm in path:
# don't write writeOut = True
writeOut = False
break break
# prepend the build directory to get filelist with absolute paths # prepend the build directory to get filelist with absolute paths
if writeOut: if writeOut:
df.write(f"{args.build_dir}/{path}") if not args.build_dir in path:
df.write(f"{args.build_dir}/{path}")
else:
df.write(f"{path}")
with open(args.out_tb_filelist, 'w') as df: with open(args.out_tb_filelist, 'w') as df:
with open(args.in_all_filelist) as fl: with open(args.in_all_filelist) as fl:
# add paths that correspond to modules to output file # add paths that correspond to modules to output file
for path in fl: for path in fl:
writeOut = True writeOut = False
for dm in tb_mods: for dm in tb_mods:
if dm in path: if dm in path:
# don't write writeOut = True
writeOut = False
break break
# prepend the build directory to get filelist with absolute paths # prepend the build directory to get filelist with absolute paths
if writeOut: if writeOut:
df.write(f"{args.build_dir}/{path}") if not args.build_dir in path:
df.write(f"{args.build_dir}/{path}")
else:
df.write(f"{path}")