- ghc-commits - Haskell.org

[Git][ghc/ghc] Pushed new branch wip/fendor/fix-haddock-stackanno
by Hannes Siebenhandl (＠fendor) 15 Oct '25

15 Oct '25

Hannes Siebenhandl pushed new branch wip/fendor/fix-haddock-stackanno at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/fendor/fix-haddock-stackanno You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26503] [ci skip] wip
by Brandon Chinn (＠brandonchinn178) 15 Oct '25

15 Oct '25

Brandon Chinn pushed to branch wip/T26503 at Glasgow Haskell Compiler / GHC Commits: 70cb4e7e by Brandon Chinn at 2025-10-14T21:29:53-07:00 [ci skip] wip - - - - - 4 changed files: - compiler/GHC/Hs/Lit.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/Errors/Types.hs - libraries/ghc-internal/src/GHC/Internal/TH/Syntax.hs Changes: ===================================== compiler/GHC/Hs/Lit.hs ===================================== @@ -38,6 +38,7 @@ import GHC.Utils.Panic (panic) import GHC.Hs.Extension import Language.Haskell.Syntax.Expr ( HsExpr ) import Language.Haskell.Syntax.Extension +import Language.Haskell.Syntax.Module.Name (ModuleName) import Language.Haskell.Syntax.Lit {- @@ -87,6 +88,7 @@ instance Eq HsLitTc where data HsStringMeta = HsStringMeta { strMetaSourceText :: SourceText , strMetaMultiline :: Bool + , strMetaQualified :: Maybe ModuleName } deriving (Data) ===================================== compiler/GHC/Parser.y ===================================== @@ -4148,6 +4148,17 @@ literal :: { Located (HsLit GhcPs) } $ getPRIMSTRING $1 } | PRIMFLOAT { sL1 $1 $ HsFloatPrim noExtField $ getPRIMFLOAT $1 } | PRIMDOUBLE { sL1 $1 $ HsDoublePrim noExtField $ getPRIMDOUBLE $1 } + | modid '.' STRING { hintQualifiedStrings *> + sLL $1 $2 + (HsString + (defaultStrMeta (getSTRINGs $1)) + (getSTRING $1)) } + | modid '.' STRING_MULTI { hintQualifiedStrings *> + hintMultilineStrings *> + sLL $1 $2 + (HsString + (defaultStrMeta (getSTRINGMULTIs $1)){strMetaMultiline = True} + (getSTRING $1)) } ----------------------------------------------------------------------------- -- Layout @@ -4505,6 +4516,18 @@ hintQualifiedDo tok = do ITmdo (Just m) -> Just $ ftext m <> text ".mdo" t -> Nothing +-- Hint about the MultilineStrings extension +hintMultilineStrings :: SrcSpan -> P () +hintMultilineStrings span = do + enabled <- getBit MultilineStringsBit + unless enabled $ addError $ mkPlainErrorMsgEnvelope span PsErrMultilineStrings + +-- Hint about the QualifiedStrings extension +hintQualifiedStrings :: SrcSpan -> P () +hintQualifiedStrings span = do + enabled <- getBit QualifiedStringsBit + unless enabled $ addError $ mkPlainErrorMsgEnvelope span PsErrQualifiedStrings + -- When two single quotes don't followed by tyvar or gtycon, we report the -- error as empty character literal, or TH quote that missing proper type -- variable or constructor. See #13450. ===================================== compiler/GHC/Parser/Errors/Types.hs ===================================== @@ -441,6 +441,12 @@ data PsMessage -- | Multi-way if-expression found but MultiWayIf not enabled | PsErrMultiWayIf + -- | Multiline string literal found but MultilineStrings not enabled + | PsErrMultilineStrings + + -- | Qualified string literal found but QualifiedStrings not enabled + | PsErrQualifiedStrings + -- | Explicit forall found but no extension allowing it is enabled | PsErrExplicitForall !Bool -- ^ is Unicode forall? ===================================== libraries/ghc-internal/src/GHC/Internal/TH/Syntax.hs ===================================== @@ -696,6 +696,7 @@ data Lit = CharL Char -- ^ @\'c\'@ | StringPrimL [Word8] -- ^ @"string"#@. A primitive C-style string, type 'Addr#' | BytesPrimL Bytes -- ^ Some raw bytes, type 'Addr#': | CharPrimL Char -- ^ @\'c\'#@ + | QualStringL ModName String -- ^ @M."string"#@ deriving( Show, Eq, Ord, Generic ) -- We could add Int, Float, Double etc, as we do in HsLit, View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/70cb4e7e79a377a75119e019d7b64d9… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/70cb4e7e79a377a75119e019d7b64d9… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/T26503
by Brandon Chinn (＠brandonchinn178) 15 Oct '25

15 Oct '25

Brandon Chinn pushed new branch wip/T26503 at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/T26503 You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 5 commits: Change Alex and Happy m4 scripts to display which version was found in the...
by Marge Bot (＠marge-bot) 15 Oct '25

