From 1bdb131799a356628e2906c892905b715c722fa0 Mon Sep 17 00:00:00 2001
From: Cheng Shao <terrorjack@type.dance>
Date: Tue, 22 Oct 2024 11:19:22 +0200
Subject: [PATCH] hadrian: enable late-CCS for perf flavour as well
This patch enables late-CCS for perf flavour so that the testsuite can
pass for perf as well. Fixes #25308.
---
hadrian/doc/flavours.md | 4 ++--
hadrian/src/Settings/Flavours/Performance.hs | 2 +-
hadrian/src/Settings/Flavours/Release.hs | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hadrian/doc/flavours.md b/hadrian/doc/flavours.md
index c7f02ca4a5f..72095944ef6 100644
--- a/hadrian/doc/flavours.md
+++ b/hadrian/doc/flavours.md
@@ -107,7 +107,7 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH
<td>-O2</td>
</tr>
<tr>
- <th>release (same as perf with -haddock and +late-ccs)</td>
+ <th>release (same as perf with -haddock)</td>
<td></td>
<td>-O<br>-H64m</td>
<td>-O<br>-H64m</td>
@@ -323,7 +323,7 @@ The supported transformers are listed below:
</tr>
<tr>
<td><code>late_ccs</code></td>
- <td>Enable <code>-fprof-late</code> in profiled libraries.</td>
+ <td>Enable <code>-fprof-late</code> in profiled libraries. Enabled in <code>perf</code> and <code>release</code> flavours.</td>
</tr>
<tr>
<td><code>dump_stg</code></td>
diff --git a/hadrian/src/Settings/Flavours/Performance.hs b/hadrian/src/Settings/Flavours/Performance.hs
index b6af25711b4..e1ac4bf72f1 100644
--- a/hadrian/src/Settings/Flavours/Performance.hs
+++ b/hadrian/src/Settings/Flavours/Performance.hs
@@ -6,7 +6,7 @@ import {-# SOURCE #-} Settings.Default
-- Please update doc/flavours.md when changing this file.
performanceFlavour :: Flavour
-performanceFlavour = splitSections $ defaultFlavour
+performanceFlavour = splitSections $ enableLateCCS $ defaultFlavour
{ name = "perf"
, extraArgs = performanceArgs <> defaultHaddockExtraArgs }
diff --git a/hadrian/src/Settings/Flavours/Release.hs b/hadrian/src/Settings/Flavours/Release.hs
index f7165a4274e..2f3daadae10 100644
--- a/hadrian/src/Settings/Flavours/Release.hs
+++ b/hadrian/src/Settings/Flavours/Release.hs
@@ -4,4 +4,4 @@ import Settings.Flavours.Performance
import Flavour
releaseFlavour :: Flavour
-releaseFlavour = enableLateCCS $ enableHaddock performanceFlavour { name = "release" }
+releaseFlavour = enableHaddock performanceFlavour { name = "release" }
--
GitLab