Skip to content
Snippets Groups Projects
  1. Dec 09, 2024
    • Cheng Shao's avatar
      ci: update wasm jobs configuration · 966ac3b5
      Cheng Shao authored
      This commit bumps ci-image revision to use updated wasm toolchain, and
      use host_fully_static instead of fully_static for wasm jobs so to
      ensure wasm shared libraries can be properly built.
      
      (cherry picked from commit 5043507c)
      966ac3b5
    • Matthew Pickering's avatar
      Update alpine release job to 3.20 · f29cc9cd
      Matthew Pickering authored and Cheng Shao's avatar Cheng Shao committed
      alpine 3.20 was recently released and uses a new python and sphinx
      toolchain which could be useful to test.
      
      (cherry picked from commit 7bcda869)
      f29cc9cd
    • Cheng Shao's avatar
      hadrian: add the host_fully_static flavour transformer · 30eda801
      Cheng Shao authored
      This commit adds the host_fully_static flavour transformer to hadrian,
      which ensures stage0 is fully statically linked while still permitting
      stage1 libdir to contain shared libraries. This is intended to be used
      by the wasm backend to build portable linux bindists that contain wasm
      shared libraries.
      
      (cherry picked from commit b45080a3)
      30eda801
    • Cheng Shao's avatar
      hadrian: re-enable PIC for gmp on wasm · 51794307
      Cheng Shao authored
      This commit re-enables --with-pic=yes configuration option of gmp when
      building for wasm, given we're about to include support for shared
      libraries, TH and ghci.
      
      (cherry picked from commit 775410fd)
      51794307
    • Cheng Shao's avatar
      hadrian: fix CFLAGS for gmp shared objs on wasm · 93d531c5
      Cheng Shao authored
      This commit adds -fvisibility=default to CFLAGS of gmp when building
      for wasm. This is required to generate the ghc-bignum shared library
      without linking errors. Clang defaults to -fvisibility=hidden for wasm
      targets, which will cause issues when a symbol is expected to be
      exported in a shared library but without explicit visibility attribute
      annotation.
      
      (cherry picked from commit c247f2ee)
      93d531c5
    • Cheng Shao's avatar
      hadrian: enable internal-interpreter for ghc-bin stage0 · 7aa62b54
      Cheng Shao authored
      This commit enables internal-interpreter flag for ghc-bin even when
      compiling stage0, as long as target supports ghci. It enables ghci
      functionality for cross targets that support ghci, since cross ghc-bin
      is really stage0.
      
      (cherry picked from commit 577c1819)
      7aa62b54
    • Cheng Shao's avatar
      hadrian: disable internal-interpreter of ghc library when cross compiling · f64548de
      Cheng Shao authored
      This commit disable the internal-interpreter flag of ghc library when
      cross compiling, only external interpreter works in such cases.
      
      (cherry picked from commit f232c872)
      f64548de
    • Cheng Shao's avatar
      hadrian: use targetSupportsRPaths predicate · e51db5a6
      Cheng Shao authored
      This commit changes the hostSupportsRPaths predicate to
      targetSupportsRPaths and use that to decide whether to pass
      RPATH-related link-time options. It's not applied to stage0, we should
      just use the default link-time options of stageBoot ghc.
      
      (cherry picked from commit a6a82cdb)
      e51db5a6
    • Cheng Shao's avatar
      rts: fix conflicting StgRun definitions on wasm · fb6145f1
      Cheng Shao authored
      This commit fixes conflicting StgRun definition when building dynamic
      ways of RTS for wasm in unregisterised mode.
      
      (cherry picked from commit bef94bde)
      fb6145f1
    • Cheng Shao's avatar
      rts: don't build predefined GloblRegs for wasm PIC mode · 7fbafbae
      Cheng Shao authored
      This commit wraps the predefined GlobalRegs in Wasm.S under a CPP
      guard to prevent building for PIC mode. When building dynamic ways of
      RTS, the wasm globals that represent STG GlobalRegs will be created
      and supplied by dyld.mjs. The current wasm dylink convention doesn't
      properly support exporting relocatable wasm globals at all, any wasm
      global exported by a .so is assumed to be a GOT.mem entry.
      
      (cherry picked from commit 98a32ec5)
      7fbafbae
    • Cheng Shao's avatar
      rts: drop interpretBCO support from non-dyn ways on wasm · c3738d4c
      Cheng Shao authored
      This commit drops interpretBCO support from non dynamic rts ways on
      wasm. The bytecode interpreter is only useful when the RTS linker also
      works, and on wasm it only works for dynamic ways anyway. An
      additional benefit of dropping interpretBCO is reduction in code size
      of linked wasm modules, especially since interpretBCO references
      ffi_call which is an auto-generated large function in libffi-wasm and
      unused by most user applications.
      
      (cherry picked from commit 90a35c41)
      c3738d4c
    • Cheng Shao's avatar
      rts: correct stale link in comment · 2132a026
      Cheng Shao authored
      (cherry picked from commit 0d0a16a8)
      2132a026
    • Cheng Shao's avatar
      rts: add __wrapped_freeJSVal · 58fe91cb
      Cheng Shao authored
      This commit wraps imported freeJSVal in a __wrapped_freeJSVal C
      function for wasm backend RTS. In general, wasm imports are only
      supposed to be directly called by C; they shouldn't be used as
      function pointers, which confuses wasm-ld at link-time when generating
      shared libraries.
      
      (cherry picked from commit 33d9db17)
      58fe91cb
    • Cheng Shao's avatar
      rts: rename prelude.js to prelude.mjs · dd4c2480
      Cheng Shao authored
      This commit renames prelude.js to prelude.mjs for wasm backend rts
      jsbits, and slightly adjusts the jsbits contents. This is for
      preparing the implementation of dyld.mjs that contains wasm dynamic
      linker logic, which needs to import prelude.mjs as a proper ESM
      module.
      
      (cherry picked from commit 71a471e7)
      dd4c2480
    • Cheng Shao's avatar
      ghc-internal: add missing CPPs for wasm · 2d21ddb1
      Cheng Shao authored
      This patch adds some missing CPP guards to ghc-internal, given those
      functions are non existent on wasm and would cause linking issues.
      
      (cherry picked from commit a998f69d)
      2d21ddb1
    • Cheng Shao's avatar
      ghci: use plain malloc for mkConInfoTable on non-TNTC platforms · 96df0c6d
      Cheng Shao authored
      This patch avoids using mmap() to allocate executable memory for
      mkConInfoTable on platforms without tables-next-to-code, see added
      comment for explanation.
      
      (cherry picked from commit 839ac52e)
      96df0c6d
    • Cheng Shao's avatar
      Drop obsolete libffi Makefile · c2e1e50d
      Cheng Shao authored
      This patch drops obsolete libffi Makefile from the tree, given it's
      completely unused since removal of make build system in !7094.
      
      (cherry picked from commit 3fe843c7)
      c2e1e50d
    • Cheng Shao's avatar
      hadrian: remove unused ghciWithDebugger field from flavour config · de973f50
      Cheng Shao authored
      This patch removes the ghciWithDebugger field from flavour config
      since it's actually not used anywhere.
      
      (cherry picked from commit c6e5fd3d)
      de973f50
    • Cheng Shao's avatar
      driver: fix runWorkerLimit on wasm · cab30bdd
      Cheng Shao authored
      This commit fixes link-time unresolved symbol errors for sem_open etc
      on wasm, by making runWorkerLimit always behave single-threaded. This
      avoids introducing the jobserver logic into the final wasm module and
      thus avoids referencing the posix semaphore symbols.
      
      (cherry picked from commit ceca9efb)
      cab30bdd
    • Cheng Shao's avatar
      rts: fix checkClosure error message · 65230578
      Cheng Shao authored
      This patch fixes an error message in checkClosure() when the closure
      has already been evacuated. The previous logic was meant to print the
      evacuated closure's type in the error message, but it was completely
      wrong, given info was not really an info table, but a tagged pointer
      that points to the closure's new address.
      
      (cherry picked from commit 0d3bc2fa)
      65230578
    • Cheng Shao's avatar
      git: remove a.out and include it in .gitignore · 594a0990
      Cheng Shao authored
      a.out is a configure script byproduct. It was mistakenly checked into
      the tree in !13118. This patch removes it, and include it in
      .gitignore to prevent a similar error in the future.
      
      (cherry picked from commit f0408eeb)
      594a0990
    • Cheng Shao's avatar
      ghci: fix isMinTTY.h casing for Windows targets · 980e5a65
      Cheng Shao authored
      This commit fixes isMinTTY.h casing in isMinTTY.c that's compiled for
      Windows targets. While this looks harmless given Windows filesystems
      are case-insensitive by default, it does cause a compilation warning
      with recent versions of clang, so we might as well fix the casing:
      
      ```
      driver\ghci\isMinTTY.c:10:10: error:
           warning: non-portable path to file '"isMinTTY.h"'; specified path differs in case from file name on disk [-Wnonportable-include-path]
         |
      10 | #include "isMINTTY.h"
         |          ^
      
       #include "isMINTTY.h"
               ^~~~~~~~~~~~
               "isMinTTY.h"
      1 warning generated.
      ```
      
      (cherry picked from commit 3a145315)
      980e5a65
    • Cheng Shao's avatar
      testsuite: remove undesired -fasm flag from test ways · 3d5f9827
      Cheng Shao authored
      This patch removes the -fasm flag from test ways, except ways like
      optasm that explicitly state they are meant to be compiled with NCG
      backend. Most test ways should use the default codegen backend, and
      the precense of -fasm can cause stderr mismatches like this when GHC
      is configured with the unregisterised backend:
      
      ```
      --- /dev/null
      +++ /tmp/ghctest-3hydwldj/test   spaces/testsuite/tests/profiling/should_compile/prof-late-cc.run/prof-late-cc.comp.stderr.normalised
      @@ -0,0 +1,2 @@
      +when making flags consistent: warning: [GHC-74335] [-Winconsistent-flags (in -Wdefault)]
      +    Target platform uses unregisterised ABI, so compiling via C
      *** unexpected failure for prof-late-cc(prof_no_auto)
      ```
      
      This has been breaking the wasm unreg nightly job since !12595 landed.
      
      (cherry picked from commit 88488847)
      3d5f9827
    • Cheng Shao's avatar
      testsuite: bump T17572 timeout on wasm32 · dcc86795
      Cheng Shao authored
      (cherry picked from commit 64fba310)
      dcc86795
    • Cheng Shao's avatar
      rts: use page sized mblocks on wasm · f2fdc462
      Cheng Shao authored
      This patch changes mblock size to page size on wasm. It allows us to
      simplify our wasi-libc fork, makes it much easier to test third party
      libc allocators like emmalloc/mimalloc, as well as experimenting with
      threaded RTS in wasm.
      
      (cherry picked from commit 558353f4)
      f2fdc462
    • Cheng Shao's avatar
      rts: replace ad-hoc MYTASK_USE_TLV with proper CC_SUPPORTS_TLS · 1d259c1b
      Cheng Shao authored
      This patch replaces the ad-hoc `MYTASK_USE_TLV` with the
      `CC_SUPPORTS_TLS` macro. If TLS support is detected by autoconf, then
      we should use that for managing `myTask` in the threaded RTS.
      
      (cherry picked from commit f3017dd3)
      1d259c1b
    • Cheng Shao's avatar
      rts: cleanup inlining logic · 11651fc7
      Cheng Shao authored
      This patch removes pre-C11 legacy code paths related to
      INLINE_HEADER/STATIC_INLINE/EXTERN_INLINE macros, ensure EXTERN_INLINE
      is treated as static inline in most cases (fixes #24945), and also
      corrects the comments accordingly.
      
      (cherry picked from commit 35a64220)
      11651fc7
    • Cheng Shao's avatar
      testsuite: skip objc-hi/objcxx-hi when cross compiling · 295d109e
      Cheng Shao authored
      objc-hi/objcxx-hi should be skipped when cross compiling. The existing
      opsys('darwin') predicate only asserts the host system is darwin but
      tells us nothing about the target, hence the oversight.
      
      (cherry picked from commit 595c0894)
      295d109e
    • Cheng Shao's avatar
      testsuite: bump T7653 timeout for wasm · 7493e459
      Cheng Shao authored
      (cherry picked from commit 2eee65e1)
      7493e459
    • Cheng Shao's avatar
      compiler: remove unused CompilerInfo/LinkerInfo types · b7ec1aa9
      Cheng Shao authored
      This patch removes CompilerInfo/LinkerInfo types from the compiler
      since they aren't actually used anywhere.
      
      (cherry picked from commit 98ad1ea5)
      b7ec1aa9
    • Cheng Shao's avatar
      compiler: emit NaturallyAligned when element type & index type are the same width · a97e5190
      Cheng Shao authored
      This commit fixes a subtle mistake in alignmentFromTypes that used to
      generate Unaligned when element type & index type are the same width.
      Fixes #24930.
      
      (cherry picked from commit 0cff083a)
      a97e5190
    • Cheng Shao's avatar
      testsuite: mark T7773 as fragile on wasm · 21e35afe
      Cheng Shao authored
      (cherry picked from commit ae50a8eb)
      21e35afe
    • Cheng Shao's avatar
      hadrian: build in-tree GMP with malloc-notreentrant on wasm32 · eefca039
      Cheng Shao authored
      This patch makes hadrian build in-tree GMP with the
      --enable-alloca=malloc-notreentrant configure option. We will only
      need malloc-reentrant when we have threaded RTS and SMP support on
      wasm32, which will take some time to happen, before which we should
      use malloc-notreentrant to avoid undesired runtime overhead.
      
      (cherry picked from commit 06277d56)
      eefca039
    • Cheng Shao's avatar
      hadrian: disable in-tree gmp fft code path for wasm32 · d720dcb9
      Cheng Shao authored
      This patch disables in-tree GMP FFT code paths for wasm32 target in
      order to give up some performance of multiplying very large operands
      in exchange for reduced code size.
      
      (cherry picked from commit 1a32f828)
      d720dcb9
    • Cheng Shao's avatar
      hadrian: disable PIC for in-tree GMP on wasm32 · 1d61cabd
      Cheng Shao authored
      This patch disables PIC for in-tree GMP on wasm32 target. Enabling PIC
      unconditionally adds undesired code size and runtime overhead for
      wasm32.
      
      (cherry picked from commit f9c1ae12)
      1d61cabd
    • Cheng Shao's avatar
      compiler: fix -ddump-cmm-raw when compiling .cmm · 4ff4bc65
      Cheng Shao authored
      This patch fixes missing -ddump-cmm-raw output when compiling .cmm,
      which is useful for debugging cmm related codegen issues.
      
      (cherry picked from commit 6346c669)
      4ff4bc65
    • Cheng Shao's avatar
      configure: do not set LLC/OPT/LLVMAS fallback values when FIND_LLVM_PROG fails · a71d40d4
      Cheng Shao authored
      When configure fails to find LLC/OPT/LLVMAS within supported version
      range, it used to set "llc"/"opt"/"clang" as fallback values. This
      behavior is particularly troublesome when the user has llc/opt/clang
      with other versions in their PATH and run the testsuite, since hadrian
      will incorrectly assume have_llvm=True and pass that to the testsuite
      driver, resulting in annoying optllvm test failures (#23186). If
      configure determines llc/opt/clang wouldn't work, then we shouldn't
      pretend it'll work at all, and the bindist configure will invoke
      FIND_LLVM_PROG check again at install time anyway.
      
      (cherry picked from commit 4eb5ad09)
      a71d40d4
    • Cheng Shao's avatar
      hadrian: handle findExecutable "" gracefully · 872bc206
      Cheng Shao authored
      hadrian may invoke findExecutable "" at run-time due to a certain
      program is not found by configure script. Which is fine and
      findExecutable is supposed to return Nothing in this case. However, on
      Windows there's a directory bug that throws an exception (see
      https://github.com/haskell/directory/issues/180), so we might as well
      use a wrapper for findExecutable and handle exceptions gracefully.
      
      (cherry picked from commit 1e5752f6)
      872bc206
    • Cheng Shao's avatar
      utils: add hie.yaml config file for ghc-config · fd30857c
      Cheng Shao authored
      Add hie.yaml to ghc-config project directory so it can be edited using
      HLS.
      
      (cherry picked from commit 7eda4bd2)
      fd30857c
    • Cheng Shao's avatar
      compiler: remove ArchWasm32 special case in cmmDoCmmSwitchPlans · 72754949
      Cheng Shao authored
      This patch removes special consideration for ArchWasm32 in
      cmmDoCmmSwitchPlans, which means the compiler will now disable
      cmmImplementSwitchPlans for wasm unreg backend, just like unreg
      backend of other targets. We enabled it in the past to workaround some
      compile-time panic in older versions of LLVM, but those panics are no
      longer present, hence no need to keep this workaround.
      
      (cherry picked from commit bf0737c0)
      72754949
Loading