[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 5 commits: Add changelog entry for specialised Enum Int64/Word64 instances
Marge Bot (@marge-bot)
gitlab at gitlab.haskell.org
Mon Aug 14 12:14:46 UTC 2023
Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC
Commits:
d7047e0d by Jaro Reinders at 2023-08-14T04:41:42-04:00
Add changelog entry for specialised Enum Int64/Word64 instances
- - - - -
52f5e8fb by cydparser at 2023-08-14T04:42:20-04:00
Fix -ddump-to-file and -ddump-timings interaction (#20316)
- - - - -
1274c5d6 by cydparser at 2023-08-14T04:42:20-04:00
Update release notes (#20316)
- - - - -
88b4f6a2 by Matthew Pickering at 2023-08-14T08:14:41-04:00
base: Add changelog entry for CLC #188
This proposal modified the implementations of copyBytes, moveBytes and
fillBytes (as detailed in the proposal)
https://github.com/haskell/core-libraries-committee/issues/188
- - - - -
75a2b499 by Matthew Pickering at 2023-08-14T08:14:42-04:00
packaging: Build manpage in separate directory to other documentation
We were installing two copies of the manpage:
* One useless one in the `share/doc` folder, because we copy the doc/
folder into share/
* The one we deliberately installed into `share/man` etc
The solution is to build the manpage into the `manpage` directory when
building the bindist, and then just install it separately.
Fixes #23707
- - - - -
7 changed files:
- compiler/GHC/Utils/Error.hs
- docs/users_guide/9.10.1-notes.rst
- hadrian/bindist/Makefile
- hadrian/src/Rules/BinaryDist.hs
- hadrian/src/Rules/Documentation.hs
- libraries/base/changelog.md
- − testsuite/tests/driver/T20316.stderr
Changes:
=====================================
compiler/GHC/Utils/Error.hs
=====================================
@@ -414,7 +414,7 @@ withTiming' :: MonadIO m
-> m a
withTiming' logger what force_result prtimings action
= if logVerbAtLeast logger 2 || logHasDumpFlag logger Opt_D_dump_timings
- then do whenPrintTimings $
+ then do when printTimingsNotDumpToFile $ liftIO $
logInfo logger $ withPprStyle defaultUserStyle $
text "***" <+> what <> colon
let ctx = log_default_user_context (logFlags logger)
@@ -432,7 +432,7 @@ withTiming' logger what force_result prtimings action
let alloc = alloc0 - alloc1
time = realToFrac (end - start) * 1e-9
- when (logVerbAtLeast logger 2 && prtimings == PrintTimings)
+ when (logVerbAtLeast logger 2 && printTimingsNotDumpToFile)
$ liftIO $ logInfo logger $ withPprStyle defaultUserStyle
(text "!!!" <+> what <> colon <+> text "finished in"
<+> doublePrec 2 time
@@ -452,7 +452,16 @@ withTiming' logger what force_result prtimings action
pure r
else action
- where whenPrintTimings = liftIO . when (prtimings == PrintTimings)
+ where whenPrintTimings =
+ liftIO . when printTimings
+
+ printTimings =
+ prtimings == PrintTimings
+
+ -- Avoid both printing to console and dumping to a file (#20316).
+ printTimingsNotDumpToFile =
+ printTimings
+ && not (log_dump_to_file (logFlags logger))
recordAllocs alloc =
liftIO $ traceMarkerIO $ "GHC:allocs:" ++ show alloc
=====================================
docs/users_guide/9.10.1-notes.rst
=====================================
@@ -48,6 +48,9 @@ Compiler
<https://github.com/agda/agda>`_, the size of the build results was reduced by
about 10% when these info tables were omitted.
+- Fixed a bug where compiling with both :ghc-flag:`-ddump-timings` and :ghc-flag:`-ddump-to-file` did not
+ suppress printing timings to the console. See :ghc-ticket:`20316`.
+
GHCi
~~~~
=====================================
hadrian/bindist/Makefile
=====================================
@@ -201,7 +201,7 @@ install_docs:
fi
MAN_SECTION := 1
-MAN_PAGES := doc/users_guide/build-man/ghc.1
+MAN_PAGES := manpage/ghc.1
.PHONY: install_man
install_man:
=====================================
hadrian/src/Rules/BinaryDist.hs
=====================================
@@ -246,6 +246,10 @@ bindistRules = do
-- reference. See #20802.
copyDirectory ("utils" -/- "completion") bindistFilesDir
+ -- Copy the manpage into the binary distribution
+ whenM (liftIO (IO.doesDirectoryExist (root -/- "manpage"))) $ do
+ copyDirectory (root -/- "manpage") bindistFilesDir
+
-- These scripts are only necessary in the configure/install
-- workflow which is not supported on windows.
-- TODO: Instead of guarding against windows, we could offer the
=====================================
hadrian/src/Rules/Documentation.hs
=====================================
@@ -43,7 +43,7 @@ archiveRoot :: FilePath
archiveRoot = docRoot -/- "archives"
manPageBuildPath :: FilePath
-manPageBuildPath = docRoot -/- "users_guide/build-man/ghc.1"
+manPageBuildPath = "manpage" -/- "ghc.1"
-- TODO: Get rid of this hack.
docContext :: Context
=====================================
libraries/base/changelog.md
=====================================
@@ -2,6 +2,8 @@
## 4.20.0.0 *TBA*
* Add a `RULE` to `Prelude.lookup`, allowing it to participate in list fusion ([CLC proposal #174](https://github.com/haskell/core-libraries-committee/issues/175))
+ * The `Enum Int64` and `Enum Word64` instances now use native operations on 32-bit platforms, increasing performance by up to 1.5x on i386 and up to 5.6x with the JavaScript backend. ([CLC proposal #187](https://github.com/haskell/core-libraries-committee/issues/187))
+
## 4.19.0.0 *TBA*
* Add `{-# WARNING in "x-partial" #-}` to `Data.List.{head,tail}`.
@@ -39,6 +41,7 @@
* Make `Semigroup`'s `stimes` specializable. ([CLC proposal #8](https://github.com/haskell/core-libraries-committee/issues/8))
* Deprecate `Data.List.NonEmpty.unzip` ([CLC proposal #86](https://github.com/haskell/core-libraries-committee/issues/86))
* Fixed exponent overflow/underflow bugs in the `Read` instances for `Float` and `Double` ([CLC proposal #192](https://github.com/haskell/core-libraries-committee/issues/192))
+ * Implement `copyBytes`, `fillBytes`, `moveBytes` and `stimes` for `Data.Array.Byte.ByteArray` using primops ([CLC proposal #188](https://github.com/haskell/core-libraries-committee/issues/188))
## 4.18.0.0 *March 2023*
* Shipped with GHC 9.6.1
=====================================
testsuite/tests/driver/T20316.stderr deleted
=====================================
@@ -1,6 +0,0 @@
-*** initializing unit database:
-*** Chasing dependencies:
-*** Parser [Main]:
-*** Renamer/typechecker [Main]:
-*** Desugar [Main]:
-*** CoreTidy [Main]:
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e7288c9b3f0279644f8a387cdc6d9bb159ce282d...75a2b4997f5a8f2f652daab480d25e244ce03b37
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e7288c9b3f0279644f8a387cdc6d9bb159ce282d...75a2b4997f5a8f2f652daab480d25e244ce03b37
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230814/122b09e3/attachment-0001.html>
More information about the ghc-commits
mailing list