+# SPDX-License-Identifier: LGPL-2-or-later
"""TestRunner class, part of the Test API
SPDX-License: LGPLv2+
"""
def __init__(self, tst_data, microwatt_mmu=False, rom=None,
svp64=True, run_hdl=None, run_sim=True,
- allow_overlap=False):
+ allow_overlap=False, inorder=False):
super().__init__("run_all")
self.test_data = tst_data
self.microwatt_mmu = microwatt_mmu
self.rom = rom
self.svp64 = svp64
self.allow_overlap = allow_overlap
+ self.inorder = inorder
self.run_hdl = run_hdl
self.run_sim = run_sim
pspec = TestMemPspec(ldst_ifacetype=ldst_ifacetype,
imem_ifacetype=imem_ifacetype,
- addr_wid=48,
+ addr_wid=64,
mask_wid=8,
+ XLEN=64,
imem_reg_wid=64,
# wb_data_width=32,
use_pll=False,
core_domain="sync", # no alternative domain
svp64=self.svp64,
allow_overlap=self.allow_overlap,
+ inorder=self.inorder,
mmu=self.microwatt_mmu,
reg_wid=64)
# get each test, completely reset the core, and run it
for test in self.test_data:
-
- with self.subTest(test.name):
+ with self.subTest(test.name, **test.subtest_args):
###### PREPARATION PHASE AT START OF TEST #######
# overwrite (reset) the wb_get memory dictionary with
# the test's memory contents (oh, and put the wb_get
# memory back in as well)
- if self.rom is not None and test.mem is not None:
- self.default_mem.clear()
+ self.default_mem.clear()
+ if self.rom is not None:
self.default_mem.update(deepcopy(self.rom))
+ if test.mem is not None:
self.default_mem.update(deepcopy(test.mem))
for runner in state_list:
# optionally, if a wishbone-based ROM is passed in, run that as an
# extra emulated process
+ self.default_mem = {}
if self.rom is not None:
print ("TestRunner with MMU ROM")
pprint (self.rom)