15 Oct '25

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: d59ef6b6 by Hai / @BestYeen at 2025-10-14T21:51:14-04:00 Change Alex and Happy m4 scripts to display which version was found in the system, adapt small formatting details in Happy script to be more like the Alex script again. - - - - - c98abb6a by Hai / @BestYeen at 2025-10-14T21:52:08-04:00 Update occurrences of return to pure and add a sample for redefining :m to mean :main - - - - - 70ee825a by Cheng Shao at 2025-10-14T21:52:50-04:00 testsuite: fix T3586 for non-SSE3 platforms `T3586.hs` contains `-fvia-C -optc-msse3` which I think is a best-effort basis to harvest the C compiler's auto vectorization optimizations via the C backend back when the test was added. The `-fvia-C` part is now a deprecated no-op because GHC can't fall back to the C backend on a non-unregisterised build, and `-optc-msse3` might actually cause the test to fail on non x86/x64 platforms, e.g. recent builds of wasi-sdk would report `wasm32-wasi-clang: error: unsupported option '-msse3' for target 'wasm32-unknown-wasi'`. So this patch cleans up this historical cruft. `-fvia-C` is removed, and `-optc-msse3` is only passed when cpuid contains `pni` (which indicates support of SSE3). - - - - - 6145c2e7 by Teo Camarasu at 2025-10-14T22:25:36-04:00 Add submodules for template-haskell-lift and template-haskell-quasiquoter These two new boot libraries expose stable subsets of the template-haskell interface. This is an implemenation of the GHC proposal https://github.com/ghc-proposals/ghc-proposals/pull/696 Work towards #25262 - - - - - 21a82639 by Ben Gamari at 2025-10-14T22:25:36-04:00 rts: Eliminate uses of implicit constant arrays Folding of `const`-sized variable-length arrays to a constant-length array is a gnu extension which clang complains about. Closes #26502. - - - - - 15 changed files: - .gitmodules - docs/users_guide/ghci.rst - hadrian/src/Packages.hs - hadrian/src/Settings/Default.hs - libraries/ghc-internal/src/GHC/Internal/TH/Lift.hs - libraries/ghc-internal/src/GHC/Internal/TH/Quote.hs - + libraries/template-haskell-lift - + libraries/template-haskell-quasiquoter - m4/fptools_alex.m4 - m4/fptools_happy.m4 - rts/Printer.c - rts/posix/OSMem.c - testsuite/driver/cpu_features.py - testsuite/tests/perf/should_run/T3586.hs - testsuite/tests/perf/should_run/all.T Changes: ===================================== .gitmodules ===================================== @@ -118,3 +118,9 @@ [submodule "libraries/file-io"] path = libraries/file-io url = https://gitlab.haskell.org/ghc/packages/file-io.git +[submodule "libraries/template-haskell-lift"] + path = libraries/template-haskell-lift + url = https://gitlab.haskell.org/ghc/template-haskell-lift.git +[submodule "libraries/template-haskell-quasiquoter"] + path = libraries/template-haskell-quasiquoter + url = https://gitlab.haskell.org/ghc/template-haskell-quasiquoter.git ===================================== docs/users_guide/ghci.rst ===================================== @@ -403,7 +403,7 @@ it can be *instantiated* to ``IO a``. For example .. code-block:: none - ghci> return True + ghci> pure True True Furthermore, GHCi will print the result of the I/O action if (and only @@ -419,7 +419,7 @@ For example, remembering that ``putStrLn :: String -> IO ()``: ghci> putStrLn "hello" hello - ghci> do { putStrLn "hello"; return "yes" } + ghci> do { putStrLn "hello"; pure "yes" } hello "yes" @@ -443,12 +443,12 @@ prompt must be in the ``IO`` monad. .. code-block:: none - ghci> x <- return 42 + ghci> x <- pure 42 ghci> print x 42 ghci> -The statement ``x <- return 42`` means “execute ``return 42`` in the +The statement ``x <- pure 42`` means “execute ``pure 42`` in the ``IO`` monad, and bind the result to ``x``\ ”. We can then use ``x`` in future statements, for example to print it as we did above. @@ -2389,7 +2389,7 @@ commonly used commands. .. code-block:: none - ghci> let date _ = Data.Time.getZonedTime >>= print >> return "" + ghci> let date _ = Data.Time.getZonedTime >>= print >> pure "" ghci> :def date date ghci> :date 2017-04-10 12:34:56.93213581 UTC @@ -2399,16 +2399,16 @@ commonly used commands. .. code-block:: none - ghci> let mycd d = System.Directory.setCurrentDirectory d >> return "" + ghci> let mycd d = System.Directory.setCurrentDirectory d >> pure "" ghci> :def mycd mycd ghci> :mycd .. - Or I could define a simple way to invoke "``ghc --make Main``" + Or we could define a simple way to invoke "``ghc --make Main``" in the current directory: .. code-block:: none - ghci> :def make (\_ -> return ":! ghc --make Main") + ghci> :def make (\_ -> pure ":! ghc --make Main") We can define a command that reads GHCi input from a file. This might be useful for creating a set of bindings that we want to @@ -2430,6 +2430,15 @@ commonly used commands. a double colon (eg ``::load``). It's not possible to redefine the commands ``:{``, ``:}`` and ``:!``. + For historical reasons, ``:m`` in ghci is shorthand for ``:module``. + If we want to override that to mean ``:main``, in a way that also + works when the implicit Prelude is deactivated, we can do it like + this using ``:def!``: + + .. code-block:: none + + ghci> :def! m \_ -> Prelude.pure ":main" + .. ghci-cmd:: :delete; * | ⟨num⟩ ... Delete one or more breakpoints by number (use :ghci-cmd:`:show breaks` to @@ -2912,7 +2921,7 @@ commonly used commands. .. code-block:: none - *ghci> :def cond \expr -> return (":cmd if (" ++ expr ++ ") then return \"\" else return \":continue\"") + *ghci> :def cond \expr -> pure (":cmd if (" ++ expr ++ ") then pure \"\" else pure \":continue\"") *ghci> :set stop 0 :cond (x < 3) To ignore breakpoints for a specified number of iterations use ===================================== hadrian/src/Packages.hs ===================================== @@ -9,7 +9,7 @@ module Packages ( ghcToolchain, ghcToolchainBin, haddockApi, haddockLibrary, haddock, haskeline, hsc2hs, hp2ps, hpc, hpcBin, integerGmp, iserv, iservProxy, libffi, mtl, osString, parsec, pretty, primitive, process, remoteIserv, rts, - runGhc, semaphoreCompat, stm, templateHaskell, terminfo, text, time, timeout, + runGhc, semaphoreCompat, stm, templateHaskell, thLift, thQuasiquoter, terminfo, text, time, timeout, transformers, unlit, unix, win32, xhtml, lintersCommon, lintNotes, lintCodes, lintCommitMsg, lintSubmoduleRefs, lintWhitespace, ghcPackages, isGhcPackage, @@ -39,7 +39,7 @@ ghcPackages = , ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghcInternal, ghci, ghciWrapper, ghcPkg, ghcPrim , ghcToolchain, ghcToolchainBin, haddockApi, haddockLibrary, haddock, haskeline, hsc2hs , hp2ps, hpc, hpcBin, integerGmp, iserv, libffi, mtl, osString - , parsec, pretty, process, rts, runGhc, stm, semaphoreCompat, templateHaskell + , parsec, pretty, process, rts, runGhc, stm, semaphoreCompat, templateHaskell, thLift, thQuasiquoter , terminfo, text, time, transformers, unlit, unix, win32, xhtml, fileio , timeout , lintersCommon @@ -56,7 +56,7 @@ array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, count ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghci, ghcInternal, ghciWrapper, ghcPkg, ghcPrim, ghcToolchain, ghcToolchainBin, haddockLibrary, haddockApi, haddock, haskeline, hsc2hs, hp2ps, hpc, hpcBin, integerGmp, iserv, iservProxy, remoteIserv, libffi, mtl, - osString, parsec, pretty, primitive, process, rts, runGhc, semaphoreCompat, stm, templateHaskell, + osString, parsec, pretty, primitive, process, rts, runGhc, semaphoreCompat, stm, templateHaskell, thLift, thQuasiquoter, terminfo, text, time, transformers, unlit, unix, win32, xhtml, timeout, lintersCommon, lintNotes, lintCodes, lintCommitMsg, lintSubmoduleRefs, lintWhitespace @@ -124,6 +124,8 @@ runGhc = util "runghc" semaphoreCompat = lib "semaphore-compat" stm = lib "stm" templateHaskell = lib "template-haskell" +thLift = lib "template-haskell-lift" +thQuasiquoter = lib "template-haskell-quasiquoter" terminfo = lib "terminfo" text = lib "text" time = lib "time" ===================================== hadrian/src/Settings/Default.hs ===================================== @@ -106,6 +106,8 @@ stage0Packages = do , runGhc , semaphoreCompat -- depends on , time -- depends on win32 + , thLift -- new library not yet present for boot compilers + , thQuasiquoter -- new library not yet present for boot compilers , unlit , if windowsHost then win32 else unix -- We must use the in-tree `Win32` as the version ===================================== libraries/ghc-internal/src/GHC/Internal/TH/Lift.hs ===================================== @@ -20,7 +20,7 @@ -- | This module gives the definition of the 'Lift' class. -- -- This is an internal module. --- Please import "Language.Haskell.TH" or "Language.Haskell.TH.Syntax" instead! +-- Please import "Language.Haskell.TH.Lift", "Language.Haskell.TH" or "Language.Haskell.TH.Syntax" instead! module GHC.Internal.TH.Lift ( Lift(..) @@ -71,6 +71,9 @@ import GHC.Internal.ForeignPtr -- > deriving Lift -- -- Representation-polymorphic since /template-haskell-2.16.0.0/. +-- +-- This is exposed both from the @template-haskell-lift@ and @template-haskell@ packages. +-- Consider importing it from the more stable @template-haskell-lift@ if you don't need the full breadth of the @template-haskell@ interface. class Lift (t :: TYPE r) where -- | Turn a value into a Template Haskell expression, suitable for use in -- a splice. ===================================== libraries/ghc-internal/src/GHC/Internal/TH/Quote.hs ===================================== @@ -31,6 +31,9 @@ import GHC.Internal.Base hiding (Type) -- @QuasiQuoter@ that is only intended to be used in certain splice -- contexts, the unused fields should just 'fail'. This is most easily -- accomplished using 'namedefaultQuasiQuoter' or 'defaultQuasiQuoter'. +-- +-- This is exposed both from the @template-haskell-quasiquoter@ and @template-haskell@ packages. +-- Consider importing it from the more stable @template-haskell-quasiquoter@ if you don't need the full breadth of the @template-haskell@ interface. data QuasiQuoter = QuasiQuoter { -- | Quasi-quoter for expressions, invoked by quotes like @lhs = $[q|...]@ quoteExp :: String -> Q Exp, ===================================== libraries/template-haskell-lift ===================================== @@ -0,0 +1 @@ +Subproject commit e0b2a7eefcd1b7247af63ab4a691d3161eada284 ===================================== libraries/template-haskell-quasiquoter ===================================== @@ -0,0 +1 @@ +Subproject commit a47506eca032b139d9779fb8210d408c81d3fbd6 ===================================== m4/fptools_alex.m4 ===================================== @@ -23,10 +23,16 @@ changequote([, ])dnl ]) if test ! -f compiler/GHC/Parser/Lexer.hs || test ! -f compiler/GHC/Cmm/Lexer.hs then + if test x"$fptools_cv_alex_version" != x; then + fptools_cv_alex_version_display="version $fptools_cv_alex_version"; + else + fptools_cv_alex_version_display="none"; + fi; + failure_msg="Alex version >= 3.2.6 && < 4 is required to compile GHC. (Found: $fptools_cv_alex_version_display)" FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[3.2.6], - [AC_MSG_ERROR([Alex >= 3.2.6 && < 4 is required to compile GHC.])])[] + [AC_MSG_ERROR([$failure_msg])])[] FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-ge],[4.0.0], - [AC_MSG_ERROR([Alex >= 3.2.6 && < 4 is required to compile GHC.])])[] + [AC_MSG_ERROR([$failure_msg])])[] fi AlexVersion=$fptools_cv_alex_version; AC_SUBST(AlexVersion) ===================================== m4/fptools_happy.m4 ===================================== @@ -13,8 +13,7 @@ AC_DEFUN([FPTOOLS_HAPPY], AC_SUBST(HappyCmd,$HAPPY) AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version, changequote(, )dnl -[ -if test x"$HappyCmd" != x; then +[if test x"$HappyCmd" != x; then fptools_cv_happy_version=`"$HappyCmd" -v | grep 'Happy Version' | sed -e 's/Happy Version $[^ ]*$.*/\1/g'` ; else @@ -24,7 +23,12 @@ changequote([, ])dnl ]) if test ! -f compiler/GHC/Parser.hs || test ! -f compiler/GHC/Cmm/Parser.hs then - failure_msg="Happy version == 1.20.* || >= 2.0.2 && < 2.2 is required to compile GHC" + if test x"$fptools_cv_happy_version" != x; then + fptools_cv_happy_version_display="version $fptools_cv_happy_version"; + else + fptools_cv_happy_version_display="none"; + fi; + failure_msg="Happy version == 1.20.* || >= 2.0.2 && < 2.2 is required to compile GHC. (Found: $fptools_cv_happy_version_display)" FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.20.0], [AC_MSG_ERROR([$failure_msg])])[] FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-ge],[1.21.0], @@ -32,7 +36,6 @@ then [AC_MSG_ERROR([$failure_msg])])[])[] FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-ge],[2.2.0], [AC_MSG_ERROR([$failure_msg])])[] - fi HappyVersion=$fptools_cv_happy_version; AC_SUBST(HappyVersion) ===================================== rts/Printer.c ===================================== @@ -1033,8 +1033,8 @@ findPtr(P_ p, int follow) { uint32_t g, n; bdescr *bd; - const int arr_size = 1024; - StgPtr arr[arr_size]; +#define ARR_SIZE 1024 + StgPtr arr[ARR_SIZE]; int i = 0; searched = 0; @@ -1044,24 +1044,24 @@ findPtr(P_ p, int follow) // just before a block is used. for (n = 0; n < getNumCapabilities(); n++) { bd = nurseries[i].blocks; - i = findPtrBlocks(p,bd,arr,arr_size,i); - if (i >= arr_size) return; + i = findPtrBlocks(p,bd,arr,ARR_SIZE,i); + if (i >= ARR_SIZE) return; } #endif for (g = 0; g < RtsFlags.GcFlags.generations; g++) { bd = generations[g].blocks; - i = findPtrBlocks(p,bd,arr,arr_size,i); + i = findPtrBlocks(p,bd,arr,ARR_SIZE,i); bd = generations[g].large_objects; - i = findPtrBlocks(p,bd,arr,arr_size,i); - if (i >= arr_size) return; + i = findPtrBlocks(p,bd,arr,ARR_SIZE,i); + if (i >= ARR_SIZE) return; for (n = 0; n < getNumCapabilities(); n++) { i = findPtrBlocks(p, gc_threads[n]->gens[g].part_list, - arr, arr_size, i); + arr, ARR_SIZE, i); i = findPtrBlocks(p, gc_threads[n]->gens[g].todo_bd, - arr, arr_size, i); + arr, ARR_SIZE, i); } - if (i >= arr_size) return; + if (i >= ARR_SIZE) return; } if (follow && i == 1) { debugBelch("-->\n"); ===================================== rts/posix/OSMem.c ===================================== @@ -585,7 +585,7 @@ void *osReserveHeapMemory(void *startAddressPtr, W_ *len) } #endif - const int MAX_ATTEMPTS = 256; +#define MAX_ATTEMPTS 256 void *bad_allocs[MAX_ATTEMPTS]; size_t bad_alloc_lens[MAX_ATTEMPTS]; memset(bad_allocs, 0, sizeof(void*) * MAX_ATTEMPTS); ===================================== testsuite/driver/cpu_features.py ===================================== @@ -8,7 +8,7 @@ SUPPORTED_CPU_FEATURES = { # These aren't comprehensive; they are only CPU features that we care about # x86: - 'sse', 'sse2', 'sse3', 'ssse3', 'sse4_1', 'sse4_2', + 'sse', 'sse2', 'sse3', 'pni', 'ssse3', 'sse4_1', 'sse4_2', 'avx', 'avx2', 'avx512f', 'fma', 'popcnt', 'bmi1', 'bmi2' ===================================== testsuite/tests/perf/should_run/T3586.hs ===================================== @@ -1,5 +1,5 @@ {-# LANGUAGE BangPatterns #-} -{-# OPTIONS -fvia-C -optc-O3 -fexcess-precision -optc-msse3 #-} +{-# OPTIONS -optc-O3 -fexcess-precision #-} import Control.Monad.ST import Data.Array.ST ===================================== testsuite/tests/perf/should_run/all.T ===================================== @@ -43,6 +43,7 @@ test('T3586', [collect_runtime_residency(2), collect_stats('bytes allocated', 5), only_ways(['normal']), + when(have_cpu_feature('pni') or have_cpu_feature('sse3'), extra_hc_opts('-optc-msse3')), ], compile_and_run, ['-O']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/277317047e9e51c49b8b24665b9c5c… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/277317047e9e51c49b8b24665b9c5c… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] testsuite: fix T3586 for non-SSE3 platforms
by Marge Bot (＠marge-bot) 15 Oct '25

