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

Ibex integration #979

Merged
merged 24 commits into from
Nov 24, 2021
Merged

Ibex integration #979

merged 24 commits into from
Nov 24, 2021

Conversation

schwarz-em
Copy link
Contributor

Type of change: new feature

Impact: software change

Release Notes

Integrate the SystemVerilog embedded core Ibex into Chipyard. This change adds the necessary Chisel wrapper module and adds Ibex to the Chipyard configurations. Documentation and CI updates are also included.
There was a also a change to the testchipip bootrom that I had to make in order to have Ibex boot correctly within Chipyard. See the pull request here: ucb-bar/testchipip#136

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.

Couple of comments:

  • Have you tried a multi-core Ibex configuration? If it doesn't work then we should prevent there being multiple cores from being instantiated.
  • Have you tried a heterogeneous setup? Ibex + Rocket... etc. Similar to above, then we should prevent this using something like requires

.circleci/run-tests.sh Outdated Show resolved Hide resolved
.gitmodules Outdated Show resolved Hide resolved
docs/Chipyard-Basics/Chipyard-Components.rst Outdated Show resolved Hide resolved
docs/Generators/Ibex.rst Outdated Show resolved Hide resolved

.. Warning:: The Ibex mtvec register is 256 byte aligned. When writing/running tests, ensure that the trap vector is also 256 byte aligned.

.. Warning:: The Ibex reset vector is located at 0x80.
Copy link
Contributor

Choose a reason for hiding this comment

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

Isn't the more appropriate thing to say is that the reset vector is located at ADDRESS+OFFSET where OFFSET is 0x80.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, that sounds more correct. I'll fix it.

docs/Generators/Ibex.rst Outdated Show resolved Hide resolved
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.

Looks like the CI is failing the tutorial setup and the core tests. Can you rebase these changes on the most recent dev branch? Also, can you fix the tutorial setup, you probably just need to re-generate the git diff patch.

@abejgonzalez
Copy link
Contributor

Looks like the CI is still failing, can you double check that this config builds in Verilator properly?

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.

Since there is no Ibex PR I'll put the comments here:

@@ -252,6 +252,13 @@ jobs:
group-key: "group-cores"
project-key: "chipyard-sodor"
timeout: "30m"
chipyard-ibex-run-tests:
Copy link
Contributor

Choose a reason for hiding this comment

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

What's going on with all the .circleci files being deleted?

@@ -100,6 +100,9 @@ case $1 in
chipyard-sodor)
run_asm ${mapping[$1]}
;;
chipyard-ibex)
run_bmark ${mapping[$1]}
Copy link
Contributor

Choose a reason for hiding this comment

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

Wait... why does this pass? Shouldn't the bmarks be RV64... not RV32 (and thus should break)?

@@ -0,0 +1,137 @@
Chipyard Continuous Integration (CI)
Copy link
Contributor

Choose a reason for hiding this comment

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

This file shouldn't exist (was renamed in the most recent dev work).

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. Pending CI passing.

@abejgonzalez abejgonzalez merged commit 5b3b388 into dev Nov 24, 2021
@schwarz-em schwarz-em deleted the ibex-integration branch November 28, 2021 21:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants