Skip to content

Merge Retire_Failure into ExecutionResult #884

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

Timmmm
Copy link
Collaborator

@Timmmm Timmmm commented Apr 25, 2025

Note: This is built on #883 so only look at the second commit (I wish Github supported this workflow nicely!)

There's really no reason to have two levels of unions here so I added Retire_Success into Retire_Failure and then used that directly as ExecutionResult. This is definitely simpler and it also removes the weird case of WFI which was included in Retire_Failure when it isn't really failing to retire (especially if wfi_is_nop() is true).

I left the RETIRE_SUCCESS to make the commit smaller, but it does mean there is some stylistic inconsistency. We can fix that with a simple search and replace in future.

@Timmmm Timmmm requested a review from pmundkur April 25, 2025 12:25
Copy link

github-actions bot commented Apr 25, 2025

Test Results

400 tests  ±0   400 ✅ ±0   1m 57s ⏱️ +3s
  1 suites ±0     0 💤 ±0 
  1 files   ±0     0 ❌ ±0 

Results for commit 179c334. ± Comparison against base commit da6f449.

♻️ This comment has been updated with latest results.

@pmundkur
Copy link
Collaborator

Another alternative is the second commit in #777. I'm okay with either.

@Timmmm
Copy link
Collaborator Author

Timmmm commented Apr 25, 2025

I think that just renames them rather than merging them.

@pmundkur
Copy link
Collaborator

Yeah, it's an alternative to merging, since it keeps the generic top-level union. I think the 'Exec_{Complete,Incomplete}' is more explicit if also more verbose, which I slightly prefer. But like I said, I'm okay with either approach.

@arichardson
Copy link
Collaborator

arichardson commented Apr 25, 2025

Note: This is built on #883 so only look at the second commit (I wish Github supported this workflow nicely!)

For LLVM I use https://github.com/spacedentist/spr which works nicely -- the downside is that you need to have write access to the repository you are contributing to (to create user/<name>/<pr_name> branches).

This works pretty well but adds lots of extra branches to the repository.

Copy link
Collaborator

@arichardson arichardson left a comment

Choose a reason for hiding this comment

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

This looks like a nice improvement. Didn't review in detail since most of it looks like an automated search+replace

@Timmmm Timmmm added the will be merged Scheduled to be merged in a few days if nobody objects label Apr 28, 2025
There's really no reason to have two levels of unions here so I added `Retire_Success` into `Retire_Failure` and then used that directly as `ExecutionResult`. This is definitely simpler and it also removes the weird case of WFI which was included in `Retire_Failure` when it isn't really failing to retire (especially if `wfi_is_nop()` is true).

I left the `RETIRE_SUCCESS` to make the commit smaller, but it does mean there is some stylistic inconsistency. We can fix that with a simple search and replace in future.
@Timmmm Timmmm force-pushed the user/timh/retire_failure branch from 69dc222 to 179c334 Compare April 29, 2025 14:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
will be merged Scheduled to be merged in a few days if nobody objects
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants