Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Don't try to init nonexistent midas submodule #552

Merged
merged 1 commit into from
May 21, 2020
Merged

Don't try to init nonexistent midas submodule #552

merged 1 commit into from
May 21, 2020

Conversation

albert-magyar
Copy link
Contributor

Type of change: bug fix
Impact: other
Release Notes
The submodule initialization script has been updated to no longer check out the now-inlined MIDAS project as a submodule of FireSim (see firesim/firesim#400).

davidbiancolin
davidbiancolin approved these changes May 15, 2020
View reviewed changes
Copy link
Contributor

@davidbiancolin davidbiancolin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

colinschmidt
colinschmidt approved these changes May 15, 2020
View reviewed changes
Copy link
Contributor

@colinschmidt colinschmidt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@albert-magyar
Copy link
Contributor Author

Plot twist: @zhemao brought up the good point that there are still submodules inside midas. I changed the script to just do dramsim2, but the version in dev is actually already fine.

@zhemao
Copy link
Contributor

zhemao commented May 15, 2020

The dramsim2 submodule in firesim is going away, and chipyard already doesn't depend on it, as it uses its own dramsim2 submodule under tools/. IMO, you should just delete the line.

@albert-magyar albert-magyar force-pushed the no-midas-sub branch 2 times, most recently from 502feb9 to 4225b13 Compare May 15, 2020 22:46
@davidbiancolin davidbiancolin force-pushed the no-midas-sub branch 2 times, most recently from dc43f79 to 013711d Compare May 20, 2020 06:03
@abejgonzalez
Copy link
Contributor

This should be rebased with dev again to get the toolchain fix.

@abejgonzalez abejgonzalez self-requested a review May 21, 2020 03:23
abejgonzalez
abejgonzalez approved these changes May 21, 2020
View reviewed changes
Copy link
Contributor

@abejgonzalez abejgonzalez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@albert-magyar albert-magyar merged commit c2c9bc8 into dev May 21, 2020
@albert-magyar albert-magyar deleted the no-midas-sub branch May 21, 2020 03:26
@alonamid alonamid mentioned this pull request May 30, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@colinschmidt colinschmidt colinschmidt approved these changes

@davidbiancolin davidbiancolin davidbiancolin approved these changes

@abejgonzalez abejgonzalez abejgonzalez approved these changes

@NathanTP NathanTP Awaiting requested review from NathanTP

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@albert-magyar @zhemao @abejgonzalez @colinschmidt @davidbiancolin