15 Oct '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 70ee825a by Cheng Shao at 2025-10-14T21:52:50-04:00 testsuite: fix T3586 for non-SSE3 platforms `T3586.hs` contains `-fvia-C -optc-msse3` which I think is a best-effort basis to harvest the C compiler's auto vectorization optimizations via the C backend back when the test was added. The `-fvia-C` part is now a deprecated no-op because GHC can't fall back to the C backend on a non-unregisterised build, and `-optc-msse3` might actually cause the test to fail on non x86/x64 platforms, e.g. recent builds of wasi-sdk would report `wasm32-wasi-clang: error: unsupported option '-msse3' for target 'wasm32-unknown-wasi'`. So this patch cleans up this historical cruft. `-fvia-C` is removed, and `-optc-msse3` is only passed when cpuid contains `pni` (which indicates support of SSE3). - - - - - 3 changed files: - testsuite/driver/cpu_features.py - testsuite/tests/perf/should_run/T3586.hs - testsuite/tests/perf/should_run/all.T Changes: ===================================== testsuite/driver/cpu_features.py ===================================== @@ -8,7 +8,7 @@ SUPPORTED_CPU_FEATURES = { # These aren't comprehensive; they are only CPU features that we care about # x86: - 'sse', 'sse2', 'sse3', 'ssse3', 'sse4_1', 'sse4_2', + 'sse', 'sse2', 'sse3', 'pni', 'ssse3', 'sse4_1', 'sse4_2', 'avx', 'avx2', 'avx512f', 'fma', 'popcnt', 'bmi1', 'bmi2' ===================================== testsuite/tests/perf/should_run/T3586.hs ===================================== @@ -1,5 +1,5 @@ {-# LANGUAGE BangPatterns #-} -{-# OPTIONS -fvia-C -optc-O3 -fexcess-precision -optc-msse3 #-} +{-# OPTIONS -optc-O3 -fexcess-precision #-} import Control.Monad.ST import Data.Array.ST ===================================== testsuite/tests/perf/should_run/all.T ===================================== @@ -43,6 +43,7 @@ test('T3586', [collect_runtime_residency(2), collect_stats('bytes allocated', 5), only_ways(['normal']), + when(have_cpu_feature('pni') or have_cpu_feature('sse3'), extra_hc_opts('-optc-msse3')), ], compile_and_run, ['-O']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/70ee825a516bcf7aac762bfedb4a017… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/70ee825a516bcf7aac762bfedb4a017… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] Update occurrences of return to pure and add a sample for redefining :m to mean :main
by Marge Bot (＠marge-bot) 15 Oct '25

