From a64604470591a54239a20c8e1ac19663bce2de49 Mon Sep 17 00:00:00 2001
From: Sagar Karandikar <sagark@eecs.berkeley.edu>
Date: Sun, 16 Oct 2022 17:19:12 -0700
Subject: [PATCH 01/10] fix open files issue and bump firesim with various
 fixes

---
 build-setup.sh            |  1 +
 scripts/fix-open-files.sh | 12 ++++++++++++
 sims/firesim              |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 scripts/fix-open-files.sh

diff --git a/build-setup.sh b/build-setup.sh
index 2435705b..8d5d25a5 100755
--- a/build-setup.sh
+++ b/build-setup.sh
@@ -96,4 +96,5 @@ $RDIR/scripts/gen-tags.sh
 cat << EOT >> env.sh
 # line auto-generated by $0
 conda activate $RDIR/.conda-env
+source $RDIR/scripts/fix-open-files.sh
 EOT
diff --git a/scripts/fix-open-files.sh b/scripts/fix-open-files.sh
new file mode 100644
index 00000000..79e12e7a
--- /dev/null
+++ b/scripts/fix-open-files.sh
@@ -0,0 +1,12 @@
+
+# first, check if the system allows sufficient limits (the hard limit)
+HARD_LIMIT=$(ulimit -Hn)
+REQUIRED_LIMIT=16384
+
+if [ "$HARD_LIMIT" -lt "$REQUIRED_LIMIT" ]; then
+    echo "WARNING: Your system does not support an open files limit (the output of 'ulimit -Sn' and 'ulimit -Hn') of at least $REQUIRED_LIMIT, which is required to workaround a bug in buildroot. You will not be able to build a Linux distro with FireMarshal until this is addressed."
+fi
+
+# in any case, set the soft limit to the same value as the hard limit
+ulimit -Sn $(ulimit -Hn)
+
diff --git a/sims/firesim b/sims/firesim
index 37d4fd03..b1abd4b2 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit 37d4fd03d68af44bfe22712c102ec0c2b361c9f7
+Subproject commit b1abd4b296c84b52eab4270bbe8b7bd835d68cd0

From a3545f2453f37bfc13f13bccf0cc89c408d2718c Mon Sep 17 00:00:00 2001
From: Sagar Karandikar <sagark@eecs.berkeley.edu>
Date: Sun, 16 Oct 2022 19:17:14 -0700
Subject: [PATCH 02/10] fix base path in generated env.sh

---
 scripts/init-submodules-no-riscv-tools-nolog.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/init-submodules-no-riscv-tools-nolog.sh b/scripts/init-submodules-no-riscv-tools-nolog.sh
index 76389b39..19eaeb8c 100755
--- a/scripts/init-submodules-no-riscv-tools-nolog.sh
+++ b/scripts/init-submodules-no-riscv-tools-nolog.sh
@@ -149,7 +149,7 @@ fi
 
 cat << EOT >> env.sh
 # line auto-generated by init-submodules-no-riscv-tools.sh
-__DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]:-${(%):-%x}}")")"
+__DIR="$RDIR"
 PATH=\$__DIR/bin:\$PATH
 PATH=\$__DIR/software/firemarshal:\$PATH
 EOT

From b659a3ed6ab0dd4a67d0c88ff44cc6a10fdf0133 Mon Sep 17 00:00:00 2001
From: Sagar Karandikar <sagark@eecs.berkeley.edu>
Date: Sun, 16 Oct 2022 20:11:22 -0700
Subject: [PATCH 03/10] update repo-clean.sh script. actually get clean repo
 now

---
 scripts/repo-clean.sh | 10 +++++++++-
 sims/firesim          |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/scripts/repo-clean.sh b/scripts/repo-clean.sh
index 35a11deb..9c6d0389 100755
--- a/scripts/repo-clean.sh
+++ b/scripts/repo-clean.sh
@@ -16,7 +16,7 @@ rm -rf $RDIR/toolchains/esp-tools/riscv-tests/build.log
     pushd $RDIR/generators/constellation
     if [ -d espresso ]
     then
-	git submodule deinit espresso    
+	git submodule deinit -f espresso
     fi
     popd
 )
@@ -25,3 +25,11 @@ rm -rf $RDIR/toolchains/esp-tools/riscv-tests/build.log
     git config --local status.showUntrackedFiles no
     popd
 )
+(
+    pushd $RDIR/generators/cva6/src/main/resources/vsrc
+    if [ -d cva6 ]
+    then
+	git submodule deinit -f cva6
+    fi
+    popd
+)
diff --git a/sims/firesim b/sims/firesim
index b1abd4b2..5991ada5 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit b1abd4b296c84b52eab4270bbe8b7bd835d68cd0
+Subproject commit 5991ada598704988552e7e2f06e1c978c3508ef7

From 7f886abb4dd53cad5c46887cf37e858ceae7a310 Mon Sep 17 00:00:00 2001
From: Sagar Karandikar <sagark@eecs.berkeley.edu>
Date: Sun, 16 Oct 2022 20:25:10 -0700
Subject: [PATCH 04/10] add first clone convenience script

---
 scripts/first-clone-setup-fast.sh | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100755 scripts/first-clone-setup-fast.sh

