X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=debug%2Fgdbserver.py;h=bd9babc717b5fabfdd2bc75870146de0f1bca37c;hb=8519aa3f0ccf4032249b346fbd67855da99b5f3c;hp=af9a33456b5855c348f2fa28f209c2d276f6a9a4;hpb=835f252ebe59ef782e96f467462a03754ea87936;p=riscv-tests.git diff --git a/debug/gdbserver.py b/debug/gdbserver.py index af9a334..bd9babc 100755 --- a/debug/gdbserver.py +++ b/debug/gdbserver.py @@ -562,30 +562,48 @@ class MulticoreRunHaltStepiTest(GdbTest): self.gdb.load() for hart in self.target.harts: self.gdb.select_hart(hart) + self.gdb.p("$mhartid") self.gdb.p("$pc=_start") def test(self): previous_hart_count = [0 for h in self.target.harts] previous_interrupt_count = [0 for h in self.target.harts] - for _ in range(10): - self.gdb.c(wait=False) - time.sleep(2) - self.gdb.interrupt() - self.gdb.p("$mie") - self.gdb.p("$mip") - self.gdb.p("$mstatus") - self.gdb.p("$priv") - self.gdb.p("buf", fmt="") - hart_count = self.gdb.p("hart_count") - interrupt_count = self.gdb.p("interrupt_count") - for i, h in enumerate(self.target.harts): - assertGreater(hart_count[i], previous_hart_count[i]) - assertGreater(interrupt_count[i], previous_interrupt_count[i]) - self.gdb.select_hart(h) - pc = self.gdb.p("$pc") - self.gdb.stepi() - stepped_pc = self.gdb.p("$pc") - assertNotEqual(pc, stepped_pc) + # Check 10 times + for i in range(10): + # 3 attempts for each time we want the check to pass + for attempt in range(3): + self.gdb.global_command("echo round %d attempt %d\\n" % (i, + attempt)) + self.gdb.c_all(wait=False) + time.sleep(2) + self.gdb.interrupt_all() + hart_count = self.gdb.p("hart_count") + interrupt_count = self.gdb.p("interrupt_count") + ok = True + for i, h in enumerate(self.target.harts): + if hart_count[i] <= previous_hart_count[i]: + ok = False + break + if interrupt_count[i] <= previous_interrupt_count[i]: + ok = False + break + self.gdb.p("$mie") + self.gdb.p("$mip") + self.gdb.p("$mstatus") + self.gdb.p("$priv") + self.gdb.p("buf", fmt="") + self.gdb.select_hart(h) + pc = self.gdb.p("$pc") + self.gdb.stepi() + stepped_pc = self.gdb.p("$pc") + assertNotEqual(pc, stepped_pc) + previous_hart_count = hart_count + previous_interrupt_count = interrupt_count + if ok: + break + else: + assert False, \ + "hart count or interrupt didn't increment as expected" class MulticoreRunAllHaltOne(GdbTest): compile_args = ("programs/multicore.c", "-DMULTICORE") @@ -615,7 +633,7 @@ class MulticoreRunAllHaltOne(GdbTest): time.sleep(1) self.gdb.p("buf", fmt="") -class StepTest(GdbTest): +class StepTest(GdbSingleHartTest): compile_args = ("programs/step.S", ) def setup(self): @@ -634,7 +652,7 @@ class StepTest(GdbTest): pc = self.gdb.p("$pc") assertEqual("%x" % (pc - main_address), "%x" % expected) -class TriggerTest(GdbTest): +class TriggerTest(GdbSingleHartTest): compile_args = ("programs/trigger.S", ) def setup(self): self.gdb.load() @@ -674,7 +692,8 @@ class TriggerLoadAddressInstant(TriggerTest): self.gdb.c() read_loop = self.gdb.p("&read_loop") read_again = self.gdb.p("&read_again") - self.gdb.command("rwatch data") + data = self.gdb.p("&data") + self.gdb.command("rwatch *0x%x" % data) self.gdb.c() # Accept hitting the breakpoint before or after the load instruction. assertIn(self.gdb.p("$pc"), [read_loop, read_loop + 4]) @@ -701,7 +720,8 @@ class TriggerStoreAddressInstant(TriggerTest): self.gdb.command("b just_before_write_loop") self.gdb.c() write_loop = self.gdb.p("&write_loop") - self.gdb.command("watch data") + data = self.gdb.p("&data") + self.gdb.command("watch *0x%x" % data) self.gdb.c() # Accept hitting the breakpoint before or after the store instruction. assertIn(self.gdb.p("$pc"), [write_loop, write_loop + 4]) @@ -753,7 +773,7 @@ class TriggerDmode(TriggerTest): assertIn("clear_triggers", output) self.check_triggers((1<<6) | (1<<0), 0xfeedac00) -class RegsTest(GdbTest): +class RegsTest(GdbSingleHartTest): compile_args = ("programs/regs.S", ) def setup(self): self.gdb.load() @@ -830,16 +850,17 @@ class DownloadTest(GdbTest): self.binary = self.target.compile(self.hart, self.download_c.name, "programs/checksum.c") - self.gdb.command("file %s" % self.binary) + self.gdb.global_command("file %s" % self.binary) def test(self): self.gdb.load() + self.parkOtherHarts() self.gdb.command("b _exit") self.gdb.c() assertEqual(self.gdb.p("status"), self.crc) os.unlink(self.download_c.name) -#class MprvTest(GdbTest): +#class MprvTest(GdbSingleHartTest): # compile_args = ("programs/mprv.S", ) # def setup(self): # self.gdb.load() @@ -852,7 +873,7 @@ class DownloadTest(GdbTest): # output = self.gdb.command("p/x *(int*)(((char*)&data)-0x80000000)") # assertIn("0xbead", output) -class PrivTest(GdbTest): +class PrivTest(GdbSingleHartTest): compile_args = ("programs/priv.S", ) def setup(self): # pylint: disable=attribute-defined-outside-init @@ -881,13 +902,14 @@ class PrivRw(PrivTest): # PMP registers are optional pass - # Ensure Virtual Memory is disabled if applicable (SATP register is not reset) + # Ensure Virtual Memory is disabled if applicable (SATP register is not + # reset) try: - self.gdb.p("$satp=0") + self.gdb.p("$satp=0") except testlib.CouldNotFetch: - # SATP only exists if you have S mode. - pass - + # SATP only exists if you have S mode. + pass + # Leave the PC at _start, where the first 4 instructions should be # legal in any mode. for privilege in range(4):