diff options
| author | simonpj <unknown> | 2002-04-22 16:06:37 +0000 |
|---|---|---|
| committer | simonpj <unknown> | 2002-04-22 16:06:37 +0000 |
| commit | dbfe93e664ee00ad854114128ffbace2a5298da4 (patch) | |
| tree | c4b9b8c2fda8be3b403cb85f7721319d60d37d47 /ghc/compiler/main/DriverState.hs | |
| parent | acaaf62143d015fe66ec9b100bd7f0ea1df523cb (diff) | |
| download | haskell-dbfe93e664ee00ad854114128ffbace2a5298da4.tar.gz | |
[project @ 2002-04-22 16:06:35 by simonpj]
CPR control
1. Remove -fno-cpr, add -fcpr-off which is a simple static flag
for switching the new CPR analysis off altogether.
(The "-fno" machinery is rather complicated.)
2. Rejig SimplCore a little so that the "old strictness analyser"
runs both the old strictness analyser and the old CPR analyser,
which makes it more like the new strictness/CPR analyser.
(How much longer we keep the old strictness/CPR analyser in the
compiler at all I don't know. It's just for comparision purposes
when we write the paper.)
Diffstat (limited to 'ghc/compiler/main/DriverState.hs')
| -rw-r--r-- | ghc/compiler/main/DriverState.hs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/ghc/compiler/main/DriverState.hs b/ghc/compiler/main/DriverState.hs index cd4f1fbed3..194893336f 100644 --- a/ghc/compiler/main/DriverState.hs +++ b/ghc/compiler/main/DriverState.hs @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- --- $Id: DriverState.hs,v 1.76 2002/04/05 23:24:29 sof Exp $ +-- $Id: DriverState.hs,v 1.77 2002/04/22 16:06:36 simonpj Exp $ -- -- Settings for the driver -- @@ -192,9 +192,6 @@ GLOBAL_VAR(v_MaxSimplifierIterations, 4, Int) GLOBAL_VAR(v_StgStats, False, Bool) GLOBAL_VAR(v_UsageSPInf, False, Bool) -- Off by default GLOBAL_VAR(v_Strictness, True, Bool) -#ifdef OLD_STRICTNESS -GLOBAL_VAR(v_CPR, True, Bool) -#endif GLOBAL_VAR(v_CSE, True, Bool) GLOBAL_VAR(v_RuleCheck, Nothing, Maybe String) @@ -234,9 +231,6 @@ buildCoreToDo = do max_iter <- readIORef v_MaxSimplifierIterations usageSP <- readIORef v_UsageSPInf strictness <- readIORef v_Strictness -#ifdef OLD_STRICTNESS - cpr <- readIORef v_CPR -#endif cse <- readIORef v_CSE rule_check <- readIORef v_RuleCheck @@ -313,7 +307,7 @@ buildCoreToDo = do case rule_check of { Just pat -> CoreDoRuleCheck 0 pat; Nothing -> CoreDoNothing }, #ifdef OLD_STRICTNESS - if cpr then CoreDoCPResult else CoreDoNothing, + CoreDoOldStrictness #endif if strictness then CoreDoStrictness else CoreDoNothing, CoreDoWorkerWrapper, |