diff --git a/.github/scripts/check-commit.sh b/.github/scripts/check-commit.sh index d45ac6ff..b15c571d 100755 --- a/.github/scripts/check-commit.sh +++ b/.github/scripts/check-commit.sh @@ -91,11 +91,6 @@ dir="tools" branches=("master" "dev") search -submodules=("firesim") -dir="sims" -branches=("master" "main" "dev" "1.13.x") -search - submodules=("fpga-shells") dir="fpga" branches=("main") diff --git a/README.md b/README.md index 91aa07ef..0d68cf77 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,8 @@ Chipyard is actively developed in the [Berkeley Architecture Research Group][ucb ## Resources * Chipyard Stable Documentation: https://chipyard.readthedocs.io/ -* Chipyard (x FireSim) Tutorial: https://fires.im/tutorial -* Chipyard Basics slides: https://fires.im/isca22-slides-pdf/02_chipyard_basics.pdf -* Chipyard Tutorial Exercise slides: https://fires.im/isca22-slides-pdf/03_building_custom_socs.pdf +* Chipyard (x FireSim) Tutorial: https://fires.im/tutorial-recent/ +* Chipyard Basics slides: https://fires.im/asplos23-slides-pdf/02_chipyard_basics.pdf ## Need help? @@ -74,6 +73,7 @@ These additional publications cover many of the internal components used in Chip * **FASED**: D. Biancolin, et al., *FPGA'19*. [PDF](https://people.eecs.berkeley.edu/~biancolin/papers/fased-fpga19.pdf). * **Golden Gate**: A. Magyar, et al., *ICCAD'19*. [PDF](https://davidbiancolin.github.io/papers/goldengate-iccad19.pdf). * **FirePerf**: S. Karandikar, et al., *ASPLOS'20*. [PDF](https://sagark.org/assets/pubs/fireperf-asplos2020.pdf). + * **FireSim ISCA@50 Retrospective**: S. Karandikar, et al., *ISCA@50 Retrospective: 1996-2020*. [PDF](https://sites.coecis.cornell.edu/isca50retrospective/files/2023/06/Karandikar_2018_FireSim.pdf) * **Tools** * **Chisel**: J. Bachrach, et al., *DAC'12*. [PDF](https://people.eecs.berkeley.edu/~krste/papers/chisel-dac2012.pdf). * **FIRRTL**: A. Izraelevitz, et al., *ICCAD'17*. [PDF](https://ieeexplore.ieee.org/document/8203780). diff --git a/docs/Chipyard-Basics/Initial-Repo-Setup.rst b/docs/Chipyard-Basics/Initial-Repo-Setup.rst index 610c7c6d..af57d6da 100644 --- a/docs/Chipyard-Basics/Initial-Repo-Setup.rst +++ b/docs/Chipyard-Basics/Initial-Repo-Setup.rst @@ -27,15 +27,8 @@ Conda allows users to create an "environment" that holds system dependencies lik .. Note:: Chipyard can also run on systems without a Conda installation. However, users on these systems must manually install toolchains and dependencies. -First, Chipyard requires Conda to be installed on the system. -Please refer to the `Conda installation instructions `__ on how to install Conda with the **Miniforge** installer. -Afterwards, verify that Conda is a sufficient version (we test on version 4.12.0 but higher is most likely fine). - -.. Note:: If you have installed conda separately from this documentation (i.e. from miniconda or full Anaconda), please ensure you follow https://conda-forge.org/docs/user/introduction.html#how-can-i-install-packages-from-conda-forge to use ``conda-forge`` packages without any issues. - -.. code-block:: shell - - conda --version # must be version 22.11.1 or higher +First, Chipyard requires the latest Conda to be installed on the system. +Please refer to the `Conda installation instructions `__ on how to install the latest Conda with the **Miniforge** installer. After Conda is installed and is on your ``PATH``, we need to install a version of ``git`` to initially checkout the repository. For this you can use the system package manager like ``yum`` or ``apt`` to install ``git``. diff --git a/sims/firesim b/sims/firesim index 56d30d55..7cade060 160000 --- a/sims/firesim +++ b/sims/firesim @@ -1 +1 @@ -Subproject commit 56d30d5536bdb1bcf6167103bd236b79d3cbd992 +Subproject commit 7cade06041e372f103c1b22fbb49aeb525aed871