- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/gbc-files] 11 commits: driver: Load bytecode static pointer entries during linking
by Matthew Pickering (＠mpickering) 29 Sep '25

29 Sep '25

Matthew Pickering pushed to branch wip/gbc-files at Glasgow Haskell Compiler / GHC Commits: 290f8357 by Matthew Pickering at 2025-09-29T11:50:38+01:00 driver: Load bytecode static pointer entries during linking Previously the entries were loaded too eagerly, during upsweep, but we should delay loading them until we know that the relevant bytecode object is demanded. Towards #25230 - - - - - ec2e3643 by Matthew Pickering at 2025-09-29T12:52:44+01:00 loader: Unify loadDecls and loadModuleLinkables functions These two functions nearly did the same thing. I have refactored them so that `loadDecls` now calls `loadModuleLinkables`. Fixes #26459 - - - - - 3d2fdc22 by Matthew Pickering at 2025-09-29T13:08:42+01:00 testsuite: Use ghci_ways to set ways in PackedDataCon/UnboxedTuples/UnliftedDataTypeInterp tests These tests reimplemented the logic from `valid_way` in order to determine what ways to run. It's easier to use this combination of `only_ways` and `extra_ways` to only run in GHCi ways and always run in GHCi ways. - - - - - 7b818199 by Matthew Pickering at 2025-09-29T13:08:42+01:00 Rename interpreterBackend to bytecodeBackend - - - - - b6923147 by Cheng Shao at 2025-09-29T13:08:42+01:00 compiler: implement and test bytecode serialization logic - - - - - 2fa6fb1c by Matthew Pickering at 2025-09-29T13:09:23+01:00 Add support for generating bytecode objects This commit adds the `-fwrite-byte-code` option which makes GHC emit a `.gbc` file which contains a serialised representation of bytecode. The bytecode can be loaded by the compiler to avoid having to reinterpret a module when using the bytecode interpreter (for example, in GHCi). There are also the new options: * -gbcdir=<DIR>: Specify the directory to place the gbc files * -gbcsuf=<suffix>: Specify the suffix for gbc files The option `-fbyte-code-and-object-code` now implies `-fwrite-byte-code`. - - - - - ff36bea7 by Matthew Pickering at 2025-09-29T13:09:24+01:00 Remove LazyBCOs - - - - - 79400e0f by Matthew Pickering at 2025-09-29T13:09:24+01:00 Print path to .gbc file if it's generated. - - - - - acd34084 by Matthew Pickering at 2025-09-29T13:09:24+01:00 Normalised ghci output - - - - - 5355a342 by Matthew Pickering at 2025-09-29T13:09:24+01:00 Fix loading of objects - - - - - c2ca8e1a by Matthew Pickering at 2025-09-29T13:09:24+01:00 Add performance test for consuming bytecode files - - - - - 75 changed files: - compiler/GHC.hs - compiler/GHC/Builtin/PrimOps.hs - compiler/GHC/ByteCode/Breakpoints.hs - + compiler/GHC/ByteCode/Serialize.hs - compiler/GHC/ByteCode/Types.hs - compiler/GHC/Data/FlatBag.hs - compiler/GHC/Data/SmallArray.hs - compiler/GHC/Driver/Backend.hs - compiler/GHC/Driver/Backend/Internal.hs - compiler/GHC/Driver/Backpack.hs - + compiler/GHC/Driver/ByteCode.hs - compiler/GHC/Driver/Config/Finder.hs - compiler/GHC/Driver/Downsweep.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Main.hs - compiler/GHC/Driver/Make.hs - compiler/GHC/Driver/Pipeline.hs - compiler/GHC/Driver/Pipeline/Execute.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/HsToCore/Breakpoints.hs - compiler/GHC/HsToCore/Usage.hs - compiler/GHC/Iface/Tidy/StaticPtrTable.hs - compiler/GHC/Linker/Deps.hs - compiler/GHC/Linker/Loader.hs - compiler/GHC/Linker/Types.hs - compiler/GHC/Types/SptEntry.hs - compiler/GHC/Types/Tickish.hs - compiler/GHC/Unit/Finder.hs - compiler/GHC/Unit/Finder/Types.hs - compiler/GHC/Unit/Module/Graph.hs - compiler/GHC/Unit/Module/Location.hs - compiler/GHC/Unit/Module/ModSummary.hs - compiler/GHC/Unit/Module/WholeCoreBindings.hs - compiler/GHC/Utils/Binary.hs - compiler/ghc.cabal.in - docs/users_guide/phases.rst - docs/users_guide/separate_compilation.rst - ghc/Main.hs - testsuite/driver/testglobals.py - testsuite/driver/testlib.py - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - testsuite/tests/driver/T5313.hs - + testsuite/tests/driver/bytecode-object/A.hs - + testsuite/tests/driver/bytecode-object/BytecodeForeign.c - + testsuite/tests/driver/bytecode-object/BytecodeForeign.hs - + testsuite/tests/driver/bytecode-object/BytecodeMain.hs - + testsuite/tests/driver/bytecode-object/BytecodeTest.hs - + testsuite/tests/driver/bytecode-object/Makefile - + testsuite/tests/driver/bytecode-object/all.T - + testsuite/tests/driver/bytecode-object/bytecode_object12.stderr - + testsuite/tests/driver/bytecode-object/bytecode_object13.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object14.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object15.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object16.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object17.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object18.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object19.script - + testsuite/tests/driver/bytecode-object/bytecode_object19.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object25.script - + testsuite/tests/driver/bytecode-object/bytecode_object25.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object4.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object5.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object6.stdout - testsuite/tests/ghc-api/T10052/T10052.hs - testsuite/tests/ghc-api/T8639_api.hs - testsuite/tests/ghc-api/apirecomp001/myghc.hs - testsuite/tests/ghci/linking/dyn/T3372.hs - testsuite/tests/ghci/should_run/PackedDataCon/packeddatacon.T - testsuite/tests/ghci/should_run/UnboxedTuples/unboxedtuples.T - testsuite/tests/ghci/should_run/UnliftedDataTypeInterp/unlifteddatatypeinterp.T - testsuite/tests/perf/compiler/Makefile - + testsuite/tests/perf/compiler/MultiLayerModulesDefsGhciWithBytecodeFiles.script - testsuite/tests/perf/compiler/all.T The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/db41490e9802bb340260dbb4b5dbd2… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/db41490e9802bb340260dbb4b5dbd2… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/refactorLoadDecls
by Matthew Pickering (＠mpickering) 29 Sep '25

29 Sep '25

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

1 0

[Git][ghc/ghc][wip/26264] 33 commits: Improve pretty printer for HsExpr
by Zubin (＠wz1000) 29 Sep '25

29 Sep '25

