From c0cbd0fd2a31f284b92835755081418e8ebc7c2d Mon Sep 17 00:00:00 2001
From: Kevin Wan <kewan@hmc.edu>
Date: Thu, 27 Apr 2023 16:12:43 -0700
Subject: [PATCH 1/2] added tests for pmppriority module

---
 testbench/tests.vh           |   3 +-
 tests/coverage/pmppriority.S | 161 +++++++++++++++++++++++++++++++++++
 2 files changed, 163 insertions(+), 1 deletion(-)
 create mode 100644 tests/coverage/pmppriority.S

diff --git a/testbench/tests.vh b/testbench/tests.vh
index 81b31617..28d9cdea 100644
--- a/testbench/tests.vh
+++ b/testbench/tests.vh
@@ -63,7 +63,8 @@ string tvpaths[] = '{
     "pmp",
     "pmpcfg",
     "pmpcfg1",
-    "pmpcfg2"
+    "pmpcfg2",
+    "pmppriority"
   };
 
   string coremark[] = '{
diff --git a/tests/coverage/pmppriority.S b/tests/coverage/pmppriority.S
new file mode 100644
index 00000000..da2f0f40
--- /dev/null
+++ b/tests/coverage/pmppriority.S
@@ -0,0 +1,161 @@
+// pmppriority test cases
+// Kevin Wan kewan@hmc.edu 4/27/2023
+// want memory ranges to match:
+// 1. only the most significant address and none of the lower ones, 
+// 2. the most significant address and ANY of the lower ones. 
+
+
+
+#include "WALLY-init-lib.h" 
+main: 
+
+    li t1, 0x21FFFFFF // start at 0x8000000 with a range of 1000000. Address format is set to NAPOT in pmpcfg.
+    csrw pmpaddr0, t1  
+    csrw pmpaddr1, t1
+    csrw pmpaddr2, t1  
+    csrw pmpaddr3, t1
+    csrw pmpaddr4, t1  
+    csrw pmpaddr5, t1
+    csrw pmpaddr6, t1
+    csrw pmpaddr7, t1
+
+    csrw pmpaddr8, t1
+    csrw pmpaddr9, t1
+    csrw pmpaddr10, t1  
+    csrw pmpaddr11, t1
+    csrw pmpaddr12, t1  
+    csrw pmpaddr13, t1
+    csrw pmpaddr14, t1
+    csrw pmpaddr15, t1
+
+
+    li t0, 0x1F
+    csrw pmpcfg0, t0 //set to XWR and NAPOT
+    sw zero, 0(sp)
+
+    li t0, 0x1F00
+    csrw pmpcfg0, t0 
+    sw zero, 0(sp)
+
+    li t0, 0x1F1F
+    csrw pmpcfg0, t0 
+    sw zero, 0(sp)
+
+    li t0, 0x1F0000
+    csrw pmpcfg0, t0 
+    sw zero, 0(sp)
+    
+    li t0, 0x1F1F1F
+    csrw pmpcfg0, t0 
+    sw zero, 0(sp)
+
+    li t0, 0x1F000000
+    csrw pmpcfg0, t0 
+    sw zero, 0(sp)
+    
+    li t0, 0x1F1F1F1F
+    csrw pmpcfg0, t0 
+    sw zero, 0(sp)
+
+    li t0, 0x1F00000000
+    csrw pmpcfg0, t0 
+    sw zero, 0(sp)
+    
+    li t0, 0x1F1F1F1F1F
+    csrw pmpcfg0, t0 
+    sw zero, 0(sp)
+
+    li t0, 0x1F0000000000
+    csrw pmpcfg0, t0 
+    sw zero, 0(sp)
+    
+    li t0, 0x1F1F1F1F1F1F
+    csrw pmpcfg0, t0 
+    sw zero, 0(sp)
+
+    li t0, 0x1F000000000000
+    csrw pmpcfg0, t0 
+    sw zero, 0(sp)
+    
+    li t0, 0x1F1F1F1F1F1F1F
+    csrw pmpcfg0, t0 
+    sw zero, 0(sp)
+
+    li t0, 0x1F00000000000000
+    csrw pmpcfg0, t0 
+    sw zero, 0(sp)
+    
+    li t0, 0x1F1F1F1F1F1F1F1F
+    csrw pmpcfg0, t0 
+    sw zero, 0(sp)
+
+    li t0, 0x0
+    csrw pmpcfg0, t0
+    li t0, 0x1F
+    csrw pmpcfg2, t0
+    sw zero, 0(sp)
+
+    li t0, 0x1F00
+    csrw pmpcfg2, t0
+    sw zero, 0(sp)
+
+    li t0, 0x1F0000
+    csrw pmpcfg2, t0
+    sw zero, 0(sp)
+
+    li t0, 0x1F00000000
+    csrw pmpcfg2, t0
+    sw zero, 0(sp)
+
+    li t0, 0x1F0000000000
+    csrw pmpcfg2, t0
+    sw zero, 0(sp)
+
+    li t0, 0x1F000000000000
+    csrw pmpcfg2, t0
+    sw zero, 0(sp)
+
+    li t0, 0x1F00000000000000
+    csrw pmpcfg2, t0
+    sw zero, 0(sp)
+
+    li t0, 0x1F1F1F1F1F1F1F1F
+    csrw pmpcfg0, t0
+    li t0, 0x1F
+    csrw pmpcfg2, t0
+    sw zero, 0(sp)
+
+    li t0, 0x1F1F
+    csrw pmpcfg2, t0
+    sw zero, 0(sp)
+
+    li t0, 0x1F1F1F
+    csrw pmpcfg2, t0
+    sw zero, 0(sp)
+
+    li t0, 0x1F1F1F1F
+    csrw pmpcfg2, t0
+    sw zero, 0(sp)
+
+    li t0, 0x1F1F1F1F1F
+    csrw pmpcfg2, t0
+    sw zero, 0(sp)
+
+    li t0, 0x1F1F1F1F1F1F
+    csrw pmpcfg2, t0
+    sw zero, 0(sp)
+
+    li t0, 0x1F1F1F1F1F1F1F
+    csrw pmpcfg2, t0
+    sw zero, 0(sp)
+
+    li t0, 0x1F1F1F1F1F1F1F1F
+    csrw pmpcfg2, t0
+    sw zero, 0(sp)
+
+
+
+    j done
+
+
+    
\ No newline at end of file

From 3569998cb96da58ef577ced30db745653aa2a9d7 Mon Sep 17 00:00:00 2001
From: Kevin Wan <kewan@hmc.edu>
Date: Fri, 28 Apr 2023 07:47:59 -0700
Subject: [PATCH 2/2] fixed tests.vh test lines

---
 testbench/tests.vh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testbench/tests.vh b/testbench/tests.vh
index 28d9cdea..ffe71818 100644
--- a/testbench/tests.vh
+++ b/testbench/tests.vh
@@ -64,7 +64,8 @@ string tvpaths[] = '{
     "pmpcfg",
     "pmpcfg1",
     "pmpcfg2",
-    "pmppriority"
+    "pmppriority",
+    "pmpadrdecs"
   };
 
   string coremark[] = '{