X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=534c3d224f725f1ab9a62a266551a0b91ef83e16;hp=f245d18f0e1a39b52bafbacd00668b599107c611;hb=a7f88c2f7900257d6791286f653cf141ebcb81c4;hpb=44d4bf2c3eff873d18e683c0629f17a228e9dfe0 diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs index f245d18..534c3d2 100644 --- a/compiler/main/StaticFlags.hs +++ b/compiler/main/StaticFlags.hs @@ -1,10 +1,3 @@ -{-# OPTIONS -w #-} --- The above warning supression flag is a temporary kludge. --- While working on this module you are encouraged to remove it and fix --- any warnings in the module. See --- http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings --- for details - ----------------------------------------------------------------------------- -- -- Static flags @@ -28,6 +21,7 @@ module StaticFlags ( opt_PprUserLength, opt_SuppressUniques, opt_PprStyle_Debug, + opt_NoDebugOutput, -- profiling opts opt_AutoSccsOnAllToplevs, @@ -43,11 +37,9 @@ module StaticFlags ( opt_DictsStrict, opt_IrrefutableTuples, opt_Parallel, - opt_RuntimeTypes, - opt_Flatten, -- optimisation opts - opt_NoMethodSharing, + opt_DsMultiTyVar, opt_NoStateHack, opt_SpecInlineJoinPoints, opt_CprOff, @@ -62,6 +54,9 @@ module StaticFlags ( opt_UF_KeenessFactor, opt_UF_DearOp, + -- Optimization fuel controls + opt_Fuel, + -- Related to linking opt_PIC, opt_Static, @@ -83,7 +78,7 @@ module StaticFlags ( import CmdLineParser import Config -import FastString ( FastString, mkFastString ) +import FastString import Util import Maybes ( firstJust ) import Panic @@ -98,12 +93,12 @@ import Data.List ----------------------------------------------------------------------------- -- Static flags -parseStaticFlags :: [String] -> IO [String] +parseStaticFlags :: [String] -> IO ([String], [String]) parseStaticFlags args = do ready <- readIORef v_opt_C_ready when ready $ throwDyn (ProgramError "Too late for parseStaticFlags: call it before newSession") - (leftover, errs) <- processArgs static_flags args + (leftover, errs, warns1) <- processArgs static_flags args when (not (null errs)) $ throwDyn (UsageError (unlines errs)) -- deal with the way flags: the way (eg. prof) gives rise to @@ -114,7 +109,7 @@ parseStaticFlags args = do let unreg_flags | cGhcUnregisterised == "YES" = unregFlags | otherwise = [] - (more_leftover, errs) <- processArgs static_flags (unreg_flags ++ way_flags) + (more_leftover, errs, warns2) <- processArgs static_flags (unreg_flags ++ way_flags) -- see sanity code in staticOpts writeIORef v_opt_C_ready True @@ -133,12 +128,13 @@ parseStaticFlags args = do | otherwise = [] when (not (null errs)) $ ghcError (UsageError (unlines errs)) - return (excess_prec++cg_flags++more_leftover++leftover) + return (excess_prec ++ cg_flags ++ more_leftover ++ leftover, + warns1 ++ warns2) initStaticOpts :: IO () initStaticOpts = writeIORef v_opt_C_ready True -static_flags :: [(String, OptKind IO)] +static_flags :: [Flag IO] -- All the static flags should appear in this list. It describes how each -- static flag should be processed. Two main purposes: -- (a) if a command-line flag doesn't appear in the list, GHC can complain @@ -146,69 +142,82 @@ 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 -- flags further down the list with the same prefix. static_flags = [ - ------- GHCi ------------------------------------------------------- - ( "ignore-dot-ghci", PassFlag addOpt ) - , ( "read-dot-ghci" , NoArg (removeOpt "-ignore-dot-ghci") ) - - ------- ways -------------------------------------------------------- - , ( "prof" , NoArg (addWay WayProf) ) - , ( "ticky" , NoArg (addWay WayTicky) ) - , ( "parallel" , NoArg (addWay WayPar) ) - , ( "gransim" , NoArg (addWay WayGran) ) - , ( "smp" , NoArg (addWay WayThreaded) ) -- backwards compat. - , ( "debug" , NoArg (addWay WayDebug) ) - , ( "ndp" , NoArg (addWay WayNDP) ) - , ( "threaded" , NoArg (addWay WayThreaded) ) - -- ToDo: user ways - - ------ Debugging ---------------------------------------------------- - , ( "dppr-debug", PassFlag addOpt ) - , ( "dsuppress-uniques", PassFlag addOpt ) - , ( "dppr-user-length", AnySuffix addOpt ) + ------- GHCi ------------------------------------------------------- + Flag "ignore-dot-ghci" (PassFlag addOpt) Supported + , Flag "read-dot-ghci" (NoArg (removeOpt "-ignore-dot-ghci")) Supported + + ------- ways -------------------------------------------------------- + , Flag "prof" (NoArg (addWay WayProf)) Supported + , Flag "ticky" (NoArg (addWay WayTicky)) Supported + , Flag "parallel" (NoArg (addWay WayPar)) Supported + , Flag "gransim" (NoArg (addWay WayGran)) Supported + , Flag "smp" (NoArg (addWay WayThreaded)) + (Deprecated "Use -threaded instead") + , Flag "debug" (NoArg (addWay WayDebug)) Supported + , Flag "ndp" (NoArg (addWay WayNDP)) Supported + , Flag "threaded" (NoArg (addWay WayThreaded)) Supported + -- ToDo: user ways + + ------ Debugging ---------------------------------------------------- + , Flag "dppr-debug" (PassFlag addOpt) Supported + , Flag "dsuppress-uniques" (PassFlag addOpt) Supported + , Flag "dppr-user-length" (AnySuffix addOpt) Supported + , Flag "dopt-fuel" (AnySuffix addOpt) Supported + , Flag "dno-debug-output" (PassFlag addOpt) Supported -- rest of the debugging flags are dynamic - --------- Profiling -------------------------------------------------- - , ( "auto-all" , NoArg (addOpt "-fauto-sccs-on-all-toplevs") ) - , ( "auto" , NoArg (addOpt "-fauto-sccs-on-exported-toplevs") ) - , ( "caf-all" , NoArg (addOpt "-fauto-sccs-on-individual-cafs") ) + --------- Profiling -------------------------------------------------- + , Flag "auto-all" (NoArg (addOpt "-fauto-sccs-on-all-toplevs")) + Supported + , Flag "auto" (NoArg (addOpt "-fauto-sccs-on-exported-toplevs")) + Supported + , Flag "caf-all" (NoArg (addOpt "-fauto-sccs-on-individual-cafs")) + Supported -- "ignore-sccs" doesn't work (ToDo) - , ( "no-auto-all" , NoArg (removeOpt "-fauto-sccs-on-all-toplevs") ) - , ( "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 + , Flag "no-auto-all" (NoArg (removeOpt "-fauto-sccs-on-all-toplevs")) + Supported + , Flag "no-auto" (NoArg (removeOpt "-fauto-sccs-on-exported-toplevs")) + Supported + , Flag "no-caf-all" (NoArg (removeOpt "-fauto-sccs-on-individual-cafs")) + Supported - ----- Linker -------------------------------------------------------- - , ( "static" , PassFlag addOpt ) - , ( "dynamic" , NoArg (removeOpt "-static") ) - , ( "rdynamic" , NoArg (return ()) ) -- ignored for compat w/ gcc + ----- Linker -------------------------------------------------------- + , Flag "static" (PassFlag addOpt) Supported + , Flag "dynamic" (NoArg (removeOpt "-static")) Supported + -- ignored for compat w/ gcc: + , Flag "rdynamic" (NoArg (return ())) Supported - ----- RTS opts ------------------------------------------------------ - , ( "H" , HasArg (setHeapSize . fromIntegral . decodeSize) ) - , ( "Rghc-timing" , NoArg (enableTimingStats) ) + ----- RTS opts ------------------------------------------------------ + , Flag "H" (HasArg (setHeapSize . fromIntegral . decodeSize)) + Supported + , Flag "Rghc-timing" (NoArg (enableTimingStats)) Supported ------ Compiler flags ----------------------------------------------- - -- All other "-fno-" options cancel out "-f" on the hsc cmdline - , ( "fno-", PrefixPred (\s -> isStaticFlag ("f"++s)) - (\s -> removeOpt ("-f"++s)) ) - - -- Pass all remaining "-f" options to hsc - , ( "f", AnySuffixPred (isStaticFlag) addOpt ) + -- All other "-fno-" options cancel out "-f" on the hsc cmdline + , Flag "fno-" + (PrefixPred (\s -> isStaticFlag ("f"++s)) (\s -> removeOpt ("-f"++s))) + Supported + + -- Pass all remaining "-f" options to hsc + , Flag "f" (AnySuffixPred (isStaticFlag) addOpt) + Supported ] +addOpt :: String -> IO () addOpt = consIORef v_opt_C +addWay :: WayName -> IO () addWay = consIORef v_Ways +removeOpt :: String -> IO () removeOpt f = do fs <- readIORef v_opt_C writeIORef v_opt_C $! filter (/= f) fs @@ -222,6 +231,8 @@ lookup_str :: String -> Maybe String -- being unsafely read by unpacked_static_opts below. GLOBAL_VAR(v_opt_C, defaultStaticOpts, [String]) GLOBAL_VAR(v_opt_C_ready, False, Bool) + +staticFlags :: [String] staticFlags = unsafePerformIO $ do ready <- readIORef v_opt_C_ready if (not ready) @@ -229,8 +240,10 @@ staticFlags = unsafePerformIO $ do else readIORef v_opt_C -- -static is the default +defaultStaticOpts :: [String] defaultStaticOpts = ["-static"] +packed_static_opts :: [FastString] packed_static_opts = map mkFastString staticFlags lookUp sw = sw `elem` packed_static_opts @@ -279,77 +292,119 @@ unpacked_opts = expandAts l = [l] -} - -opt_IgnoreDotGhci = lookUp FSLIT("-ignore-dot-ghci") +opt_IgnoreDotGhci :: Bool +opt_IgnoreDotGhci = lookUp (fsLit "-ignore-dot-ghci") -- debugging opts -opt_SuppressUniques = lookUp FSLIT("-dsuppress-uniques") -opt_PprStyle_Debug = lookUp FSLIT("-dppr-debug") +opt_SuppressUniques :: Bool +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 = lookUp FSLIT("-fauto-sccs-on-all-toplevs") -opt_AutoSccsOnExportedToplevs = lookUp FSLIT("-fauto-sccs-on-exported-toplevs") -opt_AutoSccsOnIndividualCafs = lookUp FSLIT("-fauto-sccs-on-individual-cafs") -opt_SccProfilingOn = lookUp FSLIT("-fscc-profiling") +opt_AutoSccsOnAllToplevs :: Bool +opt_AutoSccsOnAllToplevs = lookUp (fsLit "-fauto-sccs-on-all-toplevs") +opt_AutoSccsOnExportedToplevs :: Bool +opt_AutoSccsOnExportedToplevs = lookUp (fsLit "-fauto-sccs-on-exported-toplevs") +opt_AutoSccsOnIndividualCafs :: Bool +opt_AutoSccsOnIndividualCafs = lookUp (fsLit "-fauto-sccs-on-individual-cafs") +opt_SccProfilingOn :: Bool +opt_SccProfilingOn = lookUp (fsLit "-fscc-profiling") +opt_DoTickyProfiling :: Bool opt_DoTickyProfiling = WayTicky `elem` (unsafePerformIO $ readIORef v_Ways) -- Hpc opts -opt_Hpc = lookUp FSLIT("-fhpc") +opt_Hpc :: Bool +opt_Hpc = lookUp (fsLit "-fhpc") -- language opts -opt_DictsStrict = lookUp FSLIT("-fdicts-strict") -opt_IrrefutableTuples = lookUp FSLIT("-firrefutable-tuples") -opt_Parallel = lookUp FSLIT("-fparallel") -opt_Flatten = lookUp FSLIT("-fflatten") +opt_DictsStrict :: Bool +opt_DictsStrict = lookUp (fsLit "-fdicts-strict") +opt_IrrefutableTuples :: Bool +opt_IrrefutableTuples = lookUp (fsLit "-firrefutable-tuples") +opt_Parallel :: Bool +opt_Parallel = lookUp (fsLit "-fparallel") -- optimisation opts -opt_SpecInlineJoinPoints = lookUp FSLIT("-fspec-inline-join-points") -opt_NoStateHack = lookUp FSLIT("-fno-state-hack") -opt_NoMethodSharing = lookUp FSLIT("-fno-method-sharing") -opt_CprOff = lookUp FSLIT("-fcpr-off") +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_NoStateHack :: Bool +opt_NoStateHack = lookUp (fsLit "-fno-state-hack") +opt_CprOff :: Bool +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 = lookUp FSLIT("-fgransim") +opt_GranMacros :: Bool +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 = lookUp FSLIT("-dno-black-holing") -opt_RuntimeTypes = lookUp FSLIT("-fruntime-types") +opt_OmitBlackHoling :: Bool +opt_OmitBlackHoling = lookUp (fsLit "-dno-black-holing") -- Simplifier switches -opt_SimplNoPreInlining = lookUp FSLIT("-fno-pre-inlining") +opt_SimplNoPreInlining :: Bool +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 = lookUp FSLIT("-fexcess-precision") +opt_SimplExcessPrecision :: Bool +opt_SimplExcessPrecision = lookUp (fsLit "-fexcess-precision") -- Unfolding control +opt_UF_CreationThreshold :: Int opt_UF_CreationThreshold = lookup_def_int "-funfolding-creation-threshold" (45::Int) +opt_UF_UseThreshold :: Int opt_UF_UseThreshold = lookup_def_int "-funfolding-use-threshold" (8::Int) -- Discounts can be big +opt_UF_FunAppDiscount :: Int opt_UF_FunAppDiscount = lookup_def_int "-funfolding-fun-discount" (6::Int) -- It's great to inline a fn +opt_UF_KeenessFactor :: Float opt_UF_KeenessFactor = lookup_def_float "-funfolding-keeness-factor" (1.5::Float) +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 = lookUp FSLIT("-static") -opt_Unregisterised = lookUp FSLIT("-funregisterised") +opt_Static :: Bool +opt_Static = lookUp (fsLit "-static") +opt_Unregisterised :: Bool +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 -- indirection to the entry code. See TABLES_NEXT_TO_CODE in -- includes/InfoTables.h. +tablesNextToCode :: Bool tablesNextToCode = not opt_Unregisterised && cGhcEnableTablesNextToCode == "YES" -opt_EmitExternalCore = lookUp FSLIT("-fext-core") +opt_EmitExternalCore :: Bool +opt_EmitExternalCore = lookUp (fsLit "-fext-core") -- Include full span info in error messages, instead of just the start position. -opt_ErrorSpans = lookUp FSLIT("-ferror-spans") +opt_ErrorSpans :: Bool +opt_ErrorSpans = lookUp (fsLit "-ferror-spans") -- object files and libraries to be linked in are collected here. @@ -357,6 +412,7 @@ opt_ErrorSpans = lookUp FSLIT("-ferror-spans") -- how to do it though --SDM. GLOBAL_VAR(v_Ld_inputs, [], [String]) +isStaticFlag :: String -> Bool isStaticFlag f = f `elem` [ "fauto-sccs-on-all-toplevs", @@ -367,12 +423,12 @@ isStaticFlag f = "fspec-inline-join-points", "firrefutable-tuples", "fparallel", - "fflatten", "fgransim", "fno-hi-version-check", "dno-black-holing", "fno-method-sharing", "fno-state-hack", + "fno-ds-multi-tyvar", "fruntime-types", "fno-pre-inlining", "fexcess-precision", @@ -480,6 +536,7 @@ data WayName GLOBAL_VAR(v_Ways, [] ,[WayName]) +allowed_combination :: [WayName] -> Bool allowed_combination way = and [ x `allowedWith` y | x <- way, y <- way, x < y ] where @@ -492,6 +549,7 @@ allowed_combination way = and [ x `allowedWith` y WayDebug `allowedWith` _ = True WayProf `allowedWith` WayNDP = True + WayThreaded `allowedWith` WayProf = True _ `allowedWith` _ = False @@ -519,11 +577,13 @@ findBuildTag = do mkBuildTag :: [Way] -> String mkBuildTag ways = concat (intersperse "_" (map wayTag ways)) +lkupWay :: WayName -> Way lkupWay w = case lookup w way_details of Nothing -> error "findBuildTag" Just details -> details +isRTSWay :: WayName -> Bool isRTSWay = wayRTSOnly . lkupWay data Way = Way { @@ -603,7 +663,7 @@ way_details = (WayNDP, Way "ndp" False "Nested data parallelism" [ "-fparr" - , "-fflatten"]), + , "-fvectorise"]), (WayUser_a, Way "a" False "User way 'a'" ["$WAY_a_REAL_OPTS"]), (WayUser_b, Way "b" False "User way 'b'" ["$WAY_b_REAL_OPTS"]), @@ -624,6 +684,7 @@ way_details = (WayUser_B, Way "B" False "User way 'B'" ["$WAY_B_REAL_OPTS"]) ] +unregFlags :: [String] unregFlags = [ "-optc-DNO_REGS" , "-optc-DUSE_MINIINTERPRETER"