Zubin pushed to branch wip/26264 at Glasgow Haskell Compiler / GHC Commits: e7df6cc0 by Simon Peyton Jones at 2025-09-23T14:34:39-04:00 Improve pretty printer for HsExpr Given a very deeply-nested application, it just kept printing deeper and deeper. This small change makes it cut off. Test is in #26330, but we also get a dramatic decrease in compile time for perf/compiler/InstanceMatching: InstanceMatching 4,086,884,584 1,181,767,232 -71.1% GOOD Why? Because before we got a GIGANTIC error message that took ages to pretty-print; now we get this much more civilised message (I have removed some whitespace.) Match.hs:1007:1: error: • No instance for ‘Show (F001 a)’ arising from a use of ‘showsPrec’ • In the second argument of ‘showString’, namely ‘(showsPrec 11 b1 (GHC.Internal.Show.showSpace (showsPrec 11 b2 (GHC.Internal.Show.showSpace (showsPrec 11 b3 (GHC.Internal.Show.showSpace (showsPrec 11 b4 (GHC.Internal.Show.showSpace (showsPrec 11 b5 (GHC.Internal.Show.showSpace (showsPrec 11 b6 (GHC.Internal.Show.showSpace (showsPrec ...)))))))))))))’ ----------------------- The main payload is * At the start of `pprExpr` * In the defn of `pprApp` A little bit of refactoring: * It turned out that we were setting the default cut-off depth to a fixed value in two places, so changing one didn't change the other. See defaultSDocDepth and defaultSDocCols * I refactored `pprDeeperList` a bit so I could understand it better. Because the depth calculation has changed, there are lots of small error message wibbles. Metric Decrease: InstanceMatching - - - - - 209f0158 by Simon Peyton Jones at 2025-09-23T14:34:39-04:00 Use Outputable.ellipsis rather than text "..." - - - - - 64bb0e37 by Sylvain Henry at 2025-09-23T14:35:56-04:00 deriveConstants: automatically pass -fcommon CC flag (#26393) By mistake we tried to use deriveConstants without passing `--gcc-flag -fcommon` (which Hadrian does) and it failed. This patch: 1. adds parsing support for constants stored in the .bss section (i.e. when -fcommon isn't passed) 2. enables passing `-fcommon` automatically to the C compiler because Windows requires this for subtle reasons 3. Documents the subtle reasons (1) isn't strictly necessary because we always do (2) but it does no harm and it is still useful if the CC flags ever contain -fno-common - - - - - afcdf92f by Oleg Grenrus at 2025-09-23T14:36:41-04:00 Don't wrap spaces in <span>s Doing similar comparison as in 63189b2ceca07edf4e179f4180ca60d470c62cb3 With this change the gzipped documentation is now 2% smaller (previously 1%) 12_694_206 Agda-2.9.0-docs-orig.tar.gz 12_436_829 Agda-2.9.0-docs.tar.gz Unzipped docs are 5% smaller (previously 3%) 178M Agda-2.9.0-docs-orig 169M Agda-2.9.0-docs Individual hyperlinked sources are around 7-10% smaller (previously 5%) (`Parser` module is generated by happy and has relatively little whitespace) 14_230_117 Agda.Syntax.Parser.Parser.html 13_220_758 Agda.Syntax.Parser.Parser.html Agda's hyperlinked sources are 9% smaller now: 121M Agda-2.9.0-docs-orig/src 110M Agda-2.9.0-docs/src - - - - - 67de53a6 by Cheng Shao at 2025-09-23T14:37:31-04:00 rts: remove obsolete __GNUC__ related logic This patch removes obsolete `__GNUC__` related logic, given on any currently supported platform and toolchain, `__GNUC__ >= 4` is universally true. Also pulls some other weeds and most notably, use `__builtin___clear_cache` for clang as well, since clang has supported this gcc intrinsic since 2014, see https://github.com/llvm/llvm-project/commit/c491a8d4577052bc6b3b4c72a7db6a7…. - - - - - c4d32493 by Sven Tennie at 2025-09-23T20:40:57-04:00 RV64: Fix: Add missing truncation to MO_S_Shr (#26248) Sub-double word (<W64) registers need to be truncated after the operation. - - - - - 41dce477 by Sven Tennie at 2025-09-23T20:40:57-04:00 RV64: Cleanup shift emitting cases/code Remove overlapping cases to make the shift logic easier to understand. - - - - - 0a601c30 by Alex Washburn at 2025-09-23T20:41:41-04:00 Correcting LLVM linking of Intel BMI intrinsics pdep{8,16} and pext{8,16}. This patch fixes #26065. The LLVM interface does not expose bindings to: - llvm.x86.bmi.pdep.8 - llvm.x86.bmi.pdep.16 - llvm.x86.bmi.pext.8 - llvm.x86.bmi.pext.16 So calls are instead made to llvm.x86.bmi.{pdep,pext}.32 in these cases, with pre/post-operation truncation to constrain the logical value range. - - - - - 89e8ff3d by Peng Fan at 2025-09-23T20:42:37-04:00 NCG/LA64: Implement MO_BSwap and MO_BRev with bit-manipulation Instructions - - - - - 50f6be09 by Sylvain Henry at 2025-09-23T20:43:29-04:00 Allow Core plugins to access unoptimized Core (#23337) Make the first simple optimization pass after desugaring a real CoreToDo pass. This allows CorePlugins to decide whether they want to be executed before or after this pass. - - - - - 30ef0aac by Simon Hengel at 2025-09-23T20:44:12-04:00 docs: Fix typo in scoped_type_variables.rst - - - - - f8919262 by Cheng Shao at 2025-09-23T20:44:54-04:00 ghci: fix bootstrapping with 9.12.3-rc1 and above This patch fixes bootstrapping GHC with 9.12.3-rc1 and above. ghci defines `Binary` instance for `HalfWord` in `ghc-heap`, which is a proper `newtype` in 9.14 and starting from 9.12.3. Given we don't build `ghc-heap` in stage0, we need to fix this predicate so that it corresponds to the boot ghc versions that contain the right version of `ghc-heap`. - - - - - a7f15858 by sheaf at 2025-09-24T09:49:53-04:00 User's guide: clarify optimisation of INLINABLE unfoldings This updates the user's guide section on INLINABLE pragmas to explain how the unfoldings of inlineable functions are optimised. The user's guide incorrectly stated that the RHS was not optimised at all, but this is not true. Instead, GHC is careful about phase control to optmise the RHS while retaining the guarantee that GHC behaves as if the original RHS had been written. - - - - - 495886d9 by Rodrigo Mesquita at 2025-09-24T09:50:35-04:00 cleanup: Delete historical artifact of COMPILING_WINDOWS_DLL Namely, drop the obsolete - DLL_IMPORT_RTS - DLL_IMPORT_DATA_VAR - DLL_IMPORT_DATA_VARNAME - DLL_IMPORT_DATA_REF These macros were not doing anything and placed inconsistently Looking at the git logs reveal these macros were used to support dynamic libraries on Win32, a feature that was dropped in b8cfa8f741729ef123569fb321c4b2ab4a1a941c This allows us to get rid of the rts/DLL.h file too. - - - - - 5ae89054 by Sylvain Henry at 2025-09-24T17:07:00-04:00 Allow disabling builtin rules (#20298) Add a way to disable built-in rules programmatically and with a debug flag. I also took the opportunity to add a debug flag to disable bignum rules, which was only possible programmatically (e.g. in a plugin). - - - - - 135242ca by Rodrigo Mesquita at 2025-09-24T17:07:44-04:00 Don't use build CFLAGS and friends as target settings In the GHC in tree configure, `CFLAGS`, `CXXFLAGS`, and similar tool configuration flags apply to the BUILD phase of the compiler, i.e. to the tools run to compile GHC itself. Notably, they should /not/ be carried over to the Target settings, i.e. these flags should /not/ apply to the tool which GHC invokes at runtime. Fixes #25637 - - - - - b418408b by Irene Knapp at 2025-09-25T09:47:54-04:00 Document etymology of "bind" as the name for `>>=` It took me twenty years of contemplation to realize why it's called that. I therefore feel that it may not be obvious to beginners. - - - - - e9c5e46f by Brandon Chinn at 2025-09-25T09:48:36-04:00 Fix tabs in string gaps (#26415) Tabs in string gaps were broken in bb030d0d because previously, string gaps were manually parsed, but now it's lexed by the usual Alex grammar and post-processed after successful lexing. It broke because of a discrepancy between GHC's lexer grammar and the Haskell Report. The Haskell Report includes tabs in whitechar: whitechar → newline | vertab | space | tab | uniWhite $whitechar used to include tabs until 18 years ago, when it was removed in order to exclude tabs from $white_no_nl in order to warn on tabs: 6e202120. In this MR, I'm adding \t back into $whitechar, and explicitly excluding \t from the $white_no_nl+ rule ignoring all whitespace in source code, which more accurately colocates the "ignore all whitespace except tabs, which is handled in the next line" logic. As a side effect of this MR, tabs are now allowed in pragmas; currently, a pragma written as {-# \t LANGUAGE ... #-} is interpreted as the tab character being the pragma name, and GHC warns "Unrecognized pragma". With this change, tabs are ignored as whitespace, which more closely matches the Report anyway. - - - - - 8bf5b309 by Cheng Shao at 2025-09-25T09:49:18-04:00 wasm: remove the --no-turbo-fast-api-calls hack from dynamic linker shebang This patch removes the `--no-turbo-fast-api-calls` hack from the dyld script shebang; it was used to workaround v8 fast call coredumps in nodejs and no longer needed, and comes with a performance penalty, hence the removal. - - - - - c1cab0c3 by Sylvain Henry at 2025-09-26T10:36:30-04:00 Revert "Add necessary flag for js linking" This reverts commit 84f68e2231b2eddb2e1dc4e90af394ef0f2e803f. This commit didn't have the expected effect. See discussion in #26290. Instead we export HEAP8 and HEAPU8 from rts/js/mem.js - - - - - 0a434a80 by Sylvain Henry at 2025-09-26T10:36:30-04:00 JS: export HEAPU8 (#26290) This is now required by newer Emscripten versions. - - - - - b10296a9 by Andreas Klebinger at 2025-09-26T10:37:11-04:00 sizeExpr: Improve Tick handling. When determining if we scrutinize a function argument we now properly look through ticks. Fixes #26444. - - - - - d9e2a9a7 by mniip at 2025-09-26T16:00:50-04:00 rts: Refactor parsing of -h flags We have a nontrivial amount of heap profiling flags available in the non-profiled runtime, so it makes sense to reuse the parsing code between the profiled and the non-profiled runtime, only restricting which flags are allowed. - - - - - 089e45aa by mniip at 2025-09-26T16:00:50-04:00 rts: Fix parsing of -h options with braces When the "filter by" -h options were introduced in bc210f7d267e8351ccb66972f4b3a650eb9338bb, the braces were mandatory. Then in 3c22fb21fb18e27ce8d941069a6915fce584a526, the braces were made optional. Then in d1ce35d2271ac8b79cb5e37677b1a989749e611c the brace syntax stopped working, and no one seems to have noticed. - - - - - 423f1472 by mniip at 2025-09-26T16:00:50-04:00 rts: add -hT<type> and -hi<table id> heap filtering options (#26361) They are available in non-profiled builds. Along the way fixed a bug where combining -he<era> and -hr<retainer> would ignore whether the retainer matches or not. - - - - - 4cda4785 by mniip at 2025-09-26T16:00:50-04:00 docs: Document -hT<type> and -hi<addr> - - - - - 982ad30f by mniip at 2025-09-26T16:00:50-04:00 rts: Refactor dumping the heap census Always do the printing of the total size right next to where the bucket label is printed. This prevents accidentally printing a label without the corresponding amount. Fixed a bug where exactly this happened for -hi profile and the 0x0 (uncategorized) info table. There is now also much more symmetry between fprintf(hp_file,...) and the corresponding traceHeapProfSampleString. - - - - - 8cbe006a by Cheng Shao at 2025-09-26T16:01:34-04:00 hadrian: fix GHC.Platform.Host generation for cross stage1 This patch fixes incorrectly GHC.Platform.Host generation logic for cross stage1 in hadrian (#26449). Also adds T26449 test case to witness the fix. Co-authored-by: Codex <codex(a)openai.com> - - - - - 0ddd0fdc by soulomoon at 2025-09-28T19:24:10-04:00 Remove hptAllInstances usage during upsweep Previously, during the upsweep phase when checking safe imports, we were loading the module interface with runTcInteractive, which in turn calls hptAllInstances. This accesses non-below modules from the home package table. Change the implementation of checkSafeImports to use initTcWithGbl and loadSysInterface to load the module interface, since we already have TcGblEnv at hand. This eliminates the unnecessary use of runTcInteractive and hptAllInstances during the upsweep phase. - - - - - e05c496c by Ben Gamari at 2025-09-28T19:24:59-04:00 base: Update changelog to reflect timing of IOPort# removal This change will make 9.14 afterall. - - - - - bdc9d130 by Cheng Shao at 2025-09-28T19:25:45-04:00 rts: fix wasm JSFFI initialization constructor code This commit fixes wasm JSFFI initialization constructor code so that the constructor is self-contained and avoids invoking a fake __main_argc_argv function. The previous approach of reusing __main_void logic in wasi-libc saves a tiny bit of code, at the expense of link-time trouble whenever GHC links a wasm module without -no-hs-main, in which case the driver-generated main function would clash with the definition here, resulting in a linker error. It's simply better to avoid messing with the main function, and it would additionally allow linking wasm32-wasi command modules that does make use of synchronous JSFFI. - - - - - 5d59fc8f by Cheng Shao at 2025-09-28T19:26:27-04:00 rts: provide stub implementations of ExecPage functions for wasm This patch provides stub implementations of ExecPage functions for wasm. They are never actually invoked at runtime for any non-TNTC platform, yet they can cause link-time errors of missing symbols when the GHCi.InfoTable module gets linked into the final wasm module (e.g. a GHC API program). - - - - - 276c449a by Zubin Duggal at 2025-09-29T17:24:11+05:30 compiler: Attempt to systematize Unique tags by introducing an ADT for each different tag Fixes #26264 - - - - - 182 changed files: - compiler/GHC/Builtin/Uniques.hs - compiler/GHC/Cmm/Info.hs - compiler/GHC/Cmm/Info/Build.hs - compiler/GHC/Cmm/Pipeline.hs - compiler/GHC/Cmm/UniqueRenamer.hs - compiler/GHC/CmmToAsm/LA64/CodeGen.hs - compiler/GHC/CmmToAsm/LA64/Instr.hs - compiler/GHC/CmmToAsm/LA64/Ppr.hs - compiler/GHC/CmmToAsm/RV64/CodeGen.hs - compiler/GHC/CmmToLlvm/Base.hs - compiler/GHC/CmmToLlvm/CodeGen.hs - compiler/GHC/Core/Opt/ConstantFold.hs - compiler/GHC/Core/Opt/Monad.hs - compiler/GHC/Core/Opt/Pipeline.hs - compiler/GHC/Core/Opt/Pipeline/Types.hs - compiler/GHC/Core/Opt/Simplify/Env.hs - compiler/GHC/Core/Opt/Simplify/Monad.hs - compiler/GHC/Core/Ppr.hs - compiler/GHC/Core/Rules.hs - compiler/GHC/Core/Rules/Config.hs - compiler/GHC/Core/Unfold.hs - compiler/GHC/CoreToStg/Prep.hs - compiler/GHC/Driver/CodeOutput.hs - compiler/GHC/Driver/Config/Core/Rules.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Main.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/HsToCore.hs - compiler/GHC/HsToCore/Errors/Ppr.hs - compiler/GHC/HsToCore/Foreign/JavaScript.hs - compiler/GHC/HsToCore/Monad.hs - compiler/GHC/HsToCore/Pmc/Ppr.hs - compiler/GHC/HsToCore/Pmc/Types.hs - compiler/GHC/Iface/Binary.hs - compiler/GHC/Iface/Rename.hs - compiler/GHC/Iface/Syntax.hs - compiler/GHC/JS/JStg/Monad.hs - compiler/GHC/Llvm/Ppr.hs - compiler/GHC/Llvm/Types.hs - compiler/GHC/Parser/Lexer.x - compiler/GHC/Parser/Lexer/String.x - compiler/GHC/Platform/Reg.hs - compiler/GHC/Runtime/Eval.hs - compiler/GHC/Runtime/Heap/Inspect.hs - compiler/GHC/Runtime/Loader.hs - compiler/GHC/Stg/EnforceEpt.hs - compiler/GHC/Stg/Pipeline.hs - compiler/GHC/StgToCmm/ExtCode.hs - compiler/GHC/StgToCmm/Monad.hs - compiler/GHC/StgToJS/CodeGen.hs - compiler/GHC/StgToJS/Ids.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Types.hs - compiler/GHC/Tc/Types/Origin.hs - compiler/GHC/Tc/Utils/Monad.hs - compiler/GHC/Types/Hint/Ppr.hs - compiler/GHC/Types/Name/Cache.hs - compiler/GHC/Types/Unique.hs - compiler/GHC/Types/Unique/DSM.hs - compiler/GHC/Types/Unique/Supply.hs - compiler/GHC/Utils/Outputable.hs - compiler/GHC/Utils/Ppr.hs - configure.ac - docs/users_guide/debugging.rst - docs/users_guide/exts/pragmas.rst - docs/users_guide/exts/scoped_type_variables.rst - docs/users_guide/profiling.rst - hadrian/src/Rules/Generate.hs - hadrian/src/Settings/Builders/DeriveConstants.hs - libraries/base/changelog.md - libraries/ghc-internal/cbits/atomic.c - libraries/ghc-internal/cbits/ctz.c - libraries/ghc-internal/src/GHC/Internal/Base.hs - libraries/ghc-internal/src/GHC/Internal/RTS/Flags.hsc - libraries/ghci/GHCi/Message.hs - m4/fp_setup_windows_toolchain.m4 - m4/fptools_set_c_ld_flags.m4 - m4/ghc_toolchain.m4 - rts/CloneStack.h - rts/ExecPage.c - rts/Prelude.h - rts/ProfHeap.c - rts/RetainerSet.c - rts/RtsFlags.c - rts/RtsStartup.c - rts/RtsSymbols.c - rts/include/Rts.h - rts/include/RtsAPI.h - rts/include/Stg.h - rts/include/rts/Flags.h - rts/include/rts/NonMoving.h - rts/include/rts/StableName.h - rts/include/rts/StablePtr.h - rts/include/rts/Types.h - − rts/include/stg/DLL.h - rts/include/stg/MiscClosures.h - rts/js/mem.js - rts/rts.cabal - rts/sm/BlockAlloc.c - rts/sm/Evac.h - rts/sm/Storage.c - rts/wasm/JSFFI.c - testsuite/driver/testlib.py - testsuite/tests/arrows/gadt/T17423.stderr - + testsuite/tests/codeGen/should_compile/T20298a.hs - + testsuite/tests/codeGen/should_compile/T20298a.stderr - + testsuite/tests/codeGen/should_compile/T20298b.hs - + testsuite/tests/codeGen/should_compile/T20298b.stderr - + testsuite/tests/codeGen/should_compile/T20298c.hs - + testsuite/tests/codeGen/should_compile/T20298c.stderr - testsuite/tests/codeGen/should_compile/all.T - + testsuite/tests/cross/should_run/T26449.hs - + testsuite/tests/cross/should_run/all.T - testsuite/tests/indexed-types/should_compile/PushedInAsGivens.stderr - testsuite/tests/indexed-types/should_fail/T26176.stderr - testsuite/tests/indexed-types/should_fail/T2693.stderr - testsuite/tests/indexed-types/should_fail/T4093b.stderr - testsuite/tests/indexed-types/should_fail/T8518.stderr - testsuite/tests/indexed-types/should_fail/T9662.stderr - testsuite/tests/interface-stability/ghc-experimental-exports.stdout - testsuite/tests/interface-stability/ghc-experimental-exports.stdout-mingw32 - testsuite/tests/linear/should_fail/Linear17.stderr - testsuite/tests/linear/should_fail/LinearLet7.stderr - + testsuite/tests/llvm/should_run/T26065.hs - + testsuite/tests/llvm/should_run/T26065.stdout - testsuite/tests/llvm/should_run/all.T - testsuite/tests/parser/should_fail/RecordDotSyntaxFail10.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail11.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail13.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail8.stderr - + testsuite/tests/parser/should_run/T26415.hs - + testsuite/tests/parser/should_run/T26415.stdout - testsuite/tests/parser/should_run/all.T - testsuite/tests/partial-sigs/should_compile/T21719.stderr - testsuite/tests/perf/should_run/UniqLoop.hs - testsuite/tests/plugins/annotation-plugin/SayAnnNames.hs - testsuite/tests/plugins/late-plugin/LatePlugin.hs - testsuite/tests/plugins/simple-plugin/Simple/ReplacePlugin.hs - testsuite/tests/polykinds/T13393.stderr - testsuite/tests/regalloc/regalloc_unit_tests.hs - testsuite/tests/rep-poly/T12709.stderr - testsuite/tests/simplCore/should_compile/simpl017.stderr - testsuite/tests/th/T10945.stderr - testsuite/tests/th/TH_StaticPointers02.stderr - testsuite/tests/typecheck/should_compile/T11339.stderr - testsuite/tests/typecheck/should_fail/DoExpansion3.stderr - testsuite/tests/typecheck/should_fail/T12177.stderr - testsuite/tests/typecheck/should_fail/T22707.stderr - testsuite/tests/typecheck/should_fail/T24064.stderr - + testsuite/tests/typecheck/should_fail/T26330.hs - + testsuite/tests/typecheck/should_fail/T26330.stderr - testsuite/tests/typecheck/should_fail/T8142.stderr - testsuite/tests/typecheck/should_fail/T8603.stderr - testsuite/tests/typecheck/should_fail/all.T - testsuite/tests/typecheck/should_fail/tcfail128.stderr - testsuite/tests/typecheck/should_fail/tcfail153.stderr - testsuite/tests/typecheck/should_fail/tcfail168.stderr - testsuite/tests/typecheck/should_fail/tcfail177.stderr - testsuite/tests/typecheck/should_fail/tcfail185.stderr - testsuite/tests/typecheck/should_run/Typeable1.stderr - utils/deriveConstants/Main.hs - utils/ghc-toolchain/src/GHC/Toolchain/Tools/Link.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs - utils/haddock/hypsrc-test/ref/src/Bug1091.html - utils/haddock/hypsrc-test/ref/src/CPP.html - utils/haddock/hypsrc-test/ref/src/Classes.html - utils/haddock/hypsrc-test/ref/src/Constructors.html - utils/haddock/hypsrc-test/ref/src/Identifiers.html - utils/haddock/hypsrc-test/ref/src/LinkingIdentifiers.html - utils/haddock/hypsrc-test/ref/src/Literals.html - utils/haddock/hypsrc-test/ref/src/Operators.html - utils/haddock/hypsrc-test/ref/src/Polymorphism.html - utils/haddock/hypsrc-test/ref/src/PositionPragmas.html - utils/haddock/hypsrc-test/ref/src/Quasiquoter.html - utils/haddock/hypsrc-test/ref/src/Records.html - utils/haddock/hypsrc-test/ref/src/TemplateHaskellQuasiquotes.html - utils/haddock/hypsrc-test/ref/src/TemplateHaskellSplices.html - utils/haddock/hypsrc-test/ref/src/Types.html - utils/haddock/hypsrc-test/ref/src/UsingQuasiquotes.html - utils/jsffi/dyld.mjs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d69994f2632869607f84ca1be82615… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d69994f2632869607f84ca1be82615… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/andreask/bomb_out] exprSize: Accumulate size as we go to allow early bomb out.
by Andreas Klebinger (＠AndreasK) 29 Sep '25

