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

Merge pull request #154 from ucb-bar/cleanup

Browse Source 
Address misc. issues
This commit is contained in:
Abraham Gonzalez
2019-07-16 14:50:45 -07:00
committed by GitHub
parent 1520e239f1 01f21900fe
commit fb91f2346d
10 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/build-verilator.sh
View File

@@ -23,7 +23,7 @@ if [ ! -d "$LOCAL_VERILATOR_DIR" ]; then
run "mkdir -p $REMOTE_CHIPYARD_DIR" run "mkdir -p $REMOTE_CHIPYARD_DIR"
copy $LOCAL_CHIPYARD_DIR/ $SERVER:$REMOTE_CHIPYARD_DIR copy $LOCAL_CHIPYARD_DIR/ $SERVER:$REMOTE_CHIPYARD_DIR
run "make -C $REMOTE_CHIPYARD_DIR/sims/verisim VERILATOR_INSTALL_DIR=$REMOTE_VERILATOR_DIR verilator_install" run "make -C $REMOTE_SIM_DIR VERILATOR_INSTALL_DIR=$REMOTE_VERILATOR_DIR verilator_install"
# copy so that circleci can cache # copy so that circleci can cache
mkdir -p $LOCAL_CHIPYARD_DIR mkdir -p $LOCAL_CHIPYARD_DIR

2
.circleci/check-commit.sh
View File

@@ -26,7 +26,7 @@ search () {
done done
} }
submodules=("boom" "firechip" "hwacha" "icenet" "rocket-chip" "sifive-blocks" "sifive-cache" "testchipip") submodules=("boom" "hwacha" "icenet" "rocket-chip" "sifive-blocks" "sifive-cache" "testchipip")
dir="generators" dir="generators"
search search

28
.circleci/config.yml
View File