15 Oct '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: c98abb6a by Hai / @BestYeen at 2025-10-14T21:52:08-04:00 Update occurrences of return to pure and add a sample for redefining :m to mean :main - - - - - 1 changed file: - docs/users_guide/ghci.rst Changes: ===================================== docs/users_guide/ghci.rst ===================================== @@ -403,7 +403,7 @@ it can be *instantiated* to ``IO a``. For example .. code-block:: none - ghci> return True + ghci> pure True True Furthermore, GHCi will print the result of the I/O action if (and only @@ -419,7 +419,7 @@ For example, remembering that ``putStrLn :: String -> IO ()``: ghci> putStrLn "hello" hello - ghci> do { putStrLn "hello"; return "yes" } + ghci> do { putStrLn "hello"; pure "yes" } hello "yes" @@ -443,12 +443,12 @@ prompt must be in the ``IO`` monad. .. code-block:: none - ghci> x <- return 42 + ghci> x <- pure 42 ghci> print x 42 ghci> -The statement ``x <- return 42`` means “execute ``return 42`` in the +The statement ``x <- pure 42`` means “execute ``pure 42`` in the ``IO`` monad, and bind the result to ``x``\ ”. We can then use ``x`` in future statements, for example to print it as we did above. @@ -2389,7 +2389,7 @@ commonly used commands. .. code-block:: none - ghci> let date _ = Data.Time.getZonedTime >>= print >> return "" + ghci> let date _ = Data.Time.getZonedTime >>= print >> pure "" ghci> :def date date ghci> :date 2017-04-10 12:34:56.93213581 UTC @@ -2399,16 +2399,16 @@ commonly used commands. .. code-block:: none - ghci> let mycd d = System.Directory.setCurrentDirectory d >> return "" + ghci> let mycd d = System.Directory.setCurrentDirectory d >> pure "" ghci> :def mycd mycd ghci> :mycd .. - Or I could define a simple way to invoke "``ghc --make Main``" + Or we could define a simple way to invoke "``ghc --make Main``" in the current directory: .. code-block:: none - ghci> :def make (\_ -> return ":! ghc --make Main") + ghci> :def make (\_ -> pure ":! ghc --make Main") We can define a command that reads GHCi input from a file. This might be useful for creating a set of bindings that we want to @@ -2430,6 +2430,15 @@ commonly used commands. a double colon (eg ``::load``). It's not possible to redefine the commands ``:{``, ``:}`` and ``:!``. + For historical reasons, ``:m`` in ghci is shorthand for ``:module``. + If we want to override that to mean ``:main``, in a way that also + works when the implicit Prelude is deactivated, we can do it like + this using ``:def!``: + + .. code-block:: none + + ghci> :def! m \_ -> Prelude.pure ":main" + .. ghci-cmd:: :delete; * | ⟨num⟩ ... Delete one or more breakpoints by number (use :ghci-cmd:`:show breaks` to @@ -2912,7 +2921,7 @@ commonly used commands. .. code-block:: none - *ghci> :def cond \expr -> return (":cmd if (" ++ expr ++ ") then return \"\" else return \":continue\"") + *ghci> :def cond \expr -> pure (":cmd if (" ++ expr ++ ") then pure \"\" else pure \":continue\"") *ghci> :set stop 0 :cond (x < 3) To ignore breakpoints for a specified number of iterations use View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c98abb6ac0f422df318691405ddd4b5… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c98abb6ac0f422df318691405ddd4b5… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] Change Alex and Happy m4 scripts to display which version was found in the...
by Marge Bot (＠marge-bot) 15 Oct '25

