From 17e776f8535439b257373e3aadbed271ef932204 Mon Sep 17 00:00:00 2001
From: bbracker <bbracker@hmc.edu>
Date: Fri, 5 Nov 2021 22:37:05 -0700
Subject: [PATCH] checkpoints now use binary ram files

---
 .../testvector-generation/Makefile            |  13 +++++++
 .../testvector-generation/fixBinMem           | Bin 0 -> 8784 bytes
 .../testvector-generation/fixBinMem.c         |  33 ++++++++++++++++++
 .../{fix_mem.py => fixTxtMem.py}              |   0
 .../testvector-generation/genCheckpoint.gdb   |   7 ++--
 .../testvector-generation/genCheckpoint.sh    |  23 ++++++++----
 .../testvector-generation/genInitMem.sh       |   4 +--
 .../testvector-generation/genSettings.sh      |   2 +-
 wally-pipelined/testbench/testbench-linux.sv  |   9 +++--
 9 files changed, 75 insertions(+), 16 deletions(-)
 create mode 100644 tests/linux-testgen/testvector-generation/Makefile
 create mode 100755 tests/linux-testgen/testvector-generation/fixBinMem
 create mode 100644 tests/linux-testgen/testvector-generation/fixBinMem.c
 rename tests/linux-testgen/testvector-generation/{fix_mem.py => fixTxtMem.py} (100%)

diff --git a/tests/linux-testgen/testvector-generation/Makefile b/tests/linux-testgen/testvector-generation/Makefile
new file mode 100644
index 00000000..8f9bff4b
--- /dev/null
+++ b/tests/linux-testgen/testvector-generation/Makefile
@@ -0,0 +1,13 @@
+SHELL = /bin/sh
+
+CFLAG = -Wall -g
+CC = clang
+
+all: fixBinMem
+
+fixBinMem: fixBinMem.c
+	${CC} ${CFLAGS} fixBinMem.c -o fixBinMem
+	chmod +x fixBinMem
+
+clean:
+	-rm -f fixBinMem
diff --git a/tests/linux-testgen/testvector-generation/fixBinMem b/tests/linux-testgen/testvector-generation/fixBinMem
new file mode 100755
index 0000000000000000000000000000000000000000..563ed988d78611241ac015f656c16c9483981703
GIT binary patch
literal 8784
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

literal 0
HcmV?d00001

diff --git a/tests/linux-testgen/testvector-generation/fixBinMem.c b/tests/linux-testgen/testvector-generation/fixBinMem.c
new file mode 100644
index 00000000..fe071008
--- /dev/null
+++ b/tests/linux-testgen/testvector-generation/fixBinMem.c
@@ -0,0 +1,33 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+int main(int argc, char *argv[]) {
+    if (argc < 3){
+        fprintf(stderr, "Expected 2 arguments: <raw GDB dump> <output binary>\n");
+        exit(1);
+    }
+    char* rawGDBfilePath = argv[1];
+    FILE* rawGDBfile;
+    if ((rawGDBfile = fopen(rawGDBfilePath,"rb"))==NULL) {
+        fprintf(stderr, "File not found: %s\n",rawGDBfilePath);
+        exit(1);
+    }
+    char* outFilePath = argv[2];
+    FILE* outFile = fopen(outFilePath,"w");
+    uint64_t qemuWord;
+    uint64_t verilogWord;
+    int bytesReturned=0;
+    do {
+        bytesReturned=fread(&qemuWord, 8, 1, rawGDBfile);
+        verilogWord = (((qemuWord>>0 )&0xff)<<56 | 
+                       ((qemuWord>>8 )&0xff)<<48 | 
+                       ((qemuWord>>16)&0xff)<<40 | 
+                       ((qemuWord>>24)&0xff)<<32 | 
+                       ((qemuWord>>32)&0xff)<<24 | 
+                       ((qemuWord>>40)&0xff)<<16 | 
+                       ((qemuWord>>48)&0xff)<<8  | 
+                       ((qemuWord>>56)&0xff)<<0);
+        fwrite(&verilogWord, 8, 1, outFile);
+    } while(bytesReturned!=0);
+    return 0;
+}
diff --git a/tests/linux-testgen/testvector-generation/fix_mem.py b/tests/linux-testgen/testvector-generation/fixTxtMem.py
similarity index 100%
rename from tests/linux-testgen/testvector-generation/fix_mem.py
rename to tests/linux-testgen/testvector-generation/fixTxtMem.py
diff --git a/tests/linux-testgen/testvector-generation/genCheckpoint.gdb b/tests/linux-testgen/testvector-generation/genCheckpoint.gdb
index 92630698..a7744139 100755
--- a/tests/linux-testgen/testvector-generation/genCheckpoint.gdb
+++ b/tests/linux-testgen/testvector-generation/genCheckpoint.gdb
@@ -13,7 +13,7 @@ define genCheckpoint
     set $checkPC=$arg3
     set $checkPCoccurences=$arg4
     eval "set $statePath = \"%s/stateGDB.txt\"", $statePath