29 Sep '25

Andreas Klebinger pushed to branch wip/andreask/bomb_out at Glasgow Haskell Compiler / GHC Commits: 86d2ee51 by Andreas Klebinger at 2025-09-29T13:35:44+02:00 exprSize: Accumulate size as we go to allow early bomb out. When dealing with branches in the AST we now accumulate expr size across branches, rather than computing both branches before adding them up. This way we can abort early when it's clear an expression is too large to be useful. This fixes an issue I observed in #26425 where we sometimes spent a significant amount of time computing unfolding sizes in deeply nested but branching rhss. Speedup is on the order of ~1%-4% depending on the program we are compiling. - - - - - 1 changed file: - compiler/GHC/Core/Unfold.hs Changes: ===================================== compiler/GHC/Core/Unfold.hs ===================================== @@ -567,43 +567,46 @@ sizeExpr :: UnfoldingOpts -- Forcing bOMB_OUT_SIZE early prevents repeated -- unboxing of the Int argument. sizeExpr opts !bOMB_OUT_SIZE top_args expr - = size_up expr + = size_up sizeZero expr where - size_up (Cast e _) = size_up e - size_up (Tick _ e) = size_up e - size_up (Type _) = sizeZero -- Types cost nothing - size_up (Coercion _) = sizeZero - size_up (Lit lit) = sizeN (litSize lit) - size_up (Var f) | isZeroBitId f = sizeZero - -- Make sure we get constructor discounts even - -- on nullary constructors - | otherwise = size_up_call f [] 0 - - size_up (App fun arg) - | isTyCoArg arg = size_up fun - | otherwise = size_up arg `addSizeNSD` - size_up_app fun [arg] (if isZeroBitExpr arg then 1 else 0) - - size_up (Lam b e) - | isId b && not (isZeroBitId b) = lamScrutDiscount opts (size_up e `addSizeN` 10) - | otherwise = size_up e - - size_up (Let (NonRec binder rhs) body) - = size_up_rhs (binder, rhs) `addSizeNSD` - size_up body `addSizeN` - size_up_alloc binder - - size_up (Let (Rec pairs) body) - = foldr (addSizeNSD . size_up_rhs) - (size_up body `addSizeN` sum (map (size_up_alloc . fst) pairs)) - pairs - - size_up (Case e _ _ alts) = case nonEmpty alts of - Nothing -> size_up e -- case e of {} never returns, so take size of scrutinee + size_up :: ExprSize -> CoreExpr -> ExprSize + size_up (TooBig) !_ = TooBig + size_up (SizeIs !s _ _) _ + | s > bOMB_OUT_SIZE = TooBig + size_up s (Cast e _) = size_up s e + size_up s (Tick _ e) = size_up s e + size_up s (Type _) = s -- Types cost nothing + size_up s (Coercion _) = s + size_up s (Lit lit) = addSizeNSD (sizeN (litSize lit)) s + size_up s (Var f) | isZeroBitId f = s + -- Make sure we get constructor discounts even + -- on nullary constructors + | otherwise = size_up_call s f [] 0 + + size_up s (App fun arg) + | isTyCoArg arg = size_up s fun + | otherwise = size_up_app (stripDiscounts $ size_up s arg) + fun [arg] (if isZeroBitExpr arg then 1 else 0) + + size_up s (Lam b e) + | isId b && not (isZeroBitId b) = lamScrutDiscount opts (size_up (addSizeN s 10) e) + | otherwise = size_up s e + + size_up s (Let (NonRec binder rhs) body) + = let rhs_s = size_up_let s (binder, rhs) + in size_up (stripDiscounts $ rhs_s) body + + + size_up s (Let (Rec pairs) body) + = size_up (stripDiscounts (foldr (flip size_up_let) s pairs)) + body + + size_up s (Case e _ _ alts) = case nonEmpty alts of + Nothing -> size_up s e -- case e of {} never returns, so take size of scrutinee Just alts | Just v <- is_top_arg e -> -- We are scrutinising an argument variable let - alt_sizes = NE.map size_up_alt alts + alt_sizes = NE.map (size_up_alt s) alts -- alts_size tries to compute a good discount for -- the case when we are scrutinising an argument variable @@ -625,21 +628,24 @@ sizeExpr opts !bOMB_OUT_SIZE top_args expr alts_size tot_size _ = tot_size in - alts_size (foldr1 addAltSize alt_sizes) -- alts is non-empty - (foldr1 maxSize alt_sizes) + s `addSizeNSD` alts_size (foldr1 addAltSize alt_sizes) -- alts is non-empty + (foldr1 maxSize alt_sizes) -- Good to inline if an arg is scrutinised, because -- that may eliminate allocation in the caller -- And it eliminates the case itself - | otherwise -> size_up e `addSizeNSD` - foldr (addAltSize . size_up_alt) case_size alts + | otherwise -> foldr (addAltSize . size_up_alt s) + (size_up s e `addSizeNSD` case_size) + alts where is_top_arg (Var v) | v `elem` top_args = Just v is_top_arg (Cast e _) = is_top_arg e + is_top_arg (Tick _t e) = is_top_arg e is_top_arg _ = Nothing where + case_size | is_inline_scrut e, lengthAtMost alts 1 = sizeN (-10) | otherwise = sizeZero @@ -675,48 +681,61 @@ sizeExpr opts !bOMB_OUT_SIZE top_args expr | otherwise = False - size_up_rhs (bndr, rhs) + size_up_let :: ExprSize -> (Id, CoreExpr) -> ExprSize + size_up_let s (bndr, rhs) | JoinPoint join_arity <- idJoinPointHood bndr -- Skip arguments to join point , (_bndrs, body) <- collectNBinders join_arity rhs - = size_up body + = size_up s body | otherwise - = size_up rhs + = size_up (s `addSizeN` size_up_alloc bndr) rhs ------------ -- size_up_app is used when there's ONE OR MORE value args - size_up_app (App fun arg) args voids - | isTyCoArg arg = size_up_app fun args voids - | isZeroBitExpr arg = size_up_app fun (arg:args) (voids + 1) - | otherwise = size_up arg `addSizeNSD` - size_up_app fun (arg:args) voids - size_up_app (Var fun) args voids = size_up_call fun args voids - size_up_app (Tick _ expr) args voids = size_up_app expr args voids - size_up_app (Cast expr _) args voids = size_up_app expr args voids - size_up_app other args voids = size_up other `addSizeN` - callSize (length args) voids + size_up_app :: ExprSize -> CoreExpr -> [CoreExpr] -> Int -> ExprSize + size_up_app s (App fun arg) args voids + | isTyCoArg arg = size_up_app s fun args voids + | isZeroBitExpr arg = size_up_app s fun (arg:args) (voids + 1) + | otherwise = let arg_size = stripDiscounts $ size_up s arg + in size_up_app arg_size fun (arg:args) voids + size_up_app s (Var fun) args voids = size_up_call s fun args voids + size_up_app s (Tick _ expr) args voids = size_up_app s expr args voids + size_up_app s (Cast expr _) args voids = size_up_app s expr args voids + size_up_app s other args voids = size_up (s `addSizeN` callSize (length args) voids) other + -- if the lhs is not an App or a Var, or an invisible thing like a -- Tick or Cast, then we should charge for a complete call plus the -- size of the lhs itself. ------------ - size_up_call :: Id -> [CoreExpr] -> Int -> ExprSize - size_up_call fun val_args voids - = case idDetails fun of - FCallId _ -> sizeN (callSize (length val_args) voids) - DataConWorkId dc -> conSize dc (length val_args) - PrimOpId op _ -> primOpSize op (length val_args) - ClassOpId cls _ -> classOpSize opts cls top_args val_args - _ | fun `hasKey` buildIdKey -> buildSize - | fun `hasKey` augmentIdKey -> augmentSize - | otherwise -> funSize opts top_args fun (length val_args) voids + size_up_call :: ExprSize -> Id -> [CoreExpr] -> Int -> ExprSize + size_up_call !s fun val_args voids + = let !n_args = length val_args + call_size = case idDetails fun of + FCallId _ -> sizeN (callSize n_args voids) + DataConWorkId dc -> conSize dc n_args + PrimOpId op _ -> primOpSize op n_args + ClassOpId cls _ -> classOpSize opts cls top_args val_args + _ | fun `hasKey` buildIdKey -> buildSize + | fun `hasKey` augmentIdKey -> augmentSize + | otherwise -> funSize opts top_args fun n_args voids + in s `addSizeNSD` call_size ------------ - size_up_alt (Alt _con _bndrs rhs) = size_up rhs `addSizeN` 10 + -- size_up_alt returns on the alternatives size, not counting the accumulated + -- size passed in unless we reach TooBig. This is to facility better discount + -- calculation based on the size of only the alternative. + size_up_alt TooBig _ = TooBig + size_up_alt (SizeIs {_es_size_is=s}) (Alt _con _bndrs rhs) = + size_up (sizeN s) rhs + -- Why add and then subtract s? + -- If the expression large enough this will ensure we bomb out early. + `addSizeN` (10 -s) + -- Don't charge for args, so that wrappers look cheap -- (See comments about wrappers with Case) -- - -- IMPORTANT: *do* charge 1 for the alternative, else we + -- IMPORTANT: *do* charge 10 for the alternative, else we -- find that giant case nests are treated as practically free -- A good example is Foreign.C.Error.errnoToIOError @@ -753,6 +772,14 @@ sizeExpr opts !bOMB_OUT_SIZE top_args expr (xs `unionBags` ys) d2 -- Ignore d1 + -- Throw away the discount for scrutinizing the expression. + -- Used for things like `let x = rhs in body` where we only consider + -- this benefit for the body. + -- Why? `x` is visible to `body` either way, so it really should not + -- affect our inlining decision either way. + stripDiscounts TooBig = TooBig + stripDiscounts (SizeIs n xs _) = (SizeIs n xs 0) + -- don't count expressions such as State# RealWorld -- exclude join points, because they can be rep-polymorphic -- and typePrimRep will crash View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/86d2ee51e42ca5c76b12ec0c14f9a36… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/86d2ee51e42ca5c76b12ec0c14f9a36… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/ghc-upsweep-spt] driver: Load bytecode static pointer entries during linking
by Matthew Pickering (＠mpickering) 29 Sep '25

