Skip to content

Commit 32c957c

Browse files
authored
Merge pull request #418 from ucb-bar/dev
Chipyard Release 1.2.0
2 parents f0ba107 + a3e12b9 commit 32c957c

File tree

123 files changed

+3049
-2749
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+3049
-2749
lines changed

.circleci/README.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ For example:
1616
- prepare-rocketchip:
1717
requires:
1818
- install-riscv-toolchain
19-
- install-verilator
2019

21-
This specifies that the `prepare-rocketchip` job needs the `install-riscv-toolchain` and `install-verilator` steps to run before it can run.
20+
This specifies that the `prepare-rocketchip` job needs the `install-riscv-toolchain` steps to run before it can run.
2221

2322
All jobs in the CI workflow are specified at the top of `config.yml`
2423
They specify a docker image to use (in this case a riscv-boom image since that is already available and works nicely) and an environment.
@@ -36,7 +35,6 @@ This directory contains all the collateral for the Chipyard CI to work.
3635
The following is included:
3736

3837
`build-toolchains.sh` # build either riscv-tools or esp-tools
39-
`build-verilator.sh` # build verilator (remotely)
4038
`create-hash.sh` # create hashes of riscv-tools/esp-tools so circleci caching can work
4139
`do-rtl-build.sh` # use verilator to build a sim executable (remotely)
4240
`config.yml` # main circleci config script to enumerate jobs/workflows
@@ -48,11 +46,10 @@ How things are setup for Chipyard
4846
The steps for CI to run are as follows.
4947
1st, build the toolchains in parallel (note: `esp-tools` is currently not used in the run).
5048
The docker image sets up the `PATH` and `RISCV` variable so that `riscv-tools` is the default (currently the `env.sh` script that is created at tool build is unused).
51-
2nd, install verilator using the `*.mk` to cache unique versions of verilator (mainly for if verilator is bumped).
52-
3rd, create the simulator binary.
49+
2nd, create the simulator binary.
5350
This requires the `riscv-tools` for `fesvr` and `verilator` to be able to build the binary.
5451
This stores all collateral for the tests (srcs, generated-srcs, sim binary, etc) to run "out of the gate" in the next job (make needs everything or else it will run again).
55-
4th, finally run the tests that were wanted.
52+
3rd, finally run the desired tests.
5653

5754
Other CI Setup
5855
--------------

.circleci/build-verilator.sh

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)