Allow more than 3 simplifier iterations to be run in phase 0

[ghc-hetmet.git] / compiler / main / DynFlags.hs

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 3ef66cb..c8e999a 100644 (file)
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -126,6 +126,7 @@ data DynFlag
    | Opt_D_dump_rn
    | Opt_D_dump_simpl
    | Opt_D_dump_simpl_iterations
+   | Opt_D_dump_simpl_phases
    | Opt_D_dump_spec
    | Opt_D_dump_prep
    | Opt_D_dump_stg
@@ -244,7 +245,6 @@ data DynFlag
    | Opt_OmitInterfacePragmas
    | Opt_DoLambdaEtaExpansion
    | Opt_IgnoreAsserts
-   | Opt_IgnoreBreakpoints
    | Opt_DoEtaReduction
    | Opt_CaseMerge
    | Opt_UnboxStrictFields
@@ -273,6 +273,7 @@ data DynFlag
    | Opt_BreakOnException
    | Opt_BreakOnError
    | Opt_PrintEvldWithShow
+   | Opt_PrintBindContents
    | Opt_GenManifest
    | Opt_EmbedManifest
    | Opt_RunCPSZ
@@ -524,27 +525,26 @@ defaultDynFlags =
         pkgDatabase             = Nothing,
         pkgState                = panic "no package state yet: call GHC.setSessionDynFlags",
   haddockOptions = Nothing,
-       flags = [ 
-           Opt_ReadUserPackageConf,
-    
-           Opt_MonoPatBinds,   -- Experimentally, I'm making this non-standard
-                               -- behaviour the default, to see if anyone notices
-                               -- SLPJ July 06
+        flags = [
+            Opt_ReadUserPackageConf,
 
-           Opt_ImplicitPrelude,
-           Opt_MonomorphismRestriction,
+            Opt_MonoPatBinds,   -- Experimentally, I'm making this non-standard
+                                -- behaviour the default, to see if anyone notices
+                                -- SLPJ July 06
+
+            Opt_ImplicitPrelude,
+            Opt_MonomorphismRestriction,
+
+            Opt_DoAsmMangling,
 
-           Opt_DoAsmMangling,
-    
             Opt_GenManifest,
             Opt_EmbedManifest,
+            Opt_PrintBindContents
+            ]
+            ++ [f | (ns,f) <- optLevelFlags, 0 `elem` ns]
+                    -- The default -O0 options
+            ++ standardWarnings,
 
-           -- on by default:
-           Opt_PrintBindResult ]
-           ++ [f | (ns,f) <- optLevelFlags, 0 `elem` ns]
-                   -- The default -O0 options
-           ++ standardWarnings,
-               
         log_action = \severity srcSpan style msg -> 
                         case severity of
                           SevInfo  -> hPutStrLn stderr (show (msg style))
@@ -848,7 +848,7 @@ getCoreToDo dflags
                -- Phase 0: allow all Ids to be inlined now
                -- This gets foldr inlined before strictness analysis
 
-          MaxSimplifierIterations 3
+          MaxSimplifierIterations (max max_iter 3)
                -- At least 3 iterations because otherwise we land up with
                -- huge dead expressions because of an infelicity in the 
                -- simpifier.   
@@ -902,10 +902,15 @@ getCoreToDo dflags
 
        runWhen spec_constr CoreDoSpecConstr,
 
+       case rule_check of { Just pat -> CoreDoRuleCheck 0 pat; Nothing -> CoreDoNothing },
+
        -- Final clean-up simplification:
        CoreDoSimplify (SimplPhase 0) [
          MaxSimplifierIterations max_iter
-       ]
+       ],
+
+       case rule_check of { Just pat -> CoreDoRuleCheck 0 pat; Nothing -> CoreDoNothing }
+
      ]
 
 -- -----------------------------------------------------------------------------
@@ -938,10 +943,13 @@ allFlags :: [String]
 allFlags = map ('-':) $
            [ name | (name, optkind) <- dynamic_flags, ok optkind ] ++
            map ("fno-"++) flags ++
-           map ("f"++) flags
+           map ("f"++) flags ++
+           map ("X"++) xs ++
+           map ("XNo"++) xs
     where ok (PrefixPred _ _) = False
           ok _ = True
           flags = map fst fFlags
+          xs = map fst xFlags
 
 dynamic_flags :: [(String, OptKind DynP)]
 dynamic_flags = [
@@ -1072,6 +1080,7 @@ dynamic_flags = [
   ,  ( "ddump-rn",              setDumpFlag Opt_D_dump_rn)
   ,  ( "ddump-simpl",           setDumpFlag Opt_D_dump_simpl)
   ,  ( "ddump-simpl-iterations", setDumpFlag Opt_D_dump_simpl_iterations)
+  ,  ( "ddump-simpl-phases",     setDumpFlag Opt_D_dump_simpl_phases)
   ,  ( "ddump-spec",            setDumpFlag Opt_D_dump_spec)
   ,  ( "ddump-prep",            setDumpFlag Opt_D_dump_prep)
   ,  ( "ddump-stg",             setDumpFlag Opt_D_dump_stg)
@@ -1135,7 +1144,7 @@ dynamic_flags = [
   ,  ( "fspec-threshold",          IntSuffix (\n -> upd (\dfs -> dfs{ specThreshold = n })))
   ,  ( "fliberate-case-threshold", IntSuffix (\n -> upd (\dfs -> dfs{ specThreshold = n })))
 
-  ,  ( "frule-check", SepArg (\s -> upd (\dfs -> dfs{ ruleCheck = Just s })))
+  ,  ( "frule-check",     SepArg (\s -> upd (\dfs -> dfs{ ruleCheck = Just s })))
   ,  ( "fcontext-stack"        , IntSuffix $ \n -> upd $ \dfs -> dfs{ ctxtStkDepth = n })
 
         ------ Compiler flags -----------------------------------------------
@@ -1197,7 +1206,6 @@ fFlags = [
   ( "omit-interface-pragmas",           Opt_OmitInterfacePragmas ),
   ( "do-lambda-eta-expansion",          Opt_DoLambdaEtaExpansion ),
   ( "ignore-asserts",                   Opt_IgnoreAsserts ),
-  ( "ignore-breakpoints",               Opt_IgnoreBreakpoints),
   ( "do-eta-reduction",                 Opt_DoEtaReduction ),
   ( "case-merge",                       Opt_CaseMerge ),
   ( "unbox-strict-fields",              Opt_UnboxStrictFields ),
@@ -1211,6 +1219,7 @@ fFlags = [
   ( "break-on-exception",               Opt_BreakOnException ),
   ( "break-on-error",                   Opt_BreakOnError ),
   ( "print-evld-with-show",             Opt_PrintEvldWithShow ),
+  ( "print-bind-contents",              Opt_PrintBindContents ),
   ( "run-cps",                          Opt_RunCPSZ ),
   ( "convert-to-zipper-and-back",       Opt_ConvertToZipCfgAndBack),
   ( "vectorise",                        Opt_Vectorise ),