Merge pull request #581 from ahlyssa/ahlyssa2

Align Coverpoint Hole for I instructions

Author: davidharrishmc

bin/testgen.py

@@ -1840,6 +1840,8 @@ def write_tests(coverpoints, test, xlen):
       pass # Zalrsc coverpoints handled custom
     elif (coverpoint == "cp_custom_aqrl"):
       make_custom(test, xlen)
+    elif (coverpoint == "cp_align_byte", "cp_align_word", "cp_align_hword"):
+      make_custom(test, xlen)
     else:
       print("Warning: " + coverpoint + " not implemented yet for " + test)
 

templates/testgen/lb.S

@@ -0,0 +1,31 @@
+# cp_align_byte
+# test all 8 byte alignments
+    la t0, scratch
+    li t1, 0x9ABCDEF0
+    li t2, 0x12345678
+    sw t1, 0(t0)  // Initialize memory
+    sw t2, 4(t0)
+
+# cp_align_byte: imm[2:0]=000
+    lb t1, 0(t0)
+
+# cp_align_byte: imm[2:0]=001
+    lb t1, 1(t0)
+
+# cp_align_byte: imm[2:0]=010
+    lb t1, 2(t0)
+
+# cp_align_byte: imm[2:0]=011
+    lb t1, 3(t0)
+
+# cp_align_byte: imm[2:0]=100
+    lb t1, 4(t0)
+
+# cp_align_byte: imm[2:0]=101
+    lb t1, 5(t0)
+
+# cp_align_byte: imm[2:0]=110
+    lb t1, 6(t0)
+
+# cp_align_byte: imm[2:0]=111
+    lb t1, 7(t0)

templates/testgen/lbu.S

@@ -0,0 +1,31 @@
+# cp_align_byte
+# test all 8 byte alignments
+    la t0, scratch
+    li t1, 0x9ABCDEF0
+    li t2, 0x12345678
+    sw t1, 0(t0)  // Initialize memory
+    sw t2, 4(t0)
+
+# cp_align_byte: imm[2:0]=000
+    lbu t3, 0(t0)
+
+# cp_align_byte: imm[2:0]=001
+    lbu t3, 1(t0)
+
+# cp_align_byte: imm[2:0]=010
+    lbu t3, 2(t0)
+
+# cp_align_byte: imm[2:0]=011
+    lbu t3, 3(t0)
+
+# cp_align_byte: imm[2:0]=100
+    lbu t3, 4(t0)
+
+# cp_align_byte: imm[2:0]=101
+    lbu t3, 5(t0)
+
+# cp_align_byte: imm[2:0]=110
+    lbu t3, 6(t0)
+
+# cp_align_byte: imm[2:0]=111
+    lbu t3, 7(t0)

templates/testgen/lh.S

@@ -0,0 +1,19 @@
+# cp_align_hword
+# test all halfword-aligned operations
+    la t0, scratch
+    li t1, 0x9ABCDEF0
+    li t2, 0x12345678
+    sw t1, 0(t0)  // Initialize memory
+    sw t2, 4(t0)
+
+#cp_align_hword: imm[2:1]=00
+    lh t1, 0(t0)
+
+#cp_align_hword: imm[2:1]=01
+    lh t1, 2(t0)
+
+#cp_align_hword: imm[2:1]=10
+    lh t1, 4(t0)
+
+#cp_align_hword: imm[2:1]=11
+    lh t1, 6(t0)

templates/testgen/lhu.S

@@ -0,0 +1,19 @@
+# cp_align_hword
+# test all halfword-aligned operations
+    la t0, scratch
+    li t1, 0x9ABCDEF0
+    li t2, 0x12345678
+    sw t1, 0(t0)  // Initialize memory
+    sw t2, 4(t0)
+
+#cp_align_hword: imm[2:1]=00
+    lhu t3, 0(t0)
+
+#cp_align_hword: imm[2:1]=01
+    lhu t3, 2(t0)
+
+#cp_align_hword: imm[2:1]=10
+    lhu t3, 4(t0)
+
+#cp_align_hword: imm[2:1]=11
+    lhu t3, 6(t0)

templates/testgen/lw.S

@@ -0,0 +1,13 @@
+# align_word.S
+# Test word-aligned lw operations
+    la t0, scratch
+    li t2, 0x12345678
+    sw t2, 0(t0)
+    li t2, 0x9ABCDEF0
+    sw t2, 4(t0)
+
+# cp_align_word: imm[2]=0 (aligned load)
+    lw t1, 0(t0)
+
+# cp_align_word: imm[2]=1 (next word)
+    lw t1, 4(t0)

templates/testgen/lwu.S

@@ -0,0 +1,11 @@
+# cp_align_word
+# Test all word-aligned operations for RV64 only
+    la t0, scratch
+    li t2, 0x123456789ABCDEF0
+    sd t2, 0(t0)
+
+# cp_align_word: imm[2]=0
+    lwu t3, 0(t0)
+
+# cp_align_word: imm[2]=1
+    lwu t3, 4(t0)

templates/testgen/sb.S

@@ -0,0 +1,31 @@
+# cp_align_byte
+# test all 8 byte alignments
+    la t0, scratch
+    li t1, 0x9ABCDEF0
+    li t2, 0x12345678
+    sw t1, 0(t0)  // Initialize memory
+    sw t2, 4(t0)
+
+# cp_align_byte: imm[2:0]=000
+    sb t2, 0(t0)
+
+# cp_align_byte: imm[2:0]=001
+    sb t2, 1(t0)
+
+# cp_align_byte: imm[2:0]=010
+    sb t2, 2(t0)
+
+# cp_align_byte: imm[2:0]=011
+    sb t2, 3(t0)
+
+# cp_align_byte: imm[2:0]=100
+    sb t2, 4(t0)
+
+# cp_align_byte: imm[2:0]=101
+    sb t2, 5(t0)
+
+# cp_align_byte: imm[2:0]=110
+    sb t2, 6(t0)
+
+# cp_align_byte: imm[2:0]=111
+    sb t2, 7(t0)

templates/testgen/sh.S

@@ -0,0 +1,19 @@
+# cp_align_hword
+# test all halfword-aligned operations
+    la t0, scratch
+    li t1, 0x9ABCDEF0
+    li t2, 0x12345678
+    sw t1, 0(t0)  // Initialize memory
+    sw t2, 4(t0)
+
+#cp_align_hword: imm[2:1]=00
+    sh t2, 0(t0)
+
+#cp_align_hword: imm[2:1]=01
+    sh t2, 2(t0)
+
+#cp_align_hword: imm[2:1]=10
+    sh t2, 4(t0)
+
+#cp_align_hword: imm[2:1]=11
+    sh t2, 6(t0)

templates/testgen/sw.S

@@ -0,0 +1,9 @@
+# align_word.S
+# Test word-aligned sw operations
+    la t0, scratch
+    li t2, 0x12345678
+    li t3, 0x9ABCDEF0
+
+    # cp_align_word: imm[2]=0 (aligned store)
+    sw t2, 0(t0)
+    sw t3, 4(t0)