Temporarily roll back to G=0 so riscof runs ACTs. Revert this when ACT handles G=4

config/rv32gc/config.vh

@@ -139,7 +139,7 @@ localparam logic IDIV_ON_FPU = 0;
 localparam PMP_ENTRIES = 32'd16;
 // grain size should be a full cache line to avoid problems with accesses within a cache line
 // that span grain boundaries but are handled without a spill
-localparam PMP_G = 32'd4; // 64 bytes for 512-bit cache line
+localparam PMP_G = 32'd0; // 64 bytes for 512-bit cache line
 
 // Address space
 localparam logic [63:0] RESET_VECTOR = 64'h80000000;

config/rv32gc/imperas.ic

@@ -17,7 +17,7 @@
 --override cpu/Zicboz=T
 --override cmomp_bytes=64  # Zic64b
 --override cmoz_bytes=64   # Zic64b
---override lr_sc_grain=4   # Za64rs requires <=64; we use native word size
+--override lr_sc_grain=0   # Za64rs requires <=64; we use native word size
 
 # Virtual memory
 --override cpu/Sv_modes=3 # SV32 supported

config/rv64gc/config.vh

@@ -140,7 +140,7 @@ localparam PMP_ENTRIES = 32'd16;
 
 // grain size should be a full cache line to avoid problems with accesses within a cache line
 // that span grain boundaries but are handled without a spill
-localparam PMP_G = 32'd4;  //e.g. 4 for 64-byte grains (512-bit cache lines)
+localparam PMP_G = 32'd0;  //e.g. 4 for 64-byte grains (512-bit cache lines)
 
 // Address space
 localparam logic [63:0] RESET_VECTOR = 64'h0000000080000000;

config/rv64gc/imperas.ic

@@ -48,7 +48,7 @@
 
 # PMP Configuration
 --override cpu/PMP_registers=16
---override cpu/PMP_grain=4   # 64-byte grains to match cache line width
+--override cpu/PMP_grain=0   # 64-byte grains to match cache line width
 --override cpu/PMP_decompose=T  # unaligned accesses are decomposed into separate aligned accesses
 --override cpu/PMP_undefined=T # access to unimplemented PMP registers cause illegal instruction exception
 

tests/riscof/sail_cSim/rv32gc.json

@@ -10,7 +10,7 @@
   },
   "memory": {
     "pmp": {
-      "grain": 4,
+      "grain": 0,
       "count": 16
     },
     "misaligned": {

tests/riscof/sail_cSim/rv64gc.json

@@ -10,7 +10,7 @@
   },
   "memory": {
     "pmp": {
-      "grain": 4,
+      "grain": 0,
       "count": 16
     },
     "misaligned": {

tests/riscof/spike/spike_rv32gc_isa.yaml

@@ -28,7 +28,7 @@ hart0:
               - Unchanged
   PMP:
     implemented: True
-    pmp-grain: 4
+    pmp-grain: 0
     pmp-count: 16
-    pmp-writable: 12
+    pmp-writable: 16
 

tests/riscof/spike/spike_rv64gc_isa.yaml

@@ -30,6 +30,6 @@ hart0:
               - Unchanged
   PMP:
     implemented: True
-    pmp-grain: 4
+    pmp-grain: 0
     pmp-count: 16
-    pmp-writable: 12
+    pmp-writable: 16