29 Sep '25

Matthew Pickering pushed to branch wip/ghc-upsweep-spt at Glasgow Haskell Compiler / GHC Commits: 290f8357 by Matthew Pickering at 2025-09-29T11:50:38+01:00 driver: Load bytecode static pointer entries during linking Previously the entries were loaded too eagerly, during upsweep, but we should delay loading them until we know that the relevant bytecode object is demanded. Towards #25230 - - - - - 4 changed files: - compiler/GHC/Driver/Main.hs - compiler/GHC/Driver/Make.hs - compiler/GHC/Iface/Tidy/StaticPtrTable.hs - compiler/GHC/Linker/Loader.hs Changes: ===================================== compiler/GHC/Driver/Main.hs ===================================== @@ -102,7 +102,6 @@ module GHC.Driver.Main , dumpIfaceStats , ioMsgMaybe , showModuleIndex - , hscAddSptEntries , writeInterfaceOnlyMode , loadByteCode , genModDetails @@ -2515,9 +2514,6 @@ hscParsedDecls hsc_env decls = runInteractiveHsc hsc_env $ do let src_span = srcLocSpan interactiveSrcLoc _ <- liftIO $ loadDecls interp hsc_env src_span linkable - {- Load static pointer table entries -} - liftIO $ hscAddSptEntries hsc_env (cg_spt_entries tidy_cg) - let tcs = filterOut isImplicitTyCon (mg_tcs simpl_mg) patsyns = mg_patsyns simpl_mg @@ -2539,18 +2535,6 @@ hscParsedDecls hsc_env decls = runInteractiveHsc hsc_env $ do fam_insts defaults fix_env return (new_tythings, new_ictxt) --- | Load the given static-pointer table entries into the interpreter. --- See Note [Grand plan for static forms] in "GHC.Iface.Tidy.StaticPtrTable". -hscAddSptEntries :: HscEnv -> [SptEntry] -> IO () -hscAddSptEntries hsc_env entries = do - let interp = hscInterp hsc_env - let add_spt_entry :: SptEntry -> IO () - add_spt_entry (SptEntry n fpr) = do - -- These are only names from the current module - (val, _, _) <- loadName interp hsc_env n - addSptEntry interp fpr val - mapM_ add_spt_entry entries - {- Note [Fixity declarations in GHCi] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ===================================== compiler/GHC/Driver/Make.hs ===================================== @@ -56,8 +56,6 @@ import GHC.Tc.Utils.Monad ( initIfaceCheck, concatMapM ) import GHC.Runtime.Interpreter import qualified GHC.Linker.Loader as Linker -import GHC.Linker.Types - import GHC.Driver.Config.Diagnostic import GHC.Driver.Pipeline @@ -72,8 +70,6 @@ import GHC.Driver.MakeSem import GHC.Driver.Downsweep import GHC.Driver.MakeAction -import GHC.ByteCode.Types - import GHC.Iface.Load ( cannotFindModule, readIface ) import GHC.IfaceToCore ( typecheckIface ) import GHC.Iface.Recomp ( RecompileRequired(..), CompileReason(..) ) @@ -1232,31 +1228,9 @@ upsweep_mod :: HscEnv upsweep_mod hsc_env mHscMessage old_hmi summary mod_index nmods = do hmi <- compileOne' mHscMessage hsc_env summary mod_index nmods (hm_iface <$> old_hmi) (maybe emptyHomeModInfoLinkable hm_linkable old_hmi) - - -- MP: This is a bit janky, because before you add the entries you have to extend the HPT with the module - -- you just compiled. Another option, would be delay adding anything until after upsweep has finished, but I - -- am unsure if this is sound (wrt running TH splices for example). - -- This function only does anything if the linkable produced is a BCO, which - -- used to only happen with the bytecode backend, but with - -- @-fprefer-byte-code@, @HomeModInfo@ has bytecode even when generating - -- object code, see #25230. hscInsertHPT hmi hsc_env - addSptEntries (hsc_env) - (homeModInfoByteCode hmi) - return hmi --- | Add the entries from a BCO linkable to the SPT table, see --- See Note [Grand plan for static forms] in GHC.Iface.Tidy.StaticPtrTable. -addSptEntries :: HscEnv -> Maybe Linkable -> IO () -addSptEntries hsc_env mlinkable = - hscAddSptEntries hsc_env - [ spt - | linkable <- maybeToList mlinkable - , bco <- linkableBCOs linkable - , spt <- bc_spt_entries bco - ] - -- Note [When source is considered modified] -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ===================================== compiler/GHC/Iface/Tidy/StaticPtrTable.hs ===================================== @@ -124,7 +124,7 @@ Here is a running example: * If we are compiling for the byte-code interpreter, we instead explicitly add the SPT entries (recorded in CgGuts' cg_spt_entries field) to the interpreter process' SPT table using the addSptEntry interpreter message. This happens - in upsweep after we have compiled the module (see GHC.Driver.Make.upsweep'). + when the bytecode object is linked in `dynLinkBCOs`. -} import GHC.Prelude ===================================== compiler/GHC/Linker/Loader.hs ===================================== @@ -717,6 +717,7 @@ loadDecls interp hsc_env span linkable = do let ce2 = extendClosureEnv (closure_env le2) nms_fhvs !pls2 = pls { linker_env = le2 { closure_env = ce2 } , linked_breaks = lb2 } + mapM_ (linkSptEntry interp ce2) (concatMap bc_spt_entries cbcs) return (pls2, (nms_fhvs, links_needed, units_needed)) where cbcs = linkableBCOs linkable @@ -950,10 +951,28 @@ dynLinkBCOs interp pls bcos = do -- Wrap finalizers on the ones we want to keep new_binds <- makeForeignNamedHValueRefs interp to_add + let ce2 = extendClosureEnv (closure_env le2) new_binds + + -- Add SPT entries + mapM_ (linkSptEntry interp ce2) (concatMap bc_spt_entries cbcs) + return $! pls1 { linker_env = le2 { closure_env = ce2 } , linked_breaks = lb2 } +-- | Register SPT entries for this module in the interpreter +-- Assumes that the name from the SPT has already been loaded into the interpreter. +linkSptEntry :: Interp -> ClosureEnv -> SptEntry -> IO () +linkSptEntry interp ce (SptEntry name fpr) = do + case lookupNameEnv ce name of + -- The SPT entries only point to locally defined names, which should have already been + -- loaded into the interpreter before this function is called. + Nothing -> pprPanic "linkSptEntry" (ppr name) + Just (_, hval) -> addSptEntry interp fpr hval + + + + -- Link a bunch of BCOs and return references to their values linkSomeBCOs :: Interp -> PkgsLoaded View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/290f83572571be6d51f1e2f8e6701ca… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/290f83572571be6d51f1e2f8e6701ca… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/gbc-files] 10 commits: driver: Load bytecode static pointer entries during linking
by Matthew Pickering (＠mpickering) 29 Sep '25

29 Sep '25

Matthew Pickering pushed to branch wip/gbc-files at Glasgow Haskell Compiler / GHC Commits: a068ac5d by Matthew Pickering at 2025-09-29T11:07:39+01:00 driver: Load bytecode static pointer entries during linking Previously the entries were loaded too eagerly, during upsweep, but we should delay loading them until we know that the relevant bytecode object is demanded. Towards #25230 - - - - - bb6b2668 by Matthew Pickering at 2025-09-29T11:07:39+01:00 testsuite: Use ghci_ways to set ways in PackedDataCon/UnboxedTuples/UnliftedDataTypeInterp tests These tests reimplemented the logic from `valid_way` in order to determine what ways to run. It's easier to use this combination of `only_ways` and `extra_ways` to only run in GHCi ways and always run in GHCi ways. - - - - - bfbf5a03 by Matthew Pickering at 2025-09-29T11:07:39+01:00 Rename interpreterBackend to bytecodeBackend - - - - - df4be4d5 by Cheng Shao at 2025-09-29T11:07:39+01:00 compiler: implement and test bytecode serialization logic - - - - - 9fbea6ce by Matthew Pickering at 2025-09-29T11:07:40+01:00 Add support for generating bytecode objects This commit adds the `-fwrite-byte-code` option which makes GHC emit a `.gbc` file which contains a serialised representation of bytecode. The bytecode can be loaded by the compiler to avoid having to reinterpret a module when using the bytecode interpreter (for example, in GHCi). There are also the new options: * -gbcdir=<DIR>: Specify the directory to place the gbc files * -gbcsuf=<suffix>: Specify the suffix for gbc files The option `-fbyte-code-and-object-code` now implies `-fwrite-byte-code`. - - - - - 766e546f by Matthew Pickering at 2025-09-29T11:07:40+01:00 Remove LazyBCOs - - - - - 3c7a4076 by Matthew Pickering at 2025-09-29T11:07:40+01:00 Print path to .gbc file if it's generated. - - - - - 1fe7d5e4 by Matthew Pickering at 2025-09-29T11:07:40+01:00 Normalised ghci output - - - - - c29e113f by Matthew Pickering at 2025-09-29T11:07:40+01:00 Fix loading of objects - - - - - db41490e by Matthew Pickering at 2025-09-29T11:07:40+01:00 Add performance test for consuming bytecode files - - - - - 75 changed files: - compiler/GHC.hs - compiler/GHC/Builtin/PrimOps.hs - compiler/GHC/ByteCode/Breakpoints.hs - + compiler/GHC/ByteCode/Serialize.hs - compiler/GHC/ByteCode/Types.hs - compiler/GHC/Data/FlatBag.hs - compiler/GHC/Data/SmallArray.hs - compiler/GHC/Driver/Backend.hs - compiler/GHC/Driver/Backend/Internal.hs - compiler/GHC/Driver/Backpack.hs - + compiler/GHC/Driver/ByteCode.hs - compiler/GHC/Driver/Config/Finder.hs - compiler/GHC/Driver/Downsweep.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Main.hs - compiler/GHC/Driver/Make.hs - compiler/GHC/Driver/Pipeline.hs - compiler/GHC/Driver/Pipeline/Execute.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/HsToCore/Breakpoints.hs - compiler/GHC/HsToCore/Usage.hs - compiler/GHC/Iface/Tidy/StaticPtrTable.hs - compiler/GHC/Linker/Deps.hs - compiler/GHC/Linker/Loader.hs - compiler/GHC/Linker/Types.hs - compiler/GHC/Types/SptEntry.hs - compiler/GHC/Types/Tickish.hs - compiler/GHC/Unit/Finder.hs - compiler/GHC/Unit/Finder/Types.hs - compiler/GHC/Unit/Module/Graph.hs - compiler/GHC/Unit/Module/Location.hs - compiler/GHC/Unit/Module/ModSummary.hs - compiler/GHC/Unit/Module/WholeCoreBindings.hs - compiler/GHC/Utils/Binary.hs - compiler/ghc.cabal.in - docs/users_guide/phases.rst - docs/users_guide/separate_compilation.rst - ghc/Main.hs - testsuite/driver/testglobals.py - testsuite/driver/testlib.py - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - testsuite/tests/driver/T5313.hs - + testsuite/tests/driver/bytecode-object/A.hs - + testsuite/tests/driver/bytecode-object/BytecodeForeign.c - + testsuite/tests/driver/bytecode-object/BytecodeForeign.hs - + testsuite/tests/driver/bytecode-object/BytecodeMain.hs - + testsuite/tests/driver/bytecode-object/BytecodeTest.hs - + testsuite/tests/driver/bytecode-object/Makefile - + testsuite/tests/driver/bytecode-object/all.T - + testsuite/tests/driver/bytecode-object/bytecode_object12.stderr - + testsuite/tests/driver/bytecode-object/bytecode_object13.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object14.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object15.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object16.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object17.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object18.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object19.script - + testsuite/tests/driver/bytecode-object/bytecode_object19.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object25.script - + testsuite/tests/driver/bytecode-object/bytecode_object25.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object4.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object5.stdout - + testsuite/tests/driver/bytecode-object/bytecode_object6.stdout - testsuite/tests/ghc-api/T10052/T10052.hs - testsuite/tests/ghc-api/T8639_api.hs - testsuite/tests/ghc-api/apirecomp001/myghc.hs - testsuite/tests/ghci/linking/dyn/T3372.hs - testsuite/tests/ghci/should_run/PackedDataCon/packeddatacon.T - testsuite/tests/ghci/should_run/UnboxedTuples/unboxedtuples.T - testsuite/tests/ghci/should_run/UnliftedDataTypeInterp/unlifteddatatypeinterp.T - testsuite/tests/perf/compiler/Makefile - + testsuite/tests/perf/compiler/MultiLayerModulesDefsGhciWithBytecodeFiles.script - testsuite/tests/perf/compiler/all.T The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/df0a56b8d97c69141dc2cafa6bff00… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/df0a56b8d97c69141dc2cafa6bff00… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/ghc-upsweep-spt
by Matthew Pickering (＠mpickering) 29 Sep '25

29 Sep '25

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

1 0

