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

Add a label "chisel3_builtin" to ifElseFatal intrinsic #3912

Merged
merged 1 commit into from
Mar 7, 2024
Merged

Add a label "chisel3_builtin" to ifElseFatal intrinsic #3912

merged 1 commit into from
Mar 7, 2024

Conversation

uenoku
Copy link
Contributor

@uenoku uenoku commented Mar 7, 2024 •
edited by dtzSiFive
Loading

This is a follow-up to #3825.

MFC has attached a laebl "chisel3_builtin" to every ifElseFatal assertion. Usually a label on ifElseFatal is just ignored but the label is emitted when compiled with -emit-chisel-asserts-as-sva. So labels on assertions converted from ifElseFatal disappear due to #3825. This PR restores labels to preserve the old behavior.

Contributor Checklist

  • Did you add Scaladoc to every public function/method?
  • Did you add at least one test demonstrating the PR?
  • Did you delete any extraneous printlns/debugging code?
  • Did you specify the type of improvement?
  • Did you add appropriate documentation in docs/src?
  • Did you request a desired merge strategy?
  • Did you add text to be included in the Release Notes for this change?

Type of Improvement

  • Backend code generation

Desired Merge Strategy

  • Squash: The PR will be squashed and merged (choose this if you have no preference).

Release Notes

Add a label "chisel3_builtin" to ifElseFatal intrinsic.

Reviewer Checklist (only modified by reviewer)

  • Did you add the appropriate labels? (Select the most appropriate one based on the "Type of Improvement")
  • Did you mark the proper milestone (Bug fix: 3.6.x, 5.x, or 6.x depending on impact, API modification or big change: 7.0)?
  • Did you review?
  • Did you check whether all relevant Contributor checkboxes have been checked?
  • Did you do one of the following when ready to merge:
    • Squash: You/ the contributor Enable auto-merge (squash), clean up the commit message, and label with Please Merge.
    • Merge: Ensure that contributor has cleaned up their commit history, then merge with Create a merge commit.

@uenoku
Add a label "chisel3_builtin" to ifElseFatal intrinsic
6797dc7 
This is a follow-up to chipsalliance#3825.

MFC has attached a laebl "chisel3_builtin" to every ifElseFatal assertion.
Usually a label on ifElseFatal is just ignored but the label is emitted
when compiled with `-emit-chisel-asserts-as-sva`. So labels on assertions
converted from ifElseFatal disappear due to chipsalliance#3825. This PR restores labels
to preserve the old behavior.
@uenoku uenoku added Bugfix Fixes a bug, will be included in release notes Backend Code Generation Affects backend code generation, will be included in release notes labels Mar 7, 2024
@uenoku uenoku removed the Bugfix Fixes a bug, will be included in release notes label Mar 7, 2024
dtzSiFive
dtzSiFive approved these changes Mar 7, 2024
View reviewed changes
Copy link
Member

@dtzSiFive dtzSiFive left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks!

@dtzSiFive dtzSiFive added this to the 7.0 milestone Mar 7, 2024
@dtzSiFive
Copy link
Member

Marking 7.0 because the other PR was 7.0.

@dtzSiFive dtzSiFive merged commit 35d3b71 into chipsalliance:main Mar 7, 2024
16 of 19 checks passed
dtzSiFive added a commit that referenced this pull request Mar 7, 2024
@dtzSiFive
Revert "Add a label "chisel3_builtin" to ifElseFatal intrinsic (#3912)"
047acfe 
This reverts commit 35d3b71.
dtzSiFive added a commit that referenced this pull request Mar 7, 2024
@dtzSiFive
Revert move to intrinsic for assert due to performance impact (#3916)
347d82b 
Revert #3912 and #3825.

This reverts commit 35d3b71.
This reverts commit 386a7f3.
dtzSiFive added a commit to dtzSiFive/chisel3 that referenced this pull request Apr 17, 2024
@dtzSiFive
Add ifElseFatal intrinsics; use it for chisel3.assert emission.
520ab47 
Restore chipsalliance#3912 and chipsalliance#3825.
Use intrinsic expression instead of intrinsic module.

This reverts commit 347d82b.
@dtzSiFive dtzSiFive mentioned this pull request Apr 17, 2024
Merged
14 tasks
dtzSiFive added a commit to dtzSiFive/chisel3 that referenced this pull request Apr 17, 2024
@dtzSiFive
Add ifElseFatal intrinsics; use it for chisel3.assert emission.
e45a9e0 
Restore chipsalliance#3912 and chipsalliance#3825.
Use intrinsic expression instead of intrinsic module.

This reverts commit 347d82b.
dtzSiFive added a commit that referenced this pull request Apr 24, 2024
@dtzSiFive
Add ifElseFatal intrinsics; use it for chisel3.assert emission (#4001)
22e9d02 
Restore #3912 and #3825.
Use intrinsic expression instead of intrinsic module.

This reverts commit 347d82b.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dtzSiFive dtzSiFive dtzSiFive approved these changes

@jackkoenig jackkoenig Awaiting requested review from jackkoenig

Assignees
No one assigned
Labels
Backend Code Generation Affects backend code generation, will be included in release notes
Projects
None yet
Milestone
7.0
Development

Successfully merging this pull request may close these issues.
2 participants
@uenoku @dtzSiFive