15 Oct '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: d59ef6b6 by Hai / @BestYeen at 2025-10-14T21:51:14-04:00 Change Alex and Happy m4 scripts to display which version was found in the system, adapt small formatting details in Happy script to be more like the Alex script again. - - - - - 2 changed files: - m4/fptools_alex.m4 - m4/fptools_happy.m4 Changes: ===================================== m4/fptools_alex.m4 ===================================== @@ -23,10 +23,16 @@ changequote([, ])dnl ]) if test ! -f compiler/GHC/Parser/Lexer.hs || test ! -f compiler/GHC/Cmm/Lexer.hs then + if test x"$fptools_cv_alex_version" != x; then + fptools_cv_alex_version_display="version $fptools_cv_alex_version"; + else + fptools_cv_alex_version_display="none"; + fi; + failure_msg="Alex version >= 3.2.6 && < 4 is required to compile GHC. (Found: $fptools_cv_alex_version_display)" FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[3.2.6], - [AC_MSG_ERROR([Alex >= 3.2.6 && < 4 is required to compile GHC.])])[] + [AC_MSG_ERROR([$failure_msg])])[] FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-ge],[4.0.0], - [AC_MSG_ERROR([Alex >= 3.2.6 && < 4 is required to compile GHC.])])[] + [AC_MSG_ERROR([$failure_msg])])[] fi AlexVersion=$fptools_cv_alex_version; AC_SUBST(AlexVersion) ===================================== m4/fptools_happy.m4 ===================================== @@ -13,8 +13,7 @@ AC_DEFUN([FPTOOLS_HAPPY], AC_SUBST(HappyCmd,$HAPPY) AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version, changequote(, )dnl -[ -if test x"$HappyCmd" != x; then +[if test x"$HappyCmd" != x; then fptools_cv_happy_version=`"$HappyCmd" -v | grep 'Happy Version' | sed -e 's/Happy Version $[^ ]*$.*/\1/g'` ; else @@ -24,7 +23,12 @@ changequote([, ])dnl ]) if test ! -f compiler/GHC/Parser.hs || test ! -f compiler/GHC/Cmm/Parser.hs then - failure_msg="Happy version == 1.20.* || >= 2.0.2 && < 2.2 is required to compile GHC" + if test x"$fptools_cv_happy_version" != x; then + fptools_cv_happy_version_display="version $fptools_cv_happy_version"; + else + fptools_cv_happy_version_display="none"; + fi; + failure_msg="Happy version == 1.20.* || >= 2.0.2 && < 2.2 is required to compile GHC. (Found: $fptools_cv_happy_version_display)" FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.20.0], [AC_MSG_ERROR([$failure_msg])])[] FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-ge],[1.21.0], @@ -32,7 +36,6 @@ then [AC_MSG_ERROR([$failure_msg])])[])[] FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-ge],[2.2.0], [AC_MSG_ERROR([$failure_msg])])[] - fi HappyVersion=$fptools_cv_happy_version; AC_SUBST(HappyVersion) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d59ef6b66e36e6b3ef7783c7ea8971e… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d59ef6b66e36e6b3ef7783c7ea8971e… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] T22859: Increase threadDelay for small machines
by Marge Bot (＠marge-bot) 15 Oct '25

15 Oct '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: e10dcd65 by Sven Tennie at 2025-10-12T10:24:56+00:00 T22859: Increase threadDelay for small machines The previously used thread delay led to failures on my RISC-V test setups. - - - - - 1 changed file: - testsuite/tests/rts/T22859.hs Changes: ===================================== testsuite/tests/rts/T22859.hs ===================================== @@ -42,7 +42,7 @@ main = do takeMVar started readMVar done hFlush stderr - threadDelay 1000 + threadDelay 50000 -- default behaviour: -- kill it after the limit is exceeded hPutStrLn stderr "default behaviour" @@ -68,5 +68,5 @@ main = do hPutStrLn stderr "kill and log" setGlobalAllocationLimitHandler KillOnAllocationLimit (Just $ \_ -> hPutStrLn stderr "allocation limit triggered 3") runWorker - threadDelay 1000 + threadDelay 50000 hPutStrLn stderr "done" View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e10dcd65d2303fd14d66480ddf9a4f1… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e10dcd65d2303fd14d66480ddf9a4f1… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26166] 4 commits: rts: Eliminate uses of implicit constant arrays
by Ben Gamari (＠bgamari) 15 Oct '25

15 Oct '25

Ben Gamari pushed to branch wip/T26166 at Glasgow Haskell Compiler / GHC Commits: 32224b2d by Ben Gamari at 2025-10-14T19:11:29-04:00 rts: Eliminate uses of implicit constant arrays Folding of `const`-sized variable-length arrays to a constant-length array is a gnu extension which clang complains about. - - - - - d16c1769 by Ben Gamari at 2025-10-14T19:11:29-04:00 compiler: Rename isMathFun -> isLibcFun This set includes more than just math functions. - - - - - 085f00fe by Ben Gamari at 2025-10-14T19:11:29-04:00 compiler: Add libc allocator functions to libc_funs Prototypes for these are now visible from `Prim.h`, resulting in multiple-declaration warnings in the unregisterised job. - - - - - 95de617d by Ben Gamari at 2025-10-14T19:14:05-04:00 rts: Minimize header dependencies of Prim.h Otherwise we will end up with redundant and incompatible declarations resulting in warnings during the unregisterised build. - - - - - 7 changed files: - compiler/GHC/Cmm/CLabel.hs - compiler/GHC/CmmToC.hs - rts/Printer.c - rts/include/stg/Prim.h - rts/posix/OSMem.c - rts/prim/int64x2minmax.c - rts/prim/vectorQuotRem.c Changes: ===================================== compiler/GHC/Cmm/CLabel.hs ===================================== @@ -102,7 +102,7 @@ module GHC.Cmm.CLabel ( needsCDecl, maybeLocalBlockLabel, externallyVisibleCLabel, - isMathFun, + isLibcFun, isCFunctionLabel, isGcPtrLabel, labelDynamic, @@ -1028,7 +1028,7 @@ needsCDecl (CmmLabel pkgId (NeedExternDecl external) _ _) -- For other labels we inline one into the HC file directly. | otherwise = True -needsCDecl l@(ForeignLabel{}) = not (isMathFun l) +needsCDecl l@(ForeignLabel{}) = not (isLibcFun l) needsCDecl (CC_Label _) = True needsCDecl (CCS_Label _) = True needsCDecl (IPE_Label {}) = True @@ -1055,15 +1055,19 @@ maybeLocalBlockLabel _ = Nothing -- | Check whether a label corresponds to a C function that has --- a prototype in a system header somewhere, or is built-in --- to the C compiler. For these labels we avoid generating our --- own C prototypes. -isMathFun :: CLabel -> Bool -isMathFun (ForeignLabel fs _ _) = fs `elementOfUniqSet` math_funs -isMathFun _ = False - -math_funs :: UniqSet FastString -math_funs = mkUniqSet [ +-- a prototype in a system header somewhere, or is built-in +-- to the C compiler. For these labels we avoid generating our +-- own C prototypes. +isLibcFun :: CLabel -> Bool +isLibcFun (ForeignLabel fs _ _) = fs `elementOfUniqSet` libc_funs +isLibcFun _ = False + +libc_funs :: UniqSet FastString +libc_funs = mkUniqSet [ + --------------------- + -- Math functions + --------------------- + -- _ISOC99_SOURCE (fsLit "acos"), (fsLit "acosf"), (fsLit "acosh"), (fsLit "acoshf"), (fsLit "acoshl"), (fsLit "acosl"), ===================================== compiler/GHC/CmmToC.hs ===================================== @@ -245,7 +245,7 @@ pprStmt platform stmt = CmmLit (CmmLabel lbl) | CmmNeverReturns <- ret -> pprCall platform cast_fn cconv hresults hargs <> semi <> text "__builtin_unreachable();" - | not (isMathFun lbl) -> + | not (isLibcFun lbl) -> pprForeignCall platform (pprCLabel platform lbl) cconv hresults hargs _ -> pprCall platform cast_fn cconv hresults hargs <> semi ===================================== rts/Printer.c ===================================== @@ -1033,8 +1033,8 @@ findPtr(P_ p, int follow) { uint32_t g, n; bdescr *bd; - const int arr_size = 1024; - StgPtr arr[arr_size]; +#define ARR_SIZE 1024 + StgPtr arr[ARR_SIZE]; int i = 0; searched = 0; @@ -1044,24 +1044,24 @@ findPtr(P_ p, int follow) // just before a block is used. for (n = 0; n < getNumCapabilities(); n++) { bd = nurseries[i].blocks; - i = findPtrBlocks(p,bd,arr,arr_size,i); - if (i >= arr_size) return; + i = findPtrBlocks(p,bd,arr,ARR_SIZE,i); + if (i >= ARR_SIZE) return; } #endif for (g = 0; g < RtsFlags.GcFlags.generations; g++) { bd = generations[g].blocks; - i = findPtrBlocks(p,bd,arr,arr_size,i); + i = findPtrBlocks(p,bd,arr,ARR_SIZE,i); bd = generations[g].large_objects; - i = findPtrBlocks(p,bd,arr,arr_size,i); - if (i >= arr_size) return; + i = findPtrBlocks(p,bd,arr,ARR_SIZE,i); + if (i >= ARR_SIZE) return; for (n = 0; n < getNumCapabilities(); n++) { i = findPtrBlocks(p, gc_threads[n]->gens[g].part_list, - arr, arr_size, i); + arr, ARR_SIZE, i); i = findPtrBlocks(p, gc_threads[n]->gens[g].todo_bd, - arr, arr_size, i); + arr, ARR_SIZE, i); } - if (i >= arr_size) return; + if (i >= ARR_SIZE) return; } if (follow && i == 1) { debugBelch("-->\n"); ===================================== rts/include/stg/Prim.h ===================================== @@ -145,30 +145,28 @@ W_ hs_mulIntMayOflo(W_ a, W_ b); /* rts/prim/int64x2minmax and rts/prim/vectorQuotRem */ #if defined(__SSE2__) -#include <emmintrin.h> - -__m128i hs_minInt64X2(__m128i, __m128i); -__m128i hs_maxInt64X2(__m128i, __m128i); -__m128i hs_minWord64X2(__m128i, __m128i); -__m128i hs_maxWord64X2(__m128i, __m128i); - -__m128i hs_quotInt8X16(__m128i, __m128i); -__m128i hs_quotInt16X8(__m128i, __m128i); -__m128i hs_quotInt32X4(__m128i, __m128i); -__m128i hs_quotInt64X2(__m128i, __m128i); -__m128i hs_quotWord8X16(__m128i, __m128i); -__m128i hs_quotWord16X8(__m128i, __m128i); -__m128i hs_quotWord32X4(__m128i, __m128i); -__m128i hs_quotWord64X2(__m128i, __m128i); -__m128i hs_remInt8X16(__m128i, __m128i); -__m128i hs_remInt16X8(__m128i, __m128i); -__m128i hs_remInt32X4(__m128i, __m128i); -__m128i hs_remInt64X2(__m128i, __m128i); -__m128i hs_remWord8X16(__m128i, __m128i); -__m128i hs_remWord16X8(__m128i, __m128i); -__m128i hs_remWord32X4(__m128i, __m128i); -__m128i hs_remWord64X2(__m128i, __m128i); - +typedef char v128 __attribute__((vector_size(16))); +v128 hs_minInt64X2(v128, v128); +v128 hs_maxInt64X2(v128, v128); +v128 hs_minWord64X2(v128, v128); +v128 hs_maxWord64X2(v128, v128); + +v128 hs_quotInt8X16(v128, v128); +v128 hs_quotInt16X8(v128, v128); +v128 hs_quotInt32X4(v128, v128); +v128 hs_quotInt64X2(v128, v128); +v128 hs_quotWord8X16(v128, v128); +v128 hs_quotWord16X8(v128, v128); +v128 hs_quotWord32X4(v128, v128); +v128 hs_quotWord64X2(v128, v128); +v128 hs_remInt8X16(v128, v128); +v128 hs_remInt16X8(v128, v128); +v128 hs_remInt32X4(v128, v128); +v128 hs_remInt64X2(v128, v128); +v128 hs_remWord8X16(v128, v128); +v128 hs_remWord16X8(v128, v128); +v128 hs_remWord32X4(v128, v128); +v128 hs_remWord64X2(v128, v128); #endif /* bitcasts, instead of creating a new C file we static inline these here. We ===================================== rts/posix/OSMem.c ===================================== @@ -585,7 +585,7 @@ void *osReserveHeapMemory(void *startAddressPtr, W_ *len) } #endif - const int MAX_ATTEMPTS = 256; +#define MAX_ATTEMPTS 256 void *bad_allocs[MAX_ATTEMPTS]; size_t bad_alloc_lens[MAX_ATTEMPTS]; memset(bad_allocs, 0, sizeof(void*) * MAX_ATTEMPTS); ===================================== rts/prim/int64x2minmax.c ===================================== @@ -12,44 +12,44 @@ // * enable SSE4.2, or // * implement min/max in NCG. -__m128i hs_minInt64X2(__m128i xx, __m128i yy) +v128 hs_minInt64X2(v128 xx, v128 yy) { int64_t x[2], y[2]; memcpy(x, &xx, 16); memcpy(y, &yy, 16); int64_t z0 = x[0] < y[0] ? x[0] : y[0]; int64_t z1 = x[1] < y[1] ? x[1] : y[1]; - return _mm_set_epi64x(z1, z0); + return (v128) _mm_set_epi64x(z1, z0); } -__m128i hs_maxInt64X2(__m128i xx, __m128i yy) +v128 hs_maxInt64X2(v128 xx, v128 yy) { int64_t x[2], y[2]; memcpy(x, &xx, 16); memcpy(y, &yy, 16); int64_t z0 = x[0] < y[0] ? y[0] : x[0]; int64_t z1 = x[1] < y[1] ? y[1] : x[1]; - return _mm_set_epi64x(z1, z0); + return (v128) _mm_set_epi64x(z1, z0); } -__m128i hs_minWord64X2(__m128i xx, __m128i yy) +v128 hs_minWord64X2(v128 xx, v128 yy) { uint64_t x[2], y[2]; memcpy(x, &xx, 16); memcpy(y, &yy, 16); uint64_t z0 = x[0] < y[0] ? x[0] : y[0]; uint64_t z1 = x[1] < y[1] ? x[1] : y[1]; - return _mm_set_epi64x(z1, z0); + return (v128) _mm_set_epi64x(z1, z0); } -__m128i hs_maxWord64X2(__m128i xx, __m128i yy) +v128 hs_maxWord64X2(v128 xx, v128 yy) { uint64_t x[2], y[2]; memcpy(x, &xx, 16); memcpy(y, &yy, 16); uint64_t z0 = x[0] < y[0] ? y[0] : x[0]; uint64_t z1 = x[1] < y[1] ? y[1] : x[1]; - return _mm_set_epi64x(z1, z0); + return (v128) _mm_set_epi64x(z1, z0); } #endif ===================================== rts/prim/vectorQuotRem.c ===================================== @@ -16,7 +16,7 @@ int8x16_t hs_quotInt8X16(int8x16_t x, int8x16_t y) */ -__m128i hs_quotInt8X16(__m128i xx, __m128i yy) +v128 hs_quotInt8X16(v128 xx, v128 yy) { int8_t x[16], y[16]; memcpy(x, &xx, 16); @@ -37,10 +37,10 @@ __m128i hs_quotInt8X16(__m128i xx, __m128i yy) int8_t z13 = x[13] / y[13]; int8_t z14 = x[14] / y[14]; int8_t z15 = x[15] / y[15]; - return _mm_set_epi8(z15, z14, z13, z12, z11, z10, z9, z8, z7, z6, z5, z4, z3, z2, z1, z0); + return (v128) _mm_set_epi8(z15, z14, z13, z12, z11, z10, z9, z8, z7, z6, z5, z4, z3, z2, z1, z0); } -__m128i hs_quotInt16X8(__m128i xx, __m128i yy) +v128 hs_quotInt16X8(v128 xx, v128 yy) { int16_t x[8], y[8]; memcpy(x, &xx, 16); @@ -53,10 +53,10 @@ __m128i hs_quotInt16X8(__m128i xx, __m128i yy) int16_t z5 = x[5] / y[5]; int16_t z6 = x[6] / y[6]; int16_t z7 = x[7] / y[7]; - return _mm_set_epi16(z7, z6, z5, z4, z3, z2, z1, z0); + return (v128) _mm_set_epi16(z7, z6, z5, z4, z3, z2, z1, z0); } -__m128i hs_quotInt32X4(__m128i xx, __m128i yy) +v128 hs_quotInt32X4(v128 xx, v128 yy) { int32_t x[4], y[4]; memcpy(x, &xx, 16); @@ -65,20 +65,20 @@ __m128i hs_quotInt32X4(__m128i xx, __m128i yy) int32_t z1 = x[1] / y[1]; int32_t z2 = x[2] / y[2]; int32_t z3 = x[3] / y[3]; - return _mm_set_epi32(z3, z2, z1, z0); + return (v128) _mm_set_epi32(z3, z2, z1, z0); } -__m128i hs_quotInt64X2(__m128i xx, __m128i yy) +v128 hs_quotInt64X2(v128 xx, v128 yy) { int64_t x[2], y[2]; memcpy(x, &xx, 16); memcpy(y, &yy, 16); int64_t z0 = x[0] / y[0]; int64_t z1 = x[1] / y[1]; - return _mm_set_epi64x(z1, z0); + return (v128) _mm_set_epi64x(z1, z0); } -__m128i hs_quotWord8X16(__m128i xx, __m128i yy) +v128 hs_quotWord8X16(v128 xx, v128 yy) { uint8_t x[16], y[16]; memcpy(x, &xx, 16); @@ -99,10 +99,10 @@ __m128i hs_quotWord8X16(__m128i xx, __m128i yy) uint8_t z13 = x[13] / y[13]; uint8_t z14 = x[14] / y[14]; uint8_t z15 = x[15] / y[15]; - return _mm_set_epi8(z15, z14, z13, z12, z11, z10, z9, z8, z7, z6, z5, z4, z3, z2, z1, z0); + return (v128) _mm_set_epi8(z15, z14, z13, z12, z11, z10, z9, z8, z7, z6, z5, z4, z3, z2, z1, z0); } -__m128i hs_quotWord16X8(__m128i xx, __m128i yy) +v128 hs_quotWord16X8(v128 xx, v128 yy) { uint16_t x[8], y[8]; memcpy(x, &xx, 16); @@ -115,10 +115,10 @@ __m128i hs_quotWord16X8(__m128i xx, __m128i yy) uint16_t z5 = x[5] / y[5]; uint16_t z6 = x[6] / y[6]; uint16_t z7 = x[7] / y[7]; - return _mm_set_epi16(z7, z6, z5, z4, z3, z2, z1, z0); + return (v128) _mm_set_epi16(z7, z6, z5, z4, z3, z2, z1, z0); } -__m128i hs_quotWord32X4(__m128i xx, __m128i yy) +v128 hs_quotWord32X4(v128 xx, v128 yy) { uint32_t x[4], y[4]; memcpy(x, &xx, 16); @@ -127,20 +127,20 @@ __m128i hs_quotWord32X4(__m128i xx, __m128i yy) uint32_t z1 = x[1] / y[1]; uint32_t z2 = x[2] / y[2]; uint32_t z3 = x[3] / y[3]; - return _mm_set_epi32(z3, z2, z1, z0); + return (v128) _mm_set_epi32(z3, z2, z1, z0); } -__m128i hs_quotWord64X2(__m128i xx, __m128i yy) +v128 hs_quotWord64X2(v128 xx, v128 yy) { uint64_t x[2], y[2]; memcpy(x, &xx, 16); memcpy(y, &yy, 16); uint64_t z0 = x[0] / y[0]; uint64_t z1 = x[1] / y[1]; - return _mm_set_epi64x(z1, z0); + return (v128) _mm_set_epi64x(z1, z0); } -__m128i hs_remInt8X16(__m128i xx, __m128i yy) +v128 hs_remInt8X16(v128 xx, v128 yy) { int8_t x[16], y[16]; memcpy(x, &xx, 16); @@ -161,10 +161,10 @@ __m128i hs_remInt8X16(__m128i xx, __m128i yy) int8_t z13 = x[13] % y[13]; int8_t z14 = x[14] % y[14]; int8_t z15 = x[15] % y[15]; - return _mm_set_epi8(z15, z14, z13, z12, z11, z10, z9, z8, z7, z6, z5, z4, z3, z2, z1, z0); + return (v128) _mm_set_epi8(z15, z14, z13, z12, z11, z10, z9, z8, z7, z6, z5, z4, z3, z2, z1, z0); } -__m128i hs_remInt16X8(__m128i xx, __m128i yy) +v128 hs_remInt16X8(v128 xx, v128 yy) { int16_t x[8], y[8]; memcpy(x, &xx, 16); @@ -177,10 +177,10 @@ __m128i hs_remInt16X8(__m128i xx, __m128i yy) int16_t z5 = x[5] % y[5]; int16_t z6 = x[6] % y[6]; int16_t z7 = x[7] % y[7]; - return _mm_set_epi16(z7, z6, z5, z4, z3, z2, z1, z0); + return (v128) _mm_set_epi16(z7, z6, z5, z4, z3, z2, z1, z0); } -__m128i hs_remInt32X4(__m128i xx, __m128i yy) +v128 hs_remInt32X4(v128 xx, v128 yy) { int32_t x[4], y[4]; memcpy(x, &xx, 16); @@ -189,20 +189,20 @@ __m128i hs_remInt32X4(__m128i xx, __m128i yy) int32_t z1 = x[1] % y[1]; int32_t z2 = x[2] % y[2]; int32_t z3 = x[3] % y[3]; - return _mm_set_epi32(z3, z2, z1, z0); + return (v128) _mm_set_epi32(z3, z2, z1, z0); } -__m128i hs_remInt64X2(__m128i xx, __m128i yy) +v128 hs_remInt64X2(v128 xx, v128 yy) { int64_t x[2], y[2]; memcpy(x, &xx, 16); memcpy(y, &yy, 16); int64_t z0 = x[0] % y[0]; int64_t z1 = x[1] % y[1]; - return _mm_set_epi64x(z1, z0); + return (v128) _mm_set_epi64x(z1, z0); } -__m128i hs_remWord8X16(__m128i xx, __m128i yy) +v128 hs_remWord8X16(v128 xx, v128 yy) { uint8_t x[16], y[16]; memcpy(x, &xx, 16); @@ -223,10 +223,10 @@ __m128i hs_remWord8X16(__m128i xx, __m128i yy) uint8_t z13 = x[13] % y[13]; uint8_t z14 = x[14] % y[14]; uint8_t z15 = x[15] % y[15]; - return _mm_set_epi8(z15, z14, z13, z12, z11, z10, z9, z8, z7, z6, z5, z4, z3, z2, z1, z0); + return (v128) _mm_set_epi8(z15, z14, z13, z12, z11, z10, z9, z8, z7, z6, z5, z4, z3, z2, z1, z0); } -__m128i hs_remWord16X8(__m128i xx, __m128i yy) +v128 hs_remWord16X8(v128 xx, v128 yy) { uint16_t x[8], y[8]; memcpy(x, &xx, 16); @@ -239,10 +239,10 @@ __m128i hs_remWord16X8(__m128i xx, __m128i yy) uint16_t z5 = x[5] % y[5]; uint16_t z6 = x[6] % y[6]; uint16_t z7 = x[7] % y[7]; - return _mm_set_epi16(z7, z6, z5, z4, z3, z2, z1, z0); + return (v128) _mm_set_epi16(z7, z6, z5, z4, z3, z2, z1, z0); } -__m128i hs_remWord32X4(__m128i xx, __m128i yy) +v128 hs_remWord32X4(v128 xx, v128 yy) { uint32_t x[4], y[4]; memcpy(x, &xx, 16); @@ -251,17 +251,17 @@ __m128i hs_remWord32X4(__m128i xx, __m128i yy) uint32_t z1 = x[1] % y[1]; uint32_t z2 = x[2] % y[2]; uint32_t z3 = x[3] % y[3]; - return _mm_set_epi32(z3, z2, z1, z0); + return (v128) _mm_set_epi32(z3, z2, z1, z0); } -__m128i hs_remWord64X2(__m128i xx, __m128i yy) +v128 hs_remWord64X2(v128 xx, v128 yy) { uint64_t x[2], y[2]; memcpy(x, &xx, 16); memcpy(y, &yy, 16); uint64_t z0 = x[0] % y[0]; uint64_t z1 = x[1] % y[1]; - return _mm_set_epi64x(z1, z0); + return (v128) _mm_set_epi64x(z1, z0); } #endif View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/677325ce2fcefb926a9143d8c707b1… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/677325ce2fcefb926a9143d8c707b1… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T24120] compiler: Exclude units with no exposed modules from unused package check
by Ben Gamari (＠bgamari) 15 Oct '25

15 Oct '25

Ben Gamari pushed to branch wip/T24120 at Glasgow Haskell Compiler / GHC Commits: 8e973325 by Ben Gamari at 2025-10-14T11:20:46-04:00 compiler: Exclude units with no exposed modules from unused package check Such packages cannot be "used" in the Haskell sense of the word yet are nevertheless necessary as they may provide, e.g., C object code or link flags. Fixes #24120. - - - - - 3 changed files: - compiler/GHC/Driver/Make.hs - + testsuite/tests/driver/T24120.hs - testsuite/tests/driver/all.T Changes: ===================================== compiler/GHC/Driver/Make.hs ===================================== @@ -474,6 +474,10 @@ warnUnusedPackages us dflags mod_graph = ui <- lookupUnit us u -- Which are not explicitly used guard (Set.notMember (unitId ui) used_args) + -- Exclude units with no exposed modules. This covers packages which only + -- provide C object code or link flags (e.g. system-cxx-std-lib). + -- See #24120. + guard (not $ null $ unitExposedModules ui) return (unitId ui, unitPackageName ui, unitPackageVersion ui, flag) unusedArgs = sortOn (\(u,_,_,_) -> u) $ mapMaybe resolve (explicitUnits us) ===================================== testsuite/tests/driver/T24120.hs ===================================== @@ -0,0 +1,5 @@ +-- | This should not issue an @-Wunused-packages@ warning for @system-cxx-std-lib@. +module Main where + +main :: IO () +main = putStrLn "hello world" ===================================== testsuite/tests/driver/all.T ===================================== @@ -331,3 +331,4 @@ test('T24839', [unless(arch('x86_64') or arch('aarch64'), skip), extra_files(["t test('t25150', [extra_files(["t25150"])], multimod_compile, ['Main.hs', '-v0 -working-dir t25150/dir a.c']) test('T25382', normal, makefile_test, []) test('T26018', req_c, makefile_test, []) +test('T24120', normal, compile, ['-Wunused-packages -hide-all-packages -package base -package system-cxx-std-lib']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8e97332567a10ebf2f70d42e88e47ac… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8e97332567a10ebf2f70d42e88e47ac… You're receiving this email because of your account on gitlab.haskell.org.

1 0