github-mirrors/ibex
1
0
Fork 0
mirror of https://github.com/lowRISC/ibex.git synced 2025-04-22 21:07:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tweak ibex_cmd.py to fail more cleanly

Browse source 
This shouldn't change the behaviour when it works. On a failure, we
now print out a bit more about what's going on.

When asked to do something impossible now, I think the output is a bit
clearer. For example, if you try to run riscv_bitmanip_full_test with
an OpenTitan configuration (which doesn't have full bitmanip), the
warning message is now:

    WARNING:ibex_cmd:Rejecting test: riscv_bitmanip_full_test. It specifies rtl_params of ['ibex_pkg::RV32BFull'], which doesn't contain the expected 'ibex_pkg::RV32BOTEarlGrey'.

(The following stuff that appears is a bit messy, but at least the
first line is now clearer!)
This commit is contained in:
Rupert Swarbrick 2023-08-30 11:35:50 +01:00
parent 3c895f89a6
commit eb95f74a5a
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
dv/uvm/core_ibex/scripts/ibex_cmd.py
View file

@ -150,13 +150,18 @@ def filter_tests_by_config(cfg: ibex_config.Config,
for test in test_list:
if "rtl_params" not in test:
# We currently only exclude tests by mismatching 'rtl_params', so if
# that key is missing then the test is accepted by default.
# We currently only exclude tests by mismatching 'rtl_params', so
# if that key is missing then the test is accepted by default.
filtered_test_list.append(test)
else:
param_dict = test['rtl_params']
assert isinstance(param_dict, dict)
for p, p_val in param_dict.items():
# Parameters are strings or lists of strings. Coerce to the
# latter to make the code below simpler.
if isinstance(p_val, str):
p_val = [p_val]
config_val = cfg.params.get(p, None)
# Throw an error if required RTL parameters in the testlist
@ -171,11 +176,11 @@ def filter_tests_by_config(cfg: ibex_config.Config,
# bitmanipulation tests). If this is the case, the testlist
# will specify all legal enum values, check if any of them
# match the config.
if ((isinstance(p_val, list) and (config_val not in p_val)) or
(isinstance(p_val, str) and (config_val != p_val))):
if config_val not in p_val:
logger.warning(
f"Rejecting test {test['test']}, 'rtl_params' specified "
"not compatible with ibex_config")
f"Rejecting test: {test['test']}. It specifies "
f"rtl_params of {p_val}, which doesn't contain the "
f"expected '{config_val}'.")
break
# The test is accepted if we got this far