X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FCmdLineOpts.lhs;h=8bbfa55c1120735c5e3d84d63e3bc6f25a2ab1dc;hb=f16166e4bcab8ee3598df0cad35d33f1cf6b6cf1;hp=ba967f208342b4fb18a6890bc538a921ef465ac1;hpb=10521d8418fd3a1cf32882718b5bd28992db36fd;p=ghc-hetmet.git diff --git a/ghc/compiler/main/CmdLineOpts.lhs b/ghc/compiler/main/CmdLineOpts.lhs index ba967f2..8bbfa55 100644 --- a/ghc/compiler/main/CmdLineOpts.lhs +++ b/ghc/compiler/main/CmdLineOpts.lhs @@ -1,34 +1,20 @@ % -% (c) The GRASP/AQUA Project, Glasgow University, 1992-1995 +% (c) The AQUA Project, Glasgow University, 1996 % \section[CmdLineOpts]{Things to do with command-line options} \begin{code} #include "HsVersions.h" -module CmdLineOpts ( - CmdLineInfo(..), SwitchResult(..), - GlobalSwitch(..), SimplifierSwitch(..), - CoreToDo(..), - StgToDo(..), -#ifdef DPH - PodizeToDo(..), -#endif {- Data Parallel Haskell -} - - classifyOpts, - switchIsOn, stringSwitchSet, intSwitchSet, - - -- to make the interface self-sufficient - Maybe, MainIO(..) - ) where - -import MainMonad -import Maybes ( maybeToBool, Maybe(..) ) -import Outputable -import Util -#ifdef __GLASGOW_HASKELL__ -import PreludeGlaST -- bad bad bad boy, Will -#endif +module CmdLineOpts where + +import PreludeGlaST -- bad bad bad boy, Will (_Array internals) +import Argv + +CHK_Ubiq() -- debugging consistency check + +import Maybes ( assocMaybe, firstJust, maybeToBool, Maybe(..) ) +import Util ( startsWith, panic, panic#, assertPanic ) \end{code} A command-line {\em switch} is (generally) either on or off; e.g., the @@ -45,31 +31,17 @@ main loop (\tr{main/Main.lhs}), in the Core-to-Core processing loop (\tr{simplCore/SimplCore.lhs), and in the STG-to-STG processing loop (\tr{simplStg/SimplStg.lhs}). -We use function @classifyOpts@ to take raw command-line arguments from -@GetArgs@ and get back the @CmdLineInfo@, which is what we really -want. - %************************************************************************ %* * -\subsection[CmdLineOpts-datatype]{Datatypes associated with command-line options} +\subsection{Datatypes associated with command-line options} %* * %************************************************************************ \begin{code} -type CmdLineInfo - = (GlobalSwitch -> SwitchResult, -- Switch lookup function - [CoreToDo], -- Core-to-core spec -#ifdef DPH - [PodizeToDo], -- Podizer spec - [CoreToDo], -- post podized Core-to-core spec -#endif - [StgToDo] -- Stg-to-stg spec - ) - data SwitchResult - = SwBool Bool -- on/off - | SwString String -- nothing or a String - | SwInt Int -- nothing or an Int + = SwBool Bool -- on/off + | SwString FAST_STRING -- nothing or a String + | SwInt Int -- nothing or an Int \end{code} \begin{code} @@ -81,8 +53,6 @@ data CoreToDo -- These are diff core-to-core passes, (SimplifierSwitch -> SwitchResult) -- Each run of the simplifier can take a different -- set of simplifier-specific flags. - - | CoreDoArityAnalysis -- UNUSED right now | CoreDoCalcInlinings1 | CoreDoCalcInlinings2 | CoreDoFloatInwards @@ -96,9 +66,6 @@ data CoreToDo -- These are diff core-to-core passes, | CoreDoAutoCostCentres | CoreDoFoldrBuildWorkerWrapper | CoreDoFoldrBuildWWAnal --- ANDY: ---| CoreDoHaskPrint ---| CoreDoHaskLetlessPrint \end{code} \begin{code} @@ -113,145 +80,6 @@ data StgToDo \end{code} \begin{code} -#ifdef DPH -data PodizeToDo - = PodizeNeeded Int -- Which dimensioned PODs need vectorizing -#endif {- Data Parallel Haskell -} -\end{code} - -@GlobalSwitches@ may be visible everywhere in the compiler. -@SimplifierSwitches@ (which follow) are visible only in the main -Core-to-Core simplifier. - -\begin{code} -data GlobalSwitch - = ProduceC String -- generate C output into this file - | ProduceS String -- generate native-code assembler into this file - | ProduceHi String -- generate .hi interface into this file ---UNUSED: | ProduceHu String -- generate .hu usage-info into this file - - | AsmTarget String -- architecture we are generating code for - | ForConcurrent - - | Haskell_1_3 -- if set => Haskell 1.3; else 1.2 - | GlasgowExts -- Glasgow Haskell extensions allowed - | CompilingPrelude -- Compiling prelude source - - | HideBuiltinNames -- fiddle builtin namespace; used for compiling Prelude - | HideMostBuiltinNames - | EnsureSplittableC String -- (by globalising all top-level Ids w/ this String) - - | Verbose - | PprStyle_User -- printing "level" (mostly for debugging) - | PprStyle_Debug - | PprStyle_All - - | DoCoreLinting -- paranoia flags - | EmitArityChecks - - | OmitInterfacePragmas - | OmitDerivedRead - | OmitReexportedInstances - - | UnfoldingUseThreshold Int -- global one; see also SimplUnf... - | UnfoldingCreationThreshold Int -- ditto - | UnfoldingOverrideThreshold Int - - | ReportWhyUnfoldingsDisallowed - | UseGetMentionedVars - | ShowPragmaNameErrs - | NameShadowingNotOK - | SigsRequired - - | SccProfilingOn - | AutoSccsOnExportedToplevs - | AutoSccsOnAllToplevs - | AutoSccsOnIndividualCafs ---UNUSED: | AutoSccsOnIndividualDicts - | SccGroup String -- name of "group" for this cost centres in this module - - | DoTickyProfiling - - | DoSemiTagging - - -- ToDo: turn these into SimplifierSwitches? - | FoldrBuildOn -- If foldr/build-style transformations are on. - -- See also SimplDoFoldrBuild, which is used - -- inside the simplifier. - | FoldrBuildTrace -- show all foldr/build optimisations. - - | SpecialiseImports -- Treat non-essential spec requests as errors - | ShowImportSpecs -- Output spec requests for non-essential specs - | OmitUnspecialisedCode -- ToDo? (Patrick) - | SpecialiseOverloaded - | SpecialiseUnboxed - | SpecialiseAll - | SpecialiseTrace - - -- this batch of flags is for particular experiments; - -- v unlikely to be used in any other circumstance ---UNUSED: | OmitStkChecks - | OmitBlackHoling - | StgDoLetNoEscapes - | IgnoreStrictnessPragmas -- ToDo: still useful? - | IrrefutableTuples -- We inject extra "LazyPat"s in the typechecker - | IrrefutableEverything -- (TcPat); doing it any earlier would mean that - -- deriving-generated code wouldn't be irrefutablified. - | AllStrict - | NumbersStrict - | AllDemanded - - | ReturnInRegsThreshold Int - | VectoredReturnThreshold Int -- very likely UNUSED - --- NOT REALLY USED: | D_dump_type_info -- for Robin Popplestone stuff - - | D_dump_rif2hs -- debugging: print out various things - | D_dump_rn4 - | D_dump_tc - | D_dump_deriv - | D_dump_ds - | D_dump_occur_anal - | D_dump_simpl - | D_dump_spec - | D_dump_stranal - | D_dump_deforest - | D_dump_stg - | D_dump_absC - | D_dump_flatC - | D_dump_realC - | D_dump_asm - | D_dump_core_passes -- A Gill-ism - | D_dump_core_passes_info -- Yet another Gill-ism - - | D_verbose_core2core - | D_verbose_stg2stg - | D_simplifier_stats - -{- ???? - | Extra__Flag1 - | Extra__Flag2 - | Extra__Flag3 - | Extra__Flag4 - | Extra__Flag5 - | Extra__Flag6 - | Extra__Flag7 - | Extra__Flag8 - | Extra__Flag9 --} - -#ifdef DPH - | PodizeIntelligent - | PodizeAggresive - | PodizeVeryAggresive - | PodizeExtremelyAggresive - | D_dump_pod - | D_dump_psimpl - | D_dump_nextC -#endif {- Data Parallel Haskell -} -\end{code} - -\begin{code} data SimplifierSwitch = SimplOkToDupCode | SimplFloatLetsExposingWHNF @@ -261,21 +89,17 @@ data SimplifierSwitch | SimplReuseCon | SimplCaseOfCase | SimplLetToCase ---UNUSED: | SimplOkToInlineInLambdas | SimplMayDeleteConjurableIds | SimplPedanticBottoms -- see Simplifier for an explanation | SimplDoArityExpand -- expand arity of bindings | SimplDoFoldrBuild -- This is the per-simplification flag; -- see also FoldrBuildOn, used elsewhere -- in the compiler. - | SimplDoNewOccurAnal -- use the *new*, all singing, Occurance analysis | SimplDoInlineFoldrBuild -- inline foldr/build (*after* f/b rule is used) | IgnoreINLINEPragma | SimplDoLambdaEtaExpansion ---UNUSED: | SimplDoMonadEtaExpansion - | SimplDoEtaReduction | EssentialUnfoldingsOnly -- never mind the thresholds, only @@ -295,188 +119,175 @@ data SimplifierSwitch | SimplNoLetFromCase -- used when turning off floating entirely | SimplNoLetFromApp -- (for experimentation only) WDP 95/10 | SimplNoLetFromStrictLet -{- - | Extra__SimplFlag1 - | Extra__SimplFlag2 - | Extra__SimplFlag3 - | Extra__SimplFlag4 - | Extra__SimplFlag5 - | Extra__SimplFlag6 - | Extra__SimplFlag7 - | Extra__SimplFlag8 --} + + | SimplDontFoldBackAppend + -- we fold `foldr (:)' back into flip (++), + -- but we *don't* want to do it when compiling + -- List.hs, otherwise + -- xs ++ ys = foldr (:) ys xs + -- {- via our loopback -} + -- xs ++ ys = xs ++ ys + -- Oops! + -- So only use this flag inside List.hs + -- (Sigh, what a HACK, Andy. WDP 96/01) \end{code} %************************************************************************ %* * -\subsection[CmdLineOpts-classify]{Classifying command-line options} +\subsection{Classifying command-line options} %* * %************************************************************************ \begin{code} -classifyOpts :: [String] -- cmd-line args, straight from GetArgs - -> MainIO CmdLineInfo --- The MainIO bit is because we might find an unknown flag --- in which case we print an error message - -#ifndef DPH -classifyOpts opts - = sep opts [] [] [] -- accumulators... +lookup :: FAST_STRING -> Bool +lookup_int :: String -> Maybe Int +lookup_str :: String -> Maybe String + +lookup sw = maybeToBool (assoc_opts sw) + +lookup_str sw = firstJust (map (startsWith sw) unpacked_opts) + +lookup_int sw = case (lookup_str sw) of + Nothing -> Nothing + Just xx -> Just (read xx) + +assoc_opts = assocMaybe [ (a, True) | a <- argv ] +unpacked_opts = map _UNPK_ argv +\end{code} + +\begin{code} +opt_AllDemanded = lookup SLIT("-fall-demanded") +opt_AllStrict = lookup SLIT("-fall-strict") +opt_AutoSccsOnAllToplevs = lookup SLIT("-fauto-sccs-on-all-toplevs") +opt_AutoSccsOnExportedToplevs = lookup SLIT("-fauto-sccs-on-exported-toplevs") +opt_AutoSccsOnIndividualCafs = lookup SLIT("-fauto-sccs-on-individual-cafs") +opt_CompilingPrelude = lookup SLIT("-prelude") +opt_D_dump_absC = lookup SLIT("-ddump-absC") +opt_D_dump_asm = lookup SLIT("-ddump-asm") +opt_D_dump_deforest = lookup SLIT("-ddump-deforest") +opt_D_dump_deriv = lookup SLIT("-ddump-deriv") +opt_D_dump_ds = lookup SLIT("-ddump-ds") +opt_D_dump_flatC = lookup SLIT("-ddump-flatC") +opt_D_dump_occur_anal = lookup SLIT("-ddump-occur-anal") +opt_D_dump_rdr = lookup SLIT("-ddump-rdr") +opt_D_dump_realC = lookup SLIT("-ddump-realC") +opt_D_dump_rn = lookup SLIT("-ddump-rn") +opt_D_dump_simpl = lookup SLIT("-ddump-simpl") +opt_D_dump_spec = lookup SLIT("-ddump-spec") +opt_D_dump_stg = lookup SLIT("-ddump-stg") +opt_D_dump_stranal = lookup SLIT("-ddump-stranal") +opt_D_dump_tc = lookup SLIT("-ddump-tc") +opt_D_show_passes = lookup SLIT("-dshow-passes") +opt_D_simplifier_stats = lookup SLIT("-dsimplifier-stats") +opt_D_source_stats = lookup SLIT("-dsource-stats") +opt_D_verbose_core2core = lookup SLIT("-dverbose-simpl") +opt_D_verbose_stg2stg = lookup SLIT("-dverbose-stg") +opt_DoCoreLinting = lookup SLIT("-dcore-lint") +opt_DoSemiTagging = lookup SLIT("-fsemi-tagging") +opt_DoTickyProfiling = lookup SLIT("-fticky-ticky") +opt_EmitArityChecks = lookup SLIT("-darity-checks") +opt_FoldrBuildOn = lookup SLIT("-ffoldr-build-on") +opt_FoldrBuildTrace = lookup SLIT("-ffoldr-build-trace") +opt_ForConcurrent = lookup SLIT("-fconcurrent") +opt_GlasgowExts = lookup SLIT("-fglasgow-exts") +opt_Haskell_1_3 = lookup SLIT("-fhaskell-1.3") +opt_HideBuiltinNames = lookup SLIT("-fhide-builtin-names") +opt_HideMostBuiltinNames = lookup SLIT("-fmin-builtin-names") +opt_IgnoreStrictnessPragmas = lookup SLIT("-fignore-strictness-pragmas") +opt_IrrefutableEverything = lookup SLIT("-firrefutable-everything") +opt_IrrefutableTuples = lookup SLIT("-firrefutable-tuples") +opt_WarnNameShadowing = lookup SLIT("-fwarn-name-shadowing") +opt_NumbersStrict = lookup SLIT("-fnumbers-strict") +opt_OmitBlackHoling = lookup SLIT("-dno-black-holing") +opt_OmitDefaultInstanceMethods = lookup SLIT("-fomit-default-instance-methods") +opt_OmitInterfacePragmas = lookup SLIT("-fomit-interface-pragmas") +opt_OmitReexportedInstances = lookup SLIT("-fomit-reexported-instances") +opt_PprStyle_All = lookup SLIT("-dppr-all") +opt_PprStyle_Debug = lookup SLIT("-dppr-debug") +opt_PprStyle_User = lookup SLIT("-dppr-user") +opt_ReportWhyUnfoldingsDisallowed= lookup SLIT("-freport-disallowed-unfoldings") +opt_SccProfilingOn = lookup SLIT("-fscc-profiling") +opt_ShowImportSpecs = lookup SLIT("-fshow-import-specs") +opt_ShowPragmaNameErrs = lookup SLIT("-fshow-pragma-name-errs") +opt_SigsRequired = lookup SLIT("-fsignatures-required") +opt_SpecialiseAll = lookup SLIT("-fspecialise-all") +opt_SpecialiseImports = lookup SLIT("-fspecialise-imports") +opt_SpecialiseOverloaded = lookup SLIT("-fspecialise-overloaded") +opt_SpecialiseTrace = lookup SLIT("-ftrace-specialisation") +opt_SpecialiseUnboxed = lookup SLIT("-fspecialise-unboxed") +opt_StgDoLetNoEscapes = lookup SLIT("-flet-no-escape") +opt_Verbose = lookup SLIT("-v") +opt_AsmTarget = lookup_str "-fasm=" +opt_SccGroup = lookup_str "-G=" +opt_ProduceC = lookup_str "-C=" +opt_ProduceS = lookup_str "-S=" +opt_ProduceHi = lookup_str "-hifile=" +opt_ProduceHu = lookup_str "-hufile=" +opt_MyHi = lookup_str "-myhifile=" -- the ones produced last time +opt_MyHu = lookup_str "-myhufile=" -- for this module +opt_EnsureSplittableC = lookup_str "-fglobalise-toplev-names=" +opt_UnfoldingUseThreshold = lookup_int "-funfolding-use-threshold" +opt_UnfoldingCreationThreshold = lookup_int "-funfolding-creation-threshold" +opt_UnfoldingOverrideThreshold = lookup_int "-funfolding-override-threshold" +opt_ReturnInRegsThreshold = lookup_int "-freturn-in-regs-threshold" + +opt_NoImplicitPrelude = lookup SLIT("-fno-implicit-prelude") +opt_IgnoreIfacePragmas = lookup SLIT("-fignore-interface-pragmas") + +opt_HuSuffix = case (lookup_str "-husuffix=") of { Nothing -> ".hu" ; Just x -> x } +opt_HiSuffix = case (lookup_str "-hisuffix=") of { Nothing -> ".hi" ; Just x -> x } +opt_SysHiSuffix = case (lookup_str "-syshisuffix=") of { Nothing -> ".hi" ; Just x -> x } + +opt_HiDirList = get_dir_list "-i=" +opt_SysHiDirList = get_dir_list "-j=" + +get_dir_list tag + = case (lookup_str tag) of + Nothing -> [{-no dirs to search???-}] + Just xs -> colon_split xs "" [] -- character and dir accumulators, both reversed... where - sep :: [String] -- cmd-line opts (input) - -> [GlobalSwitch] -- switch accumulator - -> [CoreToDo] -> [StgToDo] -- to_do accumulators - -> MainIO CmdLineInfo -- result - - sep [] glob_sw core_td stg_td - = returnMn ( - isAmong glob_sw, - reverse core_td, - reverse stg_td - ) - - sep (opt1:opts) glob_sw core_td stg_td - -#else {- Data Parallel Haskell -} -classifyOpts opts - = sep opts [] [] [] [] [] -- accumulators... + colon_split [] cacc dacc = reverse (reverse cacc : dacc) + colon_split (':' : xs) cacc dacc = colon_split xs "" (reverse cacc : dacc) + colon_split ( x : xs) cacc dacc = colon_split xs (x : cacc) dacc + +-- -hisuf, -hisuf-prelude +-- -fno-implicit-prelude +-- -fignore-interface-pragmas +-- importdirs and sysimport dirs +\end{code} + +\begin{code} +classifyOpts :: ([CoreToDo], -- Core-to-Core processing spec + [StgToDo]) -- STG-to-STG processing spec + +classifyOpts = sep argv [] [] -- accumulators... where - sep :: [String] -- cmd-line opts (input) - -> [GlobalSwitch] -- switch accumulator - -> [CoreToDo] -> [PodizeToDo] -- to_do accumulators - -> [CoreToDo] -> [StgToDo] - -> MainIO CmdLineInfo -- result - - -- see also the related "simpl_sep" function, used - -- to collect up the SimplifierSwitches for a "-fsimplify". - - sep [] glob_sw core_td pod_td pcore_td stg_td - = returnMn ( - isAmong glob_sw, - reverse core_td, - reverse pod_td, - reverse pcore_td, - reverse stg_td - ) - - sep (opt1:opts) glob_sw core_td pod_td pcore_td stg_td -#endif {- Data Parallel Haskell -} - -#ifndef DPH -#define GLOBAL_SW(switch) sep opts (switch:glob_sw) core_td stg_td -#define CORE_TD(to_do) sep opts glob_sw (to_do:core_td) stg_td -#define POD_TD(to_do) sep opts glob_sw core_td stg_td -#define PAR_CORE_TD(to_do) sep opts glob_sw core_td stg_td -#define BOTH_CORE_TD(to_do) sep opts glob_sw (to_do:core_td) stg_td -#define STG_TD(to_do) sep opts glob_sw core_td (to_do:stg_td) -#define IGNORE_ARG() sep opts glob_sw core_td stg_td - -#else - -#define GLOBAL_SW(switch) sep opts (switch:glob_sw) core_td pod_td pcore_td stg_td -#define CORE_TD(to_do) sep opts glob_sw (to_do:core_td) pod_td pcore_td stg_td -#define POD_TD(to_do) sep opts glob_sw core_td (to_do:pod_td) pcore_td stg_td -#define PAR_CORE_TD(do) sep opts glob_sw core_td pod_td (do:pcore_td) stg_td -#define BOTH_CORE_TD(do) sep opts glob_sw (do:core_td) pod_td (do:pcore_td) stg_td -#define STG_TD(to_do) sep opts glob_sw core_td pod_td pcore_td (to_do:stg_td) -#define IGNORE_ARG() sep opts glob_sw core_td pod_td pcore_td stg_td - -#endif {- Data Parallel Haskell -} - --- ToDo: DPH-ify -#define GLOBAL_SIMPL_SW(switch) simpl_sep opts (switch:simpl_sw) glob_sw core_td stg_td - - = let - maybe_fasm = starts_with "-fasm-" opt1 - maybe_G = starts_with "-G" opt1 - maybe_C = starts_with "-C" opt1 - maybe_S = starts_with "-S" opt1 - maybe_hi = starts_with "-hi" opt1 - maybe_hu = starts_with "-hu" opt1 - maybe_uut = starts_with "-funfolding-use-threshold" opt1 - maybe_uct = starts_with "-funfolding-creation-threshold" opt1 - maybe_uot = starts_with "-funfolding-override-threshold" opt1 - maybe_rirt = starts_with "-freturn-in-regs-threshold" opt1 - maybe_gtn = starts_with "-fglobalise-toplev-names" opt1 - starts_with_fasm = maybeToBool maybe_fasm - starts_with_G = maybeToBool maybe_G - starts_with_C = maybeToBool maybe_C - starts_with_S = maybeToBool maybe_S - starts_with_hi = maybeToBool maybe_hi - starts_with_hu = maybeToBool maybe_hu - starts_with_uut = maybeToBool maybe_uut - starts_with_uct = maybeToBool maybe_uct - starts_with_uot = maybeToBool maybe_uot - starts_with_rirt = maybeToBool maybe_rirt - starts_with_gtn = maybeToBool maybe_gtn - (Just after_fasm) = maybe_fasm - (Just after_G) = maybe_G - (Just after_C) = maybe_C - (Just after_S) = maybe_S - (Just after_hi) = maybe_hi - (Just after_hu) = maybe_hu - (Just after_uut) = maybe_uut - (Just after_uct) = maybe_uct - (Just after_uot) = maybe_uot - (Just after_rirt) = maybe_rirt - (Just after_gtn) = maybe_gtn - in - case opt1 of -- the non-"just match a string" options are at the end... - ',' : _ -> IGNORE_ARG() -- it is for the parser - "-ddump-rif2hs" -> GLOBAL_SW(D_dump_rif2hs) - "-ddump-rn4" -> GLOBAL_SW(D_dump_rn4) - "-ddump-tc" -> GLOBAL_SW(D_dump_tc) - "-ddump-deriv" -> GLOBAL_SW(D_dump_deriv) - "-ddump-ds" -> GLOBAL_SW(D_dump_ds) - "-ddump-stranal" -> GLOBAL_SW(D_dump_stranal) - "-ddump-deforest"-> GLOBAL_SW(D_dump_deforest) - "-ddump-spec" -> GLOBAL_SW(D_dump_spec) - "-ddump-simpl" -> GLOBAL_SW(D_dump_simpl) - "-ddump-occur-anal" -> GLOBAL_SW(D_dump_occur_anal) --- NOT REALLY USED: "-ddump-type-info" -> GLOBAL_SW(D_dump_type_info) -#ifdef DPH - "-ddump-pod" -> GLOBAL_SW(D_dump_pod) - "-ddump-psimpl"-> GLOBAL_SW(D_dump_psimpl) - "-ddump-nextC" -> GLOBAL_SW(D_dump_nextC) -#endif {- Data Parallel Haskell -} - - "-ddump-stg" -> GLOBAL_SW(D_dump_stg) - "-ddump-absC" -> GLOBAL_SW(D_dump_absC) - "-ddump-flatC"-> GLOBAL_SW(D_dump_flatC) - "-ddump-realC"-> GLOBAL_SW(D_dump_realC) - "-ddump-asm" -> GLOBAL_SW(D_dump_asm) - - "-ddump-core-passes" -> GLOBAL_SW(D_dump_core_passes) --- ANDY: "-ddump-haskell" -> GLOBAL_SW(D_dump_core_passes_info) - "-dsimplifier-stats" -> GLOBAL_SW(D_simplifier_stats) - - "-dverbose-simpl" ->GLOBAL_SW(D_verbose_core2core) - "-dverbose-stg" -> GLOBAL_SW(D_verbose_stg2stg) - - "-fuse-get-mentioned-vars" -> GLOBAL_SW(UseGetMentionedVars) - - "-fhaskell-1.3" -> GLOBAL_SW(Haskell_1_3) - "-dcore-lint" -> GLOBAL_SW(DoCoreLinting) - "-fomit-interface-pragmas" -> GLOBAL_SW(OmitInterfacePragmas) - "-fignore-strictness-pragmas" -> GLOBAL_SW(IgnoreStrictnessPragmas) - "-firrefutable-tuples" -> GLOBAL_SW(IrrefutableTuples) - "-firrefutable-everything" -> GLOBAL_SW(IrrefutableEverything) - "-fall-strict" -> GLOBAL_SW(AllStrict) - "-fnumbers-strict" -> GLOBAL_SW(NumbersStrict) - "-fall-demanded" -> GLOBAL_SW(AllDemanded) - - "-fsemi-tagging" -> GLOBAL_SW(DoSemiTagging) - - "-fsimplify" -> -- gather up SimplifierSwitches specially... - simpl_sep opts [] glob_sw core_td stg_td - ---UNUSED: "-farity-analysis" -> CORE_TD(CoreDoArityAnalysis) + sep :: [FAST_STRING] -- cmd-line opts (input) + -> [CoreToDo] -> [StgToDo] -- to_do accumulators + -> ([CoreToDo], [StgToDo]) -- result + + sep [] core_td stg_td -- all done! + = (reverse core_td, reverse stg_td) + +# define CORE_TD(to_do) sep opts (to_do:core_td) stg_td +# define STG_TD(to_do) sep opts core_td (to_do:stg_td) +# define IGNORE_ARG() sep opts core_td stg_td + + sep (opt1:opts) core_td stg_td + = + case (_UNPK_ opt1) of -- the non-"just match a string" options are at the end... + + ',' : _ -> IGNORE_ARG() -- it is for the parser + + "-fsimplify" -> -- gather up SimplifierSwitches specially... + simpl_sep opts [] core_td stg_td + "-fcalc-inlinings1"-> CORE_TD(CoreDoCalcInlinings1) "-fcalc-inlinings2"-> CORE_TD(CoreDoCalcInlinings2) "-ffloat-inwards" -> CORE_TD(CoreDoFloatInwards) "-ffull-laziness" -> CORE_TD(CoreDoFullLaziness) - "-fliberate-case" -> CORE_TD(CoreLiberateCase) - "-fprint-core" -> CORE_TD(CoreDoPrintCore) + "-fliberate-case" -> CORE_TD(CoreLiberateCase) + "-fprint-core" -> CORE_TD(CoreDoPrintCore) "-fstatic-args" -> CORE_TD(CoreDoStaticArgs) "-fstrictness" -> CORE_TD(CoreDoStrictness) "-fspecialise" -> CORE_TD(CoreDoSpecialising) @@ -484,23 +295,6 @@ classifyOpts opts "-fadd-auto-sccs" -> CORE_TD(CoreDoAutoCostCentres) "-ffoldr-build-worker-wrapper" -> CORE_TD(CoreDoFoldrBuildWorkerWrapper) "-ffoldr-build-ww-anal" -> CORE_TD(CoreDoFoldrBuildWWAnal) ---ANDY: "-fprint-haskell-core" -> CORE_TD(CoreDoHaskPrint) --- "-fprint-haskell-letless-core" -> CORE_TD(CoreDoHaskLetlessPrint) - - "-fspecialise-overloaded" -> GLOBAL_SW(SpecialiseOverloaded) - "-fspecialise-unboxed" -> GLOBAL_SW(SpecialiseUnboxed) - "-fspecialise-all" -> GLOBAL_SW(SpecialiseAll) - "-fspecialise-imports" -> GLOBAL_SW(SpecialiseImports) - "-fshow-import-specs" -> GLOBAL_SW(ShowImportSpecs) - "-ftrace-specialisation" -> GLOBAL_SW(SpecialiseTrace) - - "-freport-disallowed-unfoldings" - -> GLOBAL_SW(ReportWhyUnfoldingsDisallowed) - - "-fomit-derived-read" -> GLOBAL_SW(OmitDerivedRead) - - "-ffoldr-build-on" -> GLOBAL_SW(FoldrBuildOn) - "-ffoldr-build-trace" -> GLOBAL_SW(FoldrBuildTrace) "-fstg-static-args" -> STG_TD(StgDoStaticArgs) "-fupdate-analysis" -> STG_TD(StgDoUpdateAnalysis) @@ -508,160 +302,84 @@ classifyOpts opts "-flambda-lift" -> STG_TD(StgDoLambdaLift) "-fmassage-stg-for-profiling" -> STG_TD(StgDoMassageForProfiling) - "-flet-no-escape" -> GLOBAL_SW(StgDoLetNoEscapes) - -#ifdef DPH - "-fpodize-vector" -> POD_TD(PodizeNeeded 1) - "-fpodize-matrix" -> POD_TD(PodizeNeeded 2) - "-fpodize-cube" -> POD_TD(PodizeNeeded 3) - "-fpodize-intelligent" -> GLOBAL_SW(PodizeIntelligent) - "-fpodize-aggresive" -> GLOBAL_SW(PodizeAggresive) - "-fpodize-very-aggresive" -> GLOBAL_SW(PodizeVeryAggresive) - "-fpodize-extremely-aggresive" -> GLOBAL_SW(PodizeExtremelyAggresive) -#endif {- Data Parallel Haskell -} - - "-v" -> GLOBAL_SW(Verbose) - - "-fglasgow-exts" -> GLOBAL_SW(GlasgowExts) - "-prelude" -> GLOBAL_SW(CompilingPrelude) - - "-fscc-profiling" -> GLOBAL_SW(SccProfilingOn) - "-fauto-sccs-on-exported-toplevs" -> GLOBAL_SW(AutoSccsOnExportedToplevs) - "-fauto-sccs-on-all-toplevs" -> GLOBAL_SW(AutoSccsOnAllToplevs) - "-fauto-sccs-on-individual-cafs" -> GLOBAL_SW(AutoSccsOnIndividualCafs) ---UNUSED: "-fauto-sccs-on-individual-dicts" -> GLOBAL_SW(AutoSccsOnIndividualDicts) - - "-fticky-ticky" -> GLOBAL_SW(DoTickyProfiling) - - "-dppr-user" -> GLOBAL_SW(PprStyle_User) - "-dppr-debug" -> GLOBAL_SW(PprStyle_Debug) - "-dppr-all" -> GLOBAL_SW(PprStyle_All) - - "-fhide-builtin-names"-> GLOBAL_SW(HideBuiltinNames) - "-fmin-builtin-names" -> GLOBAL_SW(HideMostBuiltinNames) - - "-fconcurrent" -> GLOBAL_SW(ForConcurrent) - - "-fomit-unspecialised-code" -> GLOBAL_SW(OmitUnspecialisedCode) - "-fshow-pragma-name-errs" -> GLOBAL_SW(ShowPragmaNameErrs) - "-fname-shadowing-not-ok" -> GLOBAL_SW(NameShadowingNotOK) - "-fsignatures-required" -> GLOBAL_SW(SigsRequired) - "-fomit-reexported-instances" -> GLOBAL_SW(OmitReexportedInstances) - "-darity-checks" -> GLOBAL_SW(EmitArityChecks) ---UNUSED: "-dno-stk-chks" -> GLOBAL_SW(OmitStkChecks) - "-dno-black-holing"-> GLOBAL_SW(OmitBlackHoling) - - _ | starts_with_fasm -> GLOBAL_SW(AsmTarget after_fasm) - | starts_with_G -> GLOBAL_SW(SccGroup after_G) -- profiling "group" - | starts_with_C -> GLOBAL_SW(ProduceC after_C) -- main C output - | starts_with_S -> GLOBAL_SW(ProduceS after_S) -- main .s output - | starts_with_hi -> GLOBAL_SW(ProduceHi after_hi) -- interface ---UNUSED: | starts_with_hu -> GLOBAL_SW(ProduceHu after_hu) -- usage info - - | starts_with_uut -> GLOBAL_SW(UnfoldingUseThreshold (read after_uut)) - | starts_with_uct -> GLOBAL_SW(UnfoldingCreationThreshold (read after_uct)) - | starts_with_uot -> GLOBAL_SW(UnfoldingOverrideThreshold (read after_uot)) - - | starts_with_rirt -> -- trace ("rirt:"++after_rirt) $ - GLOBAL_SW(ReturnInRegsThreshold (read after_rirt)) - - | starts_with_gtn -> GLOBAL_SW(EnsureSplittableC after_gtn) - - - _ -> writeMn stderr ("*** WARNING: bad option: "++opt1++"\n") `thenMn` ( \ _ -> - -- NB: the driver is really supposed to handle bad options - IGNORE_ARG() ) - - ---------------- - - starts_with :: String -> String -> Maybe String - - starts_with [] str = Just str - starts_with (c:cs) (s:ss) - = if c /= s then Nothing else starts_with cs ss + _ -> -- NB: the driver is really supposed to handle bad options + IGNORE_ARG() ---------------- - -- ToDo: DPH-ify "simpl_sep"! - - simpl_sep :: [String] -- cmd-line opts (input) - -> [SimplifierSwitch] -- simplifier-switch accumulator - -> [GlobalSwitch] -- switch accumulator - -> [CoreToDo] -> [StgToDo] -- to_do accumulators - -> MainIO CmdLineInfo -- result + simpl_sep :: [FAST_STRING] -- cmd-line opts (input) + -> [SimplifierSwitch] -- simplifier-switch accumulator + -> [CoreToDo] -> [StgToDo] -- to_do accumulators + -> ([CoreToDo], [StgToDo]) -- result -- "simpl_sep" tailcalls "sep" once it's seen one set -- of SimplifierSwitches for a CoreDoSimplify. #ifdef DEBUG - simpl_sep input@[] simpl_sw glob_sw core_td stg_td + simpl_sep input@[] simpl_sw core_td stg_td = panic "simpl_sep []" #endif -- The SimplifierSwitches should be delimited by "(" and ")". - simpl_sep ("(":opts) [{-better be empty-}] glob_sw core_td stg_td - = simpl_sep opts [] glob_sw core_td stg_td - - simpl_sep (")":opts) simpl_sw glob_sw core_td stg_td - = let - this_CoreDoSimplify = CoreDoSimplify (isAmongSimpl simpl_sw) - in - sep opts glob_sw (this_CoreDoSimplify : core_td) stg_td - - simpl_sep (opt1:opts) simpl_sw glob_sw core_td stg_td - = let - maybe_suut = starts_with "-fsimpl-uf-use-threshold" opt1 - maybe_suct = starts_with "-fsimpl-uf-creation-threshold" opt1 - maybe_msi = starts_with "-fmax-simplifier-iterations" opt1 + simpl_sep (opt1:opts) simpl_sw core_td stg_td + = case (_UNPK_ opt1) of + "(" -> ASSERT (null simpl_sw) + simpl_sep opts [] core_td stg_td + ")" -> let + this_simpl = CoreDoSimplify (isAmongSimpl simpl_sw) + in + sep opts (this_simpl : core_td) stg_td + +# define SIMPL_SW(sw) simpl_sep opts (sw:simpl_sw) core_td stg_td + + -- the non-"just match a string" options are at the end... + "-fshow-simplifier-progress" -> SIMPL_SW(ShowSimplifierProgress) + "-fcode-duplication-ok" -> SIMPL_SW(SimplOkToDupCode) + "-ffloat-lets-exposing-whnf" -> SIMPL_SW(SimplFloatLetsExposingWHNF) + "-ffloat-primops-ok" -> SIMPL_SW(SimplOkToFloatPrimOps) + "-falways-float-lets-from-lets" -> SIMPL_SW(SimplAlwaysFloatLetsFromLets) + "-fdo-case-elim" -> SIMPL_SW(SimplDoCaseElim) + "-fdo-eta-reduction" -> SIMPL_SW(SimplDoEtaReduction) + "-fdo-lambda-eta-expansion" -> SIMPL_SW(SimplDoLambdaEtaExpansion) + "-fdo-foldr-build" -> SIMPL_SW(SimplDoFoldrBuild) + "-fdo-not-fold-back-append" -> SIMPL_SW(SimplDontFoldBackAppend) + "-fdo-arity-expand" -> SIMPL_SW(SimplDoArityExpand) + "-fdo-inline-foldr-build" -> SIMPL_SW(SimplDoInlineFoldrBuild) + "-freuse-con" -> SIMPL_SW(SimplReuseCon) + "-fcase-of-case" -> SIMPL_SW(SimplCaseOfCase) + "-flet-to-case" -> SIMPL_SW(SimplLetToCase) + "-fpedantic-bottoms" -> SIMPL_SW(SimplPedanticBottoms) + "-fkeep-spec-pragma-ids" -> SIMPL_SW(KeepSpecPragmaIds) + "-fkeep-unused-bindings" -> SIMPL_SW(KeepUnusedBindings) + "-fmay-delete-conjurable-ids" -> SIMPL_SW(SimplMayDeleteConjurableIds) + "-fessential-unfoldings-only" -> SIMPL_SW(EssentialUnfoldingsOnly) + "-fignore-inline-pragma" -> SIMPL_SW(IgnoreINLINEPragma) + "-fno-let-from-case" -> SIMPL_SW(SimplNoLetFromCase) + "-fno-let-from-app" -> SIMPL_SW(SimplNoLetFromApp) + "-fno-let-from-strict-let" -> SIMPL_SW(SimplNoLetFromStrictLet) + + o | starts_with_msi -> SIMPL_SW(MaxSimplifierIterations (read after_msi)) + | starts_with_suut -> SIMPL_SW(SimplUnfoldingUseThreshold (read after_suut)) + | starts_with_suct -> SIMPL_SW(SimplUnfoldingCreationThreshold (read after_suct)) + where + maybe_suut = startsWith "-fsimpl-uf-use-threshold" o + maybe_suct = startsWith "-fsimpl-uf-creation-threshold" o + maybe_msi = startsWith "-fmax-simplifier-iterations" o starts_with_suut = maybeToBool maybe_suut starts_with_suct = maybeToBool maybe_suct starts_with_msi = maybeToBool maybe_msi (Just after_suut) = maybe_suut (Just after_suct) = maybe_suct (Just after_msi) = maybe_msi - in - case opt1 of -- the non-"just match a string" options are at the end... - "-fshow-simplifier-progress" -> GLOBAL_SIMPL_SW(ShowSimplifierProgress) - - "-fcode-duplication-ok" -> GLOBAL_SIMPL_SW(SimplOkToDupCode) - "-ffloat-lets-exposing-whnf" -> GLOBAL_SIMPL_SW(SimplFloatLetsExposingWHNF) - "-ffloat-primops-ok" -> GLOBAL_SIMPL_SW(SimplOkToFloatPrimOps) - "-falways-float-lets-from-lets" -> GLOBAL_SIMPL_SW(SimplAlwaysFloatLetsFromLets) - "-fdo-case-elim" -> GLOBAL_SIMPL_SW(SimplDoCaseElim) - "-fdo-eta-reduction" -> GLOBAL_SIMPL_SW(SimplDoEtaReduction) - "-fdo-lambda-eta-expansion" -> GLOBAL_SIMPL_SW(SimplDoLambdaEtaExpansion) ---UNUSED: "-fdo-monad-eta-expansion" -> GLOBAL_SIMPL_SW(SimplDoMonadEtaExpansion) - "-fdo-foldr-build" -> GLOBAL_SIMPL_SW(SimplDoFoldrBuild) - "-fdo-new-occur-anal" -> GLOBAL_SIMPL_SW(SimplDoNewOccurAnal) - "-fdo-arity-expand" -> GLOBAL_SIMPL_SW(SimplDoArityExpand) - "-fdo-inline-foldr-build" -> GLOBAL_SIMPL_SW(SimplDoInlineFoldrBuild) - "-freuse-con" -> GLOBAL_SIMPL_SW(SimplReuseCon) - "-fcase-of-case" -> GLOBAL_SIMPL_SW(SimplCaseOfCase) - "-flet-to-case" -> GLOBAL_SIMPL_SW(SimplLetToCase) - "-fpedantic-bottoms" -> GLOBAL_SIMPL_SW(SimplPedanticBottoms) - "-fkeep-spec-pragma-ids" -> GLOBAL_SIMPL_SW(KeepSpecPragmaIds) - "-fkeep-unused-bindings" -> GLOBAL_SIMPL_SW(KeepUnusedBindings) ---UNUSED: "-finline-in-lambdas-ok" -> GLOBAL_SIMPL_SW(SimplOkToInlineInLambdas) - "-fmay-delete-conjurable-ids" -> GLOBAL_SIMPL_SW(SimplMayDeleteConjurableIds) - "-fessential-unfoldings-only" -> GLOBAL_SIMPL_SW(EssentialUnfoldingsOnly) - "-fignore-inline-pragma" -> GLOBAL_SIMPL_SW(IgnoreINLINEPragma) - "-fno-let-from-case" -> GLOBAL_SIMPL_SW(SimplNoLetFromCase) - "-fno-let-from-app" -> GLOBAL_SIMPL_SW(SimplNoLetFromApp) - "-fno-let-from-strict-let" -> GLOBAL_SIMPL_SW(SimplNoLetFromStrictLet) - - _ | starts_with_msi -> GLOBAL_SIMPL_SW(MaxSimplifierIterations (read after_msi)) - | starts_with_suut -> GLOBAL_SIMPL_SW(SimplUnfoldingUseThreshold (read after_suut)) - | starts_with_suct -> GLOBAL_SIMPL_SW(SimplUnfoldingCreationThreshold (read after_suct)) - - _ -> writeMn stderr ("*** WARNING: bad simplifier option: "++opt1++"\n") `thenMn` ( \ _ -> - -- NB: the driver is really supposed to handle bad options - simpl_sep opts simpl_sw glob_sw core_td stg_td ) + + _ -> -- NB: the driver is really supposed to handle bad options + simpl_sep opts simpl_sw core_td stg_td \end{code} %************************************************************************ %* * -\subsection[CmdLineOpts-order]{Switch ordering} +\subsection{Switch ordering} %* * %************************************************************************ @@ -669,13 +387,6 @@ In spite of the @Produce*@ and @SccGroup@ constructors, these things behave just like enumeration types. \begin{code} -instance Eq GlobalSwitch where - a == b = tagOf_Switch a _EQ_ tagOf_Switch b - -instance Ord GlobalSwitch where - a < b = tagOf_Switch a _LT_ tagOf_Switch b - a <= b = tagOf_Switch a _LE_ tagOf_Switch b - instance Eq SimplifierSwitch where a == b = tagOf_SimplSwitch a _EQ_ tagOf_SimplSwitch b @@ -683,126 +394,6 @@ instance Ord SimplifierSwitch where a < b = tagOf_SimplSwitch a _LT_ tagOf_SimplSwitch b a <= b = tagOf_SimplSwitch a _LE_ tagOf_SimplSwitch b -tagOf_Switch (ProduceC _) =(ILIT(0) :: FAST_INT) -tagOf_Switch (ProduceS _) = ILIT(1) -tagOf_Switch (ProduceHi _) = ILIT(2) ---UNUSED:tagOf_Switch (ProduceHu _) = ILIT(3) -tagOf_Switch (AsmTarget _) = ILIT(4) ---UNUSED:tagOf_Switch ForParallel = ILIT(5) -tagOf_Switch ForConcurrent = ILIT(6) ---UNUSED:tagOf_Switch ForGRIP = ILIT(7) -tagOf_Switch Haskell_1_3 = ILIT(8) -tagOf_Switch GlasgowExts = ILIT(9) -tagOf_Switch CompilingPrelude = ILIT(10) -tagOf_Switch HideBuiltinNames = ILIT(11) -tagOf_Switch HideMostBuiltinNames = ILIT(12) -tagOf_Switch (EnsureSplittableC _) = ILIT(13) -tagOf_Switch Verbose = ILIT(14) -tagOf_Switch PprStyle_User = ILIT(15) -tagOf_Switch PprStyle_Debug = ILIT(16) -tagOf_Switch PprStyle_All = ILIT(17) -tagOf_Switch DoCoreLinting = ILIT(18) -tagOf_Switch EmitArityChecks = ILIT(19) -tagOf_Switch OmitInterfacePragmas = ILIT(20) -tagOf_Switch OmitDerivedRead = ILIT(21) -tagOf_Switch OmitReexportedInstances = ILIT(22) -tagOf_Switch (UnfoldingUseThreshold _) = ILIT(23) -tagOf_Switch (UnfoldingCreationThreshold _) = ILIT(24) -tagOf_Switch (UnfoldingOverrideThreshold _) = ILIT(25) -tagOf_Switch ReportWhyUnfoldingsDisallowed = ILIT(26) -tagOf_Switch UseGetMentionedVars = ILIT(27) -tagOf_Switch ShowPragmaNameErrs = ILIT(28) -tagOf_Switch NameShadowingNotOK = ILIT(29) -tagOf_Switch SigsRequired = ILIT(30) -tagOf_Switch SccProfilingOn = ILIT(31) -tagOf_Switch AutoSccsOnExportedToplevs = ILIT(32) -tagOf_Switch AutoSccsOnAllToplevs = ILIT(33) -tagOf_Switch AutoSccsOnIndividualCafs = ILIT(34) ---UNUSED:tagOf_Switch AutoSccsOnIndividualDicts = ILIT(35) -tagOf_Switch (SccGroup _) = ILIT(36) -tagOf_Switch DoTickyProfiling = ILIT(37) -tagOf_Switch DoSemiTagging = ILIT(38) -tagOf_Switch FoldrBuildOn = ILIT(39) -tagOf_Switch FoldrBuildTrace = ILIT(40) -tagOf_Switch SpecialiseImports = ILIT(41) -tagOf_Switch ShowImportSpecs = ILIT(42) -tagOf_Switch OmitUnspecialisedCode = ILIT(43) -tagOf_Switch SpecialiseOverloaded = ILIT(44) -tagOf_Switch SpecialiseUnboxed = ILIT(45) -tagOf_Switch SpecialiseAll = ILIT(46) -tagOf_Switch SpecialiseTrace = ILIT(47) ---UNUSED:tagOf_Switch OmitStkChecks = ILIT(48) -tagOf_Switch OmitBlackHoling = ILIT(49) -tagOf_Switch StgDoLetNoEscapes = ILIT(50) -tagOf_Switch IgnoreStrictnessPragmas = ILIT(51) -tagOf_Switch IrrefutableTuples = ILIT(52) -tagOf_Switch IrrefutableEverything = ILIT(53) -tagOf_Switch AllStrict = ILIT(54) -tagOf_Switch NumbersStrict = ILIT(55) -tagOf_Switch AllDemanded = ILIT(56) --- NOT REALLY USED: tagOf_Switch D_dump_type_info = ILIT(56) -tagOf_Switch (ReturnInRegsThreshold _) = ILIT(57) -tagOf_Switch (VectoredReturnThreshold _)= ILIT(58) -tagOf_Switch D_dump_rif2hs = ILIT(59) -tagOf_Switch D_dump_rn4 = ILIT(60) -tagOf_Switch D_dump_tc = ILIT(61) -tagOf_Switch D_dump_deriv = ILIT(62) -tagOf_Switch D_dump_ds = ILIT(63) -tagOf_Switch D_dump_simpl = ILIT(64) -tagOf_Switch D_dump_spec = ILIT(65) -tagOf_Switch D_dump_occur_anal = ILIT(66) -tagOf_Switch D_dump_stranal = ILIT(67) -tagOf_Switch D_dump_stg = ILIT(68) -tagOf_Switch D_dump_absC = ILIT(69) -tagOf_Switch D_dump_flatC = ILIT(70) -tagOf_Switch D_dump_realC = ILIT(71) -tagOf_Switch D_dump_asm = ILIT(72) -tagOf_Switch D_dump_core_passes = ILIT(73) -tagOf_Switch D_dump_core_passes_info = ILIT(74) -tagOf_Switch D_verbose_core2core = ILIT(75) -tagOf_Switch D_verbose_stg2stg = ILIT(76) -tagOf_Switch D_simplifier_stats = ILIT(77) {-see note below!-} - -{- -tagOf_Switch Extra__Flag1 = ILIT(76) -tagOf_Switch Extra__Flag2 = ILIT(77) -tagOf_Switch Extra__Flag3 = ILIT(78) -tagOf_Switch Extra__Flag4 = ILIT(79) -tagOf_Switch Extra__Flag5 = ILIT(80) -tagOf_Switch Extra__Flag6 = ILIT(81) -tagOf_Switch Extra__Flag7 = ILIT(82) -tagOf_Switch Extra__Flag8 = ILIT(83) -tagOf_Switch Extra__Flag9 = ILIT(84) --} - -#ifndef DPH -tagOf_Switch _ = case (panic "tagOf_Switch") of -- BUG avoidance - s -> tagOf_Switch s - -lAST_SWITCH_TAG = IBOX(tagOf_Switch D_simplifier_stats) - -#else {- Data Parallel Haskell -} - -tagOf_Switch PodizeIntelligent = ILIT(90) -tagOf_Switch PodizeAggresive = ILIT(91) -tagOf_Switch PodizeVeryAggresive = ILIT(92) -tagOf_Switch PodizeExtremelyAggresive = ILIT(93) -tagOf_Switch D_dump_pod = ILIT(94) -tagOf_Switch D_dump_psimpl = ILIT(95) -tagOf_Switch D_dump_nextC = ILIT(96) - -tagOf_Switch _ = case (panic "tagOf_Switch") of -- BUG avoidance - s -> tagOf_Switch s - -lAST_SWITCH_TAG = IBOX(tagOf_Switch D_dump_nextC) - -#endif {- Data Parallel Haskell -} -\end{code} - -(Note For Will): Could you please leave a little extra room between -your last option and @D_dump_spec@... Thanks... jon... - -\begin{code} tagOf_SimplSwitch SimplOkToDupCode =(ILIT(0) :: FAST_INT) tagOf_SimplSwitch SimplFloatLetsExposingWHNF = ILIT(1) tagOf_SimplSwitch SimplOkToFloatPrimOps = ILIT(2) @@ -811,16 +402,13 @@ tagOf_SimplSwitch SimplDoCaseElim = ILIT(4) tagOf_SimplSwitch SimplReuseCon = ILIT(5) tagOf_SimplSwitch SimplCaseOfCase = ILIT(6) tagOf_SimplSwitch SimplLetToCase = ILIT(7) ---UNUSED:tagOf_SimplSwitch SimplOkToInlineInLambdas = ILIT(8) tagOf_SimplSwitch SimplMayDeleteConjurableIds = ILIT(9) tagOf_SimplSwitch SimplPedanticBottoms = ILIT(10) tagOf_SimplSwitch SimplDoArityExpand = ILIT(11) tagOf_SimplSwitch SimplDoFoldrBuild = ILIT(12) -tagOf_SimplSwitch SimplDoNewOccurAnal = ILIT(13) tagOf_SimplSwitch SimplDoInlineFoldrBuild = ILIT(14) tagOf_SimplSwitch IgnoreINLINEPragma = ILIT(15) tagOf_SimplSwitch SimplDoLambdaEtaExpansion = ILIT(16) ---UNUSED:tagOf_SimplSwitch SimplDoMonadEtaExpansion = ILIT(17) tagOf_SimplSwitch SimplDoEtaReduction = ILIT(18) tagOf_SimplSwitch EssentialUnfoldingsOnly = ILIT(19) tagOf_SimplSwitch ShowSimplifierProgress = ILIT(20) @@ -832,91 +420,23 @@ tagOf_SimplSwitch KeepUnusedBindings = ILIT(25) tagOf_SimplSwitch SimplNoLetFromCase = ILIT(26) tagOf_SimplSwitch SimplNoLetFromApp = ILIT(27) tagOf_SimplSwitch SimplNoLetFromStrictLet = ILIT(28) +tagOf_SimplSwitch SimplDontFoldBackAppend = ILIT(29) -- If you add anything here, be sure to change lAST_SIMPL_SWITCH_TAG, too! -{- -tagOf_SimplSwitch Extra__SimplFlag1 = ILIT(26) -tagOf_SimplSwitch Extra__SimplFlag2 = ILIT(27) -tagOf_SimplSwitch Extra__SimplFlag3 = ILIT(28) -tagOf_SimplSwitch Extra__SimplFlag4 = ILIT(29) -tagOf_SimplSwitch Extra__SimplFlag5 = ILIT(30) -tagOf_SimplSwitch Extra__SimplFlag6 = ILIT(31) -tagOf_SimplSwitch Extra__SimplFlag8 = ILIT(32) --} +tagOf_SimplSwitch _ = panic# "tagOf_SimplSwitch" -tagOf_SimplSwitch _ = case (panic "tagOf_SimplSwitch") of -- BUG avoidance - s -> tagOf_SimplSwitch s - -lAST_SIMPL_SWITCH_TAG = IBOX(tagOf_SimplSwitch SimplNoLetFromStrictLet) +lAST_SIMPL_SWITCH_TAG = IBOX(tagOf_SimplSwitch SimplDontFoldBackAppend) \end{code} %************************************************************************ %* * -\subsection[CmdLineOpts-lookup]{Switch lookup} +\subsection{Switch lookup} %* * %************************************************************************ \begin{code} -isAmong :: [GlobalSwitch] -> GlobalSwitch -> SwitchResult isAmongSimpl :: [SimplifierSwitch] -> SimplifierSwitch -> SwitchResult -isAmong on_switches - = let - tidied_on_switches = foldl rm_dups [] on_switches - - sw_tbl :: Array Int SwitchResult - - sw_tbl = (array (0, lAST_SWITCH_TAG) -- bounds... - all_undefined) - // defined_elems - - all_undefined = [ i := SwBool False | i <- [0 .. lAST_SWITCH_TAG ] ] - - defined_elems = map mk_assoc_elem tidied_on_switches - in -#ifndef __GLASGOW_HASKELL__ - \ switch -> sw_tbl ! IBOX((tagOf_Switch switch)) -- but this is fast! -#else - -- and this is faster! - -- (avoid some unboxing, bounds checking, and other horrible things:) - case sw_tbl of { _Array bounds_who_needs_'em stuff -> - \ switch -> - case (indexArray# stuff (tagOf_Switch switch)) of - _Lift v -> v - } -#endif - where - mk_assoc_elem k@(ProduceC str) = IBOX(tagOf_Switch k) := SwString str - mk_assoc_elem k@(ProduceS str) = IBOX(tagOf_Switch k) := SwString str - mk_assoc_elem k@(ProduceHi str) = IBOX(tagOf_Switch k) := SwString str ---UNUSED: mk_assoc_elem k@(ProduceHu str) = IBOX(tagOf_Switch k) := SwString str - mk_assoc_elem k@(SccGroup str) = IBOX(tagOf_Switch k) := SwString str - mk_assoc_elem k@(AsmTarget str) = IBOX(tagOf_Switch k) := SwString str - mk_assoc_elem k@(EnsureSplittableC str) = IBOX(tagOf_Switch k) := SwString str - - mk_assoc_elem k@(UnfoldingUseThreshold lvl) = IBOX(tagOf_Switch k) := SwInt lvl - mk_assoc_elem k@(UnfoldingCreationThreshold lvl) = IBOX(tagOf_Switch k) := SwInt lvl - mk_assoc_elem k@(UnfoldingOverrideThreshold lvl) = IBOX(tagOf_Switch k) := SwInt lvl - - mk_assoc_elem k@(ReturnInRegsThreshold lvl) = IBOX(tagOf_Switch k) := SwInt lvl - - mk_assoc_elem k = IBOX(tagOf_Switch k) := SwBool True -- I'm here, Mom! - - -- cannot have duplicates if we are going to use the array thing - - rm_dups switches_so_far switch - = if switch `is_elem` switches_so_far - then switches_so_far - else switch : switches_so_far - where - sw `is_elem` [] = False - sw `is_elem` (s:ss) = (tagOf_Switch sw) _EQ_ (tagOf_Switch s) - || sw `is_elem` ss -\end{code} - -Same thing for @SimplifierSwitches@; for efficiency reasons, we -probably do {\em not} want something overloaded. - \begin{code} isAmongSimpl on_switches = let tidied_on_switches = foldl rm_dups [] on_switches @@ -931,17 +451,12 @@ isAmongSimpl on_switches defined_elems = map mk_assoc_elem tidied_on_switches in -#ifndef __GLASGOW_HASKELL__ - \ switch -> sw_tbl ! IBOX((tagOf_SimplSwitch switch)) -- but this is fast! -#else - -- and this is faster! -- (avoid some unboxing, bounds checking, and other horrible things:) case sw_tbl of { _Array bounds_who_needs_'em stuff -> \ switch -> case (indexArray# stuff (tagOf_SimplSwitch switch)) of _Lift v -> v } -#endif where mk_assoc_elem k@(MaxSimplifierIterations lvl) = IBOX(tagOf_SimplSwitch k) := SwInt lvl mk_assoc_elem k@(SimplUnfoldingUseThreshold i) = IBOX(tagOf_SimplSwitch k) := SwInt i @@ -963,7 +478,7 @@ isAmongSimpl on_switches %************************************************************************ %* * -\subsection[CmdLineOpts-misc]{Misc functions for command-line options} +\subsection{Misc functions for command-line options} %* * %************************************************************************ @@ -977,8 +492,8 @@ switchIsOn lookup_fn switch _ -> True stringSwitchSet :: (switch -> SwitchResult) - -> (String -> switch) - -> Maybe String + -> (FAST_STRING -> switch) + -> Maybe FAST_STRING stringSwitchSet lookup_fn switch = case (lookup_fn (switch (panic "stringSwitchSet"))) of @@ -990,8 +505,7 @@ intSwitchSet :: (switch -> SwitchResult) -> Maybe Int intSwitchSet lookup_fn switch - = -- pprTrace "intSwitchSet:" (ppInt (IBOX (tagOf_Switch (switch (panic "xxx"))))) $ - case (lookup_fn (switch (panic "intSwitchSet"))) of + = case (lookup_fn (switch (panic "intSwitchSet"))) of SwInt int -> Just int _ -> Nothing \end{code}