X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=debug%2Ftestlib.py;h=b5bd992234cd2252a30d2018076d71614d1459a1;hb=f7eef9c837acf79fe2616620a094a7f358002c10;hp=392772291f2ffa633b38b9d462dcec1005a59941;hpb=d76b30df333659baf81b8411c7144378b735062a;p=riscv-tests.git diff --git a/debug/testlib.py b/debug/testlib.py index 3927722..b5bd992 100644 --- a/debug/testlib.py +++ b/debug/testlib.py @@ -19,8 +19,14 @@ def find_file(path): return None def compile(args, xlen=32): # pylint: disable=redefined-builtin - cc = os.path.expandvars("$RISCV/bin/riscv%d-unknown-elf-gcc" % xlen) + cc = os.path.expandvars("$RISCV/bin/riscv64-unknown-elf-gcc") cmd = [cc, "-g"] + if (xlen == 32): + cmd.append("-march=rv32imac") + cmd.append("-mabi=ilp32") + else: + cmd.append("-march=rv64imac") + cmd.append("-mabi=lp64") for arg in args: found = find_file(arg) if found: @@ -28,7 +34,7 @@ def compile(args, xlen=32): # pylint: disable=redefined-builtin else: cmd.append(arg) process = subprocess.Popen(cmd, stdout=subprocess.PIPE, - stderr=subprocess.PIPE) + stderr=subprocess.PIPE) stdout, stderr = process.communicate() if process.returncode: print @@ -51,27 +57,31 @@ def unused_port(): class Spike(object): logname = "spike.log" - def __init__(self, cmd, binary=None, halted=False, with_jtag_gdb=True, + def __init__(self, sim_cmd, binary=None, halted=False, with_jtag_gdb=True, timeout=None, xlen=64): """Launch spike. Return tuple of its process and the port it's running on.""" - if cmd: - cmd = shlex.split(cmd) + if sim_cmd: + cmd = shlex.split(sim_cmd) else: - cmd = ["spike"] + spike = os.path.expandvars("$RISCV/bin/spike") + cmd = [spike] if xlen == 32: - cmd += ["--isa", "RV32"] + cmd += ["--isa", "RV32G"] + else: + cmd += ["--isa", "RV64G"] if timeout: cmd = ["timeout", str(timeout)] + cmd + cmd += ["-m0x10000000:0x10000000"] + if halted: cmd.append('-H') if with_jtag_gdb: cmd += ['--rbb-port', '0'] os.environ['REMOTE_BITBANG_HOST'] = 'localhost' - cmd.append("-m32") - cmd.append('pk') + cmd.append('programs/infinite_loop') if binary: cmd.append(binary) logfile = open(self.logname, "w") @@ -104,9 +114,9 @@ class Spike(object): return self.process.wait(*args, **kwargs) class VcsSim(object): - def __init__(self, simv=None, debug=False): - if simv: - cmd = shlex.split(simv) + def __init__(self, sim_cmd=None, debug=False): + if sim_cmd: + cmd = shlex.split(sim_cmd) else: cmd = ["simv"] cmd += ["+jtag_vpi_enable"] @@ -141,12 +151,15 @@ class VcsSim(object): class Openocd(object): logname = "openocd.log" - def __init__(self, cmd=None, config=None, debug=False): - if cmd: - cmd = shlex.split(cmd) + def __init__(self, server_cmd=None, config=None, debug=False): + if server_cmd: + cmd = shlex.split(server_cmd) else: - cmd = ["openocd", "-d"] - + openocd = os.path.expandvars("$RISCV/bin/riscv-openocd") + cmd = [openocd] + if (debug): + cmd.append("-d") + # This command needs to come before any config scripts on the command # line, since they are executed in order. cmd += [ @@ -185,7 +198,7 @@ class Openocd(object): messaged = False while True: log = open(Openocd.logname).read() - if "Examined RISCV core" in log: + if "Ready for Remote Connections" in log: break if not self.process.poll() is None: raise Exception( @@ -222,7 +235,7 @@ class Openocd(object): elif matches: [match] = matches return int(match.group('port')) - time.sleep(0.1) + time.sleep(1) raise Exception("Timed out waiting for gdb server to obtain port.") def __del__(self): @@ -280,7 +293,7 @@ class Gdb(object): """Wait for prompt.""" self.child.expect(r"\(gdb\)") - def command(self, command, timeout=-1): + def command(self, command, timeout=6000): self.child.sendline(command) self.child.expect("\n", timeout=timeout) self.child.expect(r"\(gdb\)", timeout=timeout) @@ -297,7 +310,7 @@ class Gdb(object): def interrupt(self): self.child.send("\003") - self.child.expect(r"\(gdb\)", timeout=60) + self.child.expect(r"\(gdb\)", timeout=6000) return self.child.before.strip() def x(self, address, size='w'): @@ -330,7 +343,7 @@ class Gdb(object): return output def load(self): - output = self.command("load", timeout=60) + output = self.command("load", timeout=6000) assert "failed" not in output assert "Transfer rate" in output @@ -357,7 +370,13 @@ def run_all_tests(module, target, parsed): global gdb_cmd # pylint: disable=global-statement gdb_cmd = parsed.gdb - todo = [("ExamineTarget", ExamineTarget)] + todo = [] + if (parsed.misaval): + target.misa = int(parsed.misaval, 16) + print "Assuming $MISA value of 0x%x. Skipping ExamineTarget." % target.misa + else: + todo.append(("ExamineTarget", ExamineTarget)) + for name in dir(module): definition = getattr(module, name) if type(definition) == type and hasattr(definition, 'test') and \ @@ -385,12 +404,15 @@ def run_all_tests(module, target, parsed): return result def add_test_run_options(parser): + parser.add_argument("--fail-fast", "-f", action="store_true", help="Exit as soon as any test fails.") parser.add_argument("test", nargs='*', help="Run only tests that are named here.") parser.add_argument("--gdb", help="The command to use to start gdb.") + parser.add_argument("--misaval", + help="Don't run ExamineTarget, just assume the misa value which is specified.") def header(title, dash='-'): if title: @@ -528,7 +550,8 @@ class GdbTest(BaseTest): self.gdb.command( "target extended-remote localhost:%d" % self.server.port) - self.gdb.p("$priv=3") + # FIXME: OpenOCD doesn't handle PRIV now + #self.gdb.p("$priv=3") def classTeardown(self): del self.gdb