[Git][ghc/ghc][wip/wasm-internal-interpreter] 15 commits: Revert "Add necessary flag for js linking"
by Cheng Shao (＠TerrorJack) 29 Sep '25

29 Sep '25

Cheng Shao pushed to branch wip/wasm-internal-interpreter at Glasgow Haskell Compiler / GHC Commits: c1cab0c3 by Sylvain Henry at 2025-09-26T10:36:30-04:00 Revert "Add necessary flag for js linking" This reverts commit 84f68e2231b2eddb2e1dc4e90af394ef0f2e803f. This commit didn't have the expected effect. See discussion in #26290. Instead we export HEAP8 and HEAPU8 from rts/js/mem.js - - - - - 0a434a80 by Sylvain Henry at 2025-09-26T10:36:30-04:00 JS: export HEAPU8 (#26290) This is now required by newer Emscripten versions. - - - - - b10296a9 by Andreas Klebinger at 2025-09-26T10:37:11-04:00 sizeExpr: Improve Tick handling. When determining if we scrutinize a function argument we now properly look through ticks. Fixes #26444. - - - - - d9e2a9a7 by mniip at 2025-09-26T16:00:50-04:00 rts: Refactor parsing of -h flags We have a nontrivial amount of heap profiling flags available in the non-profiled runtime, so it makes sense to reuse the parsing code between the profiled and the non-profiled runtime, only restricting which flags are allowed. - - - - - 089e45aa by mniip at 2025-09-26T16:00:50-04:00 rts: Fix parsing of -h options with braces When the "filter by" -h options were introduced in bc210f7d267e8351ccb66972f4b3a650eb9338bb, the braces were mandatory. Then in 3c22fb21fb18e27ce8d941069a6915fce584a526, the braces were made optional. Then in d1ce35d2271ac8b79cb5e37677b1a989749e611c the brace syntax stopped working, and no one seems to have noticed. - - - - - 423f1472 by mniip at 2025-09-26T16:00:50-04:00 rts: add -hT<type> and -hi<table id> heap filtering options (#26361) They are available in non-profiled builds. Along the way fixed a bug where combining -he<era> and -hr<retainer> would ignore whether the retainer matches or not. - - - - - 4cda4785 by mniip at 2025-09-26T16:00:50-04:00 docs: Document -hT<type> and -hi<addr> - - - - - 982ad30f by mniip at 2025-09-26T16:00:50-04:00 rts: Refactor dumping the heap census Always do the printing of the total size right next to where the bucket label is printed. This prevents accidentally printing a label without the corresponding amount. Fixed a bug where exactly this happened for -hi profile and the 0x0 (uncategorized) info table. There is now also much more symmetry between fprintf(hp_file,...) and the corresponding traceHeapProfSampleString. - - - - - 8cbe006a by Cheng Shao at 2025-09-26T16:01:34-04:00 hadrian: fix GHC.Platform.Host generation for cross stage1 This patch fixes incorrectly GHC.Platform.Host generation logic for cross stage1 in hadrian (#26449). Also adds T26449 test case to witness the fix. Co-authored-by: Codex <codex(a)openai.com> - - - - - 0ddd0fdc by soulomoon at 2025-09-28T19:24:10-04:00 Remove hptAllInstances usage during upsweep Previously, during the upsweep phase when checking safe imports, we were loading the module interface with runTcInteractive, which in turn calls hptAllInstances. This accesses non-below modules from the home package table. Change the implementation of checkSafeImports to use initTcWithGbl and loadSysInterface to load the module interface, since we already have TcGblEnv at hand. This eliminates the unnecessary use of runTcInteractive and hptAllInstances during the upsweep phase. - - - - - e05c496c by Ben Gamari at 2025-09-28T19:24:59-04:00 base: Update changelog to reflect timing of IOPort# removal This change will make 9.14 afterall. - - - - - bdc9d130 by Cheng Shao at 2025-09-28T19:25:45-04:00 rts: fix wasm JSFFI initialization constructor code This commit fixes wasm JSFFI initialization constructor code so that the constructor is self-contained and avoids invoking a fake __main_argc_argv function. The previous approach of reusing __main_void logic in wasi-libc saves a tiny bit of code, at the expense of link-time trouble whenever GHC links a wasm module without -no-hs-main, in which case the driver-generated main function would clash with the definition here, resulting in a linker error. It's simply better to avoid messing with the main function, and it would additionally allow linking wasm32-wasi command modules that does make use of synchronous JSFFI. - - - - - 5d59fc8f by Cheng Shao at 2025-09-28T19:26:27-04:00 rts: provide stub implementations of ExecPage functions for wasm This patch provides stub implementations of ExecPage functions for wasm. They are never actually invoked at runtime for any non-TNTC platform, yet they can cause link-time errors of missing symbols when the GHCi.InfoTable module gets linked into the final wasm module (e.g. a GHC API program). - - - - - 9708fcc1 by Cheng Shao at 2025-09-29T01:46:30+02:00 ghci: fix lookupSymbolInDLL behavior on wasm This patch fixes lookupSymbolInDLL behavior on wasm to return Nothing instead of throwing. On wasm, we only have lookupSymbol, and the driver would attempt to call lookupSymbolInDLL first before falling back to lookupSymbol, so lookupSymbolInDLL needs to return Nothing gracefully for the fallback behavior to work. - - - - - 32ffe4e2 by Cheng Shao at 2025-09-29T01:46:30+02:00 hadrian/compiler: enable internal-interpreter for ghc library in wasm stage1 - - - - - 26 changed files: - compiler/GHC.hs - compiler/GHC/Core/Unfold.hs - compiler/GHC/Driver/Main.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Linker/Loader.hs - compiler/GHC/Runtime/Interpreter/Types.hs - docs/users_guide/profiling.rst - hadrian/src/Rules/Generate.hs - hadrian/src/Settings/Packages.hs - libraries/base/changelog.md - libraries/ghc-internal/src/GHC/Internal/RTS/Flags.hsc - libraries/ghci/GHCi/ObjLink.hs - m4/fptools_set_c_ld_flags.m4 - rts/ExecPage.c - rts/ProfHeap.c - rts/RetainerSet.c - rts/RtsFlags.c - rts/include/rts/Flags.h - rts/js/mem.js - rts/wasm/JSFFI.c - testsuite/driver/testlib.py - + testsuite/tests/cross/should_run/T26449.hs - + testsuite/tests/cross/should_run/all.T - testsuite/tests/interface-stability/ghc-experimental-exports.stdout - testsuite/tests/interface-stability/ghc-experimental-exports.stdout-mingw32 - utils/ghc-toolchain/src/GHC/Toolchain/Tools/Link.hs Changes: ===================================== compiler/GHC.hs ===================================== @@ -716,17 +716,14 @@ setTopSessionDynFlags dflags = do -- see Note [Target code interpreter] interp <- if +#if !defined(wasm32_HOST_ARCH) -- Wasm dynamic linker | ArchWasm32 <- platformArch $ targetPlatform dflags -> do s <- liftIO $ newMVar InterpPending loader <- liftIO Loader.uninitializedLoader dyld <- liftIO $ makeAbsolute $ topDir dflags </> "dyld.mjs" -#if defined(wasm32_HOST_ARCH) - let libdir = sorry "cannot spawn child process on wasm" -#else libdir <- liftIO $ last <$> Loader.getGccSearchDirectory logger dflags "libraries" -#endif let profiled = ways dflags `hasWay` WayProf way_tag = if profiled then "_p" else "" let cfg = @@ -747,6 +744,7 @@ setTopSessionDynFlags dflags = do wasmInterpUnitState = ue_homeUnitState $ hsc_unit_env hsc_env } pure $ Just $ Interp (ExternalInterp $ ExtWasm $ ExtInterpState cfg s) loader lookup_cache +#endif -- JavaScript interpreter | ArchJavaScript <- platformArch (targetPlatform dflags) ===================================== compiler/GHC/Core/Unfold.hs ===================================== @@ -637,6 +637,7 @@ sizeExpr opts !bOMB_OUT_SIZE top_args expr where is_top_arg (Var v) | v `elem` top_args = Just v is_top_arg (Cast e _) = is_top_arg e + is_top_arg (Tick _t e) = is_top_arg e is_top_arg _ = Nothing where ===================================== compiler/GHC/Driver/Main.hs ===================================== @@ -165,7 +165,7 @@ import GHC.JS.Syntax import GHC.IfaceToCore ( typecheckIface, typecheckWholeCoreBindings ) -import GHC.Iface.Load ( ifaceStats, writeIface, flagsToIfCompression, getGhcPrimIface ) +import GHC.Iface.Load ( ifaceStats, writeIface, flagsToIfCompression, getGhcPrimIface, loadSysInterface ) import GHC.Iface.Make import GHC.Iface.Recomp import GHC.Iface.Tidy @@ -1765,7 +1765,7 @@ hscCheckSafe' m l = do -- so we need to call 'getModuleInterface' to load from disk case iface of Just _ -> return iface - Nothing -> snd `fmap` (liftIO $ getModuleInterface hsc_env m) + Nothing -> liftIO $ initIfaceLoad hsc_env (Just <$> loadSysInterface (text "checkSafeImports") m) -- | Check the list of packages are trusted. ===================================== compiler/GHC/Driver/Session.hs ===================================== @@ -3763,12 +3763,18 @@ makeDynFlagsConsistent dflags -- only supports dynamic code | LinkInMemory <- ghcLink dflags , sTargetRTSLinkerOnlySupportsSharedLibs $ settings dflags +#if defined(wasm32_HOST_ARCH) + , not (ways dflags `hasWay` WayDyn) +#else , not (ways dflags `hasWay` WayDyn && gopt Opt_ExternalInterpreter dflags) +#endif = flip loopNoWarn "Forcing dynamic way because target RTS linker only supports dynamic code" $ -- See checkOptions, -fexternal-interpreter is -- required when using --interactive with a non-standard -- way (-prof, -static, or -dynamic). +#if !defined(wasm32_HOST_ARCH) setGeneralFlag' Opt_ExternalInterpreter $ +#endif addWay' WayDyn dflags | LinkInMemory <- ghcLink dflags ===================================== compiler/GHC/Linker/Loader.hs ===================================== @@ -1564,6 +1564,9 @@ gccSearchDirCache = unsafePerformIO $ newIORef [] -- which dominate a large percentage of startup time on Windows. getGccSearchDirectory :: Logger -> DynFlags -> String -> IO [FilePath] getGccSearchDirectory logger dflags key = do +#if defined(wasm32_HOST_ARCH) + pure [] +#else cache <- readIORef gccSearchDirCache case lookup key cache of Just x -> return x @@ -1590,6 +1593,7 @@ getGccSearchDirectory logger dflags key = do x:_ -> case break (=='=') x of (_ , []) -> [] (_, (_:xs)) -> xs +#endif -- | Get a list of system search directories, this to alleviate pressure on -- the findSysDll function. ===================================== compiler/GHC/Runtime/Interpreter/Types.hs ===================================== @@ -214,7 +214,7 @@ data JSInterpConfig = JSInterpConfig data WasmInterpConfig = WasmInterpConfig { wasmInterpDyLD :: !FilePath -- ^ Location of dyld.mjs script - , wasmInterpLibDir :: FilePath -- ^ wasi-sdk sysroot libdir containing libc.so, etc + , wasmInterpLibDir :: !FilePath -- ^ wasi-sdk sysroot libdir containing libc.so, etc , wasmInterpOpts :: ![String] -- ^ Additional command line arguments for iserv -- wasm ghci browser mode ===================================== docs/users_guide/profiling.rst ===================================== @@ -1003,6 +1003,11 @@ follows: The flags below are marked with ``:noindex:`` to avoid duplicate ID warnings from Sphinx. +.. rts-flag:: -hT ⟨type⟩ + :noindex: + + Restrict the profile to closures with the specified closure types. + .. rts-flag:: -hc ⟨name⟩ :noindex: @@ -1050,6 +1055,13 @@ follows: biographies, where ⟨bio⟩ is one of ``lag``, ``drag``, ``void``, or ``use``. +.. rts-flag:: -hi ⟨addr⟩ + :noindex: + + Restrict the profile to closures with specified info table addresses. The + address should start with ``0x`` and be lowercase hexadecimal, just like the + addresses produced by :rts-flag:`-hi`. + For example, the following options will generate a retainer profile restricted to ``Branch`` and ``Leaf`` constructors: ===================================== hadrian/src/Rules/Generate.hs ===================================== @@ -606,8 +606,12 @@ generateVersionHs = do generatePlatformHostHs :: Expr String generatePlatformHostHs = do trackGenerateHs - cHostPlatformArch <- queryHost (archOS_arch . tgtArchOs) - cHostPlatformOS <- queryHost (archOS_OS . tgtArchOs) + stage <- getStage + let chooseHostQuery = case stage of + Stage0 {} -> queryHost + _ -> queryTarget + cHostPlatformArch <- chooseHostQuery (archOS_arch . tgtArchOs) + cHostPlatformOS <- chooseHostQuery (archOS_OS . tgtArchOs) return $ unlines [ "module GHC.Platform.Host where" , "" ===================================== hadrian/src/Settings/Packages.hs ===================================== @@ -90,7 +90,7 @@ packageArgs = do -- (#14335) and completely untested in CI for cross -- backends at the moment, so we might as well disable it -- for cross GHC. - [ andM [expr (ghcWithInterpreter stage), notCross] `cabalFlag` "internal-interpreter" + [ stage1 `cabalFlag` "internal-interpreter" , orM [ notM cross, haveCurses ] `cabalFlag` "terminfo" , arg "-build-tool-depends" , flag UseLibzstd `cabalFlag` "with-libzstd" ===================================== libraries/base/changelog.md ===================================== @@ -6,7 +6,6 @@ * Fix issues with toRational for types capable to represent infinite and not-a-number values ([CLC proposal #338](https://github.com/haskell/core-libraries-committee/issues/338)) * Ensure that `rationalToFloat` and `rationalToDouble` always inline in the end. ([CLC proposal #356](https://github.com/haskell/core-libraries-committee/issues/356)) * Modify the implementation of `Data.List.sortOn` to use `(>)` instead of `compare`. ([CLC proposal #332](https://github.com/haskell/core-libraries-committee/issues/332)) - * `GHC.Exts.IOPort#` and its related operations have been removed ([CLC #213](https://github.com/haskell/core-libraries-committee/issues/213)) * Add `thenA` and `thenM`. ([CLC proposal #351](https://github.com/haskell/core-libraries-committee/issues/351)) * Fix bug where `naturalAndNot` was incorrectly truncating results ([CLC proposal #350](github.com/haskell/core-libraries-committee/issues/350)) * Remove extra laziness from `Data.Bifunctor.Bifunctor` instances for all tuples to have the same laziness as their `Data.Functor.Functor` counterparts (i.e. they became more strict than before) ([CLC proposal #339](https://github.com/haskell/core-libraries-committee/issues/339)) @@ -37,7 +36,7 @@ * `GHC.TypeNats.Internal` * `GHC.ExecutionStack.Internal`. * Deprecate `GHC.JS.Prim.Internal.Build`, as per [CLC #329](https://github.com/haskell/core-libraries-committee/issues/329) - + * `GHC.Exts.IOPort#` and its related operations have been removed ([CLC #213](https://github.com/haskell/core-libraries-committee/issues/213)) * Fix incorrect results of `integerPowMod` when the base is 0 and the exponent is negative, and `integerRecipMod` when the modulus is zero ([#26017](https://gitlab.haskell.org/ghc/ghc/-/issues/26017)). * Fix the rewrite rule for `scanl'` not being strict in the first element of the output list ([#26143](https://gitlab.haskell.org/ghc/ghc/-/issues/26143)). ===================================== libraries/ghc-internal/src/GHC/Internal/RTS/Flags.hsc ===================================== @@ -312,6 +312,8 @@ data ProfFlags = ProfFlags , retainerSelector :: Maybe String , bioSelector :: Maybe String , eraSelector :: Word -- ^ @since base-4.20.0.0 + , closureTypeSelector :: Maybe String + , infoTableSelector :: Maybe String } deriving ( Show -- ^ @since base-4.8.0.0 , Generic -- ^ @since base-4.15.0.0 ) @@ -613,6 +615,8 @@ getProfFlags = do <*> (peekCStringOpt =<< #{peek PROFILING_FLAGS, retainerSelector} ptr) <*> (peekCStringOpt =<< #{peek PROFILING_FLAGS, bioSelector} ptr) <*> #{peek PROFILING_FLAGS, eraSelector} ptr + <*> (peekCStringOpt =<< #{peek PROFILING_FLAGS, closureTypeSelector} ptr) + <*> (peekCStringOpt =<< #{peek PROFILING_FLAGS, infoTableSelector} ptr) getTraceFlags :: IO TraceFlags getTraceFlags = do ===================================== libraries/ghci/GHCi/ObjLink.hs ===================================== @@ -103,8 +103,7 @@ foreign import javascript unsafe "__ghc_wasm_jsffi_dyld.lookupSymbol($1)" js_lookupSymbol :: JSString -> IO (Ptr a) lookupSymbolInDLL :: Ptr LoadedDLL -> String -> IO (Maybe (Ptr a)) -lookupSymbolInDLL _ sym = - throwIO $ ErrorCall $ "lookupSymbolInDLL: unsupported on wasm for " <> sym +lookupSymbolInDLL _ _ = pure Nothing resolveObjs :: IO Bool resolveObjs = pure True ===================================== m4/fptools_set_c_ld_flags.m4 ===================================== @@ -109,9 +109,6 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS], $2="$$2 -mcmodel=medium" ;; - javascript*) - $3="$$3 -sEXPORTED_RUNTIME_METHODS=HEAP8,HEAPU8" - esac AC_MSG_RESULT([done]) ===================================== rts/ExecPage.c ===================================== @@ -10,15 +10,23 @@ #include "linker/MMap.h" ExecPage *allocateExecPage(void) { +#if defined(wasm32_HOST_ARCH) + return NULL; +#else ExecPage *page = (ExecPage *) mmapAnon(getPageSize()); return page; +#endif } void freezeExecPage(ExecPage *page) { +#if !defined(wasm32_HOST_ARCH) mprotectForLinker(page, getPageSize(), MEM_READ_EXECUTE); flushExec(getPageSize(), page); +#endif } void freeExecPage(ExecPage *page) { +#if !defined(wasm32_HOST_ARCH) munmapForLinker(page, getPageSize(), "freeExecPage"); +#endif } ===================================== rts/ProfHeap.c ===================================== @@ -181,6 +181,28 @@ static void dumpCensus( Census *census ); static bool closureSatisfiesConstraints( const StgClosure* p ); +static const char *closureTypeIdentity( const StgClosure *p ) +{ + const StgInfoTable *info = get_itbl(p); + switch (info->type) { + case CONSTR: + case CONSTR_1_0: + case CONSTR_0_1: + case CONSTR_2_0: + case CONSTR_1_1: + case CONSTR_0_2: + case CONSTR_NOCAF: + return GET_CON_DESC(itbl_to_con_itbl(info)); + default: + return closure_type_names[info->type]; + } +} + +static void formatIPELabel( char *str, size_t size, uint64_t table_id ) +{ + snprintf(str, size, "0x%" PRIx64, table_id); +} + /* ---------------------------------------------------------------------------- * Find the "closure identity", which is a unique pointer representing * the band to which this closure's heap space is attributed in the @@ -215,26 +237,9 @@ closureIdentity( const StgClosure *p ) #endif case HEAP_BY_CLOSURE_TYPE: - { - const StgInfoTable *info; - info = get_itbl(p); - switch (info->type) { - case CONSTR: - case CONSTR_1_0: - case CONSTR_0_1: - case CONSTR_2_0: - case CONSTR_1_1: - case CONSTR_0_2: - case CONSTR_NOCAF: - return GET_CON_DESC(itbl_to_con_itbl(info)); - default: - return closure_type_names[info->type]; - } - } + return closureTypeIdentity(p); case HEAP_BY_INFO_TABLE: - { return (void *) (p->header.info); - } default: barf("closureIdentity"); @@ -664,6 +669,8 @@ fprint_ccs(FILE *fp, CostCentreStack *ccs, uint32_t max_length) fprintf(fp, "%s", buf); } +#endif /* PROFILING */ + bool strMatchesSelector( const char* str, const char* sel ) { @@ -688,8 +695,6 @@ strMatchesSelector( const char* str, const char* sel ) } } -#endif /* PROFILING */ - /* ----------------------------------------------------------------------------- * Figure out whether a closure should be counted in this census, by * testing against all the specified constraints. @@ -697,11 +702,8 @@ strMatchesSelector( const char* str, const char* sel ) static bool closureSatisfiesConstraints( const StgClosure* p ) { -#if !defined(PROFILING) - (void)p; /* keep gcc -Wall happy */ - return true; -#else - bool b; + bool b; +#if defined(PROFILING) // The CCS has a selected field to indicate whether this closure is // deselected by not being mentioned in the module, CC, or CCS @@ -721,7 +723,8 @@ closureSatisfiesConstraints( const StgClosure* p ) if (!b) return false; } if (RtsFlags.ProfFlags.eraSelector) { - return (p->header.prof.hp.era == RtsFlags.ProfFlags.eraSelector); + b = p->header.prof.hp.era == RtsFlags.ProfFlags.eraSelector; + if (!b) return false; } if (RtsFlags.ProfFlags.retainerSelector) { RetainerSet *rs; @@ -742,8 +745,21 @@ closureSatisfiesConstraints( const StgClosure* p ) } return false; } - return true; +#else + if (RtsFlags.ProfFlags.closureTypeSelector) { + b = strMatchesSelector( closureTypeIdentity(p), + RtsFlags.ProfFlags.closureTypeSelector ); + if (!b) return false; + } + if (RtsFlags.ProfFlags.infoTableSelector) { + char str[100]; + formatIPELabel(str, sizeof str, lookupIPEId(p->header.info)); + b = strMatchesSelector( str, + RtsFlags.ProfFlags.infoTableSelector ); + if (!b) return false; + } #endif /* PROFILING */ + return true; } /* ----------------------------------------------------------------------------- @@ -858,12 +874,11 @@ aggregateCensusInfo( void ) static void recordIPEHeapSample(FILE *hp_file, uint64_t table_id, size_t count) { - // Print to heap profile file - fprintf(hp_file, "0x%" PRIx64, table_id); - - // Create label string for tracing char str[100]; - sprintf(str, "0x%" PRIx64, table_id); + formatIPELabel(str, sizeof str, table_id); + + // Print to heap profile file + fprintf(hp_file, "%s\t%" FMT_Word "\n", str, (W_)(count * sizeof(W_))); // Emit the profiling sample (convert count to bytes) traceHeapProfSampleString(str, count * sizeof(W_)); @@ -961,7 +976,9 @@ dumpCensus( Census *census ) switch (RtsFlags.ProfFlags.doHeapProfile) { case HEAP_BY_CLOSURE_TYPE: - fprintf(hp_file, "%s", (char *)ctr->identity); + fprintf(hp_file, "%s\t%" FMT_Word "\n", + (char *)ctr->identity, + (W_)(count * sizeof(W_))); traceHeapProfSampleString((char *)ctr->identity, count * sizeof(W_)); break; @@ -979,19 +996,26 @@ dumpCensus( Census *census ) case HEAP_BY_CCS: fprint_ccs(hp_file, (CostCentreStack *)ctr->identity, RtsFlags.ProfFlags.ccsLength); + fprintf(hp_file, "\t%" FMT_Word "\n", + (W_)(count * sizeof(W_))); traceHeapProfSampleCostCentre((CostCentreStack *)ctr->identity, count * sizeof(W_)); break; case HEAP_BY_ERA: - fprintf(hp_file, "%" FMT_Word, (StgWord)ctr->identity); + { char str_era[100]; - sprintf(str_era, "%" FMT_Word, (StgWord)ctr->identity); + snprintf(str_era, sizeof str_era, "%" FMT_Word, + (StgWord)ctr->identity); + fprintf(hp_file, "%s\t%" FMT_Word "\n", + str_era, (W_)(count * sizeof(W_))); traceHeapProfSampleString(str_era, count * sizeof(W_)); break; + } case HEAP_BY_MOD: case HEAP_BY_DESCR: case HEAP_BY_TYPE: - fprintf(hp_file, "%s", (char *)ctr->identity); + fprintf(hp_file, "%s\t%" FMT_Word "\n", + (char *)ctr->identity, (W_)(count * sizeof(W_))); traceHeapProfSampleString((char *)ctr->identity, count * sizeof(W_)); break; @@ -1002,29 +1026,28 @@ dumpCensus( Census *census ) // it might be the distinguished retainer set rs_MANY: if (rs == &rs_MANY) { fprintf(hp_file, "MANY"); - break; - } + } else { - // Mark this retainer set by negating its id, because it - // has appeared in at least one census. We print the - // values of all such retainer sets into the log file at - // the end. A retainer set may exist but not feature in - // any censuses if it arose as the intermediate retainer - // set for some closure during retainer set calculation. - if (rs->id > 0) - rs->id = -(rs->id); - - // report in the unit of bytes: * sizeof(StgWord) - printRetainerSetShort(hp_file, rs, (W_)count * sizeof(W_) - , RtsFlags.ProfFlags.ccsLength); + // Mark this retainer set by negating its id, because it + // has appeared in at least one census. We print the + // values of all such retainer sets into the log file at + // the end. A retainer set may exist but not feature in + // any censuses if it arose as the intermediate retainer + // set for some closure during retainer set calculation. + if (rs->id > 0) + rs->id = -(rs->id); + + // report in the unit of bytes: * sizeof(StgWord) + printRetainerSetShort(hp_file, rs, (W_)(count * sizeof(W_)) + , RtsFlags.ProfFlags.ccsLength); + } + fprintf(hp_file, "\t%" FMT_Word "\n", (W_)(count * sizeof(W_))); break; } #endif default: barf("dumpCensus; doHeapProfile"); } - - fprintf(hp_file, "\t%" FMT_Word "\n", (W_)count * sizeof(W_)); } // Print the unallocated data into the 0 band for info table profiling. ===================================== rts/RetainerSet.c ===================================== @@ -237,7 +237,7 @@ printRetainerSetShort(FILE *f, RetainerSet *rs, W_ total_size, uint32_t max_leng // size = strlen(tmp); } } - fputs(tmp, f); + fprintf(f, "%s\t%" FMT_Word "\n", tmp, total_size); traceHeapProfSampleString(tmp, total_size); } ===================================== rts/RtsFlags.c ===================================== @@ -112,9 +112,7 @@ static void bad_option (const char *s); static void read_debug_flags(const char *arg); #endif -#if defined(PROFILING) static bool read_heap_profiling_flag(const char *arg); -#endif #if defined(TRACING) static void read_trace_flags(const char *arg); @@ -237,6 +235,9 @@ void initRtsFlagsDefaults(void) RtsFlags.ProfFlags.eraSelector = 0; #endif + RtsFlags.ProfFlags.closureTypeSelector = NULL; + RtsFlags.ProfFlags.infoTableSelector = NULL; + #if defined(TRACING) RtsFlags.TraceFlags.tracing = TRACE_NONE; RtsFlags.TraceFlags.timestamp = false; @@ -403,6 +404,8 @@ usage_text[] = { " -hr<cc>... closures with specified retainers", " -hb<bio>... closures with specified biographies (lag,drag,void,use)", " -he<era>... closures with specified era", +" -hT<typ>,... specified closure types", +" -hi<adr>,... closures with specified info table addresses", "", " -R<size> Set the maximum retainer set size (default: 8)", "", @@ -418,6 +421,9 @@ usage_text[] = { " -h Heap residency profile (output file <program>.hp)", " -hT Produce a heap profile grouped by closure type", " -hi Produce a heap profile grouped by info table address", +" A subset of closures may be selected thusly:", +" -hT<typ>,... specified closure types", +" -hi<adr>,... closures with specified info table addresses", " -po<file> Override profiling output file name prefix (program name by default)", #endif /* PROFILING */ @@ -924,11 +930,10 @@ error = true; #endif #if defined(PROFILING) -# define PROFILING_BUILD_ONLY(x) x +# define PROFILING_BUILD_ONLY(_arg, x) x #else -# define PROFILING_BUILD_ONLY(x) \ -errorBelch("the flag %s requires the program to be built with -prof", \ - rts_argv[arg]); \ +# define PROFILING_BUILD_ONLY(arg, x) \ +errorBelch("the flag %s requires the program to be built with -prof", arg); \ error = true; #endif @@ -1485,11 +1490,11 @@ error = true; RtsFlags.CcFlags.outputFileNameStem = rts_argv[arg]+3; break; default: - PROFILING_BUILD_ONLY(); + PROFILING_BUILD_ONLY(rts_argv[arg],); } break; #else - PROFILING_BUILD_ONLY( + PROFILING_BUILD_ONLY(rts_argv[arg], switch (rts_argv[arg][2]) { case 'a': RtsFlags.CcFlags.doCostCentres = COST_CENTRES_ALL; @@ -1527,43 +1532,25 @@ error = true; case 'R': OPTION_SAFE; - PROFILING_BUILD_ONLY( + PROFILING_BUILD_ONLY(rts_argv[arg], RtsFlags.ProfFlags.maxRetainerSetSize = atof(rts_argv[arg]+2); ) break; case 'L': OPTION_SAFE; - PROFILING_BUILD_ONLY( + PROFILING_BUILD_ONLY(rts_argv[arg], RtsFlags.ProfFlags.ccsLength = atof(rts_argv[arg]+2); if(RtsFlags.ProfFlags.ccsLength <= 0) { bad_option(rts_argv[arg]); } ) break; case 'h': /* serial heap profile */ -#if !defined(PROFILING) - switch (rts_argv[arg][2]) { - case '\0': - errorBelch("-h is deprecated, use -hT instead."); - - FALLTHROUGH; - case 'T': - OPTION_UNSAFE; - RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_CLOSURE_TYPE; - break; - case 'i': - OPTION_UNSAFE; - RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_INFO_TABLE; - break; - default: - OPTION_SAFE; - PROFILING_BUILD_ONLY(); - } -#else +#if defined(PROFILING) OPTION_SAFE; - PROFILING_BUILD_ONLY( - error = read_heap_profiling_flag(rts_argv[arg]); - ); -#endif /* PROFILING */ +#else + OPTION_UNSAFE; +#endif + error = read_heap_profiling_flag(rts_argv[arg]); break; case 'i': /* heap sample interval */ @@ -1840,7 +1827,7 @@ error = true; case 'c': /* Debugging tool: show current cost centre on an exception */ OPTION_SAFE; - PROFILING_BUILD_ONLY( + PROFILING_BUILD_ONLY(rts_argv[arg], RtsFlags.ProfFlags.showCCSOnException = true; ); unchecked_arg_start++; @@ -2341,139 +2328,171 @@ static void read_debug_flags(const char* arg) } #endif -#if defined(PROFILING) // Parse a "-h" flag, returning whether the parse resulted in an error. static bool read_heap_profiling_flag(const char *arg) { - // Already parsed "-h" - + // Already parsed arg[0:2] = "-h" bool error = false; - switch (arg[2]) { - case '\0': - errorBelch("-h is deprecated, use -hc instead."); - FALLTHROUGH; - case 'C': - case 'c': - case 'M': - case 'm': - case 'D': - case 'd': - case 'Y': - case 'y': - case 'i': - case 'R': - case 'r': - case 'B': - case 'b': - case 'e': - case 'T': - if (arg[2] != '\0' && arg[3] != '\0') { - { - const char *left = strchr(arg, '{'); - const char *right = strrchr(arg, '}'); - - // curly braces are optional, for - // backwards compat. - if (left) - left = left+1; - else - left = arg + 3; - - if (!right) - right = arg + strlen(arg); - - char *selector = stgStrndup(left, right - left + 1); - - switch (arg[2]) { - case 'c': // cost centre label select - RtsFlags.ProfFlags.ccSelector = selector; - break; - case 'C': - RtsFlags.ProfFlags.ccsSelector = selector; - break; - case 'M': - case 'm': // cost centre module select - RtsFlags.ProfFlags.modSelector = selector; - break; - case 'D': - case 'd': // closure descr select - RtsFlags.ProfFlags.descrSelector = selector; - break; - case 'Y': - case 'y': // closure type select - RtsFlags.ProfFlags.typeSelector = selector; - break; - case 'R': - case 'r': // retainer select - RtsFlags.ProfFlags.retainerSelector = selector; - break; - case 'B': - case 'b': // biography select - RtsFlags.ProfFlags.bioSelector = selector; - break; - case 'E': - case 'e': // era select - RtsFlags.ProfFlags.eraSelector = strtoul(selector, (char **) NULL, 10); - break; - default: - stgFree(selector); - } - } - break; - } + char property; + const char *filter; + if (arg[2] != '\0') { + property = arg[2]; + filter = arg + 3; + } else { +#if defined(PROFILING) + errorBelch("-h is deprecated, use -hc instead."); + property = 'c'; + filter = arg + 2; +#else + errorBelch("-h is deprecated, use -hT instead."); + property = 'T'; + filter = arg + 2; +#endif + } + // here property is initialized, and filter is a pointer inside arg - if (RtsFlags.ProfFlags.doHeapProfile != 0) { - errorBelch("multiple heap profile options"); - error = true; - break; - } + if (filter[0] != '\0') { + // For backwards compat, extract the portion between curly braces, else + // use the entire string + const char *left = strchr(filter, '{'); + const char *right = strrchr(filter, '}'); - switch (arg[2]) { - case '\0': + if (left) + left = left + 1; + else + left = filter; + + if (!right) + right = filter + strlen(filter); + + char *selector = stgStrndup(left, right - left); + switch (property) { +#if defined(PROFILING) + case 'c': // cost centre label select + RtsFlags.ProfFlags.ccSelector = selector; + break; case 'C': - case 'c': - RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_CCS; + RtsFlags.ProfFlags.ccsSelector = selector; break; case 'M': - case 'm': - RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_MOD; + case 'm': // cost centre module select + RtsFlags.ProfFlags.modSelector = selector; break; case 'D': - case 'd': - RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_DESCR; + case 'd': // closure descr select + RtsFlags.ProfFlags.descrSelector = selector; break; case 'Y': - case 'y': - RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_TYPE; + case 'y': // closure type select + RtsFlags.ProfFlags.typeSelector = selector; break; - case 'i': - RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_INFO_TABLE; + case 'R': + case 'r': // retainer select + RtsFlags.ProfFlags.retainerSelector = selector; break; + case 'B': + case 'b': // biography select + RtsFlags.ProfFlags.bioSelector = selector; + break; + case 'E': + case 'e': // era select + RtsFlags.ProfFlags.eraSelector = strtoul(selector, (char **) NULL, 10); + break; +#else + case 'c': + case 'C': + case 'M': + case 'm': + case 'D': + case 'd': + case 'Y': + case 'y': case 'R': case 'r': - RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_RETAINER; - break; case 'B': case 'b': - RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_LDV; + case 'E': + case 'e': + PROFILING_BUILD_ONLY(arg,); break; - case 'T': - RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_CLOSURE_TYPE; + case 'T': /* closure type select */ + RtsFlags.ProfFlags.closureTypeSelector = selector; break; - case 'e': - RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_ERA; + case 'i': /* info table select */ + RtsFlags.ProfFlags.infoTableSelector = selector; break; - } - break; - default: - errorBelch("invalid heap profile option: %s", arg); - error = true; +#endif /* PROFILING */ + default: + stgFree(selector); + } + } else { + if (RtsFlags.ProfFlags.doHeapProfile != 0) { + errorBelch("multiple heap profile options"); + error = true; + } else { + switch (property) { +#if defined(PROFILING) + case 'C': + case 'c': + RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_CCS; + break; + case 'M': + case 'm': + RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_MOD; + break; + case 'D': + case 'd': + RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_DESCR; + break; + case 'Y': + case 'y': + RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_TYPE; + break; + case 'R': + case 'r': + RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_RETAINER; + break; + case 'B': + case 'b': + RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_LDV; + break; + case 'e': + RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_ERA; + break; +#else + case 'C': + case 'c': + case 'M': + case 'm': + case 'D': + case 'd': + case 'Y': + case 'y': + case 'R': + case 'r': + case 'B': + case 'b': + case 'e': + PROFILING_BUILD_ONLY(arg,); + break; +#endif /* PROFILING*/ + case 'T': + RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_CLOSURE_TYPE; + break; + case 'i': + RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_INFO_TABLE; + break; + default: + errorBelch("invalid heap profile option: %s", arg); + error = true; + break; + } + } } return error; } -#endif #if defined(TRACING) static void read_trace_flags(const char *arg) ===================================== rts/include/rts/Flags.h ===================================== @@ -170,6 +170,8 @@ typedef struct _PROFILING_FLAGS { const char* retainerSelector; StgWord eraSelector; const char* bioSelector; + const char* closureTypeSelector; + const char* infoTableSelector; } PROFILING_FLAGS; ===================================== rts/js/mem.js ===================================== @@ -1,5 +1,5 @@ //#OPTIONS:CPP -//#OPTIONS:EMCC:EXPORTED_RUNTIME_METHODS=addFunction,removeFunction,getEmptyTableSlot,HEAP8 +//#OPTIONS:EMCC:EXPORTED_RUNTIME_METHODS=addFunction,removeFunction,getEmptyTableSlot,HEAP8,HEAPU8 // #define GHCJS_TRACE_META 1 ===================================== rts/wasm/JSFFI.c ===================================== @@ -5,6 +5,8 @@ #include "Threads.h" #include "sm/Sanity.h" +#include <sysexits.h> + #if defined(__wasm_reference_types__) extern HsBool rts_JSFFI_flag; @@ -12,21 +14,8 @@ extern HsStablePtr rts_threadDelay_impl; extern StgClosure ghczminternal_GHCziInternalziWasmziPrimziImports_raiseJSException_closure; extern StgClosure ghczminternal_GHCziInternalziWasmziPrimziConcziInternal_threadDelay_closure; -int __main_void(void); - -int __main_argc_argv(int, char*[]); - -int __main_argc_argv(int argc, char *argv[]) { - RtsConfig __conf = defaultRtsConfig; - __conf.rts_opts_enabled = RtsOptsAll; - __conf.rts_hs_main = false; - hs_init_ghc(&argc, &argv, __conf); - // See Note [threadDelay on wasm] for details. - rts_JSFFI_flag = HS_BOOL_TRUE; - getStablePtr((StgPtr)&ghczminternal_GHCziInternalziWasmziPrimziImports_raiseJSException_closure); - rts_threadDelay_impl = getStablePtr((StgPtr)&ghczminternal_GHCziInternalziWasmziPrimziConcziInternal_threadDelay_closure); - return 0; -} +__attribute__((__weak__)) +int __main_argc_argv(int argc, char *argv[]); // Note [JSFFI initialization] // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -66,11 +55,69 @@ int __main_argc_argv(int argc, char *argv[]) { // by the GHC codegen, and priority 102 to the initialization logic // here to ensure hs_init_ghc() sees everything it needs to see. __attribute__((constructor(102))) static void __ghc_wasm_jsffi_init(void) { - // See - // https://gitlab.haskell.org/ghc/wasi-libc/-/blob/master/libc-bottom-half/sou… - // for its definition. It initializes some libc state, then calls - // __main_argc_argv defined above. - __main_void(); + // If linking static code without -no-hs-main, then the driver + // emitted main() is in charge of its own RTS initialization, so + // skip. +#if !defined(__PIC__) + if (__main_argc_argv) { + return; + } +#endif + + // Code below is mirrored from + // https://gitlab.haskell.org/haskell-wasm/wasi-libc/-/blob/master/libc-bottom…, + // fetches argc/argv using wasi api + __wasi_errno_t err; + + // Get the sizes of the arrays we'll have to create to copy in the args. + size_t argv_buf_size; + size_t argc; + err = __wasi_args_sizes_get(&argc, &argv_buf_size); + if (err != __WASI_ERRNO_SUCCESS) { + _Exit(EX_OSERR); + } + + // Add 1 for the NULL pointer to mark the end, and check for overflow. + size_t num_ptrs = argc + 1; + if (num_ptrs == 0) { + _Exit(EX_SOFTWARE); + } + + // Allocate memory for storing the argument chars. + char *argv_buf = malloc(argv_buf_size); + if (argv_buf == NULL) { + _Exit(EX_SOFTWARE); + } + + // Allocate memory for the array of pointers. This uses `calloc` both to + // handle overflow and to initialize the NULL pointer at the end. + char **argv = calloc(num_ptrs, sizeof(char *)); + if (argv == NULL) { + free(argv_buf); + _Exit(EX_SOFTWARE); + } + + // Fill the argument chars, and the argv array with pointers into those chars. + // TODO: Remove the casts on `argv_ptrs` and `argv_buf` once the witx is + // updated with char8 support. + err = __wasi_args_get((uint8_t **)argv, (uint8_t *)argv_buf); + if (err != __WASI_ERRNO_SUCCESS) { + free(argv_buf); + free(argv); + _Exit(EX_OSERR); + } + + // Now that we have argc/argv, proceed to initialize the GHC RTS + RtsConfig __conf = defaultRtsConfig; + __conf.rts_opts_enabled = RtsOptsAll; + __conf.rts_hs_main = false; + hs_init_ghc((int *)&argc, &argv, __conf); + // See Note [threadDelay on wasm] for details. + rts_JSFFI_flag = HS_BOOL_TRUE; + getStablePtr(( + StgPtr)&ghczminternal_GHCziInternalziWasmziPrimziImports_raiseJSException_closure); + rts_threadDelay_impl = getStablePtr(( + StgPtr)&ghczminternal_GHCziInternalziWasmziPrimziConcziInternal_threadDelay_closure); } typedef __externref_t HsJSVal; ===================================== testsuite/driver/testlib.py ===================================== @@ -3005,7 +3005,7 @@ def normalise_errmsg(s: str) -> str: # Emscripten displays cache info and old emcc doesn't support EMCC_LOGGING=0 s = re.sub('cache:INFO: .*\n', '', s) # Old emcc warns when we export HEAP8 but new one requires it (see #26290) - s = s.replace('warning: invalid item in EXPORTED_RUNTIME_METHODS: HEAP8\nemcc: warning: warnings in JS library compilation [-Wjs-compiler]\n','') + s = s.replace('warning: invalid item in EXPORTED_RUNTIME_METHODS: HEAP8\nwarning: invalid item in EXPORTED_RUNTIME_METHODS: HEAPU8\nemcc: warning: warnings in JS library compilation [-Wjs-compiler]\n','') return s ===================================== testsuite/tests/cross/should_run/T26449.hs ===================================== @@ -0,0 +1,16 @@ +import Control.Monad +import GHC.Platform.ArchOS +import GHC.Platform.Host +import System.Info + +main :: IO () +main = + when ((arch, os) /= (arch', os')) $ + fail $ + "System.Info says host platform is " + <> show (arch, os) + <> " but GHC.Platform.Host says " + <> show (arch', os') + where + (arch', os') = + (stringEncodeArch hostPlatformArch, stringEncodeOS hostPlatformOS) ===================================== testsuite/tests/cross/should_run/all.T ===================================== @@ -0,0 +1 @@ +test('T26449', [], compile_and_run, ['']) ===================================== testsuite/tests/interface-stability/ghc-experimental-exports.stdout ===================================== @@ -6363,7 +6363,9 @@ module GHC.RTS.Flags.Experimental where ccsSelector :: GHC.Internal.Maybe.Maybe GHC.Internal.Base.String, retainerSelector :: GHC.Internal.Maybe.Maybe GHC.Internal.Base.String, bioSelector :: GHC.Internal.Maybe.Maybe GHC.Internal.Base.String, - eraSelector :: GHC.Internal.Types.Word} + eraSelector :: GHC.Internal.Types.Word, + closureTypeSelector :: GHC.Internal.Maybe.Maybe GHC.Internal.Base.String, + infoTableSelector :: GHC.Internal.Maybe.Maybe GHC.Internal.Base.String} type RTSFlags :: * data RTSFlags = RTSFlags {gcFlags :: GCFlags, concurrentFlags :: ConcFlags, miscFlags :: MiscFlags, debugFlags :: DebugFlags, costCentreFlags :: CCFlags, profilingFlags :: ProfFlags, traceFlags :: TraceFlags, tickyFlags :: TickyFlags, parFlags :: ParFlags, hpcFlags :: HpcFlags} type RtsTime :: * ===================================== testsuite/tests/interface-stability/ghc-experimental-exports.stdout-mingw32 ===================================== @@ -6366,7 +6366,9 @@ module GHC.RTS.Flags.Experimental where ccsSelector :: GHC.Internal.Maybe.Maybe GHC.Internal.Base.String, retainerSelector :: GHC.Internal.Maybe.Maybe GHC.Internal.Base.String, bioSelector :: GHC.Internal.Maybe.Maybe GHC.Internal.Base.String, - eraSelector :: GHC.Internal.Types.Word} + eraSelector :: GHC.Internal.Types.Word, + closureTypeSelector :: GHC.Internal.Maybe.Maybe GHC.Internal.Base.String, + infoTableSelector :: GHC.Internal.Maybe.Maybe GHC.Internal.Base.String} type RTSFlags :: * data RTSFlags = RTSFlags {gcFlags :: GCFlags, concurrentFlags :: ConcFlags, miscFlags :: MiscFlags, debugFlags :: DebugFlags, costCentreFlags :: CCFlags, profilingFlags :: ProfFlags, traceFlags :: TraceFlags, tickyFlags :: TickyFlags, parFlags :: ParFlags, hpcFlags :: HpcFlags} type RtsTime :: * ===================================== utils/ghc-toolchain/src/GHC/Toolchain/Tools/Link.hs ===================================== @@ -324,10 +324,6 @@ addPlatformDepLinkFlags archOs cc ccLink0 = do ArchOS ArchPPC OSAIX -> -- We need `-D_THREAD_SAFE` to unlock the thread-local `errno`. return $ ccLink2 & over _prgFlags (++["-D_THREAD_SAFE","-Wl,-bnotextro"]) - ArchOS ArchJavaScript OSGhcjs -> - -- Since https://github.com/emscripten-core/emscripten/blob/main/ChangeLog.md#407---… - -- the emcc linker does not export the HEAP8 memory view which is used by the js RTS by default anymore. - return $ ccLink2 & _prgFlags %++ "-sEXPORTED_RUNTIME_METHODS=HEAP8,HEAPU8" _ -> return ccLink2 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/77b7dfc021686576418c9fcb19713c… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/77b7dfc021686576418c9fcb19713c… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] rts: provide stub implementations of ExecPage functions for wasm
by Marge Bot (＠marge-bot) 28 Sep '25