@@ -78,14 +78,14 @@ jobs:
- checkout - checkout
- restore_cache: - restore_cache:
keys: keys:
- verilator-installed-v3-{{ checksum "sims/verisim/verilator.mk" }} - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
- run: - run:
name: Build Verilator name: Build Verilator
command: | command: |
.circleci/build-verilator.sh .circleci/build-verilator.sh
no_output_timeout: 120m no_output_timeout: 120m
- save_cache: - save_cache:
key: verilator-installed-v3-{{ checksum "sims/verisim/verilator.mk" }} key: verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
paths: paths:
- "/home/riscvuser/verilator" - "/home/riscvuser/verilator"
prepare-example: prepare-example:
@@ -108,7 +108,7 @@ jobs:
- riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} - riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- verilator-installed-v3-{{ checksum "sims/verisim/verilator.mk" }} - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
- run: - run:
name: Building the example subproject using Verilator name: Building the example subproject using Verilator
command: .circleci/do-rtl-build.sh example command: .circleci/do-rtl-build.sh example
@@ -137,7 +137,7 @@ jobs:
- riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} - riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- verilator-installed-v3-{{ checksum "sims/verisim/verilator.mk" }} - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
- run: - run:
name: Building the boomexample subproject using Verilator name: Building the boomexample subproject using Verilator
command: .circleci/do-rtl-build.sh boomexample command: .circleci/do-rtl-build.sh boomexample
@@ -166,7 +166,7 @@ jobs:
- riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} - riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- verilator-installed-v3-{{ checksum "sims/verisim/verilator.mk" }} - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
- run: - run:
name: Building the boomrocketexample subproject using Verilator name: Building the boomrocketexample subproject using Verilator
command: .circleci/do-rtl-build.sh boomrocketexample command: .circleci/do-rtl-build.sh boomrocketexample
@@ -195,7 +195,7 @@ jobs:
- riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} - riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- verilator-installed-v3-{{ checksum "sims/verisim/verilator.mk" }} - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
- run: - run:
name: Building the boom subproject using Verilator name: Building the boom subproject using Verilator
command: .circleci/do-rtl-build.sh boom command: .circleci/do-rtl-build.sh boom
@@ -224,7 +224,7 @@ jobs:
- riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} - riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- verilator-installed-v3-{{ checksum "sims/verisim/verilator.mk" }} - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
- run: - run:
name: Building the rocketchip subproject using Verilator name: Building the rocketchip subproject using Verilator
command: .circleci/do-rtl-build.sh rocketchip command: .circleci/do-rtl-build.sh rocketchip
@@ -253,7 +253,7 @@ jobs:
- esp-tools-installed-v1-{{ checksum "../esp-tools.hash" }} - esp-tools-installed-v1-{{ checksum "../esp-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- verilator-installed-v3-{{ checksum "sims/verisim/verilator.mk" }} - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
- run: - run:
name: Building the hwacha subproject using Verilator name: Building the hwacha subproject using Verilator
command: .circleci/do-rtl-build.sh hwacha command: .circleci/do-rtl-build.sh hwacha
@@ -282,7 +282,7 @@ jobs:
- example-{{ .Branch }}-{{ .Revision }} - example-{{ .Branch }}-{{ .Revision }}
- restore_cache: - restore_cache:
keys: keys:
- verilator-installed-v3-{{ checksum "sims/verisim/verilator.mk" }} - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
- run: - run:
name: Run example tests name: Run example tests
command: .circleci/run-tests.sh example command: .circleci/run-tests.sh example
@@ -306,7 +306,7 @@ jobs:
- boomexample-{{ .Branch }}-{{ .Revision }} - boomexample-{{ .Branch }}-{{ .Revision }}
- restore_cache: - restore_cache:
keys: keys:
- verilator-installed-v3-{{ checksum "sims/verisim/verilator.mk" }} - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
- run: - run:
name: Run boomexample tests name: Run boomexample tests
command: .circleci/run-tests.sh boomexample command: .circleci/run-tests.sh boomexample
@@ -330,7 +330,7 @@ jobs:
- boomrocketexample-{{ .Branch }}-{{ .Revision }} - boomrocketexample-{{ .Branch }}-{{ .Revision }}
- restore_cache: - restore_cache:
keys: keys:
- verilator-installed-v3-{{ checksum "sims/verisim/verilator.mk" }} - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
- run: - run:
name: Run boomrocketexample tests name: Run boomrocketexample tests
command: .circleci/run-tests.sh boomrocketexample command: .circleci/run-tests.sh boomrocketexample
@@ -354,7 +354,7 @@ jobs:
- boom-{{ .Branch }}-{{ .Revision }} - boom-{{ .Branch }}-{{ .Revision }}
- restore_cache: - restore_cache:
keys: keys:
- verilator-installed-v3-{{ checksum "sims/verisim/verilator.mk" }} - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
- run: - run:
name: Run boom tests name: Run boom tests
command: .circleci/run-tests.sh boom command: .circleci/run-tests.sh boom
@@ -378,7 +378,7 @@ jobs:
- rocketchip-{{ .Branch }}-{{ .Revision }} - rocketchip-{{ .Branch }}-{{ .Revision }}
- restore_cache: - restore_cache:
keys: keys:
- verilator-installed-v3-{{ checksum "sims/verisim/verilator.mk" }} - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
- run: - run:
name: Run rocketchip tests name: Run rocketchip tests
command: .circleci/run-tests.sh rocketchip command: .circleci/run-tests.sh rocketchip
@@ -402,7 +402,7 @@ jobs:
- hwacha-{{ .Branch }}-{{ .Revision }} - hwacha-{{ .Branch }}-{{ .Revision }}
- restore_cache: - restore_cache:
keys: keys:
- verilator-installed-v3-{{ checksum "sims/verisim/verilator.mk" }} - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
- run: - run:
name: Run hwacha tests name: Run hwacha tests
command: .circleci/run-tests.sh hwacha command: .circleci/run-tests.sh hwacha

4
.circleci/defaults.sh
View File

@@ -23,7 +23,7 @@ REMOTE_RISCV_DIR=$REMOTE_WORK_DIR/riscv-tools-install
REMOTE_ESP_DIR=$REMOTE_WORK_DIR/esp-tools-install REMOTE_ESP_DIR=$REMOTE_WORK_DIR/esp-tools-install
REMOTE_CHIPYARD_DIR=$REMOTE_WORK_DIR/chipyard REMOTE_CHIPYARD_DIR=$REMOTE_WORK_DIR/chipyard
REMOTE_VERILATOR_DIR=$REMOTE_WORK_DIR/verilator REMOTE_VERILATOR_DIR=$REMOTE_WORK_DIR/verilator
REMOTE_SIM_DIR=$REMOTE_CHIPYARD_DIR/sims/verisim REMOTE_SIM_DIR=$REMOTE_CHIPYARD_DIR/sims/verilator
# local variables (aka within the docker container) # local variables (aka within the docker container)
LOCAL_CHECKOUT_DIR=$HOME/project LOCAL_CHECKOUT_DIR=$HOME/project
@@ -31,7 +31,7 @@ LOCAL_RISCV_DIR=$HOME/riscv-tools-install
LOCAL_ESP_DIR=$HOME/esp-tools-install LOCAL_ESP_DIR=$HOME/esp-tools-install
LOCAL_CHIPYARD_DIR=$LOCAL_CHECKOUT_DIR LOCAL_CHIPYARD_DIR=$LOCAL_CHECKOUT_DIR
LOCAL_VERILATOR_DIR=$HOME/verilator LOCAL_VERILATOR_DIR=$HOME/verilator
LOCAL_SIM_DIR=$LOCAL_CHIPYARD_DIR/sims/verisim LOCAL_SIM_DIR=$LOCAL_CHIPYARD_DIR/sims/verilator
# key value store to get the build strings # key value store to get the build strings
declare -A mapping declare -A mapping

5
common.mk
View File

@@ -73,8 +73,9 @@ $(HARNESS_SMEMS_FILE) $(HARNESS_SMEMS_FIR): $(HARNESS_SMEMS_CONF)
verilog: $(sim_vsrcs) verilog: $(sim_vsrcs)
######################################################################################### #########################################################################################
# helper rules to run simulator # helper rules to run simulations
######################################################################################### #########################################################################################
.PHONY: run-binary run-fast
run-binary: $(sim) run-binary: $(sim)
(set -o pipefail && $(sim) $(PERMISSIVE_ON) +max-cycles=$(timeout_cycles) $(SIM_FLAGS) $(VERBOSE_FLAGS) $(PERMISSIVE_OFF) $(BINARY) 3>&1 1>&2 2>&3 | spike-dasm > $(sim_out_name).out) (set -o pipefail && $(sim) $(PERMISSIVE_ON) +max-cycles=$(timeout_cycles) $(SIM_FLAGS) $(VERBOSE_FLAGS) $(PERMISSIVE_OFF) $(BINARY) 3>&1 1>&2 2>&3 | spike-dasm > $(sim_out_name).out)
@@ -90,6 +91,8 @@ run-binary-fast: $(sim)
run-binary-debug: $(sim_debug) run-binary-debug: $(sim_debug)
(set -o pipefail && $(sim_debug) $(PERMISSIVE_ON) +max-cycles=$(timeout_cycles) $(SIM_FLAGS) $(VERBOSE_FLAG) $(WAVEFORM_FLAG) $(PERMISSIVE_OFF) $(BINARY) 3>&1 1>&2 2>&3 | spike-dasm > $(sim_out_name).out) (set -o pipefail && $(sim_debug) $(PERMISSIVE_ON) +max-cycles=$(timeout_cycles) $(SIM_FLAGS) $(VERBOSE_FLAG) $(WAVEFORM_FLAG) $(PERMISSIVE_OFF) $(BINARY) 3>&1 1>&2 2>&3 | spike-dasm > $(sim_out_name).out)
run-fast: run-asm-tests-fast run-bmark-tests-fast
######################################################################################### #########################################################################################
# run assembly/benchmarks rules # run assembly/benchmarks rules
######################################################################################### #########################################################################################

0
sims/vsim/.gitignore → sims/vcs/.gitignore vendored
View File

1
sims/vsim/Makefile → sims/vcs/Makefile
View File

@@ -56,6 +56,7 @@ VCS_NONCC_OPTS = \
-error=PCWM-L \ -error=PCWM-L \
-timescale=1ns/10ps \ -timescale=1ns/10ps \
-quiet \ -quiet \
-q \
+rad \ +rad \
+v2k \ +v2k \
+vcs+lic+wait \ +vcs+lic+wait \

0
sims/verisim/.gitignore → sims/verilator/.gitignore vendored
View File

0
sims/verisim/Makefile → sims/verilator/Makefile
View File

0
sims/verisim/verilator.mk → sims/verilator/verilator.mk
View File