X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=499367dafdc38397b2a48a8dff362d87f73bfac0;hb=9412e62942ebab0599c7fb0b358a9d4869647b67;hp=c1465ef109138b66edade510d78b60d79d7b25df;hpb=25628e2771424cae1b3366322e8ce6f8a85440f9;p=ghc-hetmet.git diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs index c1465ef..499367d 100644 --- a/compiler/main/StaticFlags.hs +++ b/compiler/main/StaticFlags.hs @@ -1,3 +1,6 @@ +{-# OPTIONS -fno-cse #-} +-- -fno-cse is needed for GLOBAL_VAR's to behave properly + ----------------------------------------------------------------------------- -- -- Static flags @@ -21,6 +24,7 @@ module StaticFlags ( opt_PprUserLength, opt_SuppressUniques, opt_PprStyle_Debug, + opt_NoDebugOutput, -- profiling opts opt_AutoSccsOnAllToplevs, @@ -38,6 +42,7 @@ module StaticFlags ( opt_Parallel, -- optimisation opts + opt_DsMultiTyVar, opt_NoStateHack, opt_SpecInlineJoinPoints, opt_CprOff, @@ -91,12 +96,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 @@ -107,7 +112,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 @@ -126,12 +131,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,57 +152,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 ) - , ( "dopt-fuel", 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 () @@ -239,7 +254,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 @@ -292,6 +307,9 @@ 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 @@ -318,8 +336,13 @@ opt_Parallel :: Bool 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_NoStateHack :: Bool opt_NoStateHack = lookUp (fsLit "-fno-state-hack") opt_CprOff :: Bool @@ -408,6 +431,7 @@ isStaticFlag f = "dno-black-holing", "fno-method-sharing", "fno-state-hack", + "fno-ds-multi-tyvar", "fruntime-types", "fno-pre-inlining", "fexcess-precision", @@ -430,19 +454,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 @@ -641,7 +652,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"]),