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

Fix more CI

Browse Source
This commit is contained in:
abejgonzalez
2022-10-10 13:43:19 -07:00
committed by joey0320
parent 65095507c7
commit a136bafabd
5 changed files with 64 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/scripts/defaults.sh vendored
View File

@@ -50,6 +50,7 @@ mapping["chipyard-hwacha"]=" CONFIG=HwachaRocketConfig"
mapping["chipyard-gemmini"]=" CONFIG=GemminiRocketConfig" mapping["chipyard-gemmini"]=" CONFIG=GemminiRocketConfig"
mapping["chipyard-cva6"]=" CONFIG=CVA6Config" mapping["chipyard-cva6"]=" CONFIG=CVA6Config"
mapping["chipyard-ibex"]=" CONFIG=IbexConfig" mapping["chipyard-ibex"]=" CONFIG=IbexConfig"
# currently spi tests are unsupported in verilator w/ circt
mapping["chipyard-spiflashread"]=" CONFIG=LargeSPIFlashROMRocketConfig" mapping["chipyard-spiflashread"]=" CONFIG=LargeSPIFlashROMRocketConfig"
mapping["chipyard-spiflashwrite"]=" CONFIG=SmallSPIFlashRocketConfig" mapping["chipyard-spiflashwrite"]=" CONFIG=SmallSPIFlashRocketConfig"
mapping["chipyard-mmios"]=" CONFIG=MMIORocketConfig verilog" mapping["chipyard-mmios"]=" CONFIG=MMIORocketConfig verilog"

93
.github/workflows/chipyard-run-tests.yml vendored
View File

