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.

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

Replace Dromajo FireSim bridge with Cospike #1588

Merged
merged 6 commits into from
Sep 5, 2023
Merged

Conversation

abejgonzalez
Copy link
Contributor

@abejgonzalez abejgonzalez commented Aug 30, 2023

This PR does the following:

  • Moves the cospike* C/Scala sources to the testchipip repository (so it can be accessed by FireSim)
  • Removes the Dromajo bridge binder and replaces it with a Cospike one

Related PRs / Issues:

Type of change:

  • Bug fix
  • New feature
  • Other enhancement

Impact:

  • RTL change
  • Software change (RISC-V software)
  • Build system change
  • Other

Contributor Checklist:

  • Did you set main as the base branch?
  • Is this PR's title suitable for inclusion in the changelog and have you added a changelog:<topic> label?
  • Did you state the type-of-change/impact?
  • Did you delete any extraneous prints/debugging code?
  • Did you mark the PR with a changelog: label?
  • (If applicable) Did you update the conda .conda-lock.yml file if you updated the conda requirements file?
  • (If applicable) Did you add documentation for the feature?
  • (If applicable) Did you add a test demonstrating the PR?
  • (If applicable) Did you mark the PR as Please Backport?

Move Cospike to testchipip
@abejgonzalez abejgonzalez self-assigned this Aug 31, 2023
@abejgonzalez abejgonzalez changed the title Cospike integration [DONOTMERGE] Replace Dromajo FireSim bridge with Cospike Aug 31, 2023
@abejgonzalez
Copy link
Contributor Author

@Mergifyio rebase main

@mergify
Copy link

mergify bot commented Aug 31, 2023

rebase main

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/4)
CONFLICT (modify/delete): generators/chipyard/src/main/resources/csrc/cospike.cc deleted in a48746f1 (Deprecate Dromajo in FireSim, use cospike) and modified in HEAD.  Version HEAD of generators/chipyard/src/main/resources/csrc/cospike.cc left in tree.
error: could not apply a48746f1... Deprecate Dromajo in FireSim, use cospike
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply a48746f1... Deprecate Dromajo in FireSim, use cospike

err-code: A38F6

Copy link
Contributor

@jerryz123 jerryz123 left a comment

Choose a reason for hiding this comment

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

Shall we delete all references to dromajo in this PR now? Including the submodule?

@abejgonzalez
Copy link
Contributor Author

Shall we delete all references to dromajo in this PR now? Including the submodule?

I'll do that in a separate PR since there are quite a few places where it needs to be removed.

@abejgonzalez abejgonzalez merged commit 48dcce2 into main Sep 5, 2023
53 checks passed
@jerryz123
Copy link
Contributor

Shall we delete all references to dromajo in this PR now? Including the submodule?

I'll do that in a separate PR since there are quite a few places where it needs to be removed.

Cool

@abejgonzalez abejgonzalez deleted the cospike-integration branch July 4, 2024 00:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants