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

Misc fixes & comments

Browse Source
This commit is contained in:
joey0320
2022-12-28 13:14:04 -08:00
parent 923eee9670
commit 744368d61f
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common.mk
View File

@@ -148,7 +148,6 @@ FIRTOOL_TARGETS = \
$(TOP_SMEMS_CONF) \ $(TOP_SMEMS_CONF) \
$(HARNESS_SMEMS_CONF) $(HARNESS_SMEMS_CONF)
SFC_MAIN = barstools.tapeout.transforms.GenerateTopAndHarness
REPL_SEQ_MEM = --infer-rw --repl-seq-mem -c:$(MODEL):-o:$(TOP_SMEMS_CONF) REPL_SEQ_MEM = --infer-rw --repl-seq-mem -c:$(MODEL):-o:$(TOP_SMEMS_CONF)
HARNESS_CONF_FLAGS = -thconf $(HARNESS_SMEMS_CONF) HARNESS_CONF_FLAGS = -thconf $(HARNESS_SMEMS_CONF)
@@ -182,13 +181,14 @@ $(CIRCT_TARGETS): firrtl_temp
@echo "" > /dev/null @echo "" > /dev/null
# hack: lower to middle firrtl if Fixed types are found # hack: lower to middle firrtl if Fixed types are found
# hack: when using dontTouch, io.cpu annotations are not removed by SFC, hence we remove them manually
$(FIRTOOL_TARGETS) &: $(FIRRTL_FILE) $(FINAL_ANNO_FILE) $(VLOG_SOURCES) $(FIRTOOL_TARGETS) &: $(FIRRTL_FILE) $(FINAL_ANNO_FILE) $(VLOG_SOURCES)
ifeq (,$(ENABLE_CUSTOM_FIRRTL_PASS)) ifeq (,$(ENABLE_CUSTOM_FIRRTL_PASS))
$(eval SFC_LEVEL := $(if $(shell grep "Fixed<" $(FIRRTL_FILE)), middle, none)) $(eval SFC_LEVEL := $(if $(shell grep "Fixed<" $(FIRRTL_FILE)), middle, none))
else else
$(eval SFC_LEVEL := low) $(eval SFC_LEVEL := low)
endif endif
$(call run_scala_main,tapeout,$(SFC_MAIN),\ $(call run_scala_main,tapeout,barstools.tapeout.transforms.GenerateTopAndHarness,\
--no-dedup \ --no-dedup \
--output-file $(SFC_FIRRTL_BASENAME) \ --output-file $(SFC_FIRRTL_BASENAME) \
--output-annotation-file $(SFC_ANNO_FILE) \ --output-annotation-file $(SFC_ANNO_FILE) \
@@ -203,8 +203,6 @@ endif
$(EXTRA_FIRRTL_OPTIONS)) $(EXTRA_FIRRTL_OPTIONS))
-mv $(SFC_FIRRTL_BASENAME).mid.fir $(SFC_FIRRTL_FILE) -mv $(SFC_FIRRTL_BASENAME).mid.fir $(SFC_FIRRTL_FILE)
-mv $(SFC_FIRRTL_BASENAME).lo.fir $(SFC_FIRRTL_FILE) -mv $(SFC_FIRRTL_BASENAME).lo.fir $(SFC_FIRRTL_FILE)
-cat $(TOP_SMEMS_CONF)
-cat $(HARNESS_SMEMS_CONF)
$(if $(ENABLE_CUSTOM_FIRRTL_PASS), cat $(SFC_ANNO_FILE) | jq 'del(.[] | select(.target | test("io.cpu"))?)' > /tmp/unnec-anno-deleted.sfc.anno.json,) $(if $(ENABLE_CUSTOM_FIRRTL_PASS), cat $(SFC_ANNO_FILE) | jq 'del(.[] | select(.target | test("io.cpu"))?)' > /tmp/unnec-anno-deleted.sfc.anno.json,)
$(if $(ENABLE_CUSTOM_FIRRTL_PASS), cat /tmp/unnec-anno-deleted.sfc.anno.json > $(SFC_ANNO_FILE) && rm /tmp/unnec-anno-deleted.sfc.anno.json,) $(if $(ENABLE_CUSTOM_FIRRTL_PASS), cat /tmp/unnec-anno-deleted.sfc.anno.json > $(SFC_ANNO_FILE) && rm /tmp/unnec-anno-deleted.sfc.anno.json,)
firtool \ firtool \