Enable FireSim distributed elaboration #716
Conversation
|
Looks like I will need to merge forward on dev but I wanted to go ahead and post this so that @davidbiancolin and others could see it. This work requires chipsalliance/rocket-chip#2725 so that |
|
SBT side things look fine to me. |
|
I'm working on merging local-chisel34 branch into this because @davidbiancolin wanted to wait to merge this until after the chisel bump. |
|
Since I merged I'm going to try cleaning this up by force-pushing my target branch and merging with |
|
@davidbiancolin I'm seeing that CY is currently pointing to https://github.com/chipsalliance/rocket-chip/tree/577994e38e3115cafa3a232b0fc60584aacb996e (on 'dev@577994e') and that doesn't have chipsalliance/rocket-chip#2725 that this requires. Are you guys planning to bump RC before the release? Here's the comparison showing what would have to be bumped to enable this PR chipsalliance/rocket-chip@577994e...0049f6e |
|
Oops... We definitely should've bumped further along in RC, i neglected to check. I'll try to get around to that next week, otherwise i'm open to a PR. |
opened #742 |
Creating an intermediate commit for ucb-bar/chipyard#716 to use for CI until ucb-bar/chipyard#742 is merged and this bump will be subsumed by the larger bump.
* only specifically identified artifacts use non-default strategies
* fallthrough uses default strategies (that will error)
* adds a custom strategy that prefers a non-rocketchip artifact (notRocketMergeStrategy)
* needed for chipard/generators/utilities/src/main/resources/csrc/emulator.cc
so that the ChipYard version is used instead of the one from RC
* adds (useRocketMergeStrategy) that prefers the RC artifact
* we want to use vsrc/SimDTM.v from rocketchip, not riscv-sodor
Needed for firesim/firesim#651
Uses a forward-merged version of the topic-branch at chipsalliance/rocket-chip#2767 until chipyard#742 is merged and can subsume this intermediate bump.
timsnyder-siv
force-pushed
the
adjust_assembly_merge_strategy
branch
from
906ed3d
to
b2cb820
Compare
|
hmm. Does anyone know why the checks aren't running after I rebased and force-pushed this? I put the 'DO NOT MERGE' label on this PR needs to merge after #742 (or someone needs to say it's okay for rocket to not be on master). |
|
The checks don't run on PRs from forks. @abejgonzalez do you remember why that was the case? |
|
I'm also happy to resubmit with a local branch now that I have write perms.
…On Tue, Dec 22, 2020, 2:13 PM Jerry Zhao ***@***.***> wrote:
The checks don't run on PRs from forks. @abejgonzalez
<https://github.com/abejgonzalez> do you remember why that was the case?
Also @abejgonzalez <https://github.com/abejgonzalez> @davidbiancolin
<https://github.com/davidbiancolin> can we just merge these in without
waiting for the checks? The changes seem to be mostly innocuous.
—
You are receiving this because you modified the open/close state.
Reply to this email directly, view it on GitHub
<#716 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AOG4JPVUCFEGJDYRKKIVWWDSWD4V3ANCNFSM4TRG5VVA>
.
|
|
I'm rebasing this onto dev and opening a local branch PR that will replace this one. Don't see a way to change the remote source branch of a PR so I'm closing this one. |
Related issue: firesim/firesim#646
Type of change: other enhancement
Impact: rtl change | software change | unknown | other
Release Notes
chipyard.config.WithBootROMnow looks for contentsFile inTargetDirKeyinstead of relative to current-working directoryfiresim.firesim.WithBootROMbecause things are simplified