diff --git a/scripts/first-clone-setup-fast.sh b/scripts/first-clone-setup-fast.sh
new file mode 100755
index 00000000..3dbf84a1
--- /dev/null
+++ b/scripts/first-clone-setup-fast.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+set -ex
+
+{
+
+export MAKEFLAGS=-j16
+
+STARTDIR=$(git rev-parse --show-toplevel)
+
+./build-setup.sh riscv-tools -f
+source env.sh
+
+./scripts/firesim-setup.sh
+cd sims/firesim
+source sourceme-f1-manager.sh --skip-ssh-setup
+
+cd sim
+unset MAKEFLAGS
+make f1
+export MAKEFLAGS=-j16
+
+cd $STARTDIR/software/firemarshal
+./init-submodules.sh
+marshal -v build br-base.json
+
+cd $STARTDIR
+./scripts/repo-clean.sh
+
+} 2>&1 | tee first-clone-setup-fast-log

From b2451d2f27c918782f632888061231a9bd064b2f Mon Sep 17 00:00:00 2001
From: Sagar Karandikar <sagark@eecs.berkeley.edu>
Date: Sun, 16 Oct 2022 20:27:50 -0700
Subject: [PATCH 05/10] .gitignore first-clone-setup-fast-log

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index ff673175..9aba3983 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ tags
 .bsp/
 .conda-env/
 .#*
+first-clone-setup-fast-log

From 301f5519e90d6e83a2f9e272debecaa9026a6475 Mon Sep 17 00:00:00 2001
From: Sagar Karandikar <sagark@eecs.berkeley.edu>
Date: Sun, 16 Oct 2022 22:20:12 -0700
Subject: [PATCH 06/10] fix first clone script conda setup

---
 scripts/first-clone-setup-fast.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/first-clone-setup-fast.sh b/scripts/first-clone-setup-fast.sh
index 3dbf84a1..728fac1b 100755
--- a/scripts/first-clone-setup-fast.sh
+++ b/scripts/first-clone-setup-fast.sh
@@ -9,6 +9,9 @@ export MAKEFLAGS=-j16
 STARTDIR=$(git rev-parse --show-toplevel)
 
 ./build-setup.sh riscv-tools -f
+
+source $STARTDIR/.conda-env/etc/profile.d/conda.sh
+
 source env.sh
 
 ./scripts/firesim-setup.sh
@@ -17,7 +20,7 @@ source sourceme-f1-manager.sh --skip-ssh-setup
 
 cd sim
 unset MAKEFLAGS
-make f1
+make verilator
 export MAKEFLAGS=-j16
 
 cd $STARTDIR/software/firemarshal

From a5acc569df1b5bee045a6b6bd524588d20325c0a Mon Sep 17 00:00:00 2001
From: Sagar Karandikar <sagark@eecs.berkeley.edu>
Date: Mon, 17 Oct 2022 21:38:29 -0700
Subject: [PATCH 07/10] bump firesim

---
 sims/firesim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sims/firesim b/sims/firesim
index 5991ada5..cb2a9fb6 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit 5991ada598704988552e7e2f06e1c978c3508ef7
+Subproject commit cb2a9fb6f86ebbd542d8e26e07b3cf8d57f56958

From fcd087944f12b67f8c3b5dd2ac6570a620c85465 Mon Sep 17 00:00:00 2001
From: Sagar Karandikar <sagark@eecs.berkeley.edu>
Date: Mon, 17 Oct 2022 21:52:28 -0700
Subject: [PATCH 08/10] bump firesim

---
 sims/firesim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sims/firesim b/sims/firesim
index cb2a9fb6..e43bef52 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit cb2a9fb6f86ebbd542d8e26e07b3cf8d57f56958
+Subproject commit e43bef5259cf5a684db3e4ebd5592c39176f84ce

From 518116bb280651e04a394b1cdd3d1bc13428173b Mon Sep 17 00:00:00 2001
From: Sagar Karandikar <sagark@eecs.berkeley.edu>
Date: Tue, 18 Oct 2022 15:35:49 -0700
Subject: [PATCH 09/10] Update CHANGELOG.md

---
 CHANGELOG.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c94c420..9bfb8fe7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,23 @@
 
 This changelog follows the format defined here: https://keepachangelog.com/en/1.0.0/
 
+## [1.8.1] - 2022-10-18
+
+Various fixes and improvements, bump FireSim to 1.15.1.
+
+### Added
+* Bump chipyard to integrate mempress #1253
+
+### Changed
+* Default VCS simulators should generate FSDB #1252
+* Bump to FireSim 1.15.1 for various improvements #1258
+
+### Fixed
+* Revert to using sbt-launch.jar to run SBT #1251
+* Fix open files issue automatically on systems with a sufficiently large hard limit, to work around buildroot bug. #1258
+* Fixed PATH issues in generated env.sh #1258
+* Fixed scripts/repo-clean.sh to restore clean repo state again #1258
+
 ## [1.8.0] - 2022-09-30
 
 Adds support for NoC-based interconnects with Constellation (https://constellation.readthedocs.io/en/latest/). Switch to Conda for dependency/environment management. Bump Rocket Chip and other hardware libraries. Bump to FireSim 1.15.0.

From 25efec39e0bf4463c752b60b560a35ab4a3438fc Mon Sep 17 00:00:00 2001
From: Sagar Karandikar <sagark@eecs.berkeley.edu>
Date: Tue, 18 Oct 2022 15:40:28 -0700
Subject: [PATCH 10/10] bump to FireSim 1.15.1 release

---
 sims/firesim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sims/firesim b/sims/firesim
index e43bef52..8176b657 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit e43bef5259cf5a684db3e4ebd5592c39176f84ce
+Subproject commit 8176b657ee779ac4901b6b03aea0ac23a0b8874d