28 Sep '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 5d59fc8f by Cheng Shao at 2025-09-28T19:26:27-04:00 rts: provide stub implementations of ExecPage functions for wasm This patch provides stub implementations of ExecPage functions for wasm. They are never actually invoked at runtime for any non-TNTC platform, yet they can cause link-time errors of missing symbols when the GHCi.InfoTable module gets linked into the final wasm module (e.g. a GHC API program). - - - - - 1 changed file: - rts/ExecPage.c Changes: ===================================== rts/ExecPage.c ===================================== @@ -10,15 +10,23 @@ #include "linker/MMap.h" ExecPage *allocateExecPage(void) { +#if defined(wasm32_HOST_ARCH) + return NULL; +#else ExecPage *page = (ExecPage *) mmapAnon(getPageSize()); return page; +#endif } void freezeExecPage(ExecPage *page) { +#if !defined(wasm32_HOST_ARCH) mprotectForLinker(page, getPageSize(), MEM_READ_EXECUTE); flushExec(getPageSize(), page); +#endif } void freeExecPage(ExecPage *page) { +#if !defined(wasm32_HOST_ARCH) munmapForLinker(page, getPageSize(), "freeExecPage"); +#endif } View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5d59fc8f98444998e7087fedae2d245… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5d59fc8f98444998e7087fedae2d245… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] rts: fix wasm JSFFI initialization constructor code
by Marge Bot (＠marge-bot) 28 Sep '25

