Skip to content
Snippets Groups Projects
  1. Feb 06, 2025
    • Cheng Shao's avatar
      testsuite: mark T7773 as fragile on wasm · c98aeaf1
      Cheng Shao authored
      (cherry picked from commit ae50a8eb)
      (cherry picked from commit b7e93bc9)
      (cherry picked from commit f2388ebc)
      c98aeaf1
    • Cheng Shao's avatar
      hadrian: build in-tree GMP with malloc-notreentrant on wasm32 · a3dde201
      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)
      (cherry picked from commit 0f9a8aaf)
      (cherry picked from commit 3c4f945a)
      a3dde201
    • Cheng Shao's avatar
      hadrian: disable in-tree gmp fft code path for wasm32 · 993e2946
      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)
      (cherry picked from commit 097ea6e2)
      (cherry picked from commit 0dac58e1)
      993e2946
    • Cheng Shao's avatar
      hadrian: disable PIC for in-tree GMP on wasm32 · c7faa919
      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)
      (cherry picked from commit 5f728fc4)
      (cherry picked from commit f45b02a8)
      c7faa919
    • Cheng Shao's avatar
      compiler: fix -ddump-cmm-raw when compiling .cmm · 5bc4f5e3
      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)
      (cherry picked from commit e5a1dd43)
      (cherry picked from commit 0ddc87c4)
      5bc4f5e3
    • Cheng Shao's avatar
      hadrian: handle findExecutable "" gracefully · 2ee67f47
      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)
      (cherry picked from commit 78150bfc)
      (cherry picked from commit 10a74dcd)
      2ee67f47
    • Cheng Shao's avatar
      utils: add hie.yaml config file for ghc-config · e5cf1a36
      Cheng Shao authored
      Add hie.yaml to ghc-config project directory so it can be edited using
      HLS.
      
      (cherry picked from commit 7eda4bd2)
      (cherry picked from commit ed81a875)
      (cherry picked from commit 9108734a)
      e5cf1a36
    • Cheng Shao's avatar
      compiler: remove ArchWasm32 special case in cmmDoCmmSwitchPlans · 5338ff59
      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)
      (cherry picked from commit 8bd28cf2)
      (cherry picked from commit 2e15c41c)
      5338ff59
    • Cheng Shao's avatar
      driver: build C/C++ with -ffunction-sections -fdata-sections when split sections is enabled · 54da5271
      Cheng Shao authored
      When -fsplit-sections is passed to GHC, pass -ffunction-sections
      -fdata-sections to gcc/clang when building C/C++. Previously,
      -fsplit-sections was only respected by the NCG/LLVM backends, but not
      the unregisterised backend; the GHC driver did not pass
      -fdata-sections and -ffunction-sections to the C compiler, which
      resulted in excessive executable sizes.
      
      Fixes #23381.
      
      -------------------------
      Metric Decrease:
          size_hello_artifact
          size_hello_unicode
      -------------------------
      
      (cherry picked from commit 02b1f91e)
      (cherry picked from commit 74cdf564)
      (cherry picked from commit 03da9015)
      54da5271
    • Cheng Shao's avatar
      hadrian: build C/C++ with split sections when enabled · da656acd
      Cheng Shao authored
      When split sections is enabled, ensure -fsplit-sections is passed to
      GHC as well when invoking GHC to compile C/C++; and pass
      -ffunction-sections -fdata-sections to gcc/clang when compiling C/C++
      with the hadrian Cc builder. Fixes #23381.
      
      (cherry picked from commit 0958937e)
      (cherry picked from commit 7d5a22c2)
      (cherry picked from commit 6de1c17d)
      da656acd
    • Cheng Shao's avatar
      testsuite: bump MultiLayerModulesDefsGhciReload timeout to 10x · bdc39308
      Cheng Shao authored
      (cherry picked from commit e17f2df9)
      (cherry picked from commit 9a2f3313)
      (cherry picked from commit 08acf27f)
      bdc39308
    • Cheng Shao's avatar
      compiler: avoid saving foreign call target to local when there are no caller-save GlobalRegs · 8dff5b23
      Cheng Shao authored
      This patch makes the STG->Cmm backend avoid saving foreign call target
      to local when there are no caller-save GlobalRegs.
      
      Since 321941a8, when we lower a
      foreign call, we unconditionally save the foreign call target to a
      temporary local first, then rely on cmmSink to clean it up later,
      which only happens with -fcmm-sink (implied by -O) and not in
      unoptimized code.
      
      And this is troublesome for the wasm backend NCG, which needs to infer
      a foreign call target symbol's type signature from the Cmm call site.
      Previously, the NCG has been emitting incorrect type signatures for
      unoptimized code, which happens to work with `wasm-ld` most of the
      time, but this is never future-proof against upstream toolchain
      updates, and it causes horrible breakages when LTO objects are
      included in linker input. Hence this patch.
      
      (cherry picked from commit 8dd8a076)
      (cherry picked from commit 2b2a3db8)
      (cherry picked from commit de7c02b5)
      8dff5b23
    • Cheng Shao's avatar
      testsuite: don't attempt to detect host cpu features when testing cross ghc · 6acf211c
      Cheng Shao authored
      The testsuite driver CPU feature detection logic only detects host CPU
      and only makes sense when we are not testing a cross GHC.
      
      (cherry picked from commit c4c6d714)
      (cherry picked from commit 07641012)
      (cherry picked from commit 68bc5d72)
      6acf211c
    • Cheng Shao's avatar
      testsuite: fix T17920 for wasm backend · e8623449
      Cheng Shao authored
      T17920 was marked as fragile on wasm before; it can be trivially fixed
      by avoiding calling variadic printf() in cmm.
      
      (cherry picked from commit 7b4c1998)
      (cherry picked from commit c4060ce3)
      (cherry picked from commit b64e0f63)
      e8623449
    • Cheng Shao's avatar
      autoconf: remove unused context diff check · ea853040
      Cheng Shao authored
      This patch removes redundant autoconf check for the context diff
      program given it isn't actually been used anywhere, especially since
      make removal.
      
      (cherry picked from commit b7bcf729)
      (cherry picked from commit 0e9d2a0f)
      (cherry picked from commit 00d58ab2)
      ea853040
    • Cheng Shao's avatar
      rts: fix I/O manager compilation errors for win32 target · cae5a3b3
      Cheng Shao authored
      This patch fixes I/O manager compilation errors for win32 target
      discovered when cross-compiling to win32 using recent clang:
      
      ```
      rts/win32/ThrIOManager.c:117:7: error:
           error: call to undeclared function 'is_io_mng_native_p'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
            117 |   if (is_io_mng_native_p ()) {
                |       ^
          |
      117 |   if (is_io_mng_native_p ()) {
          |       ^
      
      1 error generated.
      `x86_64-w64-mingw32-clang' failed in phase `C Compiler'. (Exit code: 1)
      
      rts/fs.c:143:28: error:
           error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
            143 | int setErrNoFromWin32Error () {
                |                            ^
                |                             void
          |
      143 | int setErrNoFromWin32Error () {
          |                            ^
      
      1 error generated.
      `x86_64-w64-mingw32-clang' failed in phase `C Compiler'. (Exit code: 1)
      
      rts/win32/ConsoleHandler.c:227:9: error:
           error: call to undeclared function 'interruptIOManagerEvent'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
            227 |         interruptIOManagerEvent ();
                |         ^
          |
      227 |         interruptIOManagerEvent ();
          |         ^
      
      rts/win32/ConsoleHandler.c:227:9: error:
           note: did you mean 'getIOManagerEvent'?
          |
      227 |         interruptIOManagerEvent ();
          |         ^
      
      rts/include/rts/IOInterface.h:27:10: error:
           note: 'getIOManagerEvent' declared here
             27 | void *   getIOManagerEvent  (void);
                |          ^
         |
      27 | void *   getIOManagerEvent  (void);
         |          ^
      
      1 error generated.
      `x86_64-w64-mingw32-clang' failed in phase `C Compiler'. (Exit code: 1)
      
      rts/win32/ConsoleHandler.c:196:9: error:
           error: call to undeclared function 'setThreadLabel'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
            196 |         setThreadLabel(cap, t, "signal handler thread");
                |         ^
          |
      196 |         setThreadLabel(cap, t, "signal handler thread");
          |         ^
      
      rts/win32/ConsoleHandler.c:196:9: error:
           note: did you mean 'postThreadLabel'?
          |
      196 |         setThreadLabel(cap, t, "signal handler thread");
          |         ^
      
      rts/eventlog/EventLog.h:118:6: error:
           note: 'postThreadLabel' declared here
            118 | void postThreadLabel(Capability    *cap,
                |      ^
          |
      118 | void postThreadLabel(Capability    *cap,
          |      ^
      
      1 error generated.
      `x86_64-w64-mingw32-clang' failed in phase `C Compiler'. (Exit code: 1)
      ```
      
      (cherry picked from commit 710665bd)
      (cherry picked from commit 9499ed96)
      (cherry picked from commit e19bea4a)
      cae5a3b3
    • Cheng Shao's avatar
      testsuite: bump PartialDownSweep timeout to 5x on wasm32 · afabf77c
      Cheng Shao authored
      (cherry picked from commit b1e0c313)
      (cherry picked from commit 34882192)
      (cherry picked from commit 94adf918)
      afabf77c
    • Cheng Shao's avatar
      autoconf: remove obsolete patch detection · c325e98c
      Cheng Shao authored
      This commit removes obsolete deletection logic of the patch command
      from autoconf scripts, given we no longer need to patch anything in
      the GHC build process.
      
      (cherry picked from commit 71f28958)
      (cherry picked from commit 1e77ded1)
      (cherry picked from commit e5506d09)
      c325e98c
    • Cheng Shao's avatar
      hadrian: remove obsolete Patch logic · 5c7b632a
      Cheng Shao authored
      This commit removes obsolete Patch logic from hadrian, given we no
      longer need to patch the gmp tarball when building in-tree GMP.
      
      (cherry picked from commit 65b4b92f)
      (cherry picked from commit 92065500)
      (cherry picked from commit e3d00525)
      5c7b632a
    • Cheng Shao's avatar
      ghc-bignum: remove obsolete ln script · bb440214
      Cheng Shao authored
      This commit removes an obsolete ln script in ghc-bignum/gmp. See
      060251c2 for its original intention,
      but it's been obsolete for a long time, especially since the removal
      of the make build system. Hence the house cleaning.
      
      (cherry picked from commit c62dc317)
      (cherry picked from commit 5f4848c0)
      (cherry picked from commit 5b9561d6)
      bb440214
    • Cheng Shao's avatar
      rts: assert pointer is indeed heap allocated in Bdescr() · d60121e9
      Cheng Shao authored
      This commit adds an assertion to Bdescr() to assert the pointer is
      indeed heap allocated. This is useful to rule out RTS bugs that
      attempt to access non-existent block descriptor of a static closure, #24492
      being one such example.
      
      (cherry picked from commit d19441d7)
      (cherry picked from commit 8af2c3fd)
      d60121e9
    • Cheng Shao's avatar
      rts: expose HeapAlloc.h as public header · f226e778
      Cheng Shao authored
      This commit exposes HeapAlloc.h as a public header. The intention is
      to expose HEAP_ALLOCED/HEAP_ALLOCED_GC, so they can be used in
      assertions in other public headers, and they may also be useful for
      user code.
      
      (cherry picked from commit dedcf102)
      (cherry picked from commit 8d38b450)
      f226e778
    • Cheng Shao's avatar
      utils: remove unused lndir from tree · fd781247
      Cheng Shao authored
      Ever since the removal of the make build system, the in tree lndir
      hasn't been actually built, so this patch removes it.
      
      (cherry picked from commit d3a050d2)
      (cherry picked from commit 04860c24)
      fd781247
    • Cheng Shao's avatar
      ci: enable parallelism in hadrian/ghci scripts · 5aa74978
      Cheng Shao authored
      This commit enables parallelism when the hadrian/ghci scripts are
      called in CI. The time bottleneck is in the hadrian build step, but
      previously the build step wasn't parallelized.
      
      (cherry picked from commit 50bfdb46)
      (cherry picked from commit b5df6e69)
      5aa74978
    • Cheng Shao's avatar
      hadrian/hie-bios: pass -j to hadrian · 9aa04c3a
      Cheng Shao authored
      This commit passes -j to hadrian in the hadrian/hie-bios scripts. When
      the user starts HLS in a fresh clone that has just been configured, it
      takes quite a while for hie-bios to pick up the ghc flags and start
      actual indexing, due to the fact that the hadrian build step defaulted
      to -j1, so -j speeds things up and improve HLS user experience in GHC.
      Also add -j flag to .ghcid to speed up ghcid, and sets the Windows
      build root to .hie-bios which also works and unifies with other
      platforms, the previous build root _hie-bios was missing from
      .gitignore anyway.
      
      (cherry picked from commit c71bfdff)
      (cherry picked from commit 57d706ed)
      9aa04c3a
    • Cheng Shao's avatar
      rts: remove redundant rCCCS initialization · f40d1fcb
      Cheng Shao authored
      This commit removes the redundant logic of initializing each
      Capability's rCCCS to CCS_SYSTEM in initProfiling(). Before
      initProfiling() is called during RTS startup, each Capability's rCCCS
      has already been assigned CCS_SYSTEM when they're first initialized.
      
      (cherry picked from commit a7569495)
      (cherry picked from commit 3dace6e1)
      f40d1fcb
    • Cheng Shao's avatar
      testsuite: fix hs_try_putmvar002 for targets without pthread.h · bdd297f9
      Cheng Shao authored
      hs_try_putmvar002 includes pthread.h and doesn't work on targets
      without this header (e.g. wasm32). It doesn't need to include this
      header at all. This was previously unnoticed by wasm CI, though recent
      toolchain upgrade brought in upstream changes that completely removes
      pthread.h in the single-threaded wasm32-wasi sysroot, therefore we
      need to handle that change.
      
      (cherry picked from commit 2ce2a493)
      (cherry picked from commit f581edb0)
      bdd297f9
    • Cheng Shao's avatar
      rts: define XXH_INLINE_ALL · bb362ccf
      Cheng Shao authored
      This commit cleans up how we include the xxhash.h header and only
      define XXH_INLINE_ALL, which is sufficient to inline the xxHash
      functions without symbol collision.
      
      (cherry picked from commit ee01de7d)
      (cherry picked from commit 2c52e59b)
      bb362ccf
    • Cheng Shao's avatar
      rts: use XXH3_64bits hash on all 64-bit platforms · 41e95f79
      Cheng Shao authored
      This commit enables XXH3_64bits hash to be used on all 64-bit
      platforms. Previously it was only enabled on x86_64, so platforms like
      aarch64 silently falls back to using XXH32 which degrades the hashing
      function quality.
      
      (cherry picked from commit 4a97bdb8)
      (cherry picked from commit 8ed990f5)
      41e95f79
    • Cheng Shao's avatar
      rts: update xxHash to v0.8.2 · eb60cccc
      Cheng Shao authored
      (cherry picked from commit b19ec331)
      (cherry picked from commit 7c0a6f59)
      eb60cccc
    • Cheng Shao's avatar
      compiler: explicitly disable PIC in wasm32 NCG · 8b92dd17
      Cheng Shao authored
      This commit explicitly disables the ncgPIC flag for the wasm32 target.
      The wasm backend doesn't support PIC for the time being.
      
      (cherry picked from commit 87e34888)
      (cherry picked from commit f46220a9)
      8b92dd17
    • Cheng Shao's avatar
      base: treat all FDs as "nonblocking" on wasm · a1a37769
      Cheng Shao authored
      On posix platforms, when performing read/write on FDs, we check the
      nonblocking flag first. For FDs without this flag (e.g. stdout), we
      call fdReady() first, which in turn calls poll() to wait for I/O to be
      available on that FD. This is problematic for wasm32-wasi: although
      select()/poll() is supported via the poll_oneoff() wasi syscall, that
      syscall is rather heavyweight and runtime behavior differs in
      different wasi implementations. The issue is even worse when targeting
      browsers, given there's no satisfactory way to implement async I/O as
      a synchronous syscall, so existing JS polyfills for wasi often give up
      and simply return ENOSYS.
      
      Before we have a proper I/O manager that avoids poll_oneoff() for
      async I/O on wasm, this patch improves the status quo a lot by merely
      pretending all FDs are "nonblocking". Read/write on FDs will directly
      invoke read()/write(), which are much more reliably handled in
      existing wasi implementations, especially those in browsers.
      
      Fixes #23275 and the following test cases: T7773 isEOF001 openFile009
      T4808 cgrun025
      
      Approved by CLC proposal #234:
      https://github.com/haskell/core-libraries-committee/issues/234
      
      (cherry picked from commit 2eca52b4)
      (cherry picked from commit 288692dd)
      a1a37769
    • Cheng Shao's avatar
      testsuite: fix optasm tests for wasm32 · f3306bca
      Cheng Shao authored
      (cherry picked from commit af771148)
      (cherry picked from commit 84c875d1)
      f3306bca
    • Cheng Shao's avatar
      rts: drop stale mentions of MIN_UPD_SIZE · ab2617a4
      Cheng Shao authored
      We used to have MIN_UPD_SIZE macro that describes the minimum reserved
      size for thunks, so that the thunk can be overwritten in place as
      indirections or blackholes. However, this macro has not been actually
      defined or used anywhere since a long time ago; StgThunkHeader already
      reserves a padding word for this purpose. Hence this patch which drops
      stale mentions of MIN_UPD_SIZE.
      
      (cherry picked from commit c1e3719c)
      (cherry picked from commit 8d9efe4d)
      ab2617a4
    • Cheng Shao's avatar
      rts: fix incorrect ticket reference · 5bdc2115
      Cheng Shao authored
      (cherry picked from commit a4785b33)
      (cherry picked from commit 45935f5d)
      5bdc2115
    • Cheng Shao's avatar
      Bump time submodule · ab152c79
      Cheng Shao authored
      (cherry picked from commit bd575a13)
      ab152c79
    • Cheng Shao's avatar
      rts: add missing ccs_mutex guard to internal_dlopen · dda89012
      Cheng Shao authored
      See added comment for details. Closes #24423.
      
      (cherry picked from commit 20f80b77)
      dda89012
    • Cheng Shao's avatar
      rts: use __builtin_offsetof to implement STG_FIELD_OFFSET · 5d0a76d9
      Cheng Shao authored
      This patch fixes the STG_FIELD_OFFSET macro definition by using
      __builtin_offsetof, which is what gcc/clang uses to implement offsetof
      in standard C. The previous definition that uses NULL pointer involves
      subtle undefined behavior in C and thus reported by
      UndefinedBehaviorSanitizer as well:
      
      ```
      rts/Capability.h:243:58: runtime error: member access within null pointer of type 'Capability' (aka 'struct Capability_')
      SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior rts/Capability.h:243:58
      ```
      
      (cherry picked from commit 83341bbc)
      5d0a76d9
    • Cheng Shao's avatar
      rts: enable wasm32 register mapping · 8d64ea3d
      Cheng Shao authored
      The wasm backend didn't properly make use of all Cmm global registers
      due to #24347. Now that it is fixed, this patch re-enables full
      register mapping for wasm32, and we can now generate smaller & faster
      wasm modules that doesn't always spill arguments onto the stack. Fixes #22460 #24152.
      
      (cherry picked from commit 0cda2b8b)
      (cherry picked from commit f1f5068b398b1effb837add38ecc5303dc9a381f)
      (cherry picked from commit 1e695750)
      8d64ea3d
    • Cheng Shao's avatar
      testsuite: increase timeout of ghc-api tests for wasm32 · 18fb2b57
      Cheng Shao authored
      ghc-api tests for wasm32 are more likely to timeout due to the large
      wasm module sizes, especially when testing with wasm native tail
      calls, given wasmtime's handling of tail call opcodes are suboptimal
      at the moment. It makes sense to increase timeout specifically for
      these tests on wasm32. This doesn't affect other targets, and for
      wasm32 we don't increase timeout for all tests, so not to risk letting
      major performance regressions slip through the testsuite.
      
      (cherry picked from commit 07ab5cc1)
      (cherry picked from commit c4d1edb1)
      18fb2b57
Loading