Add pure Haskell implementation #631
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
CI is finally passing. I've added a new job with the |
|
Thanks @clyring for the review! It's now ready for a second round :-) |
doyougnu
reviewed
Jan 10, 2024
|
Thanks @doyougnu for the review. I've fixed everything I believe. I've also added INLINABLE pragmas so that specialization kicks in for |
|
Any chance we can get this merged and released before the GHC 9.10 fork? |
|
Perhaps it can be merged by then but I don't think there's any reason to cut a release so soon. |
clyring
reviewed
Jan 16, 2024
clyring
reviewed
Jan 16, 2024
clyring
reviewed
Jan 27, 2024
Data/ByteString/Internal/Pure.hs
Outdated
Comment on lines
268
to
275
| -- we cannot negate directly as 0 - (minBound :: Int) = minBound | ||
| -- So we write the sign and the first digit. | ||
| pokeByteOff buf 0 '-' | ||
| let !(q,r) = quotRem x (-10) | ||
| putDigit buf 1 (fromIntegral (abs r)) | ||
| case q of | ||
| 0 -> pure (plusPtr buf 2) | ||
| _ -> decodeUnsignedDec' q (plusPtr buf 1) (plusPtr buf 2) |
There was a problem hiding this comment.
Gross! We can negate directly, so long as we cast to the appropriate unsigned type. (I know you got this logic directly from the C code, and it's even worse there because we can expect the C compiler to produce better code for unsigned-known-divisor quotRem anyway. ...follow-up work?)
|
Go ahead and just add |
hsyl20
force-pushed
the
hsyl20/pure-bytestring
branch
from
6dfb449
to
48e336b
Compare
hubot
pushed a commit
to ghc/ghc
that referenced
this pull request
Feb 1, 2024
...mostly so that 16d6b7e835ffdcf9b894e79f933dd52348dedd0c (which reworks unaligned writes in Builder) and the stuff in haskell/bytestring#631 can see wider testing. The less-terrible code for unaligned writes used in Builder on hosts not known to be ulaigned-friendly also takes less effort for GHC to compile, resulting in a metric decrease for T21839c on some platforms. The metric increase on T21839r is caused by the unrelated commit 750dac33465e7b59100698a330b44de7049a345c. It perhaps warrants further analysis and discussion (see #23822) but is not critical. Metric Decrease: T21839c Metric Increase: T21839r
|
I plan to give this another round of review in a day or two. |
hubot
pushed a commit
to ghc/ghc
that referenced
this pull request
Feb 1, 2024
...mostly so that 16d6b7e835ffdcf9b894e79f933dd52348dedd0c (which reworks unaligned writes in Builder) and the stuff in haskell/bytestring#631 can see wider testing. The less-terrible code for unaligned writes used in Builder on hosts not known to be ulaigned-friendly also takes less effort for GHC to compile, resulting in a metric decrease for T21839c on some platforms. The metric increase on T21839r is caused by the unrelated commit 750dac33465e7b59100698a330b44de7049a345c. It perhaps warrants further analysis and discussion (see #23822) but is not critical. Metric Decrease: T21839c Metric Increase: T21839r
hubot
pushed a commit
to ghc/ghc
that referenced
this pull request
Feb 2, 2024
...mostly so that 16d6b7e835ffdcf9b894e79f933dd52348dedd0c (which reworks unaligned writes in Builder) and the stuff in haskell/bytestring#631 can see wider testing. The less-terrible code for unaligned writes used in Builder on hosts not known to be ulaigned-friendly also takes less effort for GHC to compile, resulting in a metric decrease for T21839c on some platforms. The metric increase on T21839r is caused by the unrelated commit 750dac33465e7b59100698a330b44de7049a345c. It perhaps warrants further analysis and discussion (see #23822) but is not critical. Metric Decrease: T21839c Metric Increase: T21839r
hubot
pushed a commit
to ghc/ghc
that referenced
this pull request
Feb 2, 2024
...mostly so that 16d6b7e835ffdcf9b894e79f933dd52348dedd0c (which reworks unaligned writes in Builder) and the stuff in haskell/bytestring#631 can see wider testing. The less-terrible code for unaligned writes used in Builder on hosts not known to be ulaigned-friendly also takes less effort for GHC to compile, resulting in a metric decrease for T21839c on some platforms. The metric increase on T21839r is caused by the unrelated commit 750dac33465e7b59100698a330b44de7049a345c. It perhaps warrants further analysis and discussion (see #23822) but is not critical. Metric Decrease: T21839c Metric Increase: T21839r
hubot
pushed a commit
to ghc/ghc
that referenced
this pull request
Feb 3, 2024
...mostly so that 16d6b7e835ffdcf9b894e79f933dd52348dedd0c (which reworks unaligned writes in Builder) and the stuff in haskell/bytestring#631 can see wider testing. The less-terrible code for unaligned writes used in Builder on hosts not known to be ulaigned-friendly also takes less effort for GHC to compile, resulting in a metric decrease for T21839c on some platforms. The metric increase on T21839r is caused by the unrelated commit 750dac33465e7b59100698a330b44de7049a345c. It perhaps warrants further analysis and discussion (see #23822) but is not critical. Metric Decrease: T21839c Metric Increase: T21839r
clyring
reviewed
Feb 3, 2024
hubot
pushed a commit
to ghc/ghc
that referenced
this pull request
Feb 5, 2024
...mostly so that 16d6b7e835ffdcf9b894e79f933dd52348dedd0c (which reworks unaligned writes in Builder) and the stuff in haskell/bytestring#631 can see wider testing. The less-terrible code for unaligned writes used in Builder on hosts not known to be ulaigned-friendly also takes less effort for GHC to compile, resulting in a metric decrease for T21839c on some platforms. The metric increase on T21839r is caused by the unrelated commit 750dac33465e7b59100698a330b44de7049a345c. It perhaps warrants further analysis and discussion (see #23822) but is not critical. Metric Decrease: T21839c Metric Increase: T21839r
hsyl20
force-pushed
the
hsyl20/pure-bytestring
branch
from
311d539
to
bc9aed6
Compare
|
I've rebased to fix the conflict. |
hsyl20
force-pushed
the
hsyl20/pure-bytestring
branch
from
bc9aed6
to
839f1a3
Compare
bytestring used to rely on C functions. This patch adds equivalent functions implemented in Haskell. The main purpose is for the JavaScript backend to fully support bytestring. Pure Haskell implementation can be enabled explicitly with a cabal flag. It's automatically enabled for the JavaScript platform. Thanks to Matthew Craven for the thorough review and the many suggestions. Co-authored-by: Matthew Craven <[email protected]>
hsyl20
force-pushed
the
hsyl20/pure-bytestring
branch
from
839f1a3
to
9a2b433
Compare
clyring
approved these changes
Feb 7, 2024
|
@Bodigrim Did you also want to review? |
|
@hasufell @angerman Do you know what's going on with the arm64v8 CI job? (And are you the right people to ping about this?) It's been consistently failing at the very end with: |
|
Try to temporarily add the tag |
|
I've done so at #658. The problem isn't specific to either PR; feel free to open another for experimentation. |
Bodigrim
approved these changes
Feb 7, 2024
clyring
pushed a commit
that referenced
this pull request
Feb 7, 2024
bytestring used to rely on C functions. This patch adds equivalent functions implemented in Haskell. The main purpose is for the JavaScript backend to fully support bytestring. Pure Haskell implementation can be enabled explicitly with a cabal flag. It's automatically enabled for the JavaScript platform. Thanks to Matthew Craven for the thorough review and the many suggestions. Co-authored-by: Matthew Craven <[email protected]> (cherry picked from commit d497f39)
OMFG GitHub... Alright, I'll give it a .sh suffix. |
hubot
pushed a commit
to ghc/ghc
that referenced
this pull request
Feb 19, 2024
...mostly so that 16d6b7e835ffdcf9b894e79f933dd52348dedd0c (which reworks unaligned writes in Builder) and the stuff in haskell/bytestring#631 can see wider testing. The less-terrible code for unaligned writes used in Builder on hosts not known to be ulaigned-friendly also takes less effort for GHC to compile, resulting in a metric decrease for T21839c on some platforms. The metric increase on T21839r is caused by the unrelated commit 750dac33465e7b59100698a330b44de7049a345c. It perhaps warrants further analysis and discussion (see #23822) but is not critical. Metric Decrease: T21839c Metric Increase: T21839r (cherry picked from commit 2702045)
hubot
pushed a commit
to ghc/ghc
that referenced
this pull request
Feb 20, 2024
...mostly so that 16d6b7e835ffdcf9b894e79f933dd52348dedd0c (which reworks unaligned writes in Builder) and the stuff in haskell/bytestring#631 can see wider testing. The less-terrible code for unaligned writes used in Builder on hosts not known to be ulaigned-friendly also takes less effort for GHC to compile, resulting in a metric decrease for T21839c on some platforms. The metric increase on T21839r is caused by the unrelated commit 750dac33465e7b59100698a330b44de7049a345c. It perhaps warrants further analysis and discussion (see #23822) but is not critical. Metric Decrease: T21839c Metric Increase: T21839r (cherry picked from commit 2702045)
hubot
pushed a commit
to ghc/ghc
that referenced
this pull request
Feb 20, 2024
...mostly so that 16d6b7e835ffdcf9b894e79f933dd52348dedd0c (which reworks unaligned writes in Builder) and the stuff in haskell/bytestring#631 can see wider testing. The less-terrible code for unaligned writes used in Builder on hosts not known to be ulaigned-friendly also takes less effort for GHC to compile, resulting in a metric decrease for T21839c on some platforms. The metric increase on T21839r is caused by the unrelated commit 750dac33465e7b59100698a330b44de7049a345c. It perhaps warrants further analysis and discussion (see #23822) but is not critical. Metric Decrease: T21839c Metric Increase: T21839r (cherry picked from commit 2702045)
hubot
pushed a commit
to ghc/ghc
that referenced
this pull request
Feb 20, 2024
...mostly so that 16d6b7e835ffdcf9b894e79f933dd52348dedd0c (which reworks unaligned writes in Builder) and the stuff in haskell/bytestring#631 can see wider testing. The less-terrible code for unaligned writes used in Builder on hosts not known to be ulaigned-friendly also takes less effort for GHC to compile, resulting in a metric decrease for T21839c on some platforms. The metric increase on T21839r is caused by the unrelated commit 750dac33465e7b59100698a330b44de7049a345c. It perhaps warrants further analysis and discussion (see #23822) but is not critical. Metric Decrease: T21839c Metric Increase: T21839r (cherry picked from commit 2702045)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add pure Haskell implementation for use with the JS backend. Use same Cabal flag as
textpackage (-fpure-haskell).