X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=f531a16bbe87e42bca7d102558ec7f9aab5dada4;hb=0f5e104c36b1dc3d8deeec5fef3d65e7b3a1b5ad;hp=27058e4c4f17ea1198c8918ea5117f899f0fdf50;hpb=f5d4c3239e57b0396672ffc302961f84398d730e;p=ghc-hetmet.git diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs index 27058e4..f531a16 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, @@ -38,7 +39,7 @@ module StaticFlags ( opt_Parallel, -- optimisation opts - opt_NoMethodSharing, + opt_DsMultiTyVar, opt_NoStateHack, opt_SpecInlineJoinPoints, opt_CprOff, @@ -53,6 +54,9 @@ module StaticFlags ( opt_UF_KeenessFactor, opt_UF_DearOp, + -- Optimization fuel controls + opt_Fuel, + -- Related to linking opt_PIC, opt_Static, @@ -89,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 @@ -105,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 @@ -124,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 @@ -144,56 +149,66 @@ static_flags :: [(String, OptKind IO)] -- 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 () @@ -236,7 +251,7 @@ lookUp sw = sw `elem` packed_static_opts -- (lookup_str "foo") looks for the flag -foo=X or -fooX, -- and returns the string X lookup_str sw - = case firstJust (map (startsWith sw) staticFlags) of + = case firstJust (map (maybePrefixMatch sw) staticFlags) of Just ('=' : str) -> Just str Just str -> Just str Nothing -> Nothing @@ -278,69 +293,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_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 @@ -355,16 +378,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 @@ -375,11 +400,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. @@ -403,6 +428,7 @@ isStaticFlag f = "dno-black-holing", "fno-method-sharing", "fno-state-hack", + "fno-ds-multi-tyvar", "fruntime-types", "fno-pre-inlining", "fexcess-precision", @@ -425,19 +451,6 @@ isStaticFlag f = "funfolding-keeness-factor" ] - - --- Misc functions for command-line options - -startsWith :: String -> String -> Maybe String --- startsWith pfx (pfx++rest) = Just rest - -startsWith [] str = Just str -startsWith (c:cs) (s:ss) - = if c /= s then Nothing else startsWith cs ss -startsWith _ [] = Nothing - - ----------------------------------------------------------------------------- -- convert sizes like "3.5M" into integers @@ -636,7 +649,7 @@ way_details = , "-package concurrent" ]), (WayNDP, Way "ndp" False "Nested data parallelism" - [ "-fparr" + [ "-XParr" , "-fvectorise"]), (WayUser_a, Way "a" False "User way 'a'" ["$WAY_a_REAL_OPTS"]),