-    eval "set $ramPath = \"%s/ramGDB.txt\"", $ramPath
+    eval "set $ramPath = \"%s/ramGDB.bin\"", $ramPath
 
     # Connect to QEMU session
     eval "target extended-remote :%d",$tcpPort
@@ -46,10 +46,7 @@ define genCheckpoint
 
     # Log main memory to a file
     printf "GDB storing RAM to %s\n", $ramPath
-    eval "set logging file %s", $ramPath
-    set logging on
-    x/134217728xb 0x80000000
-    set logging off
+    eval "dump binary memory %s 0x80000000 0xffffffff", $ramPath
     
     kill
     q
diff --git a/tests/linux-testgen/testvector-generation/genCheckpoint.sh b/tests/linux-testgen/testvector-generation/genCheckpoint.sh
index cca7486e..ca4bcf49 100755
--- a/tests/linux-testgen/testvector-generation/genCheckpoint.sh
+++ b/tests/linux-testgen/testvector-generation/genCheckpoint.sh
@@ -3,7 +3,7 @@
 source  genSettings.sh
 tcpPort=1236
 
-instrs=450000000
+instrs=8500000
 checkOutDir="$outDir/checkpoint$instrs"
 checkIntermedDir="$checkOutDir/intermediate-outputs"
 
@@ -15,24 +15,35 @@ if [[ $REPLY =~ ^[Yy]$ ]]
 then
     mkdir -p $checkOutDir
     mkdir -p $checkIntermedDir
+    
+    # Identify instruction in trace
     instr=$(sed "${instrs}q;d" "../linux-testvectors/all.txt")
-    echo "Found ${instrs}th instr: ${instr}."
+    echo "Found ${instrs}th instr: ${instr}"
     pc=$(echo $instr | cut -d " " -f1)
     asm=$(echo $instr | cut -d " " -f2)
     occurences=$(($(head -$instrs "../linux-testvectors/all.txt" | grep -c "${pc} ${asm}")-1))
     echo "It occurs ${occurences} times before the ${instrs}th instr." 
-    # Simulate QEMU, parse QEMU trace, run GDB script which logs a bunch of data at the checkpoint
+
+    # GDB+QEMU
+    echo "Starting QEMU with attached GDB script at $(date +%H:%M:%S)"
     ($customQemu \
     -M virt \
     -nographic \
     -bios $imageDir/fw_jump.elf -kernel $imageDir/Image -append "root=/dev/vda ro" -initrd $imageDir/rootfs.cpio \
     -singlestep -rtc clock=vm -icount shift=1,align=off,sleep=on,rr=replay,rrfile="$intermedDir/$recordFile" \
     -gdb tcp::$tcpPort -S) \
-    & riscv64-unknown-elf-gdb -x genCheckpoint.gdb -ex "genCheckpoint $tcpPort $instrs \"$checkIntermedDir\" \"$pc\" $occurences"
+    & riscv64-unknown-elf-gdb --quiet \
+    -x genCheckpoint.gdb -ex "genCheckpoint $tcpPort $instrs \"$checkIntermedDir\" \"$pc\" $occurences"
+    echo "Completed GDB script completed at $(date +%H:%M:%S)"
+
     # Post-Process GDB outputs
     ./parseState.py "$checkOutDir"