28 Sep '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: bdc9d130 by Cheng Shao at 2025-09-28T19:25:45-04:00 rts: fix wasm JSFFI initialization constructor code This commit fixes wasm JSFFI initialization constructor code so that the constructor is self-contained and avoids invoking a fake __main_argc_argv function. The previous approach of reusing __main_void logic in wasi-libc saves a tiny bit of code, at the expense of link-time trouble whenever GHC links a wasm module without -no-hs-main, in which case the driver-generated main function would clash with the definition here, resulting in a linker error. It's simply better to avoid messing with the main function, and it would additionally allow linking wasm32-wasi command modules that does make use of synchronous JSFFI. - - - - - 1 changed file: - rts/wasm/JSFFI.c Changes: ===================================== rts/wasm/JSFFI.c ===================================== @@ -5,6 +5,8 @@ #include "Threads.h" #include "sm/Sanity.h" +#include <sysexits.h> + #if defined(__wasm_reference_types__) extern HsBool rts_JSFFI_flag; @@ -12,21 +14,8 @@ extern HsStablePtr rts_threadDelay_impl; extern StgClosure ghczminternal_GHCziInternalziWasmziPrimziImports_raiseJSException_closure; extern StgClosure ghczminternal_GHCziInternalziWasmziPrimziConcziInternal_threadDelay_closure; -int __main_void(void); - -int __main_argc_argv(int, char*[]); - -int __main_argc_argv(int argc, char *argv[]) { - RtsConfig __conf = defaultRtsConfig; - __conf.rts_opts_enabled = RtsOptsAll; - __conf.rts_hs_main = false; - hs_init_ghc(&argc, &argv, __conf); - // See Note [threadDelay on wasm] for details. - rts_JSFFI_flag = HS_BOOL_TRUE; - getStablePtr((StgPtr)&ghczminternal_GHCziInternalziWasmziPrimziImports_raiseJSException_closure); - rts_threadDelay_impl = getStablePtr((StgPtr)&ghczminternal_GHCziInternalziWasmziPrimziConcziInternal_threadDelay_closure); - return 0; -} +__attribute__((__weak__)) +int __main_argc_argv(int argc, char *argv[]); // Note [JSFFI initialization] // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -66,11 +55,69 @@ int __main_argc_argv(int argc, char *argv[]) { // by the GHC codegen, and priority 102 to the initialization logic // here to ensure hs_init_ghc() sees everything it needs to see. __attribute__((constructor(102))) static void __ghc_wasm_jsffi_init(void) { - // See - // https://gitlab.haskell.org/ghc/wasi-libc/-/blob/master/libc-bottom-half/sou… - // for its definition. It initializes some libc state, then calls - // __main_argc_argv defined above. - __main_void(); + // If linking static code without -no-hs-main, then the driver + // emitted main() is in charge of its own RTS initialization, so + // skip. +#if !defined(__PIC__) + if (__main_argc_argv) { + return; + } +#endif + + // Code below is mirrored from + // https://gitlab.haskell.org/haskell-wasm/wasi-libc/-/blob/master/libc-bottom…, + // fetches argc/argv using wasi api + __wasi_errno_t err; + + // Get the sizes of the arrays we'll have to create to copy in the args. + size_t argv_buf_size; + size_t argc; + err = __wasi_args_sizes_get(&argc, &argv_buf_size); + if (err != __WASI_ERRNO_SUCCESS) { + _Exit(EX_OSERR); + } + + // Add 1 for the NULL pointer to mark the end, and check for overflow. + size_t num_ptrs = argc + 1; + if (num_ptrs == 0) { + _Exit(EX_SOFTWARE); + } + + // Allocate memory for storing the argument chars. + char *argv_buf = malloc(argv_buf_size); + if (argv_buf == NULL) { + _Exit(EX_SOFTWARE); + } + + // Allocate memory for the array of pointers. This uses `calloc` both to + // handle overflow and to initialize the NULL pointer at the end. + char **argv = calloc(num_ptrs, sizeof(char *)); + if (argv == NULL) { + free(argv_buf); + _Exit(EX_SOFTWARE); + } + + // Fill the argument chars, and the argv array with pointers into those chars. + // TODO: Remove the casts on `argv_ptrs` and `argv_buf` once the witx is + // updated with char8 support. + err = __wasi_args_get((uint8_t **)argv, (uint8_t *)argv_buf); + if (err != __WASI_ERRNO_SUCCESS) { + free(argv_buf); + free(argv); + _Exit(EX_OSERR); + } + + // Now that we have argc/argv, proceed to initialize the GHC RTS + RtsConfig __conf = defaultRtsConfig; + __conf.rts_opts_enabled = RtsOptsAll; + __conf.rts_hs_main = false; + hs_init_ghc((int *)&argc, &argv, __conf); + // See Note [threadDelay on wasm] for details. + rts_JSFFI_flag = HS_BOOL_TRUE; + getStablePtr(( + StgPtr)&ghczminternal_GHCziInternalziWasmziPrimziImports_raiseJSException_closure); + rts_threadDelay_impl = getStablePtr(( + StgPtr)&ghczminternal_GHCziInternalziWasmziPrimziConcziInternal_threadDelay_closure); } typedef __externref_t HsJSVal; View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/bdc9d130a838017f863f5c7a380cb08… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/bdc9d130a838017f863f5c7a380cb08… You're receiving this email because of your account on gitlab.haskell.org.

1 0