@@ -581,51 +581,52 @@ jobs:
group-key: "group-peripherals" group-key: "group-peripherals"
project-key: "chipyard-dmirocket" project-key: "chipyard-dmirocket"
chipyard-spiflashwrite-run-tests: # Unsupported in Verilator due to CIRCT emitting alias for Analog connections
name: chipyard-spiflashwrite-run-tests # chipyard-spiflashwrite-run-tests:
needs: prepare-chipyard-peripherals # name: chipyard-spiflashwrite-run-tests
runs-on: self-hosted # needs: prepare-chipyard-peripherals
steps: # runs-on: self-hosted
- name: Delete old checkout # steps:
run: | # - name: Delete old checkout
ls -alh . # run: |
rm -rf ${{ github.workspace }}/* || true # ls -alh .
rm -rf ${{ github.workspace }}/.* || true # rm -rf ${{ github.workspace }}/* || true
ls -alh . # rm -rf ${{ github.workspace }}/.* || true
- name: Checkout # ls -alh .
uses: actions/checkout@v3 # - name: Checkout
- name: Git workaround # uses: actions/checkout@v3
uses: ./.github/actions/git-workaround # - name: Git workaround
- name: Create conda env # uses: ./.github/actions/git-workaround
uses: ./.github/actions/create-conda-env # - name: Create conda env
- name: Run tests # uses: ./.github/actions/create-conda-env
uses: ./.github/actions/run-tests # - name: Run tests
with: # uses: ./.github/actions/run-tests
group-key: "group-peripherals" # with:
project-key: "chipyard-spiflashwrite" # group-key: "group-peripherals"
# project-key: "chipyard-spiflashwrite"
chipyard-spiflashread-run-tests: #
name: chipyard-spiflashread-run-tests # chipyard-spiflashread-run-tests:
needs: prepare-chipyard-peripherals # name: chipyard-spiflashread-run-tests
runs-on: self-hosted # needs: prepare-chipyard-peripherals
steps: # runs-on: self-hosted
- name: Delete old checkout # steps:
run: | # - name: Delete old checkout
ls -alh . # run: |
rm -rf ${{ github.workspace }}/* || true # ls -alh .
rm -rf ${{ github.workspace }}/.* || true # rm -rf ${{ github.workspace }}/* || true
ls -alh . # rm -rf ${{ github.workspace }}/.* || true
- name: Checkout # ls -alh .
uses: actions/checkout@v3 # - name: Checkout
- name: Git workaround # uses: actions/checkout@v3
uses: ./.github/actions/git-workaround # - name: Git workaround
- name: Create conda env # uses: ./.github/actions/git-workaround
uses: ./.github/actions/create-conda-env # - name: Create conda env
- name: Run tests # uses: ./.github/actions/create-conda-env
uses: ./.github/actions/run-tests # - name: Run tests
with: # uses: ./.github/actions/run-tests
group-key: "group-peripherals" # with:
project-key: "chipyard-spiflashread" # group-key: "group-peripherals"
# project-key: "chipyard-spiflashread"
chipyard-lbwif-run-tests: chipyard-lbwif-run-tests:
name: chipyard-lbwif-run-tests name: chipyard-lbwif-run-tests
@@ -1043,9 +1044,7 @@ jobs:
chipyard-ibex-run-tests, chipyard-ibex-run-tests,
chipyard-sodor-run-tests, chipyard-sodor-run-tests,
chipyard-dmirocket-run-tests, chipyard-dmirocket-run-tests,
chipyard-spiflashwrite-run-tests,
chipyard-fftgenerator-run-tests, chipyard-fftgenerator-run-tests,
chipyard-spiflashread-run-tests,
chipyard-lbwif-run-tests, chipyard-lbwif-run-tests,
chipyard-sha3-run-tests, chipyard-sha3-run-tests,
chipyard-streaming-fir-run-tests, chipyard-streaming-fir-run-tests,

18
common.mk
View File

@@ -130,7 +130,7 @@ endef
export firtool_extra_anno_contents export firtool_extra_anno_contents
$(FINAL_ANNO_FILE) $(FIRTOOL_EXTRA_ANNO_FILE): $(ANNO_FILE) $(FINAL_ANNO_FILE) $(FIRTOOL_EXTRA_ANNO_FILE): $(ANNO_FILE)
echo "$$firtool_extra_anno_contents" > $(FIRTOOL_EXTRA_ANNO_FILE) echo "$$firtool_extra_anno_contents" > $(FIRTOOL_EXTRA_ANNO_FILE)
jq -s '[.[][]]' $(ANNO_FILE) $(FIRTOOL_EXTRA_ANNO_FILE) > $@ jq -s '[.[][]]' $(ANNO_FILE) $(FIRTOOL_EXTRA_ANNO_FILE) > $(FINAL_ANNO_FILE)
.PHONY: firrtl .PHONY: firrtl
firrtl: $(FIRRTL_FILE) $(FINAL_ANNO_FILE) firrtl: $(FIRRTL_FILE) $(FINAL_ANNO_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) $(FIRTOOL_FILELIST) CIRCT_TARGETS = $(FIRTOOL_SMEMS_CONF) $(FIRTOOL_MOD_HIER_JSON) $(FIRTOOL_TB_MOD_HIER_JSON) $(FIRTOOL_SMEMS_JSON) $(FIRTOOL_TB_SMEMS_JSON) $(FIRTOOL_FILELIST) $(FIRTOOL_BB_MODS_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)
@@ -171,15 +171,17 @@ $(CIRCT_TARGETS): firrtl_temp
# hack: lower to middle firrtl if Fixed types are found # hack: lower to middle firrtl if Fixed types are found
firrtl_temp: $(FIRRTL_FILE) $(FINAL_ANNO_FILE) $(VLOG_SOURCES) firrtl_temp: $(FIRRTL_FILE) $(FINAL_ANNO_FILE) $(VLOG_SOURCES)
$(call run_scala_main,tapeout,barstools.tapeout.transforms.GenerateTop,\ $(call run_scala_main,tapeout,barstools.tapeout.transforms.GenerateTop,\
--output-file $(SFC_FIRRTL_FILE) \ --no-dedup \
--output-file $(SFC_FIRRTL_START) \
--output-annotation-file $(SFC_ANNO_FILE) \
--target-dir $(build_dir) \ --target-dir $(build_dir) \
--input-file $(FIRRTL_FILE) \ --input-file $(FIRRTL_FILE) \
--annotation-file $(FINAL_ANNO_FILE) \ --annotation-file $(FINAL_ANNO_FILE) \
--out-anno-file $(SFC_ANNO_FILE) \
--log-level $(FIRRTL_LOGLEVEL) \ --log-level $(FIRRTL_LOGLEVEL) \
--allow-unrecognized-annotations \ --allow-unrecognized-annotations \
-X $(if $(shell grep "Fixed<" $(FIRRTL_FILE)),middle,none) \ -X $(if $(shell grep "Fixed<" $(FIRRTL_FILE)),middle,none) \
$(EXTRA_FIRRTL_OPTIONS)) $(EXTRA_FIRRTL_OPTIONS))
$(if $(shell grep "Fixed<" $(FIRRTL_FILE)),mv $(SFC_FIRRTL_START).mid.fir $(SFC_FIRRTL_FILE),)
firtool \ firtool \
--export-module-hierarchy \ --export-module-hierarchy \
--emit-metadata \ --emit-metadata \
@@ -200,7 +202,7 @@ firrtl_temp: $(FIRRTL_FILE) $(FINAL_ANNO_FILE) $(VLOG_SOURCES)
sed -i 's/.*/& /' $(FIRTOOL_SMEMS_CONF) # need trailing space for SFC macrocompiler sed -i 's/.*/& /' $(FIRTOOL_SMEMS_CONF) # need trailing space for SFC macrocompiler
# DOC include end: FirrtlCompiler # DOC include end: FirrtlCompiler
$(TOP_MODS_FILELIST) $(TB_MODS_FILELIST) $(ALL_MODS_FILELIST) &: $(FIRTOOL_TB_MOD_HIER_JSON) $(FIRTOOL_FILELIST) $(TOP_MODS_FILELIST) $(TB_MODS_FILELIST) $(ALL_MODS_FILELIST) $(BB_MODS_FILELIST) &: $(FIRTOOL_TB_MOD_HIER_JSON) $(FIRTOOL_FILELIST) $(FIRTOOL_BB_MODS_FILELIST)
$(base_dir)/scripts/split-module-files.py \ $(base_dir)/scripts/split-module-files.py \
--tb-hier-json $(FIRTOOL_TB_MOD_HIER_JSON) \ --tb-hier-json $(FIRTOOL_TB_MOD_HIER_JSON) \
--dut $(TOP) \ --dut $(TOP) \
@@ -209,6 +211,8 @@ $(TOP_MODS_FILELIST) $(TB_MODS_FILELIST) $(ALL_MODS_FILELIST) &: $(FIRTOOL_TB_MO
--in-all-filelist $(FIRTOOL_FILELIST) \ --in-all-filelist $(FIRTOOL_FILELIST) \
--build-dir $(build_dir) --build-dir $(build_dir)
cat $(TOP_MODS_FILELIST) $(TB_MODS_FILELIST) > $(ALL_MODS_FILELIST) cat $(TOP_MODS_FILELIST) $(TB_MODS_FILELIST) > $(ALL_MODS_FILELIST)
sed -i 's/\.\///' $(ALL_MODS_FILELIST)
sed -e 's;^;$(build_dir)/;' $(FIRTOOL_BB_MODS_FILELIST) > $(BB_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 \
@@ -230,8 +234,8 @@ $(HARNESS_SMEMS_FILE) $(HARNESS_SMEMS_FIR) &: $(HARNESS_SMEMS_CONF) | $(TOP_SMEM
######################################################################################## ########################################################################################
# remove duplicate files and headers in list of simulation file inputs # remove duplicate files and headers in list of simulation file inputs
######################################################################################## ########################################################################################
$(sim_common_files): $(sim_files) $(ALL_MODS_FILELIST) $(TOP_SMEMS_FILE) $(HARNESS_SMEMS_FILE) $(sim_common_files): $(sim_files) $(ALL_MODS_FILELIST) $(BB_MODS_FILELIST) $(TOP_SMEMS_FILE) $(HARNESS_SMEMS_FILE)
sort -u $(sim_files) $(ALL_MODS_FILELIST) | grep -v '.*\.\(svh\|h\)$$' > $@ sort -u $(sim_files) $(ALL_MODS_FILELIST) $(BB_MODS_FILELIST) | grep -v '.*\.\(svh\|h\)$$' > $@
echo "$(TOP_SMEMS_FILE)" >> $@ echo "$(TOP_SMEMS_FILE)" >> $@
echo "$(HARNESS_SMEMS_FILE)" >> $@ echo "$(HARNESS_SMEMS_FILE)" >> $@

2
generators/riscv-sodor

Submodule generators/riscv-sodor updated: fc56b7128f...510dea7407

5
variables.mk
View File

@@ -149,6 +149,7 @@ FIRTOOL_EXTRA_ANNO_FILE ?= $(build_dir)/$(long_name).extrafirtool.anno.json
FINAL_ANNO_FILE ?= $(build_dir)/$(long_name).appended.anno.json FINAL_ANNO_FILE ?= $(build_dir)/$(long_name).appended.anno.json
SFC_FIRRTL_FILE ?= $(build_dir)/$(long_name).sfc.fir SFC_FIRRTL_FILE ?= $(build_dir)/$(long_name).sfc.fir
SFC_FIRRTL_START ?= $(build_dir)/$(long_name).sfc
SFC_ANNO_FILE ?= $(build_dir)/$(long_name).sfc.anno.json SFC_ANNO_FILE ?= $(build_dir)/$(long_name).sfc.anno.json
FIRTOOL_MOD_HIER_JSON ?= $(build_dir)/modulehierarchy.json FIRTOOL_MOD_HIER_JSON ?= $(build_dir)/modulehierarchy.json
@@ -172,6 +173,10 @@ ALL_MODS_FILELIST ?= $(build_dir)/$(long_name).all.f
TOP_MODS_FILELIST ?= $(build_dir)/$(long_name).top.f TOP_MODS_FILELIST ?= $(build_dir)/$(long_name).top.f
# tb module files to include (not including top modules) # tb module files to include (not including top modules)
TB_MODS_FILELIST ?= $(build_dir)/$(long_name).tb.f TB_MODS_FILELIST ?= $(build_dir)/$(long_name).tb.f
# list of all blackbox files (may be included in the top/tb.f files)
FIRTOOL_BB_MODS_FILELIST ?= $(build_dir)/firrtl_black_box_resource_files.f
# this has the build_dir appended
BB_MODS_FILELIST ?= $(build_dir)/firrtl_black_box_resource_files.final.f
BOOTROM_FILES ?= bootrom.rv64.img bootrom.rv32.img BOOTROM_FILES ?= bootrom.rv64.img bootrom.rv32.img
BOOTROM_TARGETS ?= $(addprefix $(build_dir)/, $(BOOTROM_FILES)) BOOTROM_TARGETS ?= $(addprefix $(build_dir)/, $(BOOTROM_FILES))