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

[DNM before Sail 0.17.2] Catch up to sail mainline #371

Closed
wants to merge 1 commit into from

Conversation

nwf-msr
Copy link

@nwf-msr nwf-msr commented Dec 11, 2023

These definitions are now provided by sail's libraries, as of rems-project/sail@eb8af69 .

This includes the change in #349 and, presumably, will also not pass CI until the sail version used there is bumped.

@nwf-msr
Copy link
Author

nwf-msr commented Dec 11, 2023

Lest anyone get too hasty with the merge button, I'm not sure -- I can check, I have just been a little lazy and focused on trying to get things working on my machine -- that this is compatible with sail 0.17.1 and isn't depending on something between that release (rems-project/sail@8217b27) and current HEAD.

I do not envy the sail-riscv maintainers the task of coordination.

Copy link

Test Results

712 tests  ±0   712 ✔️ ±0   0s ⏱️ ±0s
    6 suites ±0       0 💤 ±0 
    1 files   ±0       0 ±0 

Results for commit 626cf73. ± Comparison against base commit 393e7ed.

@Alasdair
Copy link
Collaborator

The CI tests with the last opam published version so that should be fine.

I do plan on fixing up the hex_bits situation in the next Sail release, so I'm not sure if now is the right time to add a mapping.sail import. I think it just defines hex_bits_20 because it was used in one test case, but I recently added a new file that defines all 1-32 in terms of a polymorphic hex_bits mapping.

As of rems-project/sail@d535724
much of what was prelude in the RISCV model is now in sail standard libraries.

This includes the change in #349
and, presumably, will also not pass CI until the next sail release.
@nwf-msr nwf-msr changed the title Catch up to sail mainline [DNM before Sail 0.17.2] Catch up to sail mainline Jan 12, 2024
@Timmmm
Copy link
Collaborator

Timmmm commented Jan 15, 2024

I think this is a subset of #318 which is still waiting for review. Possibly also #349 (I guess that's why this failed; I haven't looked).

@nwf-msr
Copy link
Author

nwf-msr commented Jan 15, 2024

Ah, somehow I'd missed #318! I'll go comment over there.

@nwf-msr nwf-msr closed this Jan 15, 2024
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.

5 participants