Skip to content
Snippets Groups Projects
  1. Mar 04, 2025
    • Cheng Shao's avatar
      testsuite: test wasm backend JSFFI sync exports · b7dce5cd
      Cheng Shao authored
      This commit repurposes some existing JSFFI test cases to make them
      cover JSFFI sync exports as well.
      
      (cherry picked from commit b6ae908b)
      b7dce5cd
    • Cheng Shao's avatar
      compiler: wasm backend JSFFI sync exports · 8cefd046
      Cheng Shao authored
      This commit implements the synchronous flavour of the wasm backend
      JSFFI exports:
      
      - `foreign export javascript "foo sync"` exports a top-level Haskell
        binding as a synchronous JS function
      - `foreign import javascript "wrapper sync"` dynamically exports a
        Haskell function closure as a synchronous JS function
      - `foreign import javascript unsafe` is now re-entrant by lowering to
        a safe ccall
      - Also fix the issue that JSFFI dynamic exports didn't really work in
        TH & ghci (#25473)
      
      (cherry picked from commit 03ebab52)
      8cefd046
    • Cheng Shao's avatar
      compiler: allow arbitrary label string for JSFFI exports · 18dd15dc
      Cheng Shao authored
      This commit allows arbitrary label string to appear in a foreign
      export declaration, as long as the calling convention is javascript.
      Well, doesn't make sense to enforce it's a C function symbol for a
      JSFFI declaration anyway, and it gets in the way of implementing the
      "sync" flavour of exports.
      
      (cherry picked from commit a204df3a)
      18dd15dc
    • Cheng Shao's avatar
      rts: fix top handler closure type signatures · 8ebb0348
      Cheng Shao authored
      This commit fixes the runIO/runNonIO closure type signatures in the
      RTS which should be extern StgClosure. This allows us to remove an
      unnecessary type cast in the C foreign desugaring logic, as well as
      unneeded complications of JSFFI desugaring logic that also needs to
      generate C stubs that may refer to those top handler closures.
      Otherwise, we'll have to take special care to avoid generating "extern
      StgClosure" declarations for them as we would for other closures, just
      to avoid conflicting type signature error at stub compile time.
      
      (cherry picked from commit c78d8f55)
      8ebb0348
  2. Feb 28, 2025
    • Cheng Shao's avatar
      ghc-heap: fix HalfWord incompatible Binary instances for cross GHC · 25e75c1f
      Cheng Shao authored
      ghc-heap defines HalfWord as Word32/Word16 depending on host word
      size. For cross GHC with different host/target word sizes, the Binary
      instances are incompatible and breaks iserv serialization of any
      message type that involves HalfWord, breaking the ghci debugger. This
      patch fixes the issue and has been tested to fix ghci debugger
      functionality of the wasm backend. Fixes #25420 #25781.
      
      (cherry picked from commit b228fcb5)
      25e75c1f
    • Cheng Shao's avatar
      ghci: remove unused showBreakArray function · 8e0bb14d
      Cheng Shao authored
      GHCi.BreakArray.showBreakArray is not used anywhere, hence the
      housecleaning.
      
      (cherry picked from commit 2d6a63ab)
      8e0bb14d
    • Cheng Shao's avatar
      hadrian: enable building docs for cross targets · a0af1500
      Cheng Shao authored
      Hadrian used to omit the docs target as a part of binary-dist-dir for
      cross targets. This commit enables docs to be built as a part of cross
      bindists and it works just fine in CI.
      
      (cherry picked from commit a794e733)
      a0af1500
    • Cheng Shao's avatar
      hadrian: enable building stage1 haddock for cross ghc · 0b775a8a
      Cheng Shao authored
      This commit enables building stage1 haddock for cross ghc. Without
      this change, hadrian would panic with "Unknown program" error when
      building the _build/stage1/bin/cross-prefix-haddock program needed by
      the docs-haddock target, even if it only needs to copy from
      _build/stage0/bin/cross-prefix-haddock.
      
      (cherry picked from commit 272eaef0)
      0b775a8a
    • Fangyi Zhou's avatar
      wasm: use primitive opcodes for fabs and sqrt · d6b9dab5
      Fangyi Zhou authored and Cheng Shao's avatar Cheng Shao committed
      - Add new `WasmInstr` constructor `WasmSqrt` for sqrt, corresponding to
        primitivie operations in wasm.
      - When lowering CallishMachOp, use `WasmAbs` and `WasmSqrt` for F32 and
        F64 fabs and sqrt.
      
      (cherry picked from commit 64b0d4d0)
      d6b9dab5
    • Cheng Shao's avatar
      libffi: update to 3.4.7 · c4b9fc99
      Cheng Shao authored
      Bumps libffi submodule.
      
      (cherry picked from commit c318be56)
      c4b9fc99
    • Cheng Shao's avatar
      wasm: add Note [Variable passing in JSFFI] as !13583 follow up · 6f411dc5
      Cheng Shao authored
      This patch adds a note to explain how the magic variables like
      `__ghc_wasm_jsffi_dyld` are brought into scope of JSFFI code snippets,
      as follow up work of !13583.
      
      (cherry picked from commit f3bfe31e)
      6f411dc5
    • Cheng Shao's avatar
      driver: fix wasm backend sysroot lookup logic when -flto is passed · d842f750
      Cheng Shao authored
      For the wasm target, the driver calls `wasm32-wasi-clang
      --print-search-dirs` and finds the sysroot directory that contains
      libc.so etc, then passes the directory path to dyld. However, when GHC
      is configured with -flto as a part of C/C++ compiler flags, the clang
      driver would insert a llvm-lto specific directory in the
      --print-search-dirs output and the driver didn't take that into
      account. This patch fixes it and always selects the non-lto sysroot
      directory to be passed to dyld. This is one small step towards
      supporting building all cbits with lto for wasm.
      
      (cherry picked from commit 7eea38c8)
      d842f750
    • Cheng Shao's avatar
      wasm: fix dyld for shared libraries created by llvm 20.x · 6bd4fd72
      Cheng Shao authored
      This patch fixes wasm dyld script for shared libraries created by llvm
      20.x. The __wasm_apply_data_relocs function is now optional and may be
      omitted for shared libraries without any runtime relocatable data
      segments, so only call __wasm_apply_data_relocs when it's present.
      
      (cherry picked from commit cb60da24)
      6bd4fd72
    • Cheng Shao's avatar
      compiler: use fromAscList when applicable · 048b5404
      Cheng Shao authored
      This patch uses fromAscList (with O(n) complexity) instead of fromList
      (with O(nlogn) complexity) in certain Binary instances. It's safe to
      do so since the corresponding serialization logic is based on toList
      (same as toAscList).
      
      (cherry picked from commit 1c8e608a)
      048b5404
    • Cheng Shao's avatar
      testsuite: fix InternalCounters test with +debug_ghc · 70003f90
      Cheng Shao authored
      The `InternalCounters` test case fails when ghc is built with
      `+debug_ghc`. This patch skips it in that case and allows the
      testsuite to pass for the `+debug_ghc` flavour transformer.
      
      (cherry picked from commit 59b9307b)
      70003f90
  3. Feb 21, 2025
    • Cheng Shao's avatar
      hadrian: so-mutex · 93facedb
      Cheng Shao authored
      93facedb
    • Cheng Shao's avatar
      compiler: remove unused assembleOneBCO function · 31b9d01c
      Cheng Shao authored
      This patch removes the unused assembleOneBCO function from the
      bytecode assembler.
      
      (cherry picked from commit 02794411)
      31b9d01c
    • Cheng Shao's avatar
      hadrian: fix bootstrap with 9.12.1 · 4d0cd2ff
      Cheng Shao authored
      This patch bumps hadrian index-state to fix bootstrap with 9.12.1.
      
      (cherry picked from commit e16eae65)
      4d0cd2ff
    • Mateusz Goślinowski's avatar
      Allow multiline strings in JS FFI (#25633) · 5f4d0d8d
      Mateusz Goślinowski authored and Cheng Shao's avatar Cheng Shao committed
      (cherry picked from commit 14f8a7ec)
      5f4d0d8d
    • amesgen's avatar
      wasm: prevent bundlers from resolving import("node:timers") · 7d362e8e
      amesgen authored and Cheng Shao's avatar Cheng Shao committed
      This fixes the following esbuild error:
      
          ✘ [ERROR] Could not resolve "node:timers"
      
              www/ghc_wasm_jsffi.js:66:25:
                66 │     return (await import("node:timers")).setImmediate;
                   ╵                          ~~~~~~~~~~~~~
      
            The package "node:timers" wasn't found on the file system but is built into node. Are you trying
            to bundle for node? You can use "--platform=node" to do that, which will remove this error.
      
      Previously (i.e. after !13503), one had to work around this by passing
      `--external:node:timers`.
      
      (cherry picked from commit f6493dbc)
      7d362e8e
    • Cheng Shao's avatar
      xxhash: bump to v0.8.3 · e11933d6
      Cheng Shao authored
      (cherry picked from commit 42826a89)
      e11933d6
    • Cheng Shao's avatar
      ci: avoid depending on stack job for test-bootstrap jobs · 3464639c
      Cheng Shao authored
      This patch makes test-bootstrap related ci jobs only depend on
      hadrian-ghc-in-ghci job to finish, consistent with other jobs in the
      full-build stage generated by gen_ci.hs. This allows the jobs to be
      spawned earlier and improve overall pipeline parallelism.
      
      (cherry picked from commit e684c406)
      3464639c
    • Cheng Shao's avatar
      ci: minor nix-in-docker improvements · 84fb7c65
      Cheng Shao authored
      This patch makes some minor improvements re nix-in-docker logic in the
      ci configuration:
      
      - Update `nixos/nix` to the latest version
      - Apply $CPUS to `cores`/`max-jobs` to avoid oversubscribing while
        allowing a reasonable degree of parallelism
      - Remove redundant `--extra-experimental-features nix-command` in
        later `nix shell` invocations, it's already configured in
        `/etc/nix/nix.conf`
      
      (cherry picked from commit 291388e1)
      84fb7c65
    • Cheng Shao's avatar
      compiler: remove unused GHC.Linker.Loader.loadExpr · cf38c1b9
      Cheng Shao authored
      This patch removes the unused `GHC.Linker.Loader.loadExpr` function.
      It was moved from `GHC.Runtime.Linker.linkExpr` in `ghc-9.0` to
      `GHC.Linker.Loader.loadExpr` in `ghc-9.2`, and remain completely
      unused and untested ever since. There's also no third party user of
      this function to my best knowledge, so let's remove this. Anyone who
      wants to write their own GHC API function to load bytecode can consult
      the source code in older release branches.
      
      (cherry picked from commit 536cdf09)
      cf38c1b9
    • Cheng Shao's avatar
      wasm: fix foreign import javascript "wrapper" in TH/ghci · dd6cc745
      Cheng Shao authored
      This patch fixes foreign import javascript "wrapper" in wasm backend's
      TH/ghci by fixing the handling of dyld/finalization_registry magic
      variables. Fixes T25473 and closes #25473.
      
      (cherry picked from commit bd0a8b7e)
      dd6cc745
    • Cheng Shao's avatar
      testsuite: add regression test T25473 · e439f307
      Cheng Shao authored
      This commit adds regression test T25473 marked as broken due to #25473.
      It will be fixed in the subsequent commit.
      
      (cherry picked from commit ed2ed6c5)
      e439f307
    • Cheng Shao's avatar
      misc: improve clangd compile_flags.txt flags · a2e9d29b
      Cheng Shao authored
      This patch improves the compile_flags.txt config used to power clangd
      for the rts C codebase. The flags in the file are sampled & deduped
      from a real stage1 build with clang-19 and vastly improves the IDE
      accuracy when hacking the rts.
      
      For maximum code coverage under the default settings,
      compile_flags.txt defaults to threaded+profiled+dynamic+debug way.
      This does not mean profdyn needs to be actually built in _build/stage1
      for IDE to work. To activate IDE for other RTS ways, simply remove one
      of the -D flags at the end of compile_flags.txt and restart clangd.
      
      (cherry picked from commit 59e0a770)
      a2e9d29b
    • Cheng Shao's avatar
      hadrian: fix bindist makefile for wasm32-wasi target · 0512ecf5
      Cheng Shao authored
      This patch fixes one incoherent place between bindist makefile and
      hadrian logic: I forgot to include wasi/wasm32 in
      OsSupportsGHCi/ArchSupportsGHCi as well. And this results in incorrect
      settings file generated after installing the bindist, and "Use
      interpreter"/"Have interpreter" fields incorrectly have "NO" values
      where they should be "YES" like --info output of in-tree version.
      
      (cherry picked from commit 75a2eae4)
      0512ecf5
    • Cheng Shao's avatar
      Remove obsolete cross-port script · 2588a5ea
      Cheng Shao authored
      This patch removes the obsolete cross-port script in the tree. The
      script was based on the legacy Make build system which has been pruned
      from the tree long ago. For hadrian, proper support for two-stage
      bootstrapping onto a new unsupported platform is a work in progress in
      !11444.
      
      (cherry picked from commit 00d551bf)
      2588a5ea
    • Cheng Shao's avatar
      wasm: fix FinalizationRegistry logic for Cloudflare Workers · 2f443b6f
      Cheng Shao authored
      This patch fixes FinalizationRegistry related logic for Cloudflare
      Workers in wasm backend js post linker. Cloudflare Workers doesn't
      support FinalizationRegistry, in this case we use a dummy
      implementation that doesn't do anything.
      
      (cherry picked from commit bea8ea4c)
      2f443b6f
    • Cheng Shao's avatar
      wasm: fix setImmediate() implementation for Cloudflare Workers · a5b486d6
      Cheng Shao authored
      This patch fixes setImmediate() implementation for Cloudflare Workers
      in the wasm backend's js prelude script. Cloudflare Workers doesn't
      support the MessageChannel API, and we use a setTimeout() based
      fallback implementation in this case.
      
      (cherry picked from commit c37b96fa)
      a5b486d6
    • Cheng Shao's avatar
      Remove obsolete executable wrappers from the tree · 9cf34006
      Cheng Shao authored
      The executable wrappers are handled by hadrian and bindist Makefile.
      The various .wrapper scripts in the tree are unused since removal of
      Make build system, so this patch removes them all.
      
      (cherry picked from commit 9ede97f3)
      9cf34006
    • Cheng Shao's avatar
      Remove unused USE_REPORT_PRELUDE code paths from the tree · 6f20e49e
      Cheng Shao authored
      This patch removes unused `USE_REPORT_PRELUDE` code paths from the
      tree. They have been present since the first git revision
      4fb94ae5, and might have been useful
      for debugging purposes many years ago, but these code paths are never
      actually built. Removing these ease maintenance of relevant modules in
      the future, and also allows us to get rid of `CPP` extension in those
      modules as a nice byproduct.
      
      (cherry picked from commit 573cad4b)
      6f20e49e
    • Cheng Shao's avatar
      compiler: remove unused hscDecls/hscDeclsWithLocation · 771f0666
      Cheng Shao authored
      This patch removes unused `hscDecls`/`hscDeclsWithLocation` functions
      from the compiler, to reduce maintenance burden when doing
      refactorings related to ghci.
      
      (cherry picked from commit e3496ef6)
      771f0666
    • Cheng Shao's avatar
      wasm: fix safari console error message related to import("node:timers") · 24db71aa
      Cheng Shao authored
      This patch fixes the wasm backend JSFFI prelude script to avoid
      calling `import("node:timers")` on non-deno hosts. Safari doesn't like
      it and would print an error message to the console. Fixes
      https://gitlab.haskell.org/ghc/ghc-wasm-meta/-/issues/13.
      
      (cherry picked from commit 301c3b54)
      24db71aa
    • Cheng Shao's avatar
      ghcid: use multi repl for ghcid · fd5b1275
      Cheng Shao authored
      (cherry picked from commit 589fea7f)
      fd5b1275
    • Cheng Shao's avatar
      hadrian: make sure ghc-bin internal-interpreter is disabled for stage0 when not cross compiling · da57d3a0
      Cheng Shao authored
      This patch disables internal-interpreter flag for stage0 ghc-bin when
      not cross compiling, see added comment for explanation. Fixes #25406.
      
      (cherry picked from commit fde12aba)
      da57d3a0
    • Cheng Shao's avatar
      hadrian: enable late-CCS for perf flavour as well · c65c7ef4
      Cheng Shao authored
      This patch enables late-CCS for perf flavour so that the testsuite can
      pass for perf as well. Fixes #25308.
      
      (cherry picked from commit 1bdb1317)
      c65c7ef4
    • Cheng Shao's avatar
      wasm: bump dyld v8 heap size limit · 518975c2
      Cheng Shao authored
      This patch adds `--max-old-space-size=8192` to wasm dyld shebang
      arguments to bump V8 heap size limit. The default limit
      (`heap_size_limit` returned by `v8.getHeapStatistics()`) is
      dynamically determined and a bit too low under certain workloads, and
      V8 would waste too much CPU time to garbage collect old generation
      heap more aggressively. Bumping the limit to 8G doesn't imply dyld
      would really take that much memory at run-time, but it lessens V8 heap
      stress significantly.
      
      (cherry picked from commit 14c5143899d164c7ac1213d918b4819684538c4b)
      518975c2
    • Ben Gamari's avatar
      testsuite/perf: Report better error message on malformed note · 37f184af
      Ben Gamari authored and Cheng Shao's avatar Cheng Shao committed
      Previously a malformed perf note resulted in very poor errors.
      Here we slight improve this situation.
      
      (cherry picked from commit f28b5992)
      37f184af
Loading