[bazel] unify cw310_params, cw310/hyper310_jtag_params #21645
Conversation
nbdd0121
changed the title
There was a problem hiding this comment.
LGTM, but it would be nice if need_jtag were a Boolean and opentitan_test added the correct OpenOCD flags based on the exec_env.param.interface. Do you think that would be possible?
The advantage is it lets us share the same cw310_params between hyper310 and cw310 execution environments. These are basically always exactly the same, and possibly should just be merged in the future.
| if not bitstream: | ||
| bitstream = "@//hw/bitstream/universal:splice" | ||
| return struct( | ||
| tags = ["hyper310", "exclusive"] + tags, |
There was a problem hiding this comment.
The interface-specific tags have been dropped here. We seem to have moved over to using a tag derived from the Target's label, though, so maybe we can just eliminate the interface tag for cw310 as well.
We'll probably need to overhaul test filtering for multi-top.
There was a problem hiding this comment.
Good point. I think the current "hyper310", "cw310" label isn't accurate though because there's no hyper310_params so anything not using jtag is still tagged with cw310. I'll see if any of our CI relies on the interface tag.
There was a problem hiding this comment.
That's a good point but I agree with @nbdd0121 that those labels are not accurate, I think the exec_env labels are more reliable.
nbdd0121
force-pushed
the
ot
branch
2 times, most recently
from
d9271d1 to
8003682
Compare
This commit unifies cw310_params and cw310/hyper310_jtag_params by
integrating JTAG support to cw310_params as extra parameters.
The OpenOCD adapter config file (if any) is moved to execution
environments.
The intention is that one can choose to enable JTAG without having
to clear the bitstream. For backward compatibility of the rules,
*_jtag_params are set to clear the bitstream.
If test_harness is specified, then `--bitstream={bitstream}` is automatically
added to test_cmd. This was the behaviour for cw310_jtag_params, but is
generally useful for all other tests.
Co-authored-by: Amaury Pouly <amaury.pouly@lowrisc.org>
Signed-off-by: Amaury Pouly <amaury.pouly@lowrisc.org>
Signed-off-by: Gary Guo <gary.guo@lowrisc.org>
This commit removes all usage of *_jtag_params and convert them to use of `needs_jtag` and `changes_otp` (if necessary). Signed-off-by: Gary Guo <gary.guo@lowrisc.org>
nbdd0121
added
the
CherryPick:earlgrey_es_sival
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin earlgrey_es_sival
git worktree add -d .worktree/backport-21645-to-earlgrey_es_sival origin/earlgrey_es_sival
cd .worktree/backport-21645-to-earlgrey_es_sival
git switch --create backport-21645-to-earlgrey_es_sival
git cherry-pick -x 830c4ba034a7958ef97c063e8f1eda5f85f4c1e4 181abdd4a82cd23baca00e079846b4369942339f |
|
Backporting depends on #21580 |
The functionality is integrated to cw310_params as extra parameters. The intention is that one can choose to enable JTAG without having to clear the bitstream.
For backward compatibility of the rules, *_jtag_params are set to clear the bitstream.
If test_harness is specified, then
--bitstream={bitstream}is automatically added to test_cmd.