-
Notifications
You must be signed in to change notification settings - Fork 901
[prim] Remove primgen and replace with virtual cores #23555
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
65eb0ec
to
19af483
Compare
458c9e4
to
4009fe6
Compare
Interesting, it looks like mixing with a newer fusesoc might require at least Python 3.9 to work with the other dependencies.
|
e7dd88c
to
b2b9aab
Compare
Newer fusesoc also has a different directory layout compared to the OT fork. This was the OT fork's layout:
But newer fusesoc has this directory layout:
Accommodating the new tree needed fixes to various paths, including CFLAGS definitions in hjson files. In the current example, {work-root} is set to dvsim's In addition, for ralgen, the Now, some simulations work, but there is still a gap... |
787aca8
to
5344016
Compare
This PR is way out of date now, but since @olofk has released fusesoc 2.4, I think we don't need my random development tag anymore. 2.4 should be able to handle virtual cores as needed. |
@a-will I think that depends on the OT requirements. If you are fine with pulling in cores from one vendor during a build, then virtual cores should do the trick. However, as I understand it, OT wants to be able to select implementation at compile-time, and in that case you still need something like primgen. With that said, I believe FuseSoC 2.4 should have all the functionality needed to implement what you need. I have done some experimenting implementing the equivalent to primgen as a FuseSoC filter instead of a generator and it looks promising. Happy to discuss this further. |
It's unclear to me if OT actually needs that, though. All of our in-tree top-level fusesoc cores end up binding a specific prim library, and an out-of-tree integrator would almost certainly do the same for their actual chip. The build recipes for synthesis often can't be reused across technologies, and across integrations for the same opentitan IP, the top-level generally uses different RTL, so we end up with independent top-level cores anyway. We'd end up with different YAML for each real target, so sharing that core file across implementations doesn't seem to provide a benefit. There may be a bit of a rub with gate-level simulation applications, though, especially if you just want to redo the existing block-level simulations with your own prim library. I'd guess that the full integration level still uses its own core file for GLS, but is doing block-level simulation with a different prim library a supported activity? I'm not sure. We'd probably achieve the original setup's capabilities if only we could provide fusesoc (as a parameter to its invocation) which implementations of virtual cores to include for the specified top-level core file. For example, it could be arguments to provide additional VLNVs to add to the build (using their default target). Then the top-level core file wouldn't need to explicitly pull them in. |
@olofk If that bit above is interesting, the specifying of additional VLNVs would be akin to how hierarchical synthesis flows work. The top-level (and other sub-cores) may have dangling references, but the missing netlists would get specified as additional sources, then linked in during the build. For fusesoc, |
980f9e1
to
90f83e5
Compare
Looks like fusesoc 2.4 isn't being used in the sim runs in CI, and something broke with the CI file changes. I guess the API is a bit different for github actions. Maybe |
27aac7f
to
679942b
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Amazing PR! Left a few comments from looking at the code.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are these CDC waivers tested in CI? If not, have we tested this ourselves?
Regarding paths, I haven't checked exactly what the problem is, but I would recommend using |
That is what I did in this PR: https://github.com/lowRISC/opentitan/pull/23555/files#diff-8ed9c1256f9282d31ab3a7f150e2e95eaae62a546151c7203117aaa70451129e |
sv_flist_gen_flags: ["--flag=fileset_{design_level}", | ||
"--mapping=lowrisc:prim_generic:all:0.1"] | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we're going to set a default mapping here, we should document how to override sv_flist_gen_flags
+ what is ordinarily set here. I feel iffy about putting prim selection in a generically-named property like this, though. It probably should be called out more specifically.
For dvsim, I think we should document the base configurations and explicitly require fusesoc as a dependency. If there were any hope of somehow abstracting away that dependency, that is gone now, hehe. Downstream user configuration files will explicitly have fusesoc-specific parameters in them.
This can all be done in future PRs.
use_cfgs: [{ name: mbx | ||
fusesoc_core: lowrisc:ip:mbx | ||
import_cfgs: ["{proj_root}/hw/lint/tools/dvsim/common_lint_cfg.hjson"] | ||
additional_fusesoc_argument: "--mapping=lowrisc:systems:top_darjeeling:0.1" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
additional_fusesoc_argument
sounds a bit hokey. In a future PR, we should probably get more specific about prims and make the property names more obviously related to the intended use.
# files: | ||
# - lint/physical_pads.waiver |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: Should we simply remove these lines instead of commenting them out?
home_dir = "{}/homeless-shelter".format(out_dir) | ||
|
||
cache_dir = "{}/fusesoc-cache".format(out_dir) | ||
cache_dir = "/tmp/fusesoc-cache" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should create a TODO out of this and implement in a future PR. 😄
Signed-off-by: Hugo McNally <[email protected]>
Because the prim hierarchy has changed, reusing the path would target the flop directly for forcing. This meant that the forcing would delay u_state_flop from snapping back to the FsmError state that should've been held by the flop. Instead, the original path caused the flop in the new hierarchy to be targeted *directly*, delaying update until the next posedge, instead of the negedge when forcing is released. Retarget forcing to prim_sparse_fsm_flop's state_o output. Signed-off-by: Alexander Williams <[email protected]>
Signed-off-by: Hugo McNally <[email protected]>
Some core old files were left after pulling otp out of the prims. Signed-off-by: Hugo McNally <[email protected]>
These mappings will be used in a future commit. As of this commit, this will be ignored by FuseSoC as an unknown property. Signed-off-by: Hugo McNally <[email protected]>
…tants These mappings will be used in a future commit. As of this commit, this will be ignored by FuseSoC as an unknown property. Signed-off-by: Hugo McNally <[email protected]>
This option will be used in future commits, but is ignored for now. Signed-off-by: Hugo McNally <[email protected]>
This option will be used in future commits, but is ignored for now. Signed-off-by: Hugo McNally <[email protected]>
In addition to changing to virtual prim cores, quite a few paths had to be updated for FuseSoC's new build directory layout. We are now on upstream FuseSoC to 2.4.3. Note, prim_pkg still exists as prim_pkg_legacy because some RTL beyond the old primitive wrappers depends on the implementation enum. prim_pkg_legacy has been labeled as legacy. Co-authored-by: Alexander Williams <[email protected]> Signed-off-by: Hugo McNally <[email protected]>
We expect file names to match module names. Now that the IPs are virtual cores, rename the files to match the module names that are the new "ABI" (so to speak). Adjust prim_generic, prim_xilinx, and prim_xilinx_ultrascale libraries. Co-authored-by: Alexander Williams <[email protected]> Signed-off-by: Hugo McNally <[email protected]>
Signed-off-by: Hugo McNally <[email protected]>
The macros depend on ipgen outputs, so avoid pulling them in with the ordinary prims. Co-authored-by: Alexander Williams <[email protected]> Signed-off-by: Hugo McNally <[email protected]>
Add the choice of prims to the fusesoc call instead. Co-authored-by: Hugo McNally <[email protected]> Signed-off-by: Alexander Williams <[email protected]>
Signed-off-by: Alexander Williams <[email protected]>
It looks like comments have been addressed, either by making the change here or deferring to a future PR. Tests were reported passing, and my changes since then have almost entirely been comments. The only new bit was creating a core for top_englishbreakfast_racl_pkg and using it in the englishbreakfast systems (instead of earlgrey's). The CW305 build passes. The failure for Darjeeling DV is a temporary network failure and is unrelated to this PR. Merging now! |
Woohoo! Never thought I'd live to see the day :P Great work, everyone involved! Now as for the FuseSoC-dvsim integration... |
Add back prim_pkg enum for legacy support, and mention that it is deprecated. Some IPs reference the enums directly.