From 0cbec918e054c4750cab3fdd0924b22a6dec96b3 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Mon, 20 Jan 2025 14:27:03 -0800
Subject: [PATCH 01/28] Add svade to device trees

---
 linux/devicetree/wally-artya7.dts | 2 +-
 linux/devicetree/wally-vcu108.dts | 2 +-
 linux/devicetree/wally-vcu118.dts | 2 +-
 linux/devicetree/wally-virt.dts   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/linux/devicetree/wally-artya7.dts b/linux/devicetree/wally-artya7.dts
index d6ecc02b9..56a12de31 100644
--- a/linux/devicetree/wally-artya7.dts
+++ b/linux/devicetree/wally-artya7.dts
@@ -31,7 +31,7 @@
 			status = "okay";
 			compatible = "riscv";
 			riscv,isa-base = "rv64i";
-			riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "sstc", "svadu", "svinval", "svnapot", "svpbmt", "zba", "zbb", "zbc", "zbs", "zca", "zcb", "zcd", "zfa", "zfh", "zkn", "zkt", "zicbom", "zicboz", "zicntr", "zicond", "zicsr", "zifencei", "zihpm";
+			riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "sstc", "svade", "svadu", "svinval", "svnapot", "svpbmt", "zba", "zbb", "zbc", "zbs", "zca", "zcb", "zcd", "zfa", "zfh", "zkn", "zkt", "zicbom", "zicboz", "zicntr", "zicond", "zicsr", "zifencei", "zihpm";
 			riscv,cboz-block-size = <64>;
 			riscv,cbom-block-size = <64>;
 			mmu-type = "riscv,sv48";
diff --git a/linux/devicetree/wally-vcu108.dts b/linux/devicetree/wally-vcu108.dts
index 5158e05a2..57e236c9c 100644
--- a/linux/devicetree/wally-vcu108.dts
+++ b/linux/devicetree/wally-vcu108.dts
@@ -31,7 +31,7 @@
 			status = "okay";
 			compatible = "riscv";
 			riscv,isa-base = "rv64i";
-			riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "sstc", "svadu", "svinval", "svnapot", "svpbmt", "zba", "zbb", "zbc", "zbs", "zca", "zcb", "zcd", "zfa", "zfh", "zkn", "zkt", "zicbom", "zicboz", "zicntr", "zicond", "zicsr", "zifencei", "zihpm";
+			riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "sstc", "svade", "svadu", "svinval", "svnapot", "svpbmt", "zba", "zbb", "zbc", "zbs", "zca", "zcb", "zcd", "zfa", "zfh", "zkn", "zkt", "zicbom", "zicboz", "zicntr", "zicond", "zicsr", "zifencei", "zihpm";
 			riscv,cboz-block-size = <64>;
 			riscv,cbom-block-size = <64>;
 			mmu-type = "riscv,sv48";
diff --git a/linux/devicetree/wally-vcu118.dts b/linux/devicetree/wally-vcu118.dts
index 89f917635..bdfafa2d0 100644
--- a/linux/devicetree/wally-vcu118.dts
+++ b/linux/devicetree/wally-vcu118.dts
@@ -31,7 +31,7 @@
 			status = "okay";
 			compatible = "riscv";
 			riscv,isa-base = "rv64i";
-			riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "sstc", "svadu", "svinval", "svnapot", "svpbmt", "zba", "zbb", "zbc", "zbs", "zca", "zcb", "zcd", "zfa", "zfh", "zkn", "zkt", "zicbom", "zicboz", "zicntr", "zicond", "zicsr", "zifencei", "zihpm";
+			riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "sstc", "svade", "svadu", "svinval", "svnapot", "svpbmt", "zba", "zbb", "zbc", "zbs", "zca", "zcb", "zcd", "zfa", "zfh", "zkn", "zkt", "zicbom", "zicboz", "zicntr", "zicond", "zicsr", "zifencei", "zihpm";
 			riscv,cboz-block-size = <64>;
 			riscv,cbom-block-size = <64>;
 			mmu-type = "riscv,sv48";
diff --git a/linux/devicetree/wally-virt.dts b/linux/devicetree/wally-virt.dts
index c250e6920..b23d31015 100644
--- a/linux/devicetree/wally-virt.dts
+++ b/linux/devicetree/wally-virt.dts
@@ -31,7 +31,7 @@
 			status = "okay";
 			compatible = "riscv";
 			riscv,isa-base = "rv64i";
-			riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "sstc", "svadu", "svinval", "svnapot", "svpbmt", "zba", "zbb", "zbc", "zbs", "zca", "zcb", "zcd", "zfa", "zfh", "zkn", "zkt", "zicbom", "zicboz", "zicntr", "zicond", "zicsr", "zifencei", "zihpm";
+			riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "sstc", "svade", "svadu", "svinval", "svnapot", "svpbmt", "zba", "zbb", "zbc", "zbs", "zca", "zcb", "zcd", "zfa", "zfh", "zkn", "zkt", "zicbom", "zicboz", "zicntr", "zicond", "zicsr", "zifencei", "zihpm";
 			riscv,cboz-block-size = <64>;
 			riscv,cbom-block-size = <64>;
 			mmu-type = "riscv,sv48";

From ff026540ffe77fc5acafef50c565832cb14eb4d2 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Mon, 20 Jan 2025 17:17:43 -0800
Subject: [PATCH 02/28] Add qemuBoot.sh script for linux QEMU boot

---
 linux/qemuBoot.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100755 linux/qemuBoot.sh

diff --git a/linux/qemuBoot.sh b/linux/qemuBoot.sh
new file mode 100755
index 000000000..b756ad34a
--- /dev/null
+++ b/linux/qemuBoot.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+BUILDROOT="${BUILDROOT:-$RISCV/buildroot}"
+IMAGES="$BUILDROOT"/output/images
+qemu-system-riscv64 \
+	-M virt -m 256M -nographic \
+	-bios "$IMAGES"/fw_jump.bin \
+	-kernel "$IMAGES"/Image \
+	-initrd "$IMAGES"/rootfs.cpio \
+	-dtb "$IMAGES"/wally-virt.dtb \
+	-cpu rva22s64,zicond=true,zfa=true,zfh=true,zcb=true,zbc=true,zkn=true,sstc=true,svadu=true,svnapot=true

From acf886651e88f57b98f330146e45d82bbaaad00e Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Mon, 20 Jan 2025 19:16:55 -0800
Subject: [PATCH 03/28] Simplify genInitMem.sh using qemuBoot.sh

---
 linux/genInitMem.sh | 33 +++++++++------------------------
 linux/qemuBoot.sh   |  8 +++++++-
 2 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/linux/genInitMem.sh b/linux/genInitMem.sh
index b77445add..65e5c9825 100755
--- a/linux/genInitMem.sh
+++ b/linux/genInitMem.sh
@@ -1,14 +1,12 @@
 #!/bin/bash
 set -e
 tcpPort=1235
-imageDir=$RISCV/buildroot/output/images
 tvDir=$RISCV/linux-testvectors
 rawRamFile="$tvDir/ramGDB.bin"
 ramFile="$tvDir/ram.bin"
 rawBootmemFile="$tvDir/bootmemGDB.bin"
 bootmemFile="$tvDir/bootmem.bin"
 rawUntrimmedBootmemFile="$tvDir/untrimmedBootmemFileGDB.bin"
-DEVICE_TREE=${imageDir}/wally-virt.dtb
 
 if ! mkdir -p "$tvDir"; then
     echo "Error: unable to create linux testvector directory $tvDir!">&2
@@ -26,24 +24,15 @@ if ! test -w "$tvDir"; then
 fi
 
 echo "Launching QEMU in replay mode!"
-(qemu-system-riscv64 \
--M virt -m 256M -dtb "$DEVICE_TREE" \
--nographic \
--bios "$imageDir"/fw_jump.bin -kernel "$imageDir"/Image -append "root=/dev/vda ro" -initrd "$imageDir"/rootfs.cpio \
--gdb tcp::$tcpPort -S) \
-& riscv64-unknown-elf-gdb --quiet \
--ex "set pagination off" \
--ex "set logging overwrite on" \
--ex "set logging redirect on" \
--ex "set confirm off" \
--ex "target extended-remote :$tcpPort" \
--ex "maintenance packet Qqemu.PhyMemMode:1" \
--ex "printf \"Creating $rawBootmemFile\n\"" \
--ex "dump binary memory $rawBootmemFile 0x1000 0x1fff" \
--ex "printf \"Creating $rawRamFile\n\"" \
--ex "dump binary memory $rawRamFile 0x80000000 0x8fffffff" \
--ex "kill" \
--ex "q"
+./qemuBoot.sh --gdb $tcpPort &
+riscv64-unknown-elf-gdb -batch \
+    -ex "target remote :$tcpPort" \
+    -ex "maintenance packet Qqemu.PhyMemMode:1" \
+    -ex "printf \"Creating $rawBootmemFile\n\"" \
+    -ex "dump binary memory $rawBootmemFile 0x1000 0x1fff" \
+    -ex "printf \"Creating $rawRamFile\n\"" \
+    -ex "dump binary memory $rawRamFile 0x80000000 0x8fffffff" \
+    -ex "kill" \
 
 echo "Changing Endianness"
 # Extend files to 8 byte multiple
@@ -55,7 +44,3 @@ objcopy --reverse-bytes=8 -F binary "$rawBootmemFile" "$bootmemFile"
 rm -f "$rawRamFile" "$rawBootmemFile" "$rawUntrimmedBootmemFile"
 
 echo "genInitMem.sh completed!"
-echo "You may want to restrict write access to $tvDir now and give cad ownership of it."
-echo "Run the following:"
-echo "    sudo chown -R cad:cad $tvDir"
-echo "    sudo chmod -R go-w $tvDir"
diff --git a/linux/qemuBoot.sh b/linux/qemuBoot.sh
index b756ad34a..b5f130fc6 100755
--- a/linux/qemuBoot.sh
+++ b/linux/qemuBoot.sh
@@ -1,10 +1,16 @@
 #!/bin/bash
 BUILDROOT="${BUILDROOT:-$RISCV/buildroot}"
 IMAGES="$BUILDROOT"/output/images
+
+if [[ "$1" == "--gdb" && -n "$2" ]]; then
+    GDB_FLAG="-gdb tcp::$2 -S"
+fi
+
 qemu-system-riscv64 \
 	-M virt -m 256M -nographic \
 	-bios "$IMAGES"/fw_jump.bin \
 	-kernel "$IMAGES"/Image \
 	-initrd "$IMAGES"/rootfs.cpio \
 	-dtb "$IMAGES"/wally-virt.dtb \
-	-cpu rva22s64,zicond=true,zfa=true,zfh=true,zcb=true,zbc=true,zkn=true,sstc=true,svadu=true,svnapot=true
+	-cpu rva22s64,zicond=true,zfa=true,zfh=true,zcb=true,zbc=true,zkn=true,sstc=true,svadu=true,svnapot=true \
+	$GDB_FLAG

From 6dd5b9b2686b5d528861e1ca33780bde5b3cd1dd Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Mon, 20 Jan 2025 19:21:00 -0800
Subject: [PATCH 04/28] Add header to qemuBoot

---
 linux/qemuBoot.sh | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/linux/qemuBoot.sh b/linux/qemuBoot.sh
index b5f130fc6..9cef11bc5 100755
--- a/linux/qemuBoot.sh
+++ b/linux/qemuBoot.sh
@@ -1,4 +1,30 @@
 #!/bin/bash
+###########################################
+## Boot linux on QEMU configured to match Wally
+##
+## Written: Jordan Carlin, jcarlin@hmc.edu
+## Created: 20 January 2025
+## Modified:
+##
+## A component of the CORE-V-WALLY configurable RISC-V project.
+## https://github.com/openhwgroup/cvw
+##
+## Copyright (C) 2021-25 Harvey Mudd College & Oklahoma State University
+##
+## SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
+##
+## Licensed under the Solderpad Hardware License v 2.1 (the “License”); you may not use this file
+## except in compliance with the License, or, at your option, the Apache License version 2.0. You
+## may obtain a copy of the License at
+##
+## https:##solderpad.org/licenses/SHL-2.1/
+##
+## Unless required by applicable law or agreed to in writing, any work distributed under the
+## License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+## either express or implied. See the License for the specific language governing permissions
+## and limitations under the License.
+################################################################################################
+
 BUILDROOT="${BUILDROOT:-$RISCV/buildroot}"
 IMAGES="$BUILDROOT"/output/images
 

From 408e7365f97502136083a2aab17e1ba90867b9c9 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Tue, 21 Jan 2025 01:19:36 -0800
Subject: [PATCH 05/28] Integrate genInitMem.sh directly into Makefile and
 simplify

