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

ci: Increment toolchain cache keys to clear cache

Browse Source 
Generate hashfiles from normalized output of git-submodule status.
(Interestingly, the old method also worked after submodule flattening.)
This commit is contained in:
Albert Ou
2019-09-26 23:04:34 -07:00
parent 090f3c68c3
commit a6b8301f0f
2 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
.circleci/config.yml
View File

@@ -31,14 +31,14 @@ jobs:
.circleci/create-hash.sh .circleci/create-hash.sh
- restore_cache: - restore_cache:
keys: keys:
- riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} - riscv-tools-installed-v2-{{ checksum "../riscv-tools.hash" }}
- run: - run:
name: Building riscv-tools toolchain name: Building riscv-tools toolchain
command: | command: |
.circleci/build-toolchains.sh riscv-tools .circleci/build-toolchains.sh riscv-tools
no_output_timeout: 120m no_output_timeout: 120m
- save_cache: - save_cache:
key: riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} key: riscv-tools-installed-v2-{{ checksum "../riscv-tools.hash" }}
paths: paths:
- "/home/riscvuser/riscv-tools-install" - "/home/riscvuser/riscv-tools-install"
install-esp-toolchain: install-esp-toolchain:
@@ -55,14 +55,14 @@ jobs:
.circleci/create-hash.sh .circleci/create-hash.sh
- restore_cache: - restore_cache:
keys: keys:
- esp-tools-installed-v1-{{ checksum "../esp-tools.hash" }} - esp-tools-installed-v2-{{ checksum "../esp-tools.hash" }}
- run: - run:
name: Building esp-tools toolchain name: Building esp-tools toolchain
command: | command: |
.circleci/build-toolchains.sh esp-tools .circleci/build-toolchains.sh esp-tools
no_output_timeout: 120m no_output_timeout: 120m
- save_cache: - save_cache:
key: esp-tools-installed-v1-{{ checksum "../esp-tools.hash" }} key: esp-tools-installed-v2-{{ checksum "../esp-tools.hash" }}
paths: paths:
- "/home/riscvuser/esp-tools-install" - "/home/riscvuser/esp-tools-install"
install-verilator: install-verilator:
@@ -105,7 +105,7 @@ jobs:
.circleci/create-hash.sh .circleci/create-hash.sh
- restore_cache: - restore_cache:
keys: keys:
- riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} - riscv-tools-installed-v2-{{ checksum "../riscv-tools.hash" }}
- run: - run:
name: Build extra tests name: Build extra tests
command: .circleci/build-extra-tests.sh command: .circleci/build-extra-tests.sh
@@ -131,7 +131,7 @@ jobs:
.circleci/create-hash.sh .circleci/create-hash.sh
- restore_cache: - restore_cache:
keys: keys:
- riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} - riscv-tools-installed-v2-{{ checksum "../riscv-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }} - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
@@ -160,7 +160,7 @@ jobs:
.circleci/create-hash.sh .circleci/create-hash.sh
- restore_cache: - restore_cache:
keys: keys:
- riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} - riscv-tools-installed-v2-{{ checksum "../riscv-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }} - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
@@ -189,7 +189,7 @@ jobs:
.circleci/create-hash.sh .circleci/create-hash.sh
- restore_cache: - restore_cache:
keys: keys:
- riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} - riscv-tools-installed-v2-{{ checksum "../riscv-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }} - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
@@ -218,7 +218,7 @@ jobs:
.circleci/create-hash.sh .circleci/create-hash.sh
- restore_cache: - restore_cache:
keys: keys:
- riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} - riscv-tools-installed-v2-{{ checksum "../riscv-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }} - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
@@ -247,7 +247,7 @@ jobs:
.circleci/create-hash.sh .circleci/create-hash.sh
- restore_cache: - restore_cache:
keys: keys:
- riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} - riscv-tools-installed-v2-{{ checksum "../riscv-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }} - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
@@ -276,7 +276,7 @@ jobs:
.circleci/create-hash.sh .circleci/create-hash.sh
- restore_cache: - restore_cache:
keys: keys:
- esp-tools-installed-v1-{{ checksum "../esp-tools.hash" }} - esp-tools-installed-v2-{{ checksum "../esp-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }} - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
@@ -305,7 +305,7 @@ jobs:
.circleci/create-hash.sh .circleci/create-hash.sh
- restore_cache: - restore_cache:
keys: keys:
- riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} - riscv-tools-installed-v2-{{ checksum "../riscv-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }} - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
@@ -334,7 +334,7 @@ jobs:
.circleci/create-hash.sh .circleci/create-hash.sh
- restore_cache: - restore_cache:
keys: keys:
- riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} - riscv-tools-installed-v2-{{ checksum "../riscv-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }} - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
@@ -363,7 +363,7 @@ jobs:
.circleci/create-hash.sh .circleci/create-hash.sh
- restore_cache: - restore_cache:
keys: keys:
- riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} - riscv-tools-installed-v2-{{ checksum "../riscv-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }} - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
@@ -389,7 +389,7 @@ jobs:
.circleci/create-hash.sh .circleci/create-hash.sh
- restore_cache: - restore_cache:
keys: keys:
- riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} - riscv-tools-installed-v2-{{ checksum "../riscv-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }} - verilator-installed-v3-{{ checksum "sims/verilator/verilator.mk" }}
@@ -410,7 +410,7 @@ jobs:
.circleci/create-hash.sh .circleci/create-hash.sh
- restore_cache: - restore_cache:
keys: keys:
- riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} - riscv-tools-installed-v2-{{ checksum "../riscv-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- example-{{ .Branch }}-{{ .Revision }} - example-{{ .Branch }}-{{ .Revision }}
@@ -434,7 +434,7 @@ jobs:
.circleci/create-hash.sh .circleci/create-hash.sh
- restore_cache: - restore_cache:
keys: keys:
- riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} - riscv-tools-installed-v2-{{ checksum "../riscv-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- boomrocketexample-{{ .Branch }}-{{ .Revision }} - boomrocketexample-{{ .Branch }}-{{ .Revision }}
@@ -458,7 +458,7 @@ jobs:
.circleci/create-hash.sh .circleci/create-hash.sh
- restore_cache: - restore_cache:
keys: keys:
- riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} - riscv-tools-installed-v2-{{ checksum "../riscv-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- boom-{{ .Branch }}-{{ .Revision }} - boom-{{ .Branch }}-{{ .Revision }}
@@ -482,7 +482,7 @@ jobs:
.circleci/create-hash.sh .circleci/create-hash.sh
- restore_cache: - restore_cache:
keys: keys:
- riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} - riscv-tools-installed-v2-{{ checksum "../riscv-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- rocketchip-{{ .Branch }}-{{ .Revision }} - rocketchip-{{ .Branch }}-{{ .Revision }}
@@ -506,7 +506,7 @@ jobs:
.circleci/create-hash.sh .circleci/create-hash.sh
- restore_cache: - restore_cache:
keys: keys:
- esp-tools-installed-v1-{{ checksum "../esp-tools.hash" }} - esp-tools-installed-v2-{{ checksum "../esp-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- hwacha-{{ .Branch }}-{{ .Revision }} - hwacha-{{ .Branch }}-{{ .Revision }}
@@ -530,7 +530,7 @@ jobs:
.circleci/create-hash.sh .circleci/create-hash.sh
- restore_cache: - restore_cache:
keys: keys:
- riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} - riscv-tools-installed-v2-{{ checksum "../riscv-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- firesim-{{ .Branch }}-{{ .Revision }} - firesim-{{ .Branch }}-{{ .Revision }}
@@ -557,7 +557,7 @@ jobs:
.circleci/create-hash.sh .circleci/create-hash.sh
- restore_cache: - restore_cache:
keys: keys:
- riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} - riscv-tools-installed-v2-{{ checksum "../riscv-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- fireboom-{{ .Branch }}-{{ .Revision }} - fireboom-{{ .Branch }}-{{ .Revision }}
@@ -585,7 +585,7 @@ jobs:
.circleci/create-hash.sh .circleci/create-hash.sh
- restore_cache: - restore_cache:
keys: keys:
- riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }} - riscv-tools-installed-v2-{{ checksum "../riscv-tools.hash" }}
- restore_cache: - restore_cache:
keys: keys:
- firesim-clockdiv-{{ .Branch }}-{{ .Revision }} - firesim-clockdiv-{{ .Branch }}-{{ .Revision }}

13
.circleci/create-hash.sh
View File

@@ -4,6 +4,7 @@
# turn echo on and error on earliest command # turn echo on and error on earliest command
set -ex set -ex
set -o pipefail
# get shared variables # get shared variables
SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )" SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
@@ -12,10 +13,10 @@ source $SCRIPT_DIR/defaults.sh
# enter bhd repo # enter bhd repo
cd $LOCAL_CHIPYARD_DIR cd $LOCAL_CHIPYARD_DIR
# get the version of riscv-tools from the git submodule hash # Use normalized output of git-submodule status as hashfile
git submodule status | grep "riscv-tools" | awk '{print$1}' | grep -o "[[:alnum:]]*" >> $HOME/riscv-tools.hash for tools in 'riscv-tools' 'esp-tools' ; do
git submodule status | grep "esp-tools" | awk '{print$1}' | grep -o "[[:alnum:]]*" >> $HOME/esp-tools.hash git submodule status "toolchains/${tools}" | while read -r line ; do
echo "${line#[!0-9a-f]}"
done > "${HOME}/${tools}.hash"
done
echo "Hashfile for riscv-tools and esp-tools created in $HOME" echo "Hashfile for riscv-tools and esp-tools created in $HOME"
echo "Contents: riscv-tools:$(cat $HOME/riscv-tools.hash)"
echo "Contents: esp-tools:$(cat $HOME/esp-tools.hash)"