From 453c46958cb0f50f637233b553027e3ca6d3ed5d Mon Sep 17 00:00:00 2001 From: Sagar Karandikar Date: Fri, 30 Jun 2023 11:15:28 +0000 Subject: [PATCH 1/7] bump firesim to main for release --- sims/firesim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sims/firesim b/sims/firesim index 56d30d5536..5a4cc3d795 160000 --- a/sims/firesim +++ b/sims/firesim @@ -1 +1 @@ -Subproject commit 56d30d5536bdb1bcf6167103bd236b79d3cbd992 +Subproject commit 5a4cc3d7951272cf7a4a17de6e25864620bde51a From 90e4fb95840ea289e85d8bcc7bfbdf228194dcd8 Mon Sep 17 00:00:00 2001 From: Sagar Karandikar Date: Sat, 8 Jul 2023 21:25:50 -0700 Subject: [PATCH 2/7] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 91aa07efe8..0d68cf774e 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). From a11a09cf5aa3b92c68ef16612fc6a948ff5cb738 Mon Sep 17 00:00:00 2001 From: Abraham Gonzalez Date: Sat, 8 Jul 2023 22:05:42 -0700 Subject: [PATCH 3/7] Clarify docs to use latest conda --- docs/Chipyard-Basics/Initial-Repo-Setup.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/Chipyard-Basics/Initial-Repo-Setup.rst b/docs/Chipyard-Basics/Initial-Repo-Setup.rst index 610c7c6d2a..910fe4d818 100644 --- a/docs/Chipyard-Basics/Initial-Repo-Setup.rst +++ b/docs/Chipyard-Basics/Initial-Repo-Setup.rst @@ -27,11 +27,10 @@ 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). +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. -.. 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. +.. 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. Additionally, ensure that it is up-to-date by running ``conda update -n base -c conda-forge conda``. .. code-block:: shell From 91fb5e61945cd1c65f10d599867b59b34dd118d3 Mon Sep 17 00:00:00 2001 From: Sagar Karandikar Date: Sat, 8 Jul 2023 22:14:05 -0700 Subject: [PATCH 4/7] Update Initial-Repo-Setup.rst --- docs/Chipyard-Basics/Initial-Repo-Setup.rst | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docs/Chipyard-Basics/Initial-Repo-Setup.rst b/docs/Chipyard-Basics/Initial-Repo-Setup.rst index 910fe4d818..af57d6da0c 100644 --- a/docs/Chipyard-Basics/Initial-Repo-Setup.rst +++ b/docs/Chipyard-Basics/Initial-Repo-Setup.rst @@ -30,12 +30,6 @@ Conda allows users to create an "environment" that holds system dependencies lik 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. -.. 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. Additionally, ensure that it is up-to-date by running ``conda update -n base -c conda-forge conda``. - -.. code-block:: shell - - conda --version # must be version 22.11.1 or higher - 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``. This ``git`` is only used to first checkout the repository, we will later install a newer version of ``git`` with Conda. From 18dfc93b6a5d3872edaca51cb14762ac2fe8b942 Mon Sep 17 00:00:00 2001 From: Sagar Karandikar Date: Fri, 30 Jun 2023 11:52:39 +0000 Subject: [PATCH 5/7] bump firesim --- sims/firesim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sims/firesim b/sims/firesim index 5a4cc3d795..3be1d12a6f 160000 --- a/sims/firesim +++ b/sims/firesim @@ -1 +1 @@ -Subproject commit 5a4cc3d7951272cf7a4a17de6e25864620bde51a +Subproject commit 3be1d12a6f44a65d3e55d79e76eaeba66e5577a5 From 336f225143590f9060ebe7101e96f235f96db985 Mon Sep 17 00:00:00 2001 From: Sagar Karandikar Date: Fri, 30 Jun 2023 12:32:25 +0000 Subject: [PATCH 6/7] remove firesim from commit-on-main check since we always manage it ourselves --- .github/scripts/check-commit.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/scripts/check-commit.sh b/.github/scripts/check-commit.sh index d45ac6ff65..b15c571d5b 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") From 73d9f292f628b95cc670a95bc37c9a1853801fe5 Mon Sep 17 00:00:00 2001 From: Sagar Karandikar Date: Fri, 30 Jun 2023 14:30:28 +0000 Subject: [PATCH 7/7] bump firesim --- sims/firesim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sims/firesim b/sims/firesim index 3be1d12a6f..7cade06041 160000 --- a/sims/firesim +++ b/sims/firesim @@ -1 +1 @@ -Subproject commit 3be1d12a6f44a65d3e55d79e76eaeba66e5577a5 +Subproject commit 7cade06041e372f103c1b22fbb49aeb525aed871