---
 linux/Makefile      | 89 +++++++++++++++++++++++++++------------------
 linux/genInitMem.sh | 46 -----------------------
 2 files changed, 54 insertions(+), 81 deletions(-)
 delete mode 100755 linux/genInitMem.sh

diff --git a/linux/Makefile b/linux/Makefile
index c0b6c3511..8852c02ad 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -1,25 +1,26 @@
+# .SECONDEXPANSION:
+
 BUILDROOT := buildroot
 IMAGES := ${BUILDROOT}/output/images
 WALLYLINUX := $(WALLY)/linux
 DIS := ${IMAGES}/disassembly
 BR2_EXTERNAL_TREE := $(WALLYLINUX)/br2-external-tree
+LINUX_TEST_VECTORS := $(RISCV)/linux-testvectors
 
 # set sudo if needed depending on $RISCV
 SUDO := $(shell mkdir -p $(RISCV)/.test > /dev/null 2>&1 || echo sudo)
 
 # Device tree files
-DTS ?= $(shell find devicetree -type f -regex ".*\.dts" | sort)
-DTB := $(DTS:%.dts=%.dtb)
-DTB := $(foreach name, $(DTB), $(IMAGES)/$(shell basename $(name)))
+DTS ?= $(wildcard devicetree/*.dts)
+DTB := $(foreach name, $(DTS:%.dts=%.dtb), $(IMAGES)/$(notdir $(name)))
 
 # Disassembly stuff
 BINARIES := fw_jump.elf vmlinux busybox
-OBJDUMPS := $(foreach name, $(BINARIES), $(basename $(name) .elf))
-OBJDUMPS := $(foreach name, $(OBJDUMPS), $(DIS)/$(name).objdump)
+OBJDUMPS := $(foreach name, $(basename $(BINARIES) .elf), $(DIS)/$(name).objdump)
 
-.PHONY: all generate disassemble install clean cleanDTB check_write_permissions check_environment
+.PHONY: all check_environment check_write_permissions config Image disassemble generate install dumptvs clean cleanDTB
 
-all: check_environment check_write_permissions clean download Image disassemble install dumptvs
+all: check_write_permissions clean config Image disassemble install dumptvs
 
 check_environment: $(RISCV)
 ifeq ($(findstring :$(RISCV)/lib:,:$(LD_LIBRARY_PATH):),)
@@ -28,7 +29,7 @@ ifeq ($(findstring :$(RISCV)/lib:,:$(LD_LIBRARY_PATH):),)
 	&& exit 1)
 endif
 
-check_write_permissions:
+check_write_permissions: check_environment
 ifeq ($(SUDO), sudo)
 	@echo "Cannot write to '$(RISCV)'." \
 		"Using sudo (you may be prompted for your password several times throughout the install)"
@@ -38,24 +39,44 @@ endif
 		&& exit 1)
 	@$(SUDO) rm -r $(RISCV)/.test
 
-Image: check_environment
+Image: check_environment $(BUILDROOT)
 	bash -c "unset LD_LIBRARY_PATH; $(MAKE) -C $(BUILDROOT)"
-	$(MAKE) generate
+# $(MAKE) generate
 	@echo "Buildroot Image successfully generated."
 
-install: check_write_permissions check_environment
+install: check_write_permissions
 	$(SUDO) rm -rf $(RISCV)/$(BUILDROOT)
 	$(SUDO) mv $(BUILDROOT) $(RISCV)/$(BUILDROOT)
 	@echo "Buildroot successfully installed."
 
-dumptvs: check_write_permissions check_environment
-	$(SUDO) mkdir -p $(RISCV)/linux-testvectors
-	./genInitMem.sh
-	@echo "Testvectors successfully generated."
+TCP_PORT=1235
+RAW_RAM_FILE=${LINUX_TEST_VECTORS}/ramGDB.bin
+RAM_FILE=${LINUX_TEST_VECTORS}/ram.bin
+RAW_BOOTMEM_FILE=${LINUX_TEST_VECTORS}/bootmemGDB.bin
+BOOTMEM_FILE=${LINUX_TEST_VECTORS}/bootmem.bin
+
+MEM_FILES=${RAM_FILE} ${BOOTMEM_FILE}
+
+dumptvs: check_write_permissions ${MEM_FILES}
+
+${LINUX_TEST_VECTORS}/%.bin: ${LINUX_TEST_VECTORS}/%GDB.bin
+	truncate -s %8 $^ # Extend file to 8 byte multiple
+	objcopy --reverse-bytes=8 -F binary $^ $@ # Reverse bytes
+
+${LINUX_TEST_VECTORS}/%GDB.bin: | $(LINUX_TEST_VECTORS)
+	${WALLYLINUX}/qemuBoot.sh --gdb ${TCP_PORT} &
+	riscv64-unknown-elf-gdb -batch \
+		-ex "target remote :${TCP_PORT}" \
+		-ex "maintenance packet Qqemu.PhyMemMode:1" \
+		-ex "printf \"Creating ${RAW_BOOTMEM_FILE}\n\"" \
+		-ex "dump binary memory ${RAW_BOOTMEM_FILE} 0x1000 0x1fff" \
+		-ex "printf \"Creating ${RAW_RAM_FILE}\n\"" \
+		-ex "dump binary memory ${RAW_RAM_FILE} 0x80000000 0x8fffffff" \
+		-ex "kill" \
 
 generate: $(DTB) $(IMAGES)
 
-$(IMAGES)/%.dtb: ./devicetree/%.dts
+$(IMAGES)/%.dtb: ${WALLYLINUX}/devicetree/%.dts
 	dtc -I dts -O dtb $< > $@
 
 $(IMAGES):
@@ -68,42 +89,40 @@ $(RISCV):
 
 # Disassembly rules ---------------------------------------------------
 disassemble: check_environment
-	rm -rf $(BUILDROOT)/output/images/disassembly
-	find  $(BUILDROOT)/output/build/linux-* -maxdepth 1 -name "vmlinux" | xargs  cp -t $(BUILDROOT)/output/images/
-	mkdir -p $(DIS)
-	$(MAKE) $(OBJDUMPS)
-	# extract rootfs
-	mkdir -p $(BUILDROOT)/output/images/disassembly/rootfs
-	@echo "Ignore error about dev/console when extracting rootfs from rootfs.cpio"
-	-cpio -i -D $(BUILDROOT)/output/images/disassembly/rootfs < $(BUILDROOT)/output/images/rootfs.cpio
-	@echo "Disassembly successfully completed."
+	cp $(BUILDROOT)/output/build/linux-*/vmlinux $(IMAGES)
+	$(MAKE) $(OBJDUMPS) $(DIS)/rootfs
 
-$(DIS)/%.objdump: $(IMAGES)/%.elf
+$(DIS)/rootfs: $(IMAGES)/rootfs.cpio
+	@echo "Ignore error about dev/console when extracting rootfs from rootfs.cpio"
+	mkdir -p $(DIS)/rootfs
+	-cpio -i -D $(DIS)/rootfs < $(IMAGES)rootfs.cpio
+
+$(DIS)/%.objdump: $(IMAGES)/%.elf | $(DIS)
 	riscv64-unknown-elf-objdump -DS $< >> $@
 	$(WALLY)/bin/extractFunctionRadix.sh $@
 
-$(DIS)/%.objdump: $(IMAGES)/%
+$(DIS)/%.objdump: $(IMAGES)/% | $(DIS)
 	riscv64-unknown-elf-objdump -S $< >> $@
 	$(WALLY)/bin/extractFunctionRadix.sh $@
 
 $(IMAGES)/vmlinux:
-	linuxDir=$$(find $(BUILDROOT)/output/build -maxdepth 2 -type d -regex ".*/linux-[0-9]+\.[0-9]+\.[0-9]+$$") ;\
-	cp $$linuxDir/vmlinux $@ ;\
+	cp $(BUILDROOT)/output/build/linux-*/vmlinux $@
 
 $(IMAGES)/busybox:
-	busyboxDir=$$(find $(BUILDROOT)/output/build -maxdepth 2 -type d -regex ".*/busybox-[0-9]+\.[0-9]+\.[0-9]+$$") ;\
-	cp $$busyboxDir/busybox $@ ;\
+	cp $(BUILDROOT)/output/build/busybox-*/busybox $@
 
-# Generating new Buildroot directories --------------------------------
-download: $(BUILDROOT)
+config: $(BUILDROOT) $(BR2_EXTERNAL_TREE)/configs/wally_defconfig
 	$(MAKE) -C $(BUILDROOT) wally_defconfig BR2_EXTERNAL=$(BR2_EXTERNAL_TREE)
-	@echo "Buildroot successfully download."
 
 $(BUILDROOT):
 	git clone https://github.com/buildroot/buildroot.git $@
 	cd $@; git checkout 2024.11.x
 
-# ---------------------------------------------------------------------
+$(LINUX_TEST_VECTORS):
+	$(SUDO) mkdir -p $@
+
+$(DIS):
+	mkdir -p $@
 
 cleanDTB:
 	rm -f $(IMAGES)/*.dtb
diff --git a/linux/genInitMem.sh b/linux/genInitMem.sh
deleted file mode 100755
index 65e5c9825..000000000
--- a/linux/genInitMem.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-set -e
-tcpPort=1235
-tvDir=$RISCV/linux-testvectors
-rawRamFile="$tvDir/ramGDB.bin"
-ramFile="$tvDir/ram.bin"
-rawBootmemFile="$tvDir/bootmemGDB.bin"
-bootmemFile="$tvDir/bootmem.bin"
-rawUntrimmedBootmemFile="$tvDir/untrimmedBootmemFileGDB.bin"
-
-if ! mkdir -p "$tvDir"; then
-    echo "Error: unable to create linux testvector directory $tvDir!">&2
-    echo "Please try running as sudo.">&2
-    exit 1
-fi
-if ! test -w "$tvDir"; then
-    echo "Using sudo to gain access to $tvDir"
-    if ! sudo chmod -R a+rw "$tvDir"; then
-        echo "Error: insuffcient write privileges for linux testvector directory $tvDir !">&2
-        echo "Please chmod it. For example:">&2
-        echo "    sudo chmod -R a+rw $tvDir">&2
-        exit 1
-    fi
-fi
-
-echo "Launching QEMU in replay mode!"
-./qemuBoot.sh --gdb $tcpPort &
-riscv64-unknown-elf-gdb -batch \
-    -ex "target remote :$tcpPort" \
-    -ex "maintenance packet Qqemu.PhyMemMode:1" \
-    -ex "printf \"Creating $rawBootmemFile\n\"" \
-    -ex "dump binary memory $rawBootmemFile 0x1000 0x1fff" \
-    -ex "printf \"Creating $rawRamFile\n\"" \
-    -ex "dump binary memory $rawRamFile 0x80000000 0x8fffffff" \
-    -ex "kill" \
-
-echo "Changing Endianness"
-# Extend files to 8 byte multiple
-truncate -s %8 "$rawRamFile"
-truncate -s %8 "$rawBootmemFile"
-# Reverse bytes
-objcopy --reverse-bytes=8 -F binary "$rawRamFile" "$ramFile"
-objcopy --reverse-bytes=8 -F binary "$rawBootmemFile" "$bootmemFile"
-rm -f "$rawRamFile" "$rawBootmemFile" "$rawUntrimmedBootmemFile"
-
-echo "genInitMem.sh completed!"

From 2616b1c667de91b049d1cf03807dede8ca4e8cc2 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Tue, 21 Jan 2025 20:14:01 -0800
Subject: [PATCH 06/28] Overhaul linux makefile

---
 linux/Makefile                                | 127 +++++++++---------
 linux/README.MD                               |   2 +-
 .../board/wally/post_image.sh                 |   5 +
 .../br2-external-tree/configs/wally_defconfig |   1 +
 4 files changed, 70 insertions(+), 65 deletions(-)
 create mode 100644 linux/br2-external-tree/board/wally/post_image.sh

diff --git a/linux/Makefile b/linux/Makefile
index 8852c02ad..3c0c996d3 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -1,27 +1,32 @@
-# .SECONDEXPANSION:
-
-BUILDROOT := buildroot
-IMAGES := ${BUILDROOT}/output/images
-WALLYLINUX := $(WALLY)/linux
-DIS := ${IMAGES}/disassembly
+BUILDROOT         := buildroot
+IMAGE_DIR         := ${BUILDROOT}/output/images
+DISASSEMBLY_DIR   := ${IMAGE_DIR}/disassembly
+WALLYLINUX        := $(WALLY)/linux
 BR2_EXTERNAL_TREE := $(WALLYLINUX)/br2-external-tree
-LINUX_TEST_VECTORS := $(RISCV)/linux-testvectors
+LINUX_TESTVECTORS := $(RISCV)/linux-testvectors
 
-# set sudo if needed depending on $RISCV
-SUDO := $(shell mkdir -p $(RISCV)/.test > /dev/null 2>&1 || echo sudo)
+BUILDROOT_OUTPUTS := Image fw_jump.bin fw_jump.elf rootfs.cpio vmlinux busybox
 
 # Device tree files
 DTS ?= $(wildcard devicetree/*.dts)
-DTB := $(foreach name, $(DTS:%.dts=%.dtb), $(IMAGES)/$(notdir $(name)))
+DTB := $(foreach name, $(DTS:%.dts=%.dtb), $(IMAGE_DIR)/$(notdir $(name)))
 
-# Disassembly stuff
+# Disassembly files
 BINARIES := fw_jump.elf vmlinux busybox
-OBJDUMPS := $(foreach name, $(basename $(BINARIES) .elf), $(DIS)/$(name).objdump)
+OBJDUMPS := $(foreach name, $(basename $(BINARIES) .elf), $(DISASSEMBLY_DIR)/$(name).objdump)
 
-.PHONY: all check_environment check_write_permissions config Image disassemble generate install dumptvs clean cleanDTB
+# Testvector files
+RAW_RAM_FILE     := ${LINUX_TESTVECTORS}/ramGDB.bin
+RAM_FILE         := ${LINUX_TESTVECTORS}/ram.bin
+RAW_BOOTMEM_FILE := ${LINUX_TESTVECTORS}/bootmemGDB.bin
+BOOTMEM_FILE     := ${LINUX_TESTVECTORS}/bootmem.bin
 
-all: check_write_permissions clean config Image disassemble install dumptvs
+.PHONY: all check_environment check_write_permissions config build disassemble devicetrees install dumptvs clean cleanDTB
 
+# Default target
+all: check_write_permissions clean config build disassemble install dumptvs
+
+# Check if the environment variables are set correctly
 check_environment: $(RISCV)
 ifeq ($(findstring :$(RISCV)/lib:,:$(LD_LIBRARY_PATH):),)
 	@(echo "ERROR: Your environment variables are not set correctly." >&2 \
@@ -29,6 +34,8 @@ ifeq ($(findstring :$(RISCV)/lib:,:$(LD_LIBRARY_PATH):),)
 	&& exit 1)
 endif
 
+# Check if the user has write permissions to the RISCV directory, potentially using sudo
+SUDO := $(shell mkdir -p $(RISCV)/.test > /dev/null 2>&1 || echo sudo)
 check_write_permissions: check_environment
 ifeq ($(SUDO), sudo)
 	@echo "Cannot write to '$(RISCV)'." \
@@ -39,31 +46,30 @@ endif
 		&& exit 1)
 	@$(SUDO) rm -r $(RISCV)/.test
 
-Image: check_environment $(BUILDROOT)
-	bash -c "unset LD_LIBRARY_PATH; $(MAKE) -C $(BUILDROOT)"
-# $(MAKE) generate
-	@echo "Buildroot Image successfully generated."
+# Build buildroot and device tree binaries
+build: $(BUILDROOT_OUTPUTS) devicetrees
 
+# Build buildroot itself
+# LD_LIBRARY_PATH must be unset to avoid conflicts between the host and cross compiler
+$(BUILDROOT_OUTPUTS): check_environment $(BUILDROOT)
+	bash -c "unset LD_LIBRARY_PATH; $(MAKE) -C $(BUILDROOT)"
+
+# Install buildroot to $RISCV
 install: check_write_permissions
 	$(SUDO) rm -rf $(RISCV)/$(BUILDROOT)
 	$(SUDO) mv $(BUILDROOT) $(RISCV)/$(BUILDROOT)
-	@echo "Buildroot successfully installed."
 
-TCP_PORT=1235
-RAW_RAM_FILE=${LINUX_TEST_VECTORS}/ramGDB.bin
-RAM_FILE=${LINUX_TEST_VECTORS}/ram.bin
-RAW_BOOTMEM_FILE=${LINUX_TEST_VECTORS}/bootmemGDB.bin
-BOOTMEM_FILE=${LINUX_TEST_VECTORS}/bootmem.bin
+# Generate linux boot testvectors
+dumptvs: ${RAM_FILE} ${BOOTMEM_FILE}
 
-MEM_FILES=${RAM_FILE} ${BOOTMEM_FILE}
-
-dumptvs: check_write_permissions ${MEM_FILES}
-
-${LINUX_TEST_VECTORS}/%.bin: ${LINUX_TEST_VECTORS}/%GDB.bin
+# Format QEMU memory dumps for use as testvectors
+${LINUX_TESTVECTORS}/%.bin: ${LINUX_TESTVECTORS}/%GDB.bin
 	truncate -s %8 $^ # Extend file to 8 byte multiple
 	objcopy --reverse-bytes=8 -F binary $^ $@ # Reverse bytes
 
-${LINUX_TEST_VECTORS}/%GDB.bin: | $(LINUX_TEST_VECTORS)
+# Generate memory dumps from QEMU buildroot boot
+TCP_PORT := 1235
+${LINUX_TESTVECTORS}/%GDB.bin: | $(LINUX_TESTVECTORS)
 	${WALLYLINUX}/qemuBoot.sh --gdb ${TCP_PORT} &
 	riscv64-unknown-elf-gdb -batch \
 		-ex "target remote :${TCP_PORT}" \
@@ -72,60 +78,53 @@ ${LINUX_TEST_VECTORS}/%GDB.bin: | $(LINUX_TEST_VECTORS)
 		-ex "dump binary memory ${RAW_BOOTMEM_FILE} 0x1000 0x1fff" \
 		-ex "printf \"Creating ${RAW_RAM_FILE}\n\"" \
 		-ex "dump binary memory ${RAW_RAM_FILE} 0x80000000 0x8fffffff" \
-		-ex "kill" \
+		-ex "kill"
 
-generate: $(DTB) $(IMAGES)
-
-$(IMAGES)/%.dtb: ${WALLYLINUX}/devicetree/%.dts
+# Generate device tree binaries
+devicetrees: $(DTB)
+$(IMAGE_DIR)/%.dtb: ${WALLYLINUX}/devicetree/%.dts
 	dtc -I dts -O dtb $< > $@
 
-$(IMAGES):
-	@ echo "No output/images directory in buildroot."
-	@ echo "Run make --jobs in buildroot directory before generating device tree binaries."; exit 1
+# Create disassembly files
+disassemble: check_environment $(OBJDUMPS) $(DISASSEMBLY_DIR)/rootfs
 
-$(RISCV):
-	@ echo "ERROR: No $(RISCV) directory. Make sure you have installed the Wally Toolchain."
-	@ echo "and sourced setup.sh"
-
-# Disassembly rules ---------------------------------------------------
-disassemble: check_environment
-	cp $(BUILDROOT)/output/build/linux-*/vmlinux $(IMAGES)
-	$(MAKE) $(OBJDUMPS) $(DIS)/rootfs
-
-$(DIS)/rootfs: $(IMAGES)/rootfs.cpio
+# Extract rootfs
+$(DISASSEMBLY_DIR)/rootfs: $(IMAGE_DIR)/rootfs.cpio
 	@echo "Ignore error about dev/console when extracting rootfs from rootfs.cpio"
-	mkdir -p $(DIS)/rootfs
-	-cpio -i -D $(DIS)/rootfs < $(IMAGES)rootfs.cpio
+	mkdir -p $(DISASSEMBLY_DIR)/rootfs
+	-cpio -i -D $(DISASSEMBLY_DIR)/rootfs -F $(IMAGE_DIR)rootfs.cpio
 
-$(DIS)/%.objdump: $(IMAGES)/%.elf | $(DIS)
-	riscv64-unknown-elf-objdump -DS $< >> $@
+# Disassemble binaries
+objdump_flags = $(if $(findstring .elf,$<),-SD,-S) # Add -D flag for .elf files
+$(DISASSEMBLY_DIR)/%.objdump: $(IMAGE_DIR)/% | $(DISASSEMBLY_DIR)
+	riscv64-unknown-elf-objdump $(objdump_flags) $< >> $@
 	$(WALLY)/bin/extractFunctionRadix.sh $@
 
-$(DIS)/%.objdump: $(IMAGES)/% | $(DIS)
-	riscv64-unknown-elf-objdump -S $< >> $@
-	$(WALLY)/bin/extractFunctionRadix.sh $@
-
-$(IMAGES)/vmlinux:
-	cp $(BUILDROOT)/output/build/linux-*/vmlinux $@
-
-$(IMAGES)/busybox:
-	cp $(BUILDROOT)/output/build/busybox-*/busybox $@
-
+# Load wally buildroot configuration
 config: $(BUILDROOT) $(BR2_EXTERNAL_TREE)/configs/wally_defconfig
 	$(MAKE) -C $(BUILDROOT) wally_defconfig BR2_EXTERNAL=$(BR2_EXTERNAL_TREE)
 
+# Clone buildroot and checkout the correct version
 $(BUILDROOT):
 	git clone https://github.com/buildroot/buildroot.git $@
 	cd $@; git checkout 2024.11.x
 
-$(LINUX_TEST_VECTORS):
+# Create directories
+$(LINUX_TESTVECTORS): check_write_permissions
 	$(SUDO) mkdir -p $@
 
-$(DIS):
+$(DISASSEMBLY_DIR):
 	mkdir -p $@
 
+# Remove device tree binaries
 cleanDTB:
-	rm -f $(IMAGES)/*.dtb
+	rm -f $(IMAGE_DIR)/*.dtb
 
+# Remove buildroot directory
 clean:
 	rm -rf $(BUILDROOT)
+
+# Check if the RISCV environment variable is set
+$(RISCV):
+	@ echo "ERROR: No $(RISCV) directory. Make sure you have installed the Wally Toolchain."
+	@ echo "and sourced setup.sh"
diff --git a/linux/README.MD b/linux/README.MD
index b7a031ce6..2e8405f70 100644
--- a/linux/README.MD
+++ b/linux/README.MD
@@ -35,7 +35,7 @@ The device tree files for the various FPGAs Wally supports, as well as QEMU's de
 They are built automatically using the main `make` command. To build the device tree binaries (.dtb) from the device tree sources (.dts) separately, we can build all of them at once using:
 
 ```bash
-$ make generate # optionally override BUILDROOT
+$ make devicetrees # optionally override BUILDROOT
 ```
 
 The .dts files will end up in the `<BUILDROOT>/output/images` folder of your chosen buildroot directory.
diff --git a/linux/br2-external-tree/board/wally/post_image.sh b/linux/br2-external-tree/board/wally/post_image.sh
new file mode 100644
index 000000000..53544d8b3
--- /dev/null
+++ b/linux/br2-external-tree/board/wally/post_image.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# Copy linux and busybox binaries (with symbol info) to images directory
+cp "$BUILD_DIR"/linux-*/vmlinux "$BINARIES_DIR"/vmlinux
+cp "$BUILD_DIR"busybox-*/busybox "$BINARIES_DIR"/busybox
diff --git a/linux/br2-external-tree/configs/wally_defconfig b/linux/br2-external-tree/configs/wally_defconfig
index 24d82e9d0..8759588a7 100644
--- a/linux/br2-external-tree/configs/wally_defconfig
+++ b/linux/br2-external-tree/configs/wally_defconfig
@@ -19,6 +19,7 @@ BR2_TARGET_GENERIC_ISSUE="Greetings! This RISC-V Linux image was built for Wally
 BR2_ROOTFS_DEVICE_TABLE_SUPPORTS_EXTENDED_ATTRIBUTES=y
 BR2_SYSTEM_DHCP="eth0"
 BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_WALLY_PATH)/board/wally/rootfs_overlay"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_WALLY_PATH)/board/wally/post_image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.8"

