GitLab

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

0491f08a

by Sylvain Henry at 2026-01-22T03:44:26-05:00

GC: don't use CAS without PARALLEL_GC on

If we're not using the parallel GC, there is no reason to do a costly
CAS. This was flagged as taking time in a perf profile.

211a8f56

by Sylvain Henry at 2026-01-22T03:44:26-05:00

GC: suffix parallel GC with "par" instead of "thr"

Avoid some potential confusion (see discussion in !15351).

4 changed files:

rts/rts.cabal
rts/sm/Evac.c
rts/sm/Evac_thr.c → rts/sm/Evac_par.c
rts/sm/Scav_thr.c → rts/sm/Scav_par.c

Changes:

rts/rts.cabal

@@ -511,7 +511,7 @@ library
                   sm/CNF.c
                   sm/Compact.c
                   sm/Evac.c
 -                 sm/Evac_thr.c
 +                 sm/Evac_par.c
                   sm/GC.c
                   sm/GCAux.c
                   sm/GCUtils.c
@@ -526,7 +526,7 @@ library
                   sm/NonMovingSweep.c
                   sm/Sanity.c
                   sm/Scav.c
 -                 sm/Scav_thr.c
 +                 sm/Scav_par.c
                   sm/Storage.c
                   sm/Sweep.c
                   fs.c

rts/sm/Evac.c

@@ -498,7 +498,7 @@ evacuate_static_object (StgClosure **link_field, StgClosure *q)
      // See Note [STATIC_LINK fields] for how the link field bits work
      if (((link & STATIC_BITS) | prev_static_flag) != 3) {
          StgWord new_list_head = (StgWord)q | static_flag;
 -#if !defined(THREADED_RTS)
 +#if !defined(PARALLEL_GC)
          *link_field = gct->static_objects;
          gct->static_objects = (StgClosure *)new_list_head;
  #else

rts/sm/Evac_thr.c → rts/sm/Evac_par.c

rts/sm/Scav_thr.c → rts/sm/Scav_par.c