separated buildroot debugging from buildroot logging

.gitignore

@@ -35,5 +35,7 @@ wally-pipelined/linux-testgen/linux-testvectors/intermediate-outputs/*
 wally-pipelined/linux-testgen/buildroot/
 wally-pipelined/linux-testgen/buildroot-image-output
 wally-pipelined/linux-testgen/buildroot-config-src/main.config.old
+wally-pipelined/linux-testgen/buildroot-config-src/linux.config.old
+wally-pipelined/linux-testgen/buildroot-config-src/busybox.config.old
 wally-pipelined/regression/slack-notifier/slack-webhook-url.txt
 

wally-pipelined/linux-testgen/buildroot-config-src/main.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Buildroot -gafcb8fe-dirty Configuration
+# Buildroot -g73f9753-dirty Configuration
 #
 BR2_HAVE_DOT_CONFIG=y
 

wally-pipelined/linux-testgen/testvector-generation/debugBuildroot.sh

@@ -0,0 +1,39 @@
+# Oftentimes this script runs so long you'll go to sleep.
+# But you don't want the script to die when your computer goes to sleep.
+# So consider invoking this with nohup (i.e. "nohup ./logAllBuildroot.sh")
+# You can run "tail -f nohup.out" to see what would've
+# outputted to the terminal if you didn't use nohup
+
+customQemu="/courses/e190ax/qemu_sim/rv64_initrd/qemu_experimental/qemu/build/qemu-system-riscv64"
+#customQemu="qemu-system-riscv64"
+imageDir="../buildroot-image-output"
+intermedDir="../linux-testvectors/intermediate-outputs"
+outDir="../linux-testvectors"
+
+# =========== Debug the Process ========== 
+# Uncomment this version for QEMU debugging of kernel
+#  - good for poking around VM if it boots up
+#  - good for running QEMU commands (press "Ctrl-A" then "c" to open QEMU command prompt)
+$customQemu -M virt -nographic -bios $imageDir/fw_jump.elf -kernel $imageDir/Image -append "root=/dev/vda ro" -initrd $imageDir/rootfs.cpio 
+# Uncomment this version for GDB debugging of kernel
+#  - attempts to load in symbols from "vmlinux"
+#  - good for looking at backtraces when Linux gets stuck for some reason 
+#$customQemu -M virt -nographic -bios $imageDir/fw_jump.elf -kernel $imageDir/Image -append "root=/dev/vda ro" -initrd $imageDir/rootfs.cpio -gdb tcp::1237 -S & riscv64-unknown-elf-gdb -x gdbinit_debug
+
+# Uncomment this version to generate qemu_output.txt
+# - Uses GDB script
+# - Logs raw QEMU output to qemu_output.txt
+#($customQemu -M virt -nographic -bios $imageDir/fw_jump.elf -kernel $imageDir/Image -append "root=/dev/vda ro" -initrd $imageDir/rootfs.cpio -d nochain,cpu,in_asm -serial /dev/null -singlestep -gdb tcp::1237 -S 2> $intermedDir/qemu_output.txt) & riscv64-unknown-elf-gdb -x gdbinit_debug
+
+# Uncomment this version for parse_qemu.py debugging
+# - Uses qemu_output.txt
+# - Makes qemu_in_gdb_format.txt
+# - Splits qemu_in_gdb_format.txt into chunks of 100,000 instrs
+#cat $intermedDir/qemu_output.txt | ./parse_qemu.py >$intermedDir/qemu_in_gdb_format.txt
+#cd $intermedDir
+#split -d -l 5600000 ./qemu_in_gdb_format.txt --verbose
+#cd ../../testvector-generation
+
+# Uncomment this version for parse_gdb_output.py debugging
+# - Uses qemu_in_gdb_format.txt
+# - Makes testvectors#cat $intermedDir/qemu_in_gdb_format.txt | ./parse_gdb_output.py "$outDir"

wally-pipelined/linux-testgen/testvector-generation/gdbinit_debug

@@ -1,3 +1,8 @@
-file ../buildroot-image-output/vmlinux
 set pagination off
-target extended-remote :1236
+file ../buildroot-image-output/fw_jump.elf
+target extended-remote :1237
+b irqchip_plic_warm_init
+c
+file ../buildroot-image-output/vmlinux
+b plic_init
+c

wally-pipelined/linux-testgen/testvector-generation/gdbinit_qemulog_debug

@@ -1,10 +0,0 @@
-set pagination off
-target extended-remote :1236
-maint print symbols symbols.txt
-b *0x000000008020103c
-c
-del 1
-stepi 100000
-set confirm off
-kill
-q

wally-pipelined/linux-testgen/testvector-generation/logAllBuildroot.sh

@@ -10,35 +10,5 @@ imageDir="../buildroot-image-output"
 intermedDir="../linux-testvectors/intermediate-outputs"
 outDir="../linux-testvectors"
 
-# =========== Debug the Process ========== 
-# Uncomment this version for QEMU debugging of kernel
-#  - good for poking around VM if it boots up
-#  - good for running QEMU commands (press "Ctrl-A" then "c" to open QEMU command prompt)
-#$customQemu -M virt -nographic -bios $imageDir/fw_jump.elf -kernel $imageDir/Image -append "root=/dev/vda ro" -initrd $imageDir/rootfs.cpio 
-# Uncomment this version for GDB debugging of kernel
-#  - attempts to load in symbols from "vmlinux"
-#  - good for looking at backtraces when Linux gets stuck for some reason 
-#$customQemu -M virt -nographic -bios $imageDir/fw_jump.elf -kernel $imageDir/Image -append "root=/dev/vda ro" -initrd $imageDir/rootfs.cpio -gdb tcp::1236 -S & riscv64-unknown-elf-gdb -x gdbinit_debug
-
-# Uncomment this version to generate qemu_output.txt
-# - Uses GDB script
-# - Logs raw QEMU output to qemu_output.txt
-#($customQemu -M virt -nographic -bios $imageDir/fw_jump.elf -kernel $imageDir/Image -append "root=/dev/vda ro" -initrd $imageDir/rootfs.cpio -d nochain,cpu,in_asm -serial /dev/null -singlestep -gdb tcp::1236 -S 2> $intermedDir/qemu_output.txt) & riscv64-unknown-elf-gdb -x gdbinit_qemulog_debug
-
-# Uncomment this version for parse_qemu.py debugging
-# - Uses qemu_output.txt
-# - Makes qemu_in_gdb_format.txt
-# - Splits qemu_in_gdb_format.txt into chunks of 100,000 instrs
-#cat $intermedDir/qemu_output.txt | ./parse_qemu.py >$intermedDir/qemu_in_gdb_format.txt
-#cd $intermedDir
-#split -d -l 5600000 ./qemu_in_gdb_format.txt --verbose
-#cd ../../testvector-generation
-
-# Uncomment this version for parse_gdb_output.py debugging
-# - Uses qemu_in_gdb_format.txt
-# - Makes testvectors#cat $intermedDir/qemu_in_gdb_format.txt | ./parse_gdb_output.py "$outDir"
-
-# =========== Just Do the Thing ========== 
-# Uncomment this version for the whole thing 
 # - Logs info needed by buildroot testbench
 ($customQemu -M virt -nographic -bios $imageDir/fw_jump.elf -kernel $imageDir/Image -append "root=/dev/vda ro" -initrd $imageDir/rootfs.cpio -d nochain,cpu,in_asm -serial /dev/null -singlestep -gdb tcp::1236 -S 2>&1 >/dev/null | ./parse_qemu.py | ./parse_gdb_output.py "$outDir") & riscv64-unknown-elf-gdb -x gdbinit_qemulog