From f3a16e90a9d9b243435e7f2b922c448f072aecf4 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Tue, 21 Jan 2025 20:33:25 -0800
Subject: [PATCH 07/28] A little more simplification

---
 linux/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/linux/Makefile b/linux/Makefile
index 3c0c996d3..45588e7f7 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -91,8 +91,7 @@ disassemble: check_environment $(OBJDUMPS) $(DISASSEMBLY_DIR)/rootfs
 # Extract rootfs
 $(DISASSEMBLY_DIR)/rootfs: $(IMAGE_DIR)/rootfs.cpio
 	@echo "Ignore error about dev/console when extracting rootfs from rootfs.cpio"
-	mkdir -p $(DISASSEMBLY_DIR)/rootfs
-	-cpio -i -D $(DISASSEMBLY_DIR)/rootfs -F $(IMAGE_DIR)rootfs.cpio
+	-cpio -id -D $(DISASSEMBLY_DIR)/rootfs -F $(IMAGE_DIR)rootfs.cpio
 
 # Disassemble binaries
 objdump_flags = $(if $(findstring .elf,$<),-SD,-S) # Add -D flag for .elf files

From 3e9f2d0b276446dbe09cce3f2715b45f720c0a24 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Tue, 21 Jan 2025 22:58:33 -0800
Subject: [PATCH 08/28] Fix a few more linux build issues

