X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=6d826cb72b9e76a935d4af9a09a31a67a62b1e26;hb=a3f24157839605f19e869fdde8cd73266fecf4ac;hp=a2362d91e53d0fca3d55ab58448b75e8452d7336;hpb=30c122df62ec75f9ed7f392f24c2925675bf1d06;p=ghc-hetmet.git diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs index a2362d9..6d826cb 100644 --- a/compiler/main/StaticFlags.hs +++ b/compiler/main/StaticFlags.hs @@ -21,6 +21,7 @@ module StaticFlags ( opt_PprUserLength, opt_SuppressUniques, opt_PprStyle_Debug, + opt_NoDebugOutput, -- profiling opts opt_AutoSccsOnAllToplevs, @@ -36,10 +37,9 @@ module StaticFlags ( opt_DictsStrict, opt_IrrefutableTuples, opt_Parallel, - opt_RuntimeTypes, -- optimisation opts - opt_NoMethodSharing, + opt_DsMultiTyVar, opt_NoStateHack, opt_SpecInlineJoinPoints, opt_CprOff, @@ -54,6 +54,9 @@ module StaticFlags ( opt_UF_KeenessFactor, opt_UF_DearOp, + -- Optimization fuel controls + opt_Fuel, + -- Related to linking opt_PIC, opt_Static, @@ -138,7 +141,7 @@ static_flags :: [(String, OptKind IO)] -- -- The common (PassFlag addOpt) action puts the static flag into the bunch of -- things that are searched up by the top-level definitions like --- opt_foo = lookUp FSLIT("-dfoo") +-- opt_foo = lookUp (fsLit "-dfoo") -- Note that ordering is important in the following list: any flag which -- is a prefix flag (i.e. HasArg, Prefix, OptPrefix, AnySuffix) will override @@ -164,6 +167,8 @@ static_flags = [ , ( "dppr-debug", PassFlag addOpt ) , ( "dsuppress-uniques", PassFlag addOpt ) , ( "dppr-user-length", AnySuffix addOpt ) + , ( "dopt-fuel", AnySuffix addOpt ) + , ( "dno-debug-output", PassFlag addOpt ) -- rest of the debugging flags are dynamic --------- Profiling -------------------------------------------------- @@ -176,9 +181,6 @@ static_flags = [ , ( "no-auto" , NoArg (removeOpt "-fauto-sccs-on-exported-toplevs") ) , ( "no-caf-all" , NoArg (removeOpt "-fauto-sccs-on-individual-cafs") ) - ------- Miscellaneous ----------------------------------------------- - , ( "no-link-chk" , NoArg (return ()) ) -- ignored for backwards compat - ----- Linker -------------------------------------------------------- , ( "static" , PassFlag addOpt ) , ( "dynamic" , NoArg (removeOpt "-static") ) @@ -279,71 +281,77 @@ unpacked_opts = -} opt_IgnoreDotGhci :: Bool -opt_IgnoreDotGhci = lookUp FSLIT("-ignore-dot-ghci") +opt_IgnoreDotGhci = lookUp (fsLit "-ignore-dot-ghci") -- debugging opts opt_SuppressUniques :: Bool -opt_SuppressUniques = lookUp FSLIT("-dsuppress-uniques") -opt_PprStyle_Debug :: Bool -opt_PprStyle_Debug = lookUp FSLIT("-dppr-debug") -opt_PprUserLength :: Int +opt_SuppressUniques = lookUp (fsLit "-dsuppress-uniques") +opt_PprStyle_Debug :: Bool +opt_PprStyle_Debug = lookUp (fsLit "-dppr-debug") +opt_PprUserLength :: Int opt_PprUserLength = lookup_def_int "-dppr-user-length" 5 --ToDo: give this a name +opt_Fuel :: Int +opt_Fuel = lookup_def_int "-dopt-fuel" maxBound +opt_NoDebugOutput :: Bool +opt_NoDebugOutput = lookUp (fsLit "-dno-debug-output") + -- profiling opts opt_AutoSccsOnAllToplevs :: Bool -opt_AutoSccsOnAllToplevs = lookUp FSLIT("-fauto-sccs-on-all-toplevs") +opt_AutoSccsOnAllToplevs = lookUp (fsLit "-fauto-sccs-on-all-toplevs") opt_AutoSccsOnExportedToplevs :: Bool -opt_AutoSccsOnExportedToplevs = lookUp FSLIT("-fauto-sccs-on-exported-toplevs") +opt_AutoSccsOnExportedToplevs = lookUp (fsLit "-fauto-sccs-on-exported-toplevs") opt_AutoSccsOnIndividualCafs :: Bool -opt_AutoSccsOnIndividualCafs = lookUp FSLIT("-fauto-sccs-on-individual-cafs") +opt_AutoSccsOnIndividualCafs = lookUp (fsLit "-fauto-sccs-on-individual-cafs") opt_SccProfilingOn :: Bool -opt_SccProfilingOn = lookUp FSLIT("-fscc-profiling") +opt_SccProfilingOn = lookUp (fsLit "-fscc-profiling") opt_DoTickyProfiling :: Bool opt_DoTickyProfiling = WayTicky `elem` (unsafePerformIO $ readIORef v_Ways) -- Hpc opts opt_Hpc :: Bool -opt_Hpc = lookUp FSLIT("-fhpc") +opt_Hpc = lookUp (fsLit "-fhpc") -- language opts opt_DictsStrict :: Bool -opt_DictsStrict = lookUp FSLIT("-fdicts-strict") +opt_DictsStrict = lookUp (fsLit "-fdicts-strict") opt_IrrefutableTuples :: Bool -opt_IrrefutableTuples = lookUp FSLIT("-firrefutable-tuples") +opt_IrrefutableTuples = lookUp (fsLit "-firrefutable-tuples") opt_Parallel :: Bool -opt_Parallel = lookUp FSLIT("-fparallel") +opt_Parallel = lookUp (fsLit "-fparallel") -- optimisation opts +opt_DsMultiTyVar :: Bool +opt_DsMultiTyVar = not (lookUp (fsLit "-fno-ds-multi-tyvar")) + -- On by default + opt_SpecInlineJoinPoints :: Bool -opt_SpecInlineJoinPoints = lookUp FSLIT("-fspec-inline-join-points") +opt_SpecInlineJoinPoints = lookUp (fsLit "-fspec-inline-join-points") + opt_NoStateHack :: Bool -opt_NoStateHack = lookUp FSLIT("-fno-state-hack") -opt_NoMethodSharing :: Bool -opt_NoMethodSharing = lookUp FSLIT("-fno-method-sharing") +opt_NoStateHack = lookUp (fsLit "-fno-state-hack") opt_CprOff :: Bool -opt_CprOff = lookUp FSLIT("-fcpr-off") +opt_CprOff = lookUp (fsLit "-fcpr-off") -- Switch off CPR analysis in the new demand analyser opt_MaxWorkerArgs :: Int opt_MaxWorkerArgs = lookup_def_int "-fmax-worker-args" (10::Int) opt_GranMacros :: Bool -opt_GranMacros = lookUp FSLIT("-fgransim") +opt_GranMacros = lookUp (fsLit "-fgransim") opt_HiVersion :: Integer opt_HiVersion = read (cProjectVersionInt ++ cProjectPatchLevel) :: Integer opt_HistorySize :: Int opt_HistorySize = lookup_def_int "-fhistory-size" 20 opt_OmitBlackHoling :: Bool -opt_OmitBlackHoling = lookUp FSLIT("-dno-black-holing") -opt_RuntimeTypes :: Bool -opt_RuntimeTypes = lookUp FSLIT("-fruntime-types") +opt_OmitBlackHoling = lookUp (fsLit "-dno-black-holing") -- Simplifier switches opt_SimplNoPreInlining :: Bool -opt_SimplNoPreInlining = lookUp FSLIT("-fno-pre-inlining") +opt_SimplNoPreInlining = lookUp (fsLit "-fno-pre-inlining") -- NoPreInlining is there just to see how bad things -- get if you don't do it! opt_SimplExcessPrecision :: Bool -opt_SimplExcessPrecision = lookUp FSLIT("-fexcess-precision") +opt_SimplExcessPrecision = lookUp (fsLit "-fexcess-precision") -- Unfolding control opt_UF_CreationThreshold :: Int @@ -358,16 +366,18 @@ opt_UF_KeenessFactor = lookup_def_float "-funfolding-keeness-factor" (1.5::F opt_UF_DearOp :: Int opt_UF_DearOp = ( 4 :: Int) + +-- Related to linking opt_PIC :: Bool #if darwin_TARGET_OS && x86_64_TARGET_ARCH opt_PIC = True #else -opt_PIC = lookUp FSLIT("-fPIC") +opt_PIC = lookUp (fsLit "-fPIC") #endif opt_Static :: Bool -opt_Static = lookUp FSLIT("-static") +opt_Static = lookUp (fsLit "-static") opt_Unregisterised :: Bool -opt_Unregisterised = lookUp FSLIT("-funregisterised") +opt_Unregisterised = lookUp (fsLit "-funregisterised") -- Derived, not a real option. Determines whether we will be compiling -- info tables that reside just before the entry code, or with an @@ -378,11 +388,11 @@ tablesNextToCode = not opt_Unregisterised && cGhcEnableTablesNextToCode == "YES" opt_EmitExternalCore :: Bool -opt_EmitExternalCore = lookUp FSLIT("-fext-core") +opt_EmitExternalCore = lookUp (fsLit "-fext-core") -- Include full span info in error messages, instead of just the start position. opt_ErrorSpans :: Bool -opt_ErrorSpans = lookUp FSLIT("-ferror-spans") +opt_ErrorSpans = lookUp (fsLit "-ferror-spans") -- object files and libraries to be linked in are collected here. @@ -406,6 +416,7 @@ isStaticFlag f = "dno-black-holing", "fno-method-sharing", "fno-state-hack", + "fno-ds-multi-tyvar", "fruntime-types", "fno-pre-inlining", "fexcess-precision",