added scratch register tests for 64 and 32 bits

pipelined/testbench/tests.vh

@@ -1490,7 +1490,9 @@ string imperas32f[] = '{
     "rv64i_m/privilege/WALLY-minfo-01", "40A0",
     "rv64i_m/privilege/WALLY-CSR-permission-s-01", "50A0",
     "rv64i_m/privilege/WALLY-CSR-permission-u-01", "50A0",
-    "rv64i_m/privilege/WALLY-misa-01", "40A0"
+    "rv64i_m/privilege/WALLY-misa-01", "40A0",
+    "rv64i_m/privilege/WALLY-scratch-01", "40A0",
+    "rv64i_m/privilege/WALLY-sscratch-s-01", "40A0"
  };
 
  string wally64periph[] = '{
@@ -1555,7 +1557,9 @@ string wally32i[] = '{
     "rv32i_m/privilege/WALLY-CSR-permission-s-01", "5080",
     "rv32i_m/privilege/WALLY-CSR-permission-u-01", "5080",
     "rv32i_m/privilege/WALLY-minfo-01", "4080",
-    "rv32i_m/privilege/WALLY-misa-01", "4080"
+    "rv32i_m/privilege/WALLY-misa-01", "4080",
+    "rv32i_m/privilege/WALLY-scratch-01", "4080",
+    "rv32i_m/privilege/WALLY-sscratch-s-01", "4080"
  };
 
  string wally32periph[] = '{

tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/Makefrag

@@ -33,7 +33,9 @@ rv32i_sc_tests = \
     WALLY-CSR-permission-s-01 \
     WALLY-CSR-permission-u-01 \
     WALLY-minfo-01 \
-    WALLY-misa-01 
+    WALLY-misa-01 \
+    WALLY-scratch-01 \
+    WALLY-sscratch-s-01
 
 target_tests_nosim = WALLY-PMA \
 

tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-scratch-01.S

@@ -0,0 +1,35 @@
+///////////////////////////////////////////
+//
+// WALLY-scratch
+//
+// Author: Kip Macsai-Goren <kmacsaigoren@g.hmc.edu>
+//
+// Created 2022-02-20
+//
+// Copyright (C) 2021 Harvey Mudd College & Oklahoma State University
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
+// modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
+// is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+// OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+///////////////////////////////////////////
+
+#include "WALLY-TEST-LIB-32.h"
+
+INIT_TESTS
+
+s_file_begin:
+// Test 5.3.2.3: Scratch registers test
+
+WRITE_READ_CSR mscratch, 0x111 // check that mscratch is readable and writeable in machine mode
+
+END_TESTS
+
+TEST_STACK_AND_DATA

tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-sscratch-s-01.S

@@ -0,0 +1,39 @@
+///////////////////////////////////////////
+//
+// WALLY-sscratch
+//
+// Author: Kip Macsai-Goren <kmacsaigoren@g.hmc.edu>
+//
+// Created 2022-02-20
+//
+// Copyright (C) 2021 Harvey Mudd College & Oklahoma State University
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
+// modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
+// is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+// OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+///////////////////////////////////////////
+
+#include "WALLY-TEST-LIB-32.h"
+
+INIT_TESTS
+
+s_file_begin:
+
+// Test 5.3.2.3: Scratch registers test
+WRITE_READ_CSR sscratch, 0x111 // check that sscratch is readable and writeable in machine mode
+
+GOTO_S_MODE 0x0, 0x0
+
+WRITE_READ_CSR sscratch, 0xAAA // check that sscratch is readable and writeable in supervisor mode
+
+END_TESTS
+
+TEST_STACK_AND_DATA

tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefrag

@@ -34,7 +34,9 @@ rv64i_sc_tests = \
     WALLY-minfo-01 \
     WALLY-CSR-permission-s-01 \
     WALLY-CSR-permission-u-01 \
-    WALLY-misa-01
+    WALLY-misa-01 \
+    WALLY-scratch-01 \
+    WALLY-sscratch-s-01
 
 target_tests_nosim = WALLY-PMA \
 

tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-scratch-01.S

@@ -0,0 +1,35 @@
+///////////////////////////////////////////
+//
+// WALLY-scratch
+//
+// Author: Kip Macsai-Goren <kmacsaigoren@g.hmc.edu>
+//
+// Created 2022-02-20
+//
+// Copyright (C) 2021 Harvey Mudd College & Oklahoma State University
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
+// modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
+// is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+// OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+///////////////////////////////////////////
+
+#include "WALLY-TEST-LIB-64.h"
+
+INIT_TESTS
+
+s_file_begin:
+// Test 5.3.2.3: Scratch registers test
+
+WRITE_READ_CSR mscratch, 0x111 // check that mscratch is readable and writeable in machine mode
+
+END_TESTS
+
+TEST_STACK_AND_DATA

tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-sscratch-s-01.S

@@ -0,0 +1,39 @@
+///////////////////////////////////////////
+//
+// WALLY-sscratch
+//
+// Author: Kip Macsai-Goren <kmacsaigoren@g.hmc.edu>
+//
+// Created 2022-02-20
+//
+// Copyright (C) 2021 Harvey Mudd College & Oklahoma State University
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
+// modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
+// is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+// OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+///////////////////////////////////////////
+
+#include "WALLY-TEST-LIB-64.h"
+
+INIT_TESTS
+
+s_file_begin:
+
+// Test 5.3.2.3: Scratch registers test
+WRITE_READ_CSR sscratch, 0x111 // check that sscratch is readable and writeable in machine mode
+
+GOTO_S_MODE 0x0, 0x0
+
+WRITE_READ_CSR sscratch, 0xAAA // check that sscratch is readable and writeable in supervisor mode
+
+END_TESTS
+
+TEST_STACK_AND_DATA