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

Boot files #2377

Merged
merged 6 commits into from
Nov 23, 2021
Merged

Boot files #2377

merged 6 commits into from
Nov 23, 2021

Conversation

pepeiborra
Copy link
Collaborator

@pepeiborra pepeiborra commented Nov 20, 2021

Fixes the regression in #2365 addressing 2 problems identified by @mpickering and @wz1000
Tested with the repros described in that ticket (using the ghc codebase).

Does not_fix #2362 but that appears to be a slightly different problem (and verified it's not a regression).

I don't know if I'll have time to add a new test before next weekend

Copy link
Collaborator

@wz1000 wz1000 left a comment

Choose a reason for hiding this comment

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

Seems fine to me, I will try to come up with a test case.

@jneira jneira linked an issue Nov 22, 2021 that may be closed by this pull request
@guibou
Copy link
Collaborator

guibou commented Nov 22, 2021

I tested that this also closes #2385.

@jneira jneira linked an issue Nov 22, 2021 that may be closed by this pull request
@jneira
Copy link
Member

jneira commented Nov 22, 2021

maybe a regression test based on #2385 would be great, sad it is not reproducible with the simple case described in the issue

@guibou
Copy link
Collaborator

guibou commented Nov 22, 2021

@jneira I discovered at the end of writting the issue that boot file may be involved. So my repro without boot file was not succesful.

I was at work, so a bit busy by "we need to fix HLS right now", but I'll try to write a repro when I'll get a bit of time.

@pepeiborra
Copy link
Collaborator Author

I basically gave up on constructing a test case for this, so any ideas will be appreciated @guibou @wz1000
In the meantime we should land this and start thinking about an HLS 1.5.1 release @jneira

@mpickering
Copy link
Contributor

Perhaps the boot5688 test in the GHC tree triggers this case?

@pepeiborra
Copy link
Collaborator Author

Perhaps the boot5688 test in the GHC tree triggers this case?

That worked, it fails without this patch and succeeds with it. Test added now, thanks Matt.

@guibou
Copy link
Collaborator

guibou commented Nov 22, 2021

Damned, I did not saw @mpickering answer before starting to work on my repro.

Here is my repro: https://github.com/guibou/hls_repro_2385, in case it may help.

In any case, thank you for providing a solution for this problem.

Copy link
Member

@jneira jneira left a comment

Choose a reason for hiding this comment

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

Perfect, regression test included, thanks @pepeiborra for the fix and everyone for the help

Will cut a 5.1 release asap after merge this

@jneira
Copy link
Member

jneira commented Nov 22, 2021

Damned, I did not saw @mpickering answer before starting to work on my repro.

Here is my repro: https://github.com/guibou/hls_repro_2385, in case it may help.

In any case, thank you for providing a solution for this problem.

Thanks for working in the repro anyways 👍

@pepeiborra pepeiborra added the merge me Label to trigger pull request merge label Nov 22, 2021
@jneira
Copy link
Member

jneira commented Nov 23, 2021

there are almost as flaky tests in ubuntu than windows lately 😟

@mergify mergify bot merged commit e6ceb69 into master Nov 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge me Label to trigger pull request merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

The impossible happen, mkUsage, HLS 1.5.0 HLS 1.5 appears to not handle hs-boot files correctly
5 participants