-    ./fix_mem.py "$checkIntermedDir/ramGDB.txt" "$checkOutDir/ram.txt"
-    tail -n+$(($instrs+1)) "$outDir/$traceFile" > "$checkOutDir/$traceFile"
+    echo "Changing Endianness at $(date +%H:%M:%S)"
+    make
+    ./fixBinMem "$checkIntermedDir/ramGDB.bin" "$checkOutDir/ram.bin"
+    echo "Creating truncated trace at $(date +%H:%M:%S)"
+    tail -n+$instrs "$outDir/$traceFile" > "$checkOutDir/$traceFile"
+    echo "Checkpoint completed at $(date +%H:%M:%S)"
 else
     echo "You can change the number of instructions by editing the \"instrs\" variable in this script."
     echo "Have a nice day!"
diff --git a/tests/linux-testgen/testvector-generation/genInitMem.sh b/tests/linux-testgen/testvector-generation/genInitMem.sh
index 56b30a45..f82556f5 100755
--- a/tests/linux-testgen/testvector-generation/genInitMem.sh
+++ b/tests/linux-testgen/testvector-generation/genInitMem.sh
@@ -16,8 +16,8 @@ then
     & riscv64-unknown-elf-gdb -quiet -x genInitMem.gdb -ex "genInitMem $tcpPort \"$intermedDir\""
 
     echo "Translating Mem from GDB to Questa format"
-    ./fix_mem.py "$intermedDir/bootmemGDB.txt" "$outDir/bootmem.txt"
-    ./fix_mem.py "$intermedDir/ramGDB.txt"     "$outDir/ram.txt"
+    ./fixTxtMem.py "$intermedDir/bootmemGDB.txt" "$outDir/bootmem.txt"
+    ./fixTxtMem.py "$intermedDir/ramGDB.txt"     "$outDir/ram.txt"
     echo "Done"
 
     echo "Creating debugging objdump of linux image"
diff --git a/tests/linux-testgen/testvector-generation/genSettings.sh b/tests/linux-testgen/testvector-generation/genSettings.sh
index 57bd7765..59490e35 100755
--- a/tests/linux-testgen/testvector-generation/genSettings.sh
+++ b/tests/linux-testgen/testvector-generation/genSettings.sh
@@ -4,7 +4,7 @@
 # *** on the long term we'll want to include QEMU in the addins folder
 export customQemu="/courses/e190ax/qemu_sim/rv64_initrd/qemu_experimental/qemu/build/qemu-system-riscv64"
 export imageDir="../buildroot-image-output"
-export outDir="../linux-testvectors-experimental"
+export outDir="../linux-testvectors"
 export intermedDir="$outDir/intermediate-outputs"
 export traceFile="all.txt"
 export recordFile="all.qemu"
diff --git a/wally-pipelined/testbench/testbench-linux.sv b/wally-pipelined/testbench/testbench-linux.sv
index 72adf589..68bf64ad 100644
--- a/wally-pipelined/testbench/testbench-linux.sv
+++ b/wally-pipelined/testbench/testbench-linux.sv
@@ -280,7 +280,9 @@ module testbench();
   `INIT_CHECKPOINT_VAL(SATP,       [`XLEN-1:0]);
   `MAKE_CHECKPOINT_INIT_SIGNAL(MSTATUS, [`XLEN-1:0],0,0);
 
-  assign initPriv = (initPC[0][`XLEN-1]) ? 2'h2 : 2'h3; // *** a hacky way to detect initial privilege level
+  integer ramFile;
+  integer readResult;
+  assign initPriv = (initPC[0][`XLEN-1]) ? 2'h1 : 2'h3; // *** a hacky way to detect initial privilege level
   initial begin
     force dut.hart.priv.SwIntM = 0;
     force dut.hart.priv.TimerIntM = 0;
@@ -297,7 +299,10 @@ module testbench();
     end else begin // checkpoint
       $sformat(checkpointDir,"checkpoint%0d/",CHECKPOINT);
       checkpointDir = {`LINUX_TEST_VECTORS,checkpointDir};
-      $readmemh({checkpointDir,"ram.txt"}, dut.uncore.dtim.RAM);
+      //$readmemh({checkpointDir,"ram.txt"}, dut.uncore.dtim.RAM);
+      ramFile = $fopen({checkpointDir,"ram.bin"}, "rb");
+      readResult = $fread(dut.uncore.dtim.RAM,ramFile);
+      $fclose(ramFile);
       data_file_all = $fopen({checkpointDir,"all.txt"}, "r");
       InstrCountW = CHECKPOINT;
       // manual checkpoint initializations that don't neatly fit into MACRO