ucb-bar · jerryz123 · Feb 7, 2023 · Feb 5, 2023 · Feb 5, 2023 · Feb 5, 2023
diff --git a/docs/Chipyard-Basics/Initial-Repo-Setup.rst b/docs/Chipyard-Basics/Initial-Repo-Setup.rst
@@ -63,9 +63,11 @@ Start by checking out the proper Chipyard version. Run:
     git checkout |version|
 
 Next run the following script to fully setup Chipyard with a specific toolchain.
-There are two toolchains, one for normal RISC-V programs called ``riscv-tools`` which is the one needed for most Chipyard use-cases, and another for Hwacha/Gemmini called ``esp-tools``.
+There are two toolchains, one for normal RISC-V programs called ``riscv-tools`` which is the one needed for most Chipyard use-cases, and another for Hwacha called ``esp-tools``.
 Run the following script based off which compiler you would like to use.
 
+.. Note:: Prior versions of Chipyard recommended ``esp-tools`` for Gemmini development. Gemmini should now be used with the standard ``riscv-tools``.
+
 .. Warning:: The following script will complete a "full" installation of Chipyard which may take a long time depending on the system.
     Ensure that this script completes fully (no interruptions) before continuing on.
 

diff --git a/generators/chipyard/src/main/resources/csrc/spiketile.cc b/generators/chipyard/src/main/resources/csrc/spiketile.cc
@@ -260,11 +260,11 @@ extern "C" void spike_tile(int hartid, char* isa,
                            "vlen:128,elen:64",
                            false,
                            endianness_little,
-                           false,
                            pmpregions,
                            std::vector<mem_cfg_t>(),
                            std::vector<int>(),
-                           false);
+                           false,
+                           0);
     processor_t* p = new processor_t(isa_parser,
                                      cfg,
                                      simif,

diff --git a/generators/gemmini b/generators/gemmini
diff --git a/scripts/build-setup.sh b/scripts/build-setup.sh
@@ -87,6 +87,27 @@ run_step() {
 
 {
 
+# esp-tools should ONLY be used for hwacha.
+# Check for this, since many users will be attempting to use this with gemmini
+if [ $TOOLCHAIN_TYPE == "esp-tools" ]; then
+    while true; do
+        read -p "WARNING: You are trying to install the esp-tools toolchain."$'n'"This should ONLY be used for Hwacha development."$'\n'"Gemmini should be used with riscv-tools."$'\n'"Type \"y\" to continue if this is intended, or \"n\" if not: " validate
+        case "$validate" in
+            y | Y)
+                echo "Installing esp-tools."
+                break
+                ;;
+            n | N)
+                error "Rerun with riscv-tools"
+                exit 3
+                ;;
+            *)
+                error "Invalid response. Please type \"y\" or \"n\""
+                ;;
+        esac
+    done
+fi
+
 # setup and install conda environment
 if run_step "1"; then
     # note: lock file must end in .conda-lock.yml - see https://github.com/conda-incubator/conda-lock/issues/154

diff --git a/scripts/build-toolchain-extra.sh b/scripts/build-toolchain-extra.sh
@@ -102,4 +102,13 @@ echo '==> Installing espresso logic minimizer'
 echo '==>  Installing libgloss'
 CC= CXX= SRCDIR="$(pwd)/toolchains" module_all libgloss --prefix="${RISCV}/riscv${XLEN}-unknown-elf" --host=riscv${XLEN}-unknown-elf
 
+cd $RDIR
+if [ $TOOLCHAIN == "riscv-tools" ]; then
+    echo '==> Installing gemmini spike extensions'
+    git submodule update --init generators/gemmini
+    cd generators/gemmini
+    git submodule update --init software/libgemmini
+    make -C $RDIR/generators/gemmini/software/libgemmini install
+fi
+
 echo "Extra Toolchain Utilities/Tests Build Complete!"
diff --git a/toolchains/riscv-tools/riscv-isa-sim b/toolchains/riscv-tools/riscv-isa-sim
+0 −8		.github/scripts/run-tests-spike.sh
+3 −0		.gitmodules
+1 −1		CHIPYARD.hash
+0 −1		SPIKE.hash
+1 −0		software/libgemmini
+6 −2		.github/workflows/continuous-integration.yml
+64 −0		.github/workflows/debug-smoke.yml
+3 −2		README.md
+14 −0		ci-tests/build-spike
+0 −9		ci-tests/test-spike
+3 −3		ci-tests/testlib.c
+1 −0		customext/cflush.cc
+1 −0		disasm/disasm.cc
+6 −0		fesvr/htif.cc
+3 −0		fesvr/htif.h
+5 −1		riscv/cfg.cc
+18 −5		riscv/cfg.h
+2 −3		riscv/csrs.h
+3 −0		riscv/devices.h
+2 −1		riscv/disasm.h
+86 −3		riscv/encoding.h
+13 −3		riscv/execute.cc
+2 −0		riscv/insns/czero_eqz.h
+2 −0		riscv/insns/czero_nez.h
+1 −0		riscv/interactive.cc
+22 −23		riscv/isa_parser.cc
+9 −6		riscv/isa_parser.h
+4 −2		riscv/mmu.cc
+1 −3		riscv/mmu.h
+9 −1		riscv/ns16550.cc
+24 −10		riscv/processor.cc
+9 −2		riscv/processor.h
+8 −0		riscv/riscv.mk.in
+15 −7		riscv/rocc.h
+18 −39		riscv/sim.cc
+0 −6		riscv/sim.h
+109 −21		riscv/triggers.cc
+27 −2		riscv/triggers.h
+2 −2		spike_main/spike-log-parser.cc
+38 −18		spike_main/spike.cc