---
 linux/Makefile                                    | 13 +++++++++----
 linux/br2-external-tree/board/wally/post_image.sh |  2 +-
 linux/br2-external-tree/configs/wally_defconfig   |  1 +
 3 files changed, 11 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 linux/br2-external-tree/board/wally/post_image.sh

diff --git a/linux/Makefile b/linux/Makefile
index 45588e7f7..aed0ec9e3 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -6,6 +6,7 @@ BR2_EXTERNAL_TREE := $(WALLYLINUX)/br2-external-tree
 LINUX_TESTVECTORS := $(RISCV)/linux-testvectors
 
 BUILDROOT_OUTPUTS := Image fw_jump.bin fw_jump.elf rootfs.cpio vmlinux busybox
+BUILDROOT_OUTPUTS := $(foreach name, $(BUILDROOT_OUTPUTS), $(IMAGE_DIR)/$(name))
 
 # Device tree files
 DTS ?= $(wildcard devicetree/*.dts)
@@ -51,7 +52,7 @@ build: $(BUILDROOT_OUTPUTS) devicetrees
 
 # Build buildroot itself
 # LD_LIBRARY_PATH must be unset to avoid conflicts between the host and cross compiler
-$(BUILDROOT_OUTPUTS): check_environment $(BUILDROOT)
+$(BUILDROOT_OUTPUTS) $(IMAGE_DIR): check_environment $(BUILDROOT)
 	bash -c "unset LD_LIBRARY_PATH; $(MAKE) -C $(BUILDROOT)"
 
 # Install buildroot to $RISCV
@@ -82,7 +83,7 @@ ${LINUX_TESTVECTORS}/%GDB.bin: | $(LINUX_TESTVECTORS)
 
 # Generate device tree binaries
 devicetrees: $(DTB)
-$(IMAGE_DIR)/%.dtb: ${WALLYLINUX}/devicetree/%.dts
+$(IMAGE_DIR)/%.dtb: ${WALLYLINUX}/devicetree/%.dts | $(IMAGE_DIR)
 	dtc -I dts -O dtb $< > $@
 
 # Create disassembly files
@@ -94,9 +95,13 @@ $(DISASSEMBLY_DIR)/rootfs: $(IMAGE_DIR)/rootfs.cpio
 	-cpio -id -D $(DISASSEMBLY_DIR)/rootfs -F $(IMAGE_DIR)rootfs.cpio
 
 # Disassemble binaries
-objdump_flags = $(if $(findstring .elf,$<),-SD,-S) # Add -D flag for .elf files
 $(DISASSEMBLY_DIR)/%.objdump: $(IMAGE_DIR)/% | $(DISASSEMBLY_DIR)
-	riscv64-unknown-elf-objdump $(objdump_flags) $< >> $@
+	riscv64-unknown-elf-objdump -S $< >> $@
+	$(WALLY)/bin/extractFunctionRadix.sh $@
+
+# Disassemble binaries ending in .elf
+$(DISASSEMBLY_DIR)/%.objdump: $(IMAGE_DIR)/%.elf | $(DISASSEMBLY_DIR)
+	riscv64-unknown-elf-objdump -SD $< >> $@
 	$(WALLY)/bin/extractFunctionRadix.sh $@
 
 # Load wally buildroot configuration
diff --git a/linux/br2-external-tree/board/wally/post_image.sh b/linux/br2-external-tree/board/wally/post_image.sh
old mode 100644
new mode 100755
index 53544d8b3..e3db7525b
--- a/linux/br2-external-tree/board/wally/post_image.sh
+++ b/linux/br2-external-tree/board/wally/post_image.sh
@@ -2,4 +2,4 @@
 
 # Copy linux and busybox binaries (with symbol info) to images directory
 cp "$BUILD_DIR"/linux-*/vmlinux "$BINARIES_DIR"/vmlinux
-cp "$BUILD_DIR"busybox-*/busybox "$BINARIES_DIR"/busybox
+cp "$BUILD_DIR"/busybox-*/busybox "$BINARIES_DIR"/busybox
diff --git a/linux/br2-external-tree/configs/wally_defconfig b/linux/br2-external-tree/configs/wally_defconfig
index 8759588a7..bdae60a6f 100644
--- a/linux/br2-external-tree/configs/wally_defconfig
+++ b/linux/br2-external-tree/configs/wally_defconfig
@@ -10,6 +10,7 @@ BR2_GNU_MIRROR="http://ftpmirror.gnu.org"
 BR2_ENABLE_DEBUG=y
 BR2_DEBUG_3=y
 # BR2_STRIP_strip is not set
+BR2_PER_PACKAGE_DIRECTORIES=y
 # BR2_PIC_PIE is not set
 BR2_SSP_NONE=y
 BR2_RELRO_NONE=y

From d89d595cb4398de2e306c3002b7c69558af13edb Mon Sep 17 00:00:00 2001
From: David Harris <David_Harris@hmc.edu>
Date: Wed, 22 Jan 2025 04:34:53 -0800
Subject: [PATCH 09/28] Cleaned up tracer parameters

---
 testbench/common/wallyTracer.sv | 37 ++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/testbench/common/wallyTracer.sv b/testbench/common/wallyTracer.sv
index 093b72de2..468e53d40 100644
--- a/testbench/common/wallyTracer.sv
+++ b/testbench/common/wallyTracer.sv
@@ -2,6 +2,8 @@
 // wallyTracer.sv
 //
 // A component of the Wally configurable RISC-V project.
+// Implements a RISC-V Verification Interface (RVVI)
+// to support functional coverage and lockstep simulation.
 // 
 // Copyright (C) 2021 Harvey Mudd College & Oklahoma State University
 //
@@ -20,19 +22,16 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-`define NUM_REGS 32
-`define NUM_CSRS 4096
-
 `define STD_LOG 0
 `define PRINT_PC_INSTR 0
 `define PRINT_MOST 0
 `define PRINT_ALL 0
 `define PRINT_CSRS 0
 
-
 module wallyTracer import cvw::*; #(parameter cvw_t P) (rvviTrace rvvi);
 
-  localparam NUMREGS = P.E_SUPPORTED ? 16 : 32;
+  localparam NUM_REGS = P.E_SUPPORTED ? 16 : 32;
+  localparam NUM_CSRS = 4096;
   
   // wally specific signals
   logic                  reset;
@@ -50,17 +49,17 @@ module wallyTracer import cvw::*; #(parameter cvw_t P) (rvviTrace rvvi);
   logic                  TrapM, TrapW;
   logic                  HaltM, HaltW;
   logic [1:0]            PrivilegeModeW;
-  logic [P.XLEN-1:0]     rf[NUMREGS];
-  logic [NUMREGS-1:0]    rf_wb;
+  logic [P.XLEN-1:0]     rf[NUM_REGS];
+  logic [NUM_REGS-1:0]   rf_wb;
   logic [4:0]            rf_a3;
   logic                  rf_we3;
   logic [P.FLEN-1:0]     frf[32];
-  logic [`NUM_REGS-1:0]  frf_wb;
+  logic [NUM_REGS-1:0]   frf_wb;
   logic [4:0]            frf_a4;
   logic                  frf_we4;
   logic [P.XLEN-1:0]     CSRArray [4095:0];
   logic [P.XLEN-1:0]     CSRArrayOld [4095:0];
-  logic [`NUM_CSRS-1:0]  CSR_W;
+  logic [NUM_CSRS-1:0]  CSR_W;
   logic                  CSRWriteM, CSRWriteW;
   logic [11:0]           CSRAdrM, CSRAdrW;
   logic                  wfiM;
@@ -314,7 +313,7 @@ module wallyTracer import cvw::*; #(parameter cvw_t P) (rvviTrace rvvi);
 
   genvar index;
   assign rf[0] = 0;
-  for(index = 1; index < NUMREGS; index += 1) 
+  for(index = 1; index < NUM_REGS; index += 1) 
   assign rf[index] = testbench.dut.core.ieu.dp.regf.rf[index];
 
   assign rf_a3  = testbench.dut.core.ieu.dp.regf.a3;
@@ -329,12 +328,12 @@ module wallyTracer import cvw::*; #(parameter cvw_t P) (rvviTrace rvvi);
   if (P.F_SUPPORTED) begin
     assign frf_a4  = testbench.dut.core.fpu.fpu.fregfile.a4;
     assign frf_we4 = testbench.dut.core.fpu.fpu.fregfile.we4;
-    for(index = 0; index < NUMREGS; index += 1) 
+    for(index = 0; index < NUM_REGS; index += 1) 
       assign frf[index] = testbench.dut.core.fpu.fpu.fregfile.rf[index];
   end else begin
     assign frf_a4  = '0;
     assign frf_we4 = 0;
-    for(index = 0; index < NUMREGS; index += 1) 
+    for(index = 0; index < NUM_REGS; index += 1) 
       assign frf[index] = '0;
   end
   
@@ -420,7 +419,7 @@ module wallyTracer import cvw::*; #(parameter cvw_t P) (rvviTrace rvvi);
                                ~FlushE ? PCD :
                                ~FlushD ? PCF : PCNextF;
 
-  for(index = 0; index < `NUM_REGS; index += 1) begin
+  for(index = 0; index < NUM_REGS; index += 1) begin
     assign rvvi.x_wdata[0][0][index] = rf[index];
     assign rvvi.x_wb[0][0][index]    = rf_wb[index];
     assign rvvi.f_wdata[0][0][index] = frf[index];
@@ -744,18 +743,18 @@ module wallyTracer import cvw::*; #(parameter cvw_t P) (rvviTrace rvvi);
 	if(valid) begin
       if(`STD_LOG) begin
         $fwrite(file, "%016x, %08x, %s\t\t", rvvi.pc_rdata[0][0], rvvi.insn[0][0], instrWName);
-        for(index2 = 0; index2 < `NUM_REGS; index2 += 1) begin
+        for(index2 = 0; index2 < NUM_REGS; index2 += 1) begin
           if(rvvi.x_wb[0][0][index2]) begin
             $fwrite(file, "rf[%02d] = %016x ", index2, rvvi.x_wdata[0][0][index2]);
           end
         end
       end
-      for(index2 = 0; index2 < `NUM_REGS; index2 += 1) begin
+      for(index2 = 0; index2 < NUM_REGS; index2 += 1) begin
         if(rvvi.f_wb[0][0][index2]) begin
           $fwrite(file, "frf[%02d] = %016x ", index2, rvvi.f_wdata[0][0][index2]);
         end
       end
-      for(index2 = 0; index2 < `NUM_CSRS; index2 += 1) begin
+      for(index2 = 0; index2 < NUM_CSRS; index2 += 1) begin
         if(rvvi.csr_wb[0][0][index2]) begin
           $fwrite(file, "csr[%03x] = %016x ", index2, rvvi.csr[0][0][index2]);
         end
@@ -769,15 +768,15 @@ module wallyTracer import cvw::*; #(parameter cvw_t P) (rvviTrace rvvi);
       else if(`PRINT_ALL) begin
         $display("order = %08d, PC = %08x, insn = %08x, trap = %1d, halt = %1d, intr = %1d, mode = %1x, ixl = %1x, pc_wdata = %08x", 
                  rvvi.order[0][0], rvvi.pc_rdata[0][0], rvvi.insn[0][0], rvvi.trap[0][0], rvvi.halt[0][0], rvvi.intr[0][0], rvvi.mode[0][0], rvvi.ixl[0][0], rvvi.pc_wdata[0][0]);
-        for(index2 = 0; index2 < `NUM_REGS; index2 += 1) begin
+        for(index2 = 0; index2 < NUM_REGS; index2 += 1) begin
           $display("x%02d = %08x", index2, rvvi.x_wdata[0][0][index2]);
         end
-        for(index2 = 0; index2 < `NUM_REGS; index2 += 1) begin
+        for(index2 = 0; index2 < NUM_REGS; index2 += 1) begin
           $display("f%02d = %08x", index2, rvvi.f_wdata[0][0][index2]);
         end
       end
       if (`PRINT_CSRS) begin
