diff options
| author | Tim Newsome <tim@sifive.com> | 2020-02-11 14:28:25 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 14:28:25 -0800 |
| commit | abfa60c8c94d40d726d2f4bd03222ac8cff585aa (patch) | |
| tree | 8fd57fea40e97a4bb7ef88391554ce160e2b79c4 | |
| parent | 43b02e63bfdce7110e3623388a4ba85484b25e5c (diff) | |
| download | riscv-tests-abfa60c8c94d40d726d2f4bd03222ac8cff585aa.zip riscv-tests-abfa60c8c94d40d726d2f4bd03222ac8cff585aa.tar.gz riscv-tests-abfa60c8c94d40d726d2f4bd03222ac8cff585aa.tar.bz2 | |
Generate very different values on different harts. (#238)
This way if you end up reading a value that you suspect might be coming
from another hart/register, you can clearly see where it came from.
| -rwxr-xr-x | debug/gdbserver.py | 8 | ||||
| -rw-r--r-- | debug/programs/infinite_loop.S | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/debug/gdbserver.py b/debug/gdbserver.py index 4840d66..04459b8 100755 --- a/debug/gdbserver.py +++ b/debug/gdbserver.py @@ -729,19 +729,19 @@ class MulticoreRegTest(GdbTest): # Check register values. x1 = self.gdb.p("$x1") hart_id = self.gdb.p("$mhartid") - assertEqual(x1, hart_id) + assertEqual(x1, hart_id << 8) assertNotIn(hart_id, hart_ids) hart_ids.append(hart_id) for n in range(2, 32): value = self.gdb.p("$x%d" % n) - assertEqual(value, hart_ids[-1] + n - 1) + assertEqual(value, (hart_ids[-1] << 8) + n - 1) # Confirmed that we read different register values for different harts. # Write a new value to x1, and run through the add sequence again. for hart in self.target.harts: self.gdb.select_hart(hart) - self.gdb.p("$x1=0x%x" % (hart.index * 0x800)) + self.gdb.p("$x1=0x%x" % (hart.index * 0x1000)) self.gdb.p("$pc=main_post_csrr") self.gdb.c() for hart in self.target.harts: @@ -750,7 +750,7 @@ class MulticoreRegTest(GdbTest): # Check register values. for n in range(1, 32): value = self.gdb.p("$x%d" % n) - assertEqual(value, hart.index * 0x800 + n - 1) + assertEqual(value, hart.index * 0x1000 + n - 1) #class MulticoreRunHaltStepiTest(GdbTest): # compile_args = ("programs/multicore.c", "-DMULTICORE") diff --git a/debug/programs/infinite_loop.S b/debug/programs/infinite_loop.S index 6f15f45..5cc377c 100644 --- a/debug/programs/infinite_loop.S +++ b/debug/programs/infinite_loop.S @@ -8,6 +8,7 @@ // clobbered after attaching. main: csrr x1, CSR_MHARTID + slli x1, x1, 8 main_post_csrr: addi x2, x1, 1 addi x3, x2, 1 |