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

Fix Clash.Primitives.DSL.tuple on GHC-9.6 #2651

Merged
merged 1 commit into from
Jan 31, 2024
Merged

Conversation

leonschoorl
Copy link
Member

It had the module name of tuples hardcoded to GHC.Tuple, but that changed in GHC-9.6.
This would result in type mismatches in the generated VHDL.

Fixes #2512

Still TODO:

  • Write a changelog entry (see changelog/README.md)
  • Check copyright notices are up to date in edited files

It had the module name of tuples hardcoded to GHC.Tuple, but that
changed in GHC-9.6.
This would result in type mismatches in the generated VHDL.

Fixes #2512
Copy link
Member

@martijnbastiaan martijnbastiaan left a comment

Choose a reason for hiding this comment

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

Nice!

@leonschoorl leonschoorl enabled auto-merge (squash) January 31, 2024 14:57
@leonschoorl leonschoorl merged commit d6277c3 into master Jan 31, 2024
13 checks passed
@leonschoorl leonschoorl deleted the fix-prim-dsl-tuple branch January 31, 2024 15:37
mergify bot pushed a commit that referenced this pull request Jan 31, 2024
It had the module name of tuples hardcoded to GHC.Tuple, but that
changed in GHC-9.6.
This would result in type mismatches in the generated VHDL.

Fixes #2512

(cherry picked from commit d6277c3)
@DigitalBrains1
Copy link
Member

So the only thing in our test suite that triggered this bug was in a Vivado-specific test? I think we should write a regression test that doesn't rely on Vivado.

hiddemoll pushed a commit that referenced this pull request Feb 1, 2024
It had the module name of tuples hardcoded to GHC.Tuple, but that
changed in GHC-9.6.
This would result in type mismatches in the generated VHDL.

Fixes #2512
martijnbastiaan pushed a commit that referenced this pull request Feb 1, 2024
It had the module name of tuples hardcoded to GHC.Tuple, but that
changed in GHC-9.6.
This would result in type mismatches in the generated VHDL.

Fixes #2512

(cherry picked from commit d6277c3)

Co-authored-by: Leon Schoorl <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Clash generates invalid HDL on GHC 9.6 for XpmCdcHandshake primitive
3 participants