-        for(index2 = 0; index2 < `NUM_CSRS; index2 += 1) begin
+        for(index2 = 0; index2 < NUM_CSRS; index2 += 1) begin
           if(CSR_W[index2]) begin
             $display("%t: CSR %03x = %x", $time(), index2, CSRArray[index2]);
           end

From aaaefbaf0dd7bab2cbc57badb94f8078dfeb8e37 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Wed, 22 Jan 2025 15:17:55 -0800
Subject: [PATCH 10/28] Fix typo

---
 linux/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/Makefile b/linux/Makefile
index aed0ec9e3..78582ba29 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -92,7 +92,7 @@ disassemble: check_environment $(OBJDUMPS) $(DISASSEMBLY_DIR)/rootfs
 # Extract rootfs
 $(DISASSEMBLY_DIR)/rootfs: $(IMAGE_DIR)/rootfs.cpio
 	@echo "Ignore error about dev/console when extracting rootfs from rootfs.cpio"
-	-cpio -id -D $(DISASSEMBLY_DIR)/rootfs -F $(IMAGE_DIR)rootfs.cpio
+	-cpio -id -D $(DISASSEMBLY_DIR)/rootfs -F $(IMAGE_DIR)/rootfs.cpio
 
 # Disassemble binaries
 $(DISASSEMBLY_DIR)/%.objdump: $(IMAGE_DIR)/% | $(DISASSEMBLY_DIR)

From c854da75f93ae2ed62e98ce6670224bd5ae5d491 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Thu, 23 Jan 2025 00:43:35 -0800
Subject: [PATCH 11/28] Update buildroot short instruction count

---
 bin/regression-wally | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/regression-wally b/bin/regression-wally
index 185f03826..e52a89edb 100755
--- a/bin/regression-wally
+++ b/bin/regression-wally
@@ -39,7 +39,7 @@ tests = [
 
 # Separate test for short buildroot run through OpenSBI UART output
 tests_buildrootshort = [
-                    ["buildroot", ["buildroot"], [f"+INSTR_LIMIT=1400000"], # Instruction limit gets to first OpenSBI UART output  
+                    ["buildroot", ["buildroot"], [f"+INSTR_LIMIT=1600000"], # Instruction limit gets to first OpenSBI UART output  
                         "OpenSBI v", "buildroot_uart.out"]
     ]
 

From be6f1d9a2b26b60319cd618f479558f0925ebf6e Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Thu, 23 Jan 2025 00:44:38 -0800
Subject: [PATCH 12/28] Check that WALLY is set in linux Makefile

---
 linux/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/linux/Makefile b/linux/Makefile
index 78582ba29..58cb6c69b 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -28,7 +28,7 @@ BOOTMEM_FILE     := ${LINUX_TESTVECTORS}/bootmem.bin
 all: check_write_permissions clean config build disassemble install dumptvs
 
 # Check if the environment variables are set correctly
-check_environment: $(RISCV)
+check_environment: $(RISCV) $(WALLY)
 ifeq ($(findstring :$(RISCV)/lib:,:$(LD_LIBRARY_PATH):),)
 	@(echo "ERROR: Your environment variables are not set correctly." >&2 \
 	&& echo "Make sure to source setup.sh or install buildroot using the wally-tool-chain-install.sh script." >&2 \
@@ -132,3 +132,7 @@ clean:
 $(RISCV):
 	@ echo "ERROR: No $(RISCV) directory. Make sure you have installed the Wally Toolchain."
 	@ echo "and sourced setup.sh"
+
+# Check if the WALLY environment variable is set
+$(WALLY):
+	@ echo "ERROR: $$WALLY is not set. Make sure you have sourced setup.sh"

From f160b9c7fb4be206a52f289f459bf37361bca1ef Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Tue, 28 Jan 2025 23:58:44 -0800
Subject: [PATCH 13/28] Regression directory creation fix

---
 bin/regression-wally | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/regression-wally b/bin/regression-wally
index 4ec41bf19..9291faabc 100755
--- a/bin/regression-wally
+++ b/bin/regression-wally
@@ -479,12 +479,13 @@ def makeDirs(sims):
     for sim in sims:
         dirs = [f"{regressionDir}/{sim}/wkdir", f"{regressionDir}/{sim}/logs"]
         for d in dirs:
-            shutil.rmtree(d)
+            shutil.rmtree(d, ignore_errors=True)
             os.makedirs(d, exist_ok=True)
 
 
 def main(args):
     sims, coverStr, TIMEOUT_DUR = process_args(args)
+    makeDirs(sims)
     configs = selectTests(args, sims, coverStr)
     # Scale the number of concurrent processes to the number of test cases, but
     # max out at a limited number of concurrent processes to not overwhelm the system

From 94e83ccf1fff0b3faa9ad82c1c13c2072b9689f1 Mon Sep 17 00:00:00 2001
From: David Harris <David_Harris@hmc.edu>
Date: Wed, 29 Jan 2025 06:40:15 -0800
Subject: [PATCH 14/28] Removed obsolete testbench/coverage

---
 testbench/coverage/test_fencei_coverage.svh   |  25 ----
 .../coverage/test_fencei_coverage_init.svh    |   4 -
 testbench/coverage/test_pmp_coverage.sv       | 108 ------------------
 3 files changed, 137 deletions(-)
 delete mode 100644 testbench/coverage/test_fencei_coverage.svh
 delete mode 100644 testbench/coverage/test_fencei_coverage_init.svh
 delete mode 100644 testbench/coverage/test_pmp_coverage.sv

diff --git a/testbench/coverage/test_fencei_coverage.svh b/testbench/coverage/test_fencei_coverage.svh
deleted file mode 100644
index bb492b1cb..000000000
--- a/testbench/coverage/test_fencei_coverage.svh
+++ /dev/null
@@ -1,25 +0,0 @@
-typedef RISCV_instruction #(ILEN, XLEN, FLEN, VLEN, NHART, RETIRE) test_ins_rv64i_t;
-
-covergroup test_fencei_cg with function sample(test_ins_rv64i_t ins);
-    option.per_instance = 1; 
-    option.comment = "Fence.I";
-  
-    cp_asm_count : coverpoint ins.ins_str == "fence.i"  iff (ins.trap == 0 )  {
-        option.comment = "Number of times instruction is executed";
-        bins count[]  = {1};
-    }
-endgroup
-
-function void test_fencei_sample(int hart, int issue);
-    test_ins_rv64i_t ins;
-
-    case (traceDataQ[hart][issue][0].inst_name)
-        "fenci"     : begin 
-            ins = new(hart, issue, traceDataQ); 
-            test_fencei_cg.sample(ins); 
-        end
-    endcase
-
-endfunction
-
-
diff --git a/testbench/coverage/test_fencei_coverage_init.svh b/testbench/coverage/test_fencei_coverage_init.svh
deleted file mode 100644
index c07507d43..000000000
--- a/testbench/coverage/test_fencei_coverage_init.svh
+++ /dev/null
@@ -1,4 +0,0 @@
-test_fencei_cg = new(); test_fencei_cg.set_inst_name("obj_fencei");
-
-//    test_fencei_cg = new(); 
-//test_fencei_cg.set_inst_name("obj_fencei");
diff --git a/testbench/coverage/test_pmp_coverage.sv b/testbench/coverage/test_pmp_coverage.sv
deleted file mode 100644
index 2c1cbbfaa..000000000
--- a/testbench/coverage/test_pmp_coverage.sv
+++ /dev/null
@@ -1,108 +0,0 @@
-module test_pmp_coverage import cvw::*; #(parameter cvw_t P) (input clk);
-
-// Ensure the covergroup is defined correctly
-covergroup cg_priv_mode @(posedge clk);
-    coverpoint dut.core.ifu.PrivilegeModeW {
-        bins user   = {2'b00};
-        bins superv = {2'b01};
-        bins hyperv = {2'b10};
-        bins mach   = {2'b11};
-    }
-endgroup
-
-covergroup cg_PMPConfig @(posedge clk);
-    coverpoint dut.core.ifu.PMPCFG_ARRAY_REGW[0][0] {
-        bins ones    = {1};
-        bins zeros = {0};
-    }
-endgroup
-
-
-function bit [1:0] getPMPConfigSlice(int index);
-    return dut.core.ifu.immu.immu.PMPCFG_ARRAY_REGW[index][4:3];
-endfunction
-
-//if (P.PMP_ENTRIES > 0) begin : pmp
-    covergroup cg_pmpcfg_mode @(posedge clk);
-            coverpoint dut.core.ifu.immu.immu.PMPCFG_ARRAY_REGW[0][4:3] {
-                bins off   = {2'b00};
-                bins tor   = {2'b01};
-                bins na4   = {2'b10};
-                bins napot = {2'b11};
-            }
-
-
-            coverpoint dut.core.ifu.immu.immu.PMPCFG_ARRAY_REGW[1][4:3] {
-                bins off   = {2'b00};
-                bins tor   = {2'b01};
-                bins na4   = {2'b10};
-                bins napot = {2'b11};
-            }
-
-            coverpoint dut.core.ifu.immu.immu.PMPCFG_ARRAY_REGW[2][4:3] {
-                bins off   = {2'b00};
-                bins tor   = {2'b01};
-                bins na4   = {2'b10};
-                bins napot = {2'b11};
-            }
-
-            coverpoint dut.core.ifu.immu.immu.PMPCFG_ARRAY_REGW[3][4:3] {
-                bins off   = {2'b00};
-                bins tor   = {2'b01};
-                bins na4   = {2'b10};
-                bins napot = {2'b11};
-            }
-
-            coverpoint dut.core.ifu.immu.immu.PMPCFG_ARRAY_REGW[4][4:3] {
-                bins off   = {2'b00};
-                bins tor   = {2'b01};
-                bins na4   = {2'b10};
-                bins napot = {2'b11};
-            }
-
-            coverpoint dut.core.ifu.immu.immu.PMPCFG_ARRAY_REGW[5][4:3] {
-                bins off   = {2'b00};
-                bins tor   = {2'b01};
-                bins na4   = {2'b10};
-                bins napot = {2'b11};
-            }
-
-            coverpoint dut.core.ifu.immu.immu.PMPCFG_ARRAY_REGW[6][4:3] {
-                bins off   = {2'b00};
-                bins tor   = {2'b01};
-                bins na4   = {2'b10};
-                bins napot = {2'b11};
-            }
-
-            coverpoint dut.core.ifu.immu.immu.PMPCFG_ARRAY_REGW[7][4:3] {
-                bins off   = {2'b00};
-                bins tor   = {2'b01};
-                bins na4   = {2'b10};
-                bins napot = {2'b11};
-            }
-    endgroup
-//end
-
-
-// Ensure that the instantiation and sampling of covergroups are within the correct procedural context
-initial begin
-    cg_priv_mode privmodeCG = new();  // Instantiate the privilege mode covergroup
-    cg_PMPConfig pmpconfigCG = new(); // Instantiate the PMP config covergroup
-    cg_pmpcfg_mode pmpcfgmodeCG = new();
-
-    forever begin
-        @(posedge clk) begin
-            privmodeCG.sample();  // Sample the privilege mode covergroup
-            pmpconfigCG.sample(); // Sample the PMP config covergroupi
-	    pmpcfgmodeCG.sample();
-        end
-    end
-end
-
-
-endmodule
-
-
-
-
-

From 2cccf4ab21884916c7e71cb74787e2e12f722255 Mon Sep 17 00:00:00 2001
From: David Harris <David_Harris@hmc.edu>
Date: Wed, 29 Jan 2025 07:32:27 -0800
Subject: [PATCH 15/28] fixed wallyTracer to have 32 FP registers independent
 of E

---
 testbench/common/wallyTracer.sv | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/testbench/common/wallyTracer.sv b/testbench/common/wallyTracer.sv
index 468e53d40..6ec35215d 100644
--- a/testbench/common/wallyTracer.sv
+++ b/testbench/common/wallyTracer.sv
@@ -54,7 +54,7 @@ module wallyTracer import cvw::*; #(parameter cvw_t P) (rvviTrace rvvi);
   logic [4:0]            rf_a3;
   logic                  rf_we3;
   logic [P.FLEN-1:0]     frf[32];
-  logic [NUM_REGS-1:0]   frf_wb;
+  logic [31:0]           frf_wb;
   logic [4:0]            frf_a4;
   logic                  frf_we4;
   logic [P.XLEN-1:0]     CSRArray [4095:0];
@@ -314,7 +314,7 @@ module wallyTracer import cvw::*; #(parameter cvw_t P) (rvviTrace rvvi);
   genvar index;
   assign rf[0] = 0;
   for(index = 1; index < NUM_REGS; index += 1) 
-  assign rf[index] = testbench.dut.core.ieu.dp.regf.rf[index];
+    assign rf[index] = testbench.dut.core.ieu.dp.regf.rf[index];
 
   assign rf_a3  = testbench.dut.core.ieu.dp.regf.a3;
   assign rf_we3 = testbench.dut.core.ieu.dp.regf.we3;
@@ -328,12 +328,12 @@ module wallyTracer import cvw::*; #(parameter cvw_t P) (rvviTrace rvvi);
   if (P.F_SUPPORTED) begin
     assign frf_a4  = testbench.dut.core.fpu.fpu.fregfile.a4;
     assign frf_we4 = testbench.dut.core.fpu.fpu.fregfile.we4;
-    for(index = 0; index < NUM_REGS; index += 1) 
+    for(index = 0; index < 32; index += 1) 
       assign frf[index] = testbench.dut.core.fpu.fpu.fregfile.rf[index];
   end else begin
     assign frf_a4  = '0;
     assign frf_we4 = 0;
-    for(index = 0; index < NUM_REGS; index += 1) 
+    for(index = 0; index < 32; index += 1) 
       assign frf[index] = '0;
   end
   
@@ -422,6 +422,8 @@ module wallyTracer import cvw::*; #(parameter cvw_t P) (rvviTrace rvvi);
   for(index = 0; index < NUM_REGS; index += 1) begin
     assign rvvi.x_wdata[0][0][index] = rf[index];
     assign rvvi.x_wb[0][0][index]    = rf_wb[index];
+  end
+  for(index = 0; index < 32; index += 1) begin
     assign rvvi.f_wdata[0][0][index] = frf[index];
     assign rvvi.f_wb[0][0][index]    = frf_wb[index];
   end
@@ -749,7 +751,7 @@ module wallyTracer import cvw::*; #(parameter cvw_t P) (rvviTrace rvvi);
           end
         end
       end
-      for(index2 = 0; index2 < NUM_REGS; index2 += 1) begin
+      for(index2 = 0; index2 < 32; index2 += 1) begin
         if(rvvi.f_wb[0][0][index2]) begin
           $fwrite(file, "frf[%02d] = %016x ", index2, rvvi.f_wdata[0][0][index2]);
         end
@@ -771,7 +773,7 @@ module wallyTracer import cvw::*; #(parameter cvw_t P) (rvviTrace rvvi);
         for(index2 = 0; index2 < NUM_REGS; index2 += 1) begin
           $display("x%02d = %08x", index2, rvvi.x_wdata[0][0][index2]);
         end
-        for(index2 = 0; index2 < NUM_REGS; index2 += 1) begin
+        for(index2 = 0; index2 < 32; index2 += 1) begin
           $display("f%02d = %08x", index2, rvvi.f_wdata[0][0][index2]);
         end
       end

From 46ef44de5da6b033e68b6c6b272c624bbb22cc85 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Thu, 30 Jan 2025 00:58:53 -0800
Subject: [PATCH 16/28] Update breker and enable interrupts

---
 site-setup.sh                      | 2 +-
 testbench/trek_files/platform.yaml | 6 +++++-
 tests/breker/Makefile              | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/site-setup.sh b/site-setup.sh
index 81f17fff2..8bcd3d96e 100755
--- a/site-setup.sh
+++ b/site-setup.sh
@@ -15,7 +15,7 @@ export IMPERASD_LICENSE_FILE=27020@zircon.eng.hmc.edu               # Change thi
 export QUESTA_HOME=/cad/mentor/questa_sim-2023.4/questasim          # Change this for your path to Questa, excluding bin
 export DC_HOME=/cad/synopsys/SYN                                    # Change this for your path to Synopsys DC, excluding bin
 export VCS_HOME=/cad/synopsys/vcs/U-2023.03-SP2-4                   # Change this for your path to Synopsys VCS, excluding bin
-export BREKER_HOME=/cad/breker/trek5-2.1.10b-GCC6_el7               # Change this for your path to Breker Trek
+export BREKER_HOME=/cad/breker/trek5-2.1.11-GCC6_el7                # Change this for your path to Breker Trek
 
 # Tools
 # Questa and Synopsys
diff --git a/testbench/trek_files/platform.yaml b/testbench/trek_files/platform.yaml
index d7f7b8dad..c5b201342 100644
--- a/testbench/trek_files/platform.yaml
+++ b/testbench/trek_files/platform.yaml
@@ -154,7 +154,11 @@ trek:
       doc: >-
         Verbatim code that will be put into the header section of the test.
       value: |-
-
+        // enable mtimer  interrupts 
+        #define TREK_MTIME_BASE     (0x0200bff8)
+        #define TREK_MTIMECMP_BASE  (0x02004000)
+        #define TREK_MSWI_BASE      (0x02000000)
+        #define TREK_MTIMECMP_DELAY  0x1000
     declaration:
       doc: >-
         Verbatim code that will be put into the declaration section of the test.
diff --git a/tests/breker/Makefile b/tests/breker/Makefile
index fc56d8805..e21b6b3d5 100644
--- a/tests/breker/Makefile
+++ b/tests/breker/Makefile
@@ -14,7 +14,7 @@ TREKSVIP         := source $(TREKFILES)/breker-setup.sh && treksvip -p $(PLATFOR
 # Compilation paths and variables
 START_LIB_DIR := $(WALLY)/examples/C/common
 START_LIB     := $(START_LIB_DIR)/crt.S $(START_LIB_DIR)/syscalls.c
-MARCH         :=-march=rv64gc_zcb_zfa_zba_zbb_zbc_zbs_zfh_zicboz_zicbop_zicbom_zbkb_zbkx_zknd_zkne_zknh_svinval 
+MARCH         :=-march=rv64gc_zcb_zfa_zba_zbb_zbc_zbs_zfh_zicboz_zicbop_zicbom_zicond_zbkb_zbkx_zknd_zkne_zknh_svinval
 MABI          :=-mabi=lp64d
 LINKER        := $(START_LIB_DIR)/test.ld
 LINK_FLAGS    := -nostartfiles

From d28bca7306267c8d0c7e3a8158a2c21a2be6a4d8 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Sun, 12 Jan 2025 22:06:33 -0800
Subject: [PATCH 17/28] Fix buildroot when launched from install script

---
 bin/wally-tool-chain-install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh
index 35578d008..c032e899f 100755
--- a/bin/wally-tool-chain-install.sh
+++ b/bin/wally-tool-chain-install.sh
@@ -126,6 +126,8 @@ fi
 
 # Determine script directory to locate related scripts
 dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+WALLY=$(dirname "$dir")
+export WALLY
 
 # Get Linux distro and version
 source "${dir}"/wally-distro-check.sh

From b3796fc81094b7bb21be46f847a9040ee0b8d41f Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Mon, 13 Jan 2025 10:56:06 -0800
Subject: [PATCH 18/28] Allow buildroot to be compiled as root

---
 bin/wally-tool-chain-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh
index c032e899f..11da9d3d0 100755
--- a/bin/wally-tool-chain-install.sh
+++ b/bin/wally-tool-chain-install.sh
@@ -473,7 +473,7 @@ if [ ! "$no_buidroot" ]; then
     fi
     cd "$dir"/../linux
     if [ ! -e "$RISCV"/buildroot ]; then
-        make 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
+        FORCE_UNSAFE_CONFIGURE=1 make 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
         echo -e "${SUCCESS_COLOR}Buildroot successfully installed and Linux testvectors created!${ENDC}"
     elif [ ! -e "$RISCV"/linux-testvectors ]; then
         echo -e "${OK_COLOR}Buildroot already exists, but Linux testvectors are missing. Generating them now.${ENDC}"

From af99d2cd80f0f532a835ca56413c4e97bb04760d Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Thu, 16 Jan 2025 22:14:43 -0800
Subject: [PATCH 19/28] Add comment explaining FORCE_UNSAFE_CONFIGURE

[skip ci]
---
 bin/wally-tool-chain-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh
index 11da9d3d0..dbe60a007 100755
--- a/bin/wally-tool-chain-install.sh
+++ b/bin/wally-tool-chain-install.sh
@@ -473,7 +473,7 @@ if [ ! "$no_buidroot" ]; then
     fi
     cd "$dir"/../linux
     if [ ! -e "$RISCV"/buildroot ]; then
-        FORCE_UNSAFE_CONFIGURE=1 make 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
+        FORCE_UNSAFE_CONFIGURE=1 make 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ] # FORCE_UNSAFE_CONFIGURE is needed to allow buildroot to compile when run as root
         echo -e "${SUCCESS_COLOR}Buildroot successfully installed and Linux testvectors created!${ENDC}"
     elif [ ! -e "$RISCV"/linux-testvectors ]; then
         echo -e "${OK_COLOR}Buildroot already exists, but Linux testvectors are missing. Generating them now.${ENDC}"

From 1ba9fe6aa3a37e71c04c17266cf82234ecf10d53 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Mon, 27 Jan 2025 08:49:04 -0800
Subject: [PATCH 20/28] Update sail model to build with cmake

---
 bin/wally-tool-chain-install.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh
index dbe60a007..8fe98569d 100755
--- a/bin/wally-tool-chain-install.sh
+++ b/bin/wally-tool-chain-install.sh
@@ -428,13 +428,13 @@ fi
 # The RISC-V Sail Model is the golden reference model for RISC-V. It is written in Sail (described above)
 section_header "Installing/Updating RISC-V Sail Model"
 STATUS="riscv-sail-model"
-if git_check "sail-riscv" "https://github.com/riscv/sail-riscv.git" "$RISCV/bin/riscv_sim_RV32"; then
+if git_check "sail-riscv" "https://github.com/riscv/sail-riscv.git" "$RISCV/bin/riscv_sim_rv32d"; then
     cd "$RISCV"/sail-riscv
-    git reset --hard && git clean -f && git checkout master && git pull
-    ARCH=RV64 make -j "${NUM_THREADS}" c_emulator/riscv_sim_RV64  2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
-    ARCH=RV32 make -j "${NUM_THREADS}" c_emulator/riscv_sim_RV32 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
-    cp -f c_emulator/riscv_sim_RV64 "$RISCV"/bin/riscv_sim_RV64
-    cp -f c_emulator/riscv_sim_RV32 "$RISCV"/bin/riscv_sim_RV32
+    git reset --hard && git clean -f && git checkout master && git pull && rm -rf build
+    cmake -S . -B build -DCMAKE_RELEASE_TYPE=RelWithDebInfo -GNinja 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
+    cmake --build build 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
+    cp -f build/c_emulator/riscv_sim_rv64d "$RISCV"/bin/riscv_sim_rv64d
+    cp -f build/c_emulator/riscv_sim_rv32d "$RISCV"/bin/riscv_sim_rv32d
     if [ "$clean" ]; then
         cd "$RISCV"
         rm -rf sail-riscv

From 3c74f37e594a3e51f8d7956097a161cccd98a336 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Mon, 27 Jan 2025 08:49:20 -0800
Subject: [PATCH 21/28] Update name of sail executables

---
 tests/riscof/sail_cSim/riscof_sail_cSim.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/riscof/sail_cSim/riscof_sail_cSim.py b/tests/riscof/sail_cSim/riscof_sail_cSim.py
index e739af411..54e6b77d2 100644
--- a/tests/riscof/sail_cSim/riscof_sail_cSim.py
+++ b/tests/riscof/sail_cSim/riscof_sail_cSim.py
@@ -21,8 +21,8 @@ class sail_cSim(pluginTemplate):
             raise SystemExit(1)
         self.num_jobs = str(config['jobs'] if 'jobs' in config else 1)
         self.pluginpath = os.path.abspath(config['pluginpath'])
-        self.sail_exe = { '32' : os.path.join(config['PATH'] if 'PATH' in config else "","riscv_sim_RV32"),
-                '64' : os.path.join(config['PATH'] if 'PATH' in config else "","riscv_sim_RV64")}
+        self.sail_exe = { '32' : os.path.join(config['PATH'] if 'PATH' in config else "","riscv_sim_rv32d"),
+                '64' : os.path.join(config['PATH'] if 'PATH' in config else "","riscv_sim_rv64d")}
         self.isa_spec = os.path.abspath(config['ispec']) if 'ispec' in config else ''
         self.platform_spec = os.path.abspath(config['pspec']) if 'ispec' in config else ''
         self.make = config['make'] if 'make' in config else 'make'

From 256fafc4fb8ea9f1f5531049a24c87885cc520fe Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Mon, 27 Jan 2025 21:34:07 -0800
Subject: [PATCH 22/28] Fix sail install

---
 bin/wally-tool-chain-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh
index 8fe98569d..0018cafc4 100755
--- a/bin/wally-tool-chain-install.sh
+++ b/bin/wally-tool-chain-install.sh
@@ -430,7 +430,7 @@ section_header "Installing/Updating RISC-V Sail Model"
 STATUS="riscv-sail-model"
 if git_check "sail-riscv" "https://github.com/riscv/sail-riscv.git" "$RISCV/bin/riscv_sim_rv32d"; then
     cd "$RISCV"/sail-riscv
-    git reset --hard && git clean -f && git checkout master && git pull && rm -rf build
+    git reset --hard && git clean -f && git checkout master && git pull
     cmake -S . -B build -DCMAKE_RELEASE_TYPE=RelWithDebInfo -GNinja 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
     cmake --build build 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
     cp -f build/c_emulator/riscv_sim_rv64d "$RISCV"/bin/riscv_sim_rv64d

From 8d01b46a05a6030e54843b50bb02d24e3297d138 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Thu, 30 Jan 2025 07:57:22 -0800
Subject: [PATCH 23/28] Fix typo

---
 bin/wally-tool-chain-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh
index 0018cafc4..413a7953b 100755
--- a/bin/wally-tool-chain-install.sh
+++ b/bin/wally-tool-chain-install.sh
@@ -431,7 +431,7 @@ STATUS="riscv-sail-model"
 if git_check "sail-riscv" "https://github.com/riscv/sail-riscv.git" "$RISCV/bin/riscv_sim_rv32d"; then
     cd "$RISCV"/sail-riscv
     git reset --hard && git clean -f && git checkout master && git pull
-    cmake -S . -B build -DCMAKE_RELEASE_TYPE=RelWithDebInfo -GNinja 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
+    cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -GNinja 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
     cmake --build build 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
     cp -f build/c_emulator/riscv_sim_rv64d "$RISCV"/bin/riscv_sim_rv64d
     cp -f build/c_emulator/riscv_sim_rv32d "$RISCV"/bin/riscv_sim_rv32d

From 31bfcdc660b2fb1a8c5c0206a68de91b60f7aa58 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Thu, 30 Jan 2025 13:29:32 -0800
Subject: [PATCH 24/28] Update CI to ensure sufficient space

---
 .github/scripts/cli-create-lvm.sh          | 64 ++++++++++++++++++++++
 .github/{ => scripts}/cli-space-cleanup.sh |  0
 .github/workflows/install.yml              | 16 +++---
 3 files changed, 73 insertions(+), 7 deletions(-)
 create mode 100755 .github/scripts/cli-create-lvm.sh
 rename .github/{ => scripts}/cli-space-cleanup.sh (100%)

diff --git a/.github/scripts/cli-create-lvm.sh b/.github/scripts/cli-create-lvm.sh
new file mode 100755
index 000000000..a28fbe27d
--- /dev/null
+++ b/.github/scripts/cli-create-lvm.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+###########################################
+## GitHub runner create LVM volume merging /mnt with / for more space
+##
+## Written: Jordan Carlin, jcarlin@hmc.edu
+## Created: 30 Jan 2025
+## Based on https://github.com/easimon/maximize-build-space/blob/master/action.yml
+##
+## Purpose: Combine free space from multiple disks into a single logical volume for GitHub Actions runner
+## A component of the CORE-V-WALLY configurable RISC-V project.
+## https://github.com/openhwgroup/cvw
+##
+## Copyright (C) 2021-25 Harvey Mudd College & Oklahoma State University
+##
+## SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
+##
+## Licensed under the Solderpad Hardware License v 2.1 (the “License”); you may not use this file
+## except in compliance with the License, or, at your option, the Apache License version 2.0. You
+## may obtain a copy of the License at
+##
+## https:##solderpad.org/licenses/SHL-2.1/
+##
+## Unless required by applicable law or agreed to in writing, any work distributed under the
+## License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+## either express or implied. See the License for the specific language governing permissions
+## and limitations under the License.
+################################################################################################
+
+ROOT_SAVE_SPACE="${1:-20}" # in GB, needed for installing packages, etc.
+MOUNT="${2:-$GITHUB_WORKSPACE}"
+
+# First disable and remove swap file on /mnt
+sudo swapoff -a
+sudo rm -f /mnt/swapfile
+
+# Create / LVM physical volume
+ROOT_FREE_SPACE=$(df --block-size=1024 --output=avail / | tail -1)
+ROOT_LVM_SIZE=$(((ROOT_FREE_SPACE - (ROOT_SAVE_SPACE * 1024 * 1024)) * 1024))
+sudo touch /pv.img && sudo fallocate -z -l $ROOT_LVM_SIZE /pv.img
+ROOT_LOOP_DEV=$(sudo losetup --find --show /pv.img)
+sudo pvcreate -f "$ROOT_LOOP_DEV"
+
+# Create /mnt LVM physical volume
+MNT_FREE_SPACE=$(df --block-size=1024 --output=avail /mnt | tail -1)
+MNT_LVM_SIZE=$(((MNT_FREE_SPACE - (1 * 1024)) * 1024)) # Leave 1MB free on /mnt
+sudo touch /mnt/pv.img && sudo fallocate -z -l $MNT_LVM_SIZE /mnt/pv.img
+MNT_LOOP_DEV=$(sudo losetup --find --show /mnt/pv.img)
+sudo pvcreate -f "$MNT_LOOP_DEV"
+
+# Create LVM volume group
+sudo vgcreate runnervg "$ROOT_LOOP_DEV" "$MNT_LOOP_DEV"
+
+# Recreate swap
+sudo lvcreate -L 4G -n swap runnervg
+sudo mkswap /dev/mapper/runnervg-swap
+sudo swapon /dev/mapper/runnervg-swap
+
+# Create LVM logical volume
+sudo lvcreate -l 100%FREE -n runnerlv runnervg
+sudo mkfs.ext4 /dev/mapper/runnervg-runnerlv
+sudo mkdir -p "$MOUNT"
+sudo mount /dev/mapper/runnervg-runnerlv "$MOUNT"
+sudo chown runner:runner "$MOUNT"
+sudo rm -rf "$MOUNT/lost+found"
diff --git a/.github/cli-space-cleanup.sh b/.github/scripts/cli-space-cleanup.sh
similarity index 100%
rename from .github/cli-space-cleanup.sh
rename to .github/scripts/cli-space-cleanup.sh
diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
index 10e36cbab..00d72ee50 100644
--- a/.github/workflows/install.yml
+++ b/.github/workflows/install.yml
@@ -127,9 +127,11 @@ jobs:
         run: |
               df -h
               if [ -z ${{ matrix.image }} ]; then
-                ./.github/cli-space-cleanup.sh
+                ./.github/scripts/cli-space-cleanup.sh
+                ./.github/scripts/cli-create-lvm.sh
               else
-                nsenter -t 1 -m -u -n -i bash -c "$(cat .github/cli-space-cleanup.sh)"
+                nsenter -t 1 -m -u -n -i bash -c "$(cat .github/scripts/cli-space-cleanup.sh)"
+                nsenter -t 1 -m -u -n -i bash -c "$(cat .github/scripts/cli-create-lvm.sh)"
               fi
               df -h
       # Run main tool chain installation script, either as a user or system wide
@@ -159,16 +161,16 @@ jobs:
         with:
           name: installation-logs-${{ matrix.name }}
           path: ${{ env.RISCV }}/logs/
+      # Only the linux-testvectors are needed, so remove the rest of the buildroot to save space
+      - name: Remove Buildroot to Save Space
+        run: |
+            rm -rf $RISCV/buildroot/ || sudo rm -rf $RISCV/
+            df -h
       # Make riscof and zsbl only as that is the only testsuite used by standard regression
       - name: make tests
         run: |
               source setup.sh
               make riscof zsbl --jobs $(nproc --ignore 1)
-      # Only the linux-testvectors are needed, so remove the rest of the buildroot to save space
-      - name: Remove Buildroot to Save Space
-        run: |
-              rm -rf $RISCV/buildroot/output/build || sudo rm -rf $RISCV/buildroot/output/build
-              df -h
       # Run standard regression, skipping distros that are known to be broken with Verilator
       - name: Regression
         if: ${{ matrix.regressionFail != true }}

From c99f11a5a220431802a96f44247c5cae2cced59f Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Thu, 30 Jan 2025 13:32:58 -0800
Subject: [PATCH 25/28] Reorder installation CI for better space usage

---
 .github/workflows/install.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
index 00d72ee50..fc6363a4d 100644
--- a/.github/workflows/install.yml
+++ b/.github/workflows/install.yml
@@ -128,10 +128,10 @@ jobs:
               df -h
               if [ -z ${{ matrix.image }} ]; then
                 ./.github/scripts/cli-space-cleanup.sh
-                ./.github/scripts/cli-create-lvm.sh
+                #./.github/scripts/cli-create-lvm.sh
               else
                 nsenter -t 1 -m -u -n -i bash -c "$(cat .github/scripts/cli-space-cleanup.sh)"
-                nsenter -t 1 -m -u -n -i bash -c "$(cat .github/scripts/cli-create-lvm.sh)"
+                #nsenter -t 1 -m -u -n -i bash -c "$(cat .github/scripts/cli-create-lvm.sh)"
               fi
               df -h
       # Run main tool chain installation script, either as a user or system wide
@@ -162,9 +162,11 @@ jobs:
           name: installation-logs-${{ matrix.name }}
           path: ${{ env.RISCV }}/logs/
       # Only the linux-testvectors are needed, so remove the rest of the buildroot to save space
-      - name: Remove Buildroot to Save Space
+      # Logs have already been uploaded so they can be removed
+      - name: Clean up installation
         run: |
-            rm -rf $RISCV/buildroot/ || sudo rm -rf $RISCV/
+            rm -rf $RISCV/buildroot/ || sudo rm -rf $RISCV/buildroot/
+            rm -rf $RISCV/logs || sudo rm -rf $RISCV/logs
             df -h
       # Make riscof and zsbl only as that is the only testsuite used by standard regression
       - name: make tests

From e5992ad4f7d98a4a4cf28c94bcbded03f184bc01 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Thu, 30 Jan 2025 19:17:04 -0800
Subject: [PATCH 26/28] Cleanup

---
 .github/scripts/cli-create-lvm.sh | 64 -------------------------------
 .github/workflows/install.yml     |  2 -
 2 files changed, 66 deletions(-)
 delete mode 100755 .github/scripts/cli-create-lvm.sh

diff --git a/.github/scripts/cli-create-lvm.sh b/.github/scripts/cli-create-lvm.sh
deleted file mode 100755
index a28fbe27d..000000000
--- a/.github/scripts/cli-create-lvm.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-###########################################
-## GitHub runner create LVM volume merging /mnt with / for more space
-##
-## Written: Jordan Carlin, jcarlin@hmc.edu
-## Created: 30 Jan 2025
-## Based on https://github.com/easimon/maximize-build-space/blob/master/action.yml
-##
-## Purpose: Combine free space from multiple disks into a single logical volume for GitHub Actions runner
-## A component of the CORE-V-WALLY configurable RISC-V project.
-## https://github.com/openhwgroup/cvw
-##
-## Copyright (C) 2021-25 Harvey Mudd College & Oklahoma State University
-##
-## SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
-##
-## Licensed under the Solderpad Hardware License v 2.1 (the “License”); you may not use this file
-## except in compliance with the License, or, at your option, the Apache License version 2.0. You
-## may obtain a copy of the License at
-##
-## https:##solderpad.org/licenses/SHL-2.1/
-##
-## Unless required by applicable law or agreed to in writing, any work distributed under the
-## License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-## either express or implied. See the License for the specific language governing permissions
-## and limitations under the License.
-################################################################################################
-
-ROOT_SAVE_SPACE="${1:-20}" # in GB, needed for installing packages, etc.
-MOUNT="${2:-$GITHUB_WORKSPACE}"
-
-# First disable and remove swap file on /mnt
-sudo swapoff -a
-sudo rm -f /mnt/swapfile
-
-# Create / LVM physical volume
-ROOT_FREE_SPACE=$(df --block-size=1024 --output=avail / | tail -1)
-ROOT_LVM_SIZE=$(((ROOT_FREE_SPACE - (ROOT_SAVE_SPACE * 1024 * 1024)) * 1024))
-sudo touch /pv.img && sudo fallocate -z -l $ROOT_LVM_SIZE /pv.img
-ROOT_LOOP_DEV=$(sudo losetup --find --show /pv.img)
-sudo pvcreate -f "$ROOT_LOOP_DEV"
-
-# Create /mnt LVM physical volume
-MNT_FREE_SPACE=$(df --block-size=1024 --output=avail /mnt | tail -1)
-MNT_LVM_SIZE=$(((MNT_FREE_SPACE - (1 * 1024)) * 1024)) # Leave 1MB free on /mnt
-sudo touch /mnt/pv.img && sudo fallocate -z -l $MNT_LVM_SIZE /mnt/pv.img
-MNT_LOOP_DEV=$(sudo losetup --find --show /mnt/pv.img)
-sudo pvcreate -f "$MNT_LOOP_DEV"
-
-# Create LVM volume group
-sudo vgcreate runnervg "$ROOT_LOOP_DEV" "$MNT_LOOP_DEV"
-
-# Recreate swap
-sudo lvcreate -L 4G -n swap runnervg
-sudo mkswap /dev/mapper/runnervg-swap
-sudo swapon /dev/mapper/runnervg-swap
-
-# Create LVM logical volume
-sudo lvcreate -l 100%FREE -n runnerlv runnervg
-sudo mkfs.ext4 /dev/mapper/runnervg-runnerlv
-sudo mkdir -p "$MOUNT"
-sudo mount /dev/mapper/runnervg-runnerlv "$MOUNT"
-sudo chown runner:runner "$MOUNT"
-sudo rm -rf "$MOUNT/lost+found"
diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
index fc6363a4d..3cf9fd041 100644
--- a/.github/workflows/install.yml
+++ b/.github/workflows/install.yml
@@ -128,10 +128,8 @@ jobs:
               df -h
               if [ -z ${{ matrix.image }} ]; then
                 ./.github/scripts/cli-space-cleanup.sh
-                #./.github/scripts/cli-create-lvm.sh
               else
                 nsenter -t 1 -m -u -n -i bash -c "$(cat .github/scripts/cli-space-cleanup.sh)"
-                #nsenter -t 1 -m -u -n -i bash -c "$(cat .github/scripts/cli-create-lvm.sh)"
               fi
               df -h
       # Run main tool chain installation script, either as a user or system wide

From 057823d61f747832cffb7b136ac074285e0ba69f Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Thu, 30 Jan 2025 19:40:16 -0800
Subject: [PATCH 27/28] Install newer cmake on old debian and ubuntu

---
 bin/wally-tool-chain-install.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh
index 413a7953b..2c6db771c 100755
--- a/bin/wally-tool-chain-install.sh
+++ b/bin/wally-tool-chain-install.sh
@@ -286,6 +286,21 @@ if (( UBUNTU_VERSION == 20  || DEBIAN_VERSION == 11 )) || [ "$FAMILY" == suse ];
     fi
 fi
 
+# Newer version of CMake needed to build sail-riscv model (at least 3.20)
+if (( UBUNTU_VERSION == 20  || DEBIAN_VERSION == 11 )); then
+    STATUS="cmake"
+    if [ ! -e "$RISCV"/bin/cmake ]; then
+        section_header "Installing cmake"
+        cd "$RISCV"
+        wget -nv --retry-connrefused $retry_on_host_error --output-document=cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v3.31.5/cmake-3.31.5-linux-x86_64.tar.gz
+        tar xz --directory="$RISCV" --strip-components=1 -f cmake.tar.gz
+        rm -f cmake.tar.gz
+        echo -e "${SUCCESS_COLOR}CMake successfully installed/updated!${ENDC}"
+    else
+        echo -e "${SUCCESS_COLOR}CMake already installed.${ENDC}"
+    fi
+fi
+
 # RISC-V GNU Toolchain (https://github.com/riscv-collab/riscv-gnu-toolchain)
 # The RISC-V GNU Toolchain includes the GNU Compiler Collection (gcc), GNU Binutils, Newlib,
 # and the GNU Debugger Project (gdb). It is a collection of tools used to compile RISC-V programs.

From d475f64f99d8b27212574e0c5a8241b377e09e4e Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Thu, 30 Jan 2025 19:40:40 -0800
Subject: [PATCH 28/28] Cleanup installation logging

---
 bin/wally-tool-chain-install.sh | 46 ++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh
index 2c6db771c..9ffddf8bc 100755
--- a/bin/wally-tool-chain-install.sh
+++ b/bin/wally-tool-chain-install.sh
@@ -99,7 +99,7 @@ git_check() {
 
 # Log output to a file and only print lines with keywords
 logger() {
-    local log_file="$RISCV/logs/$1.log"
+    local log_file="$RISCV/logs/$STATUS.log"
     local keyword_pattern="(\bwarning|\berror|\bfail|\bsuccess|\bstamp|\bdoesn't work)"
     local exclude_pattern="(_warning|warning_|_error|error_|-warning|warning-|-error|error-|Werror|error\.o|warning flags)"
 
@@ -183,7 +183,7 @@ echo "Using $NUM_THREADS thread(s) for compilation"
 mkdir -p "$RISCV"/logs
 
 # Install/update system packages if root. Otherwise, check that packages are already installed.
-STATUS="system packages"
+STATUS="system_packages"
 if [ "$ROOT" == true ]; then
     source "${dir}"/wally-package-install.sh
 else
@@ -211,7 +211,7 @@ fi
 # Create python virtual environment so the python command targets desired version of python
 # and installed packages are isolated from the rest of the system.
 section_header "Setting up Python Environment"
-STATUS="python virtual environment"
+STATUS="python_virtual_environment"
 cd "$RISCV"
 if [ ! -e "$RISCV"/riscv-python/bin/activate ]; then
     "$PYTHON_VERSION" -m venv riscv-python --prompt cvw
@@ -244,8 +244,8 @@ if (( RHEL_VERSION == 8 )) || (( UBUNTU_VERSION == 20 )); then
         rm -f glib-2.70.5.tar.xz
         cd glib-2.70.5
         meson setup _build --prefix="$RISCV"
-        meson compile -C _build -j "${NUM_THREADS}" 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
-        meson install -C _build 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
+        meson compile -C _build -j "${NUM_THREADS}" 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
+        meson install -C _build 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
         cd "$RISCV"
         rm -rf glib-2.70.5
         echo -e "${SUCCESS_COLOR}glib successfully installed!${ENDC}"
@@ -263,8 +263,8 @@ if (( RHEL_VERSION == 8 )); then
         rm -f gmp-6.3.0.tar.xz
         cd gmp-6.3.0
         ./configure --prefix="$RISCV"
-        make -j "${NUM_THREADS}" 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
-        make install 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
+        make -j "${NUM_THREADS}" 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
+        make install 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
         cd "$RISCV"
         rm -rf gmp-6.3.0
         echo -e "${SUCCESS_COLOR}gmp successfully installed!${ENDC}"
@@ -314,7 +314,7 @@ if git_check "riscv-gnu-toolchain" "https://github.com/riscv/riscv-gnu-toolchain
     cd "$RISCV"/riscv-gnu-toolchain
     git reset --hard && git clean -f && git checkout master && git pull && git submodule update
     ./configure --prefix="${RISCV}" --with-multilib-generator="rv32e-ilp32e--;rv32i-ilp32--;rv32im-ilp32--;rv32iac-ilp32--;rv32imac-ilp32--;rv32imafc-ilp32f--;rv32imafdc-ilp32d--;rv64i-lp64--;rv64ic-lp64--;rv64iac-lp64--;rv64imac-lp64--;rv64imafdc-lp64d--;rv64im-lp64--;"
-    make -j "${NUM_THREADS}" 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
+    make -j "${NUM_THREADS}" 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
     if [ "$clean" ]; then
         cd "$RISCV"
         rm -rf riscv-gnu-toolchain
@@ -341,8 +341,8 @@ if git_check "elf2hex" "https://github.com/sifive/elf2hex.git" "$RISCV/bin/riscv
     git reset --hard && git clean -f && git checkout master && git pull
     autoreconf -i
     ./configure --target=riscv64-unknown-elf --prefix="$RISCV"
-    make 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
-    make install 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
+    make 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
+    make install 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
     if [ "$clean" ]; then
         cd "$RISCV"
         rm -rf elf2hex
@@ -362,8 +362,8 @@ if git_check "qemu" "https://github.com/qemu/qemu" "$RISCV/include/qemu-plugin.h
     cd "$RISCV"/qemu
     git reset --hard && git clean -f && git checkout master && git pull
     ./configure --target-list=riscv64-softmmu --prefix="$RISCV"
-    make -j "${NUM_THREADS}" 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
-    make install 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
+    make -j "${NUM_THREADS}" 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
+    make install 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
     if [ "$clean" ]; then
         cd "$RISCV"
         rm -rf qemu
@@ -385,8 +385,8 @@ if git_check "riscv-isa-sim" "https://github.com/riscv-software-src/riscv-isa-si
     mkdir -p build
     cd build
     ../configure --prefix="$RISCV"
-    make -j "${NUM_THREADS}" 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
-    make install 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
+    make -j "${NUM_THREADS}" 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
+    make install 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
     if [ "$clean" ]; then
         cd "$RISCV"
         rm -rf riscv-isa-sim
@@ -410,8 +410,8 @@ if git_check "verilator" "https://github.com/verilator/verilator" "$RISCV/share/
     git reset --hard && git clean -f && git checkout master && git pull
     autoconf
     ./configure --prefix="$RISCV"
-    make -j "${NUM_THREADS}" 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
-    make install 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
+    make -j "${NUM_THREADS}" 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
+    make install 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
     if [ "$clean" ]; then
         cd "$RISCV"
         rm -rf verilator
@@ -428,7 +428,7 @@ fi
 # The Sail Compiler is written in OCaml, which is an object-oriented extension of ML, which in turn
 # is a functional programming language suited to formal verification.
 section_header "Installing/Updating Sail Compiler"
-STATUS="Sail Compiler"
+STATUS="sail_compiler"
 if [ ! -e "$RISCV"/bin/sail ]; then
     cd "$RISCV"
     wget -nv --retry-connrefused $retry_on_host_error --output-document=sail.tar.gz https://github.com/rems-project/sail/releases/latest/download/sail.tar.gz
@@ -446,8 +446,8 @@ STATUS="riscv-sail-model"
 if git_check "sail-riscv" "https://github.com/riscv/sail-riscv.git" "$RISCV/bin/riscv_sim_rv32d"; then
     cd "$RISCV"/sail-riscv
     git reset --hard && git clean -f && git checkout master && git pull
-    cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -GNinja 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
-    cmake --build build 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
+    cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -GNinja 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
+    cmake --build build 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
     cp -f build/c_emulator/riscv_sim_rv64d "$RISCV"/bin/riscv_sim_rv64d
     cp -f build/c_emulator/riscv_sim_rv32d "$RISCV"/bin/riscv_sim_rv32d
     if [ "$clean" ]; then
@@ -463,7 +463,7 @@ fi
 # OSU Skywater 130 cell library (https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_osu_sc_t12)
 # The OSU Skywater 130 cell library is a standard cell library that is used to synthesize Wally.
 section_header "Installing/Updating OSU Skywater 130 cell library"
-STATUS="OSU Skywater 130 cell library"
+STATUS="osu_skywater_130_cell_library"
 mkdir -p "$RISCV"/cad/lib
 cd "$RISCV"/cad/lib
 if git_check "sky130_osu_sc_t12" "https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_osu_sc_t12" "$RISCV/cad/lib/sky130_osu_sc_t12" "main"; then
@@ -488,11 +488,11 @@ if [ ! "$no_buidroot" ]; then
     fi
     cd "$dir"/../linux
     if [ ! -e "$RISCV"/buildroot ]; then
-        FORCE_UNSAFE_CONFIGURE=1 make 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ] # FORCE_UNSAFE_CONFIGURE is needed to allow buildroot to compile when run as root
+        FORCE_UNSAFE_CONFIGURE=1 make 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ] # FORCE_UNSAFE_CONFIGURE is needed to allow buildroot to compile when run as root
         echo -e "${SUCCESS_COLOR}Buildroot successfully installed and Linux testvectors created!${ENDC}"
     elif [ ! -e "$RISCV"/linux-testvectors ]; then
         echo -e "${OK_COLOR}Buildroot already exists, but Linux testvectors are missing. Generating them now.${ENDC}"
-        make dumptvs 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ]
+        make dumptvs 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
         echo -e "${SUCCESS_COLOR}Linux testvectors successfully generated!${ENDC}"
     else
         echo -e "${OK_COLOR}Buildroot and Linux testvectors already exist.${ENDC}"
@@ -506,7 +506,7 @@ fi
 # The site-setup script is used to set up the environment for the RISC-V tools and EDA tools by setting
 # the PATH and other environment variables. It also sources the Python virtual environment.
 section_header "Downloading Site Setup Script"
-STATUS="site-setup scripts"
+STATUS="site-setup_scripts"
 cd "$RISCV"
 if [ ! -e "${RISCV}"/site-setup.sh ]; then
     wget -nv --retry-connrefused $retry_on_host_error https://raw.githubusercontent.com/openhwgroup/cvw/main/site-setup.sh