[Git][ghc/ghc][master] JS: fix recompilation avoidance (#23013)
Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: a13245a9 by Sylvain Henry at 2026-03-13T15:10:06-04:00 JS: fix recompilation avoidance (#23013) - we were checking the mtime of the *.jsexe directory, not of a file - we were not computing the PkgsLoaded at all - - - - - 14 changed files: - compiler/GHC/Driver/Main.hs - compiler/GHC/Driver/Pipeline.hs - compiler/GHC/Iface/Recomp.hs - compiler/GHC/Linker/Loader.hs - testsuite/tests/annotations/should_run/all.T - − testsuite/tests/driver/OneShotTH.stdout-javascript-unknown-ghcjs - + testsuite/tests/driver/T20604/T20604.stdout-javascript-unknown-ghcjs - testsuite/tests/driver/T20604/all.T - testsuite/tests/driver/all.T - testsuite/tests/driver/fat-iface/fat010.stdout-javascript-unknown-ghcjs - testsuite/tests/driver/recomp011/all.T - testsuite/tests/driver/recompHash/recompHash.stdout-javascript-unknown-ghcjs - testsuite/tests/driver/recompNoTH/recompNoTH.stdout-javascript-unknown-ghcjs - − testsuite/tests/driver/th-new-test/th-new-test.stdout-javascript-unknown-ghcjs Changes: ===================================== compiler/GHC/Driver/Main.hs ===================================== @@ -106,8 +106,6 @@ module GHC.Driver.Main import GHC.Prelude -import GHC.Platform - import GHC.Driver.Plugins import GHC.Driver.Session import GHC.Driver.Backend @@ -259,8 +257,6 @@ import GHC.Utils.Logger import GHC.Utils.TmpFs import GHC.Utils.Touch -import qualified GHC.LanguageExtensions as LangExt - import GHC.Data.FastString import GHC.Data.Bag import GHC.Data.OsPath (unsafeEncodeUtf) @@ -295,8 +291,8 @@ import System.IO.Unsafe ( unsafeInterleaveIO ) import GHC.Iface.Env ( trace_if ) import GHC.Stg.EnforceEpt.TagSig (seqTagSig) import GHC.StgToCmm.Utils (IPEStats) +import GHC.Types.Unique.DSet ( uniqDSetToList ) import GHC.Types.Unique.FM -import GHC.Types.Unique.DFM import GHC.Cmm.Config (CmmConfig) import Data.Bifunctor import qualified GHC.Unit.Home.Graph as HUG @@ -855,14 +851,6 @@ hscRecompStatus msg UpToDate return $ HscUpToDate checked_iface emptyRecompLinkables - -- Always recompile with the JS backend when TH is enabled until - -- #23013 is fixed. - | ArchJavaScript <- platformArch (targetPlatform lcl_dflags) - , xopt LangExt.TemplateHaskell lcl_dflags - -> do - msg $ needsRecompileBecause THWithJS - return $ HscRecompNeeded $ Just $ mi_iface_hash $ checked_iface - | otherwise -> do -- Check the status of all the linkable types we might need. -- 1. The in-memory linkable we had at hand. @@ -2910,7 +2898,7 @@ jsCodeGen hsc_env srcspan i this_mod stg_binds_with_deps binding_id = do initLoaderState interp hsc_env -- Take lock for the actual work. - (dep_linkables, needed_units) <- modifyLoaderState interp $ \pls -> do + (dep_linkables, needed_units, this_pkgs_loaded) <- modifyLoaderState interp $ \pls -> do let link_opts = initLinkDepsOpts hsc_env -- Find what packages and linkables are required @@ -2921,11 +2909,14 @@ jsCodeGen hsc_env srcspan i this_mod stg_binds_with_deps binding_id = do let objs = mapMaybe linkableFilterNative (ldNeededLinkables deps) (objs_loaded', _new_objs) = rmDupLinkables (objs_loaded pls) objs - -- FIXME: we should make the JS linker load new_objs here, instead of - -- on-demand. - - let pls' = pls { objs_loaded = objs_loaded' } - pure (pls', (ldAllLinkables deps, ldUnits deps)) + -- Compute LoadedPkgInfo metadata for recompilation avoidance. + -- We don't call loadPackages' because the JS interpreter doesn't load + -- native .o/.so files; we only need the transitive-dep metadata. + (_, pkgs_almost_loaded) <- + loadMoreUnits hsc_env (ldUnits deps) (pkgs_loaded pls) + let this_pkgs_loaded = filterNeededPkgsLoaded (ldNeededUnits deps) pkgs_almost_loaded + pls' = pls { objs_loaded = objs_loaded', pkgs_loaded = pkgs_almost_loaded } + pure (pls', (ldAllLinkables deps, uniqDSetToList (ldNeededUnits deps), this_pkgs_loaded)) let foreign_stubs = NoStubs @@ -2950,11 +2941,7 @@ jsCodeGen hsc_env srcspan i this_mod stg_binds_with_deps binding_id = do binding_fref <- withJSInterp i $ \inst -> mkForeignRef href (freeReallyRemoteRef inst href) - -- FIXME: we don't report needed units because we would have to find a way to - -- build a meaningful LoadedPkgInfo (see the mess in - -- GHC.Linker.Loader.{loadPackage,loadPackages'}). - let pkgs_loaded = emptyUDFM - return (castForeignRef binding_fref, dep_linkables, pkgs_loaded) + return (castForeignRef binding_fref, dep_linkables, this_pkgs_loaded) {- ********************************************************************** ===================================== compiler/GHC/Driver/Pipeline.hs ===================================== @@ -556,7 +556,14 @@ checkNativeLibraryLinkingNeeded staticLink _ dflags unit_env linkables pkg_deps unit_state = ue_homeUnitState unit_env arch_os = platformArchOS platform exe_file = exeFileName arch_os staticLink (outputFile_ dflags) - exe_file_os <- SysOsPath.encodeFS exe_file + -- For the JS backend, exe_file is a directory (*.jsexe). A directory's + -- mtime on Linux is only updated when entries are created/deleted, not + -- when existing files are overwritten. jsLink always overwrites out.js, + -- so use that as the mtime sentinel instead. + exe_time_file + | ArchJavaScript <- platformArch platform = exe_file </> "out.js" + | otherwise = exe_file + exe_file_os <- SysOsPath.encodeFS exe_time_file e_exe_time <- modificationTimeIfExists exe_file_os case e_exe_time of Nothing -> return $ NeedsRecompile MustCompile ===================================== compiler/GHC/Iface/Recomp.hs ===================================== @@ -204,7 +204,6 @@ data RecompReason | MismatchedDynHiFile | ObjectsChanged | LibraryChanged - | THWithJS deriving (Eq) @@ -241,7 +240,6 @@ instance Outputable RecompReason where MismatchedDynHiFile -> text "Mismatched dynamic interface file" ObjectsChanged -> text "Objects changed" LibraryChanged -> text "Library changed" - THWithJS -> text "JS backend always recompiles modules using Template Haskell for now (#23013)" recompileRequired :: RecompileRequired -> Bool recompileRequired UpToDate = False ===================================== compiler/GHC/Linker/Loader.hs ===================================== @@ -36,6 +36,8 @@ module GHC.Linker.Loader , initLinkDepsOpts , getGccSearchDirectory , mkDynLoadLib + , loadMoreUnits + , filterNeededPkgsLoaded ) where @@ -252,6 +254,20 @@ loadName interp hsc_env name = do (ppr sym_to_find) return (pls,(r, links, pkgs)) +-- | Restrict a 'PkgsLoaded' map to the packages directly needed and their +-- full transitive closure (via 'loaded_pkg_trans_deps'). +filterNeededPkgsLoaded :: UniqDSet UnitId -> PkgsLoaded -> PkgsLoaded +filterNeededPkgsLoaded directly_needed all_pkgs_loaded = + udfmRestrictKeys all_pkgs_loaded $ getUniqDSet trans_pkgs_needed + where + trans_pkgs_needed = + unionManyUniqDSets + (directly_needed : + [ loaded_pkg_trans_deps pkg + | pkg_id <- uniqDSetToList directly_needed + , Just pkg <- [lookupUDFM all_pkgs_loaded pkg_id] + ]) + loadDependencies :: Interp -> HscEnv @@ -271,12 +287,7 @@ loadDependencies interp hsc_env pls span needed_mods = do -- Link the packages and modules required pls1 <- loadPackages' interp hsc_env (ldUnits deps) pls (pls2, succ) <- loadExternalModuleLinkables interp hsc_env pls1 (ldNeededLinkables deps) - let this_pkgs_loaded = udfmRestrictKeys all_pkgs_loaded $ getUniqDSet trans_pkgs_needed - all_pkgs_loaded = pkgs_loaded pls2 - trans_pkgs_needed = unionManyUniqDSets (this_pkgs_needed : [ loaded_pkg_trans_deps pkg - | pkg_id <- uniqDSetToList this_pkgs_needed - , Just pkg <- [lookupUDFM all_pkgs_loaded pkg_id] - ]) + let this_pkgs_loaded = filterNeededPkgsLoaded this_pkgs_needed (pkgs_loaded pls2) return (pls2, succ, ldAllLinkables deps, this_pkgs_loaded) @@ -1170,17 +1181,26 @@ loadPackages interp hsc_env new_pkgs = do modifyLoaderState_ interp $ \pls -> loadPackages' interp hsc_env new_pkgs pls -loadPackages' :: Interp -> HscEnv -> [UnitId] -> LoaderState -> IO LoaderState -loadPackages' interp hsc_env new_pks pls = do - (reverse -> pkgs_info_list, pkgs_almost_loaded) <- - downsweep - ([], pkgs_loaded pls) - new_pks - loadPackage interp hsc_env pkgs_info_list (pls { pkgs_loaded = pkgs_almost_loaded }) +-- | Compute 'LoadedPkgInfo' metadata (with transitive deps) for new packages, +-- without loading any native libraries. Used for recompilation-avoidance +-- tracking and as the first pass of 'loadPackages''. +-- +-- The returned '[UnitInfo]' list is an accumulated *reverse* topologically +-- sorted list of new packages. The returned 'PkgsLoaded' is populated with +-- placeholder 'LoadedPkgInfo' for new packages (empty artifact fields, correct +-- 'loaded_pkg_trans_deps'). +loadMoreUnits + :: HscEnv + -> [UnitId] -- ^ New packages to process (not yet in PkgsLoaded) + -> PkgsLoaded -- ^ Existing loaded packages (used for memoization) + -> IO ([UnitInfo], PkgsLoaded) + -- ^ Reverse topologically-sorted new package infos + updated PkgsLoaded +loadMoreUnits hsc_env new_pks pkgs_loaded_init = + downsweep ([], pkgs_loaded_init) new_pks where -- The downsweep process takes an initial 'PkgsLoaded' and uses it -- to memoize new packages to load when recursively downsweeping - -- the dependencies. The returned 'PkgsLoaded' is popularized with + -- the dependencies. The returned 'PkgsLoaded' is populated with -- placeholder 'LoadedPkgInfo' for new packages yet to be loaded, -- which need to be modified later to fill in the missing fields. -- @@ -1221,6 +1241,12 @@ loadPackages' interp hsc_env new_pks pls = do throwGhcExceptionIO (CmdLineError ("unknown package: " ++ unpackFS (unitIdFS new_pkg))) +loadPackages' :: Interp -> HscEnv -> [UnitId] -> LoaderState -> IO LoaderState +loadPackages' interp hsc_env new_pks pls = do + (reverse -> pkgs_info_list, pkgs_almost_loaded) <- + loadMoreUnits hsc_env new_pks (pkgs_loaded pls) + loadPackage interp hsc_env pkgs_info_list (pls { pkgs_loaded = pkgs_almost_loaded }) + loadPackage :: Interp -> HscEnv -> [UnitInfo] -> LoaderState -> IO LoaderState loadPackage interp hsc_env pkgs pls ===================================== testsuite/tests/annotations/should_run/all.T ===================================== @@ -10,9 +10,6 @@ test('annrun01', [extra_files(['Annrun01_Help.hs']), req_th, req_process, - js_broken(23013), # strangely, the workaround for #23013 triggers - # a call to an undefined FFI function in bytestring. - # Before, it was slow but not failing. when(js_arch(), compile_timeout_multiplier(5)), pre_cmd('$MAKE -s --no-print-directory config'), omit_ways(['dyn'] + prof_ways)], ===================================== testsuite/tests/driver/OneShotTH.stdout-javascript-unknown-ghcjs deleted ===================================== ===================================== testsuite/tests/driver/T20604/T20604.stdout-javascript-unknown-ghcjs ===================================== @@ -0,0 +1,2 @@ +A1 +A ===================================== testsuite/tests/driver/T20604/all.T ===================================== @@ -10,6 +10,5 @@ def normalise_paths(s): test('T20604', [ req_th - , js_broken(23013) , extra_files(['A.hs', 'A1.hs']) , normalise_fun(normalise_paths)], makefile_test, []) ===================================== testsuite/tests/driver/all.T ===================================== @@ -299,7 +299,7 @@ test('T18369', normal, compile, ['-O']) test('T21682', normal, compile_fail, ['-Werror=unrecognised-warning-flags -Wfoo']) test('FullGHCVersion', normal, compile_and_run, ['-package ghc-boot']) test('OneShotTH', req_th, makefile_test, []) -test('T17481', js_broken(23013), makefile_test, []) +test('T17481', normal, makefile_test, []) test('T20084', normal, makefile_test, []) test('RunMode', [req_interp,extra_files(['RunMode/Test.hs'])], run_command, ['{compiler} --run -iRunMode/ -ignore-dot-ghci RunMode.hs -- hello']) test('T20439', normal, run_command, ===================================== testsuite/tests/driver/fat-iface/fat010.stdout-javascript-unknown-ghcjs ===================================== @@ -1,5 +1,4 @@ [1 of 3] Compiling THA [2 of 3] Compiling THB [3 of 3] Compiling THC -[1 of 3] Compiling THA [JS backend always recompiles modules using Template Haskell for now (#23013)] [2 of 3] Compiling THB [Source file changed] ===================================== testsuite/tests/driver/recomp011/all.T ===================================== @@ -2,6 +2,5 @@ test('recomp011', [ extra_files(['Main.hs']) - , js_broken(23013) ], makefile_test, []) ===================================== testsuite/tests/driver/recompHash/recompHash.stdout-javascript-unknown-ghcjs ===================================== @@ -1,3 +1,2 @@ [1 of 2] Compiling B [2 of 2] Compiling A -[2 of 2] Compiling A [JS backend always recompiles modules using Template Haskell for now (#23013)] ===================================== testsuite/tests/driver/recompNoTH/recompNoTH.stdout-javascript-unknown-ghcjs ===================================== @@ -1,4 +1,3 @@ [1 of 2] Compiling B [2 of 2] Compiling A [1 of 2] Compiling B [Source file changed] -[2 of 2] Compiling A [JS backend always recompiles modules using Template Haskell for now (#23013)] ===================================== testsuite/tests/driver/th-new-test/th-new-test.stdout-javascript-unknown-ghcjs deleted ===================================== @@ -1,26 +0,0 @@ -[1 of 6] Compiling B -[2 of 6] Compiling A -[3 of 6] Compiling D -[4 of 6] Compiling C -[5 of 6] Compiling Main -[6 of 6] Linking Main -[1 of 6] Compiling B [JS backend always recompiles modules using Template Haskell for now (#23013)] -[2 of 6] Compiling A [JS backend always recompiles modules using Template Haskell for now (#23013)] -[3 of 6] Compiling D [JS backend always recompiles modules using Template Haskell for now (#23013)] -[4 of 6] Compiling C [JS backend always recompiles modules using Template Haskell for now (#23013)] -[6 of 6] Linking Main [Objects changed] -[1 of 6] Compiling B [Source file changed] -[2 of 6] Compiling A [B[TH] changed] -[3 of 6] Compiling D [JS backend always recompiles modules using Template Haskell for now (#23013)] -[4 of 6] Compiling C [D[TH] changed] -[6 of 6] Linking Main [Objects changed] -[1 of 6] Compiling B [JS backend always recompiles modules using Template Haskell for now (#23013)] -[2 of 6] Compiling A [JS backend always recompiles modules using Template Haskell for now (#23013)] -[3 of 6] Compiling D [Source file changed] -[4 of 6] Compiling C [D[TH] changed] -[6 of 6] Linking Main [Objects changed] -[1 of 6] Compiling B [Source file changed] -[2 of 6] Compiling A [B[TH] changed] -[3 of 6] Compiling D [Source file changed] -[4 of 6] Compiling C [D[TH] changed] -[6 of 6] Linking Main [Objects changed] View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a13245a92c4cacf81b7adf41cc360226... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a13245a92c4cacf81b7adf41cc360226... You're receiving this email because of your account on gitlab.haskell.org.
participants (1)
-
Marge Bot (@marge-bot)