projects
/
riscv-tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
debug: output some more useful info into the post-mortem data
[riscv-tests.git]
/
debug
/
testlib.py
diff --git
a/debug/testlib.py
b/debug/testlib.py
index ce8aecaafbf3369e718e93b100f4276747207224..09baf1bec6bb522fb7d85631f2112c61dd1270de 100644
(file)
--- a/
debug/testlib.py
+++ b/
debug/testlib.py
@@
-56,10
+56,13
@@
def compile(args, xlen=32): # pylint: disable=redefined-builtin
raise Exception("Compile failed!")
class Spike(object):
raise Exception("Compile failed!")
class Spike(object):
- def __init__(self, target, halted=False, timeout=None, with_jtag_gdb=True):
+ def __init__(self, target, halted=False, timeout=None, with_jtag_gdb=True,
+ isa=None, progbufsize=None):
"""Launch spike. Return tuple of its process and the port it's running
on."""
self.process = None
"""Launch spike. Return tuple of its process and the port it's running
on."""
self.process = None
+ self.isa = isa
+ self.progbufsize = progbufsize
if target.harts:
harts = target.harts
if target.harts:
harts = target.harts
@@
-109,10
+112,17
@@
class Spike(object):
assert len(set(t.xlen for t in harts)) == 1, \
"All spike harts must have the same XLEN"
assert len(set(t.xlen for t in harts)) == 1, \
"All spike harts must have the same XLEN"
- if
harts[0].xlen == 32
:
- cmd += ["--isa", "RV32G"]
+ if
self.isa
:
+ isa = self.isa
else:
else:
- cmd += ["--isa", "RV64G"]
+ isa = "RV%dG" % harts[0].xlen
+
+ cmd += ["--isa", isa]
+ cmd += ["--debug-auth"]
+
+ if not self.progbufsize is None:
+ cmd += ["--progsize", str(self.progbufsize)]
+ cmd += ["--debug-sba", "32"]
assert len(set(t.ram for t in harts)) == 1, \
"All spike harts must have the same RAM layout"
assert len(set(t.ram for t in harts)) == 1, \
"All spike harts must have the same RAM layout"
@@
-325,6
+335,12
@@
class CannotAccess(Exception):
Exception.__init__(self)
self.address = address
Exception.__init__(self)
self.address = address
+class CouldNotFetch(Exception):
+ def __init__(self, regname, explanation):
+ Exception.__init__(self)
+ self.regname = regname
+ self.explanation = explanation
+
Thread = collections.namedtuple('Thread', ('id', 'description', 'target_id',
'name', 'frame'))
Thread = collections.namedtuple('Thread', ('id', 'description', 'target_id',
'name', 'frame'))
@@
-386,12
+402,18
@@
class Gdb(object):
hartid = max(self.harts) + 1
else:
hartid = 0
hartid = max(self.harts) + 1
else:
hartid = 0
- self.harts[hartid] = (child, t)
+ # solo: True iff this is the only thread on this child
+ self.harts[hartid] = {'child': child,
+ 'thread': t,
+ 'solo': len(threads) == 1}
def __del__(self):
for child in self.children:
del child
def __del__(self):
for child in self.children:
del child
+ def one_hart_per_gdb(self):
+ return all(h['solo'] for h in self.harts.itervalues())
+
def lognames(self):
return [logfile.name for logfile in self.logfiles]
def lognames(self):
return [logfile.name for logfile in self.logfiles]
@@
-399,10
+421,11
@@
class Gdb(object):
self.active_child = child
def select_hart(self, hart):
self.active_child = child
def select_hart(self, hart):
- child, thread = self.harts[hart.id]
- self.select_child(child)
- output = self.command("thread %s" % thread.id)
- assert "Unknown" not in output
+ h = self.harts[hart.id]
+ self.select_child(h['child'])
+ if not h['solo']:
+ output = self.command("thread %s" % h['thread'].id, ops=5)
+ assert "Unknown" not in output
def push_state(self):
self.stack.append({
def push_state(self):
self.stack.append({
@@
-417,8
+440,11
@@
class Gdb(object):
"""Wait for prompt."""
self.active_child.expect(r"\(gdb\)")
"""Wait for prompt."""
self.active_child.expect(r"\(gdb\)")
- def command(self, command, timeout=6000):
- """timeout is in seconds"""
+ def command(self, command, ops=1):
+ """ops is the estimated number of operations gdb will have to perform
+ to perform this command. It is used to compute a timeout based on
+ self.timeout."""
+ timeout = ops * self.timeout
self.active_child.sendline(command)
self.active_child.expect("\n", timeout=timeout)
self.active_child.expect(r"\(gdb\)", timeout=timeout)
self.active_child.sendline(command)
self.active_child.expect("\n", timeout=timeout)
self.active_child.expect(r"\(gdb\)", timeout=timeout)
@@
-431,7
+457,7
@@
class Gdb(object):
self.select_child(child)
self.command(command)
self.select_child(child)
self.command(command)
- def c(self, wait=True,
timeout=-1,
async=False):
+ def c(self, wait=True, async=False):
"""
Dumb c command.
In RTOS mode, gdb will resume all harts.
"""
Dumb c command.
In RTOS mode, gdb will resume all harts.
@@
-442,13
+468,14
@@
class Gdb(object):
async = "&"
else:
async = ""
async = "&"
else:
async = ""
+ ops = 10
if wait:
if wait:
- output = self.command("c%s" % async,
timeout=timeout
)
+ output = self.command("c%s" % async,
ops=ops
)
assert "Continuing" in output
return output
else:
self.active_child.sendline("c%s" % async)
assert "Continuing" in output
return output
else:
self.active_child.sendline("c%s" % async)
- self.active_child.expect("Continuing")
+ self.active_child.expect("Continuing"
, timeout=ops * self.timeout
)
def c_all(self):
"""
def c_all(self):
"""
@@
-503,6
+530,9
@@
class Gdb(object):
m = re.search("Cannot access memory at address (0x[0-9a-f]+)", output)
if m:
raise CannotAccess(int(m.group(1), 0))
m = re.search("Cannot access memory at address (0x[0-9a-f]+)", output)
if m:
raise CannotAccess(int(m.group(1), 0))
+ m = re.search(r"Could not fetch register \"(\w+)\"; (.*)$", output)
+ if m:
+ raise CouldNotFetch(m.group(1), m.group(2))
rhs = output.split('=')[-1]
return self.parse_string(rhs)
rhs = output.split('=')[-1]
return self.parse_string(rhs)
@@
-512,28
+542,30
@@
class Gdb(object):
return value
def stepi(self):
return value
def stepi(self):
- output = self.command("stepi",
timeout=6
0)
+ output = self.command("stepi",
ops=1
0)
return output
def load(self):
return output
def load(self):
- output = self.command("load",
timeout=6
000)
+ output = self.command("load",
ops=1
000)
assert "failed" not in output
assert "Transfer rate" in output
assert "failed" not in output
assert "Transfer rate" in output
+ output = self.command("compare-sections", ops=1000)
+ assert "MIS" not in output
def b(self, location):
def b(self, location):
- output = self.command("b %s" % location)
+ output = self.command("b %s" % location
, ops=5
)
assert "not defined" not in output
assert "Breakpoint" in output
return output
def hbreak(self, location):
assert "not defined" not in output
assert "Breakpoint" in output
return output
def hbreak(self, location):
- output = self.command("hbreak %s" % location)
+ output = self.command("hbreak %s" % location
, ops=5
)
assert "not defined" not in output
assert "Hardware assisted breakpoint" in output
return output
def threads(self):
assert "not defined" not in output
assert "Hardware assisted breakpoint" in output
return output
def threads(self):
- output = self.command("info threads")
+ output = self.command("info threads"
, ops=100
)
threads = []
for line in output.splitlines():
m = re.match(
threads = []
for line in output.splitlines():
m = re.match(
@@
-564,8
+596,12
@@
class PrivateState(object):
self.gdb.pop_state()
def run_all_tests(module, target, parsed):
self.gdb.pop_state()
def run_all_tests(module, target, parsed):
-
if not os.path.exists(parsed.logs)
:
+
try
:
os.makedirs(parsed.logs)
os.makedirs(parsed.logs)
+ except OSError:
+ # There's a race where multiple instances of the test program might
+ # decide to create the logs directory at the same time.
+ pass
overall_start = time.time()
overall_start = time.time()
@@
-618,6
+654,7
@@
def run_tests(parsed, target, todo):
try:
result = instance.run()
log_fd.write("Result: %s\n" % result)
try:
result = instance.run()
log_fd.write("Result: %s\n" % result)
+ log_fd.write("Logfile: %s\n" % log_name)
finally:
sys.stdout = real_stdout
log_fd.write("Time elapsed: %.2fs\n" % (time.time() - start))
finally:
sys.stdout = real_stdout
log_fd.write("Time elapsed: %.2fs\n" % (time.time() - start))
@@
-815,7
+852,10
@@
class GdbTest(BaseTest):
if not self.gdb:
return
self.gdb.interrupt()
if not self.gdb:
return
self.gdb.interrupt()
- self.gdb.command("info registers all", timeout=10)
+ self.gdb.command("disassemble", ops=20)
+ self.gdb.command("info registers all", ops=100)
+ self.gdb.command("flush regs")
+ self.gdb.command("info threads", ops=100)
def classTeardown(self):
del self.gdb
def classTeardown(self):
del self.gdb
@@
-830,6
+870,7
@@
class GdbSingleHartTest(GdbTest):
if hart != self.hart:
self.gdb.select_hart(hart)
self.gdb.p("$pc=loop_forever")
if hart != self.hart:
self.gdb.select_hart(hart)
self.gdb.p("$pc=loop_forever")
+
self.gdb.select_hart(self.hart)
class ExamineTarget(GdbTest):
self.gdb.select_hart(self.hart)
class ExamineTarget(GdbTest):