+{-# OPTIONS -fno-cse #-}
+-- -fno-cse is needed for GLOBAL_VAR's to behave properly
+
-----------------------------------------------------------------------------
--
-- Static flags
opt_Parallel,
-- optimisation opts
+ opt_DsMultiTyVar,
opt_NoStateHack,
opt_SpecInlineJoinPoints,
opt_CprOff,
import Maybes ( firstJust )
import Panic
-import Control.Exception ( throwDyn )
import Data.IORef
import System.IO.Unsafe ( unsafePerformIO )
import Control.Monad ( when )
-----------------------------------------------------------------------------
-- 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")
+ when ready $ ghcError (ProgramError "Too late for parseStaticFlags: call it before newSession")
- (leftover, errs) <- processArgs static_flags args
- when (not (null errs)) $ throwDyn (UsageError (unlines errs))
+ (leftover, errs, warns1) <- processArgs static_flags args
+ when (not (null errs)) $ ghcError (UsageError (unlines errs))
-- deal with the way flags: the way (eg. prof) gives rise to
-- further flags, some of which might be static.
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
| 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
-- 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 )
- , ( "dno-debug-output", PassFlag 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") )
+ , 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-<blah>" options cancel out "-f<blah>" on the hsc cmdline
- , ( "fno-", PrefixPred (\s -> isStaticFlag ("f"++s))
- (\s -> removeOpt ("-f"++s)) )
-
- -- Pass all remaining "-f<blah>" options to hsc
- , ( "f", AnySuffixPred (isStaticFlag) addOpt )
+ -- All other "-fno-<blah>" options cancel out "-f<blah>" on the hsc cmdline
+ , Flag "fno-"
+ (PrefixPred (\s -> isStaticFlag ("f"++s)) (\s -> removeOpt ("-f"++s)))
+ Supported
+
+ -- Pass all remaining "-f<blah>" options to hsc
+ , Flag "f" (AnySuffixPred (isStaticFlag) addOpt)
+ Supported
]
addOpt :: String -> IO ()
-- (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
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
"dno-black-holing",
"fno-method-sharing",
"fno-state-hack",
+ "fno-ds-multi-tyvar",
"fruntime-types",
"fno-pre-inlining",
"fexcess-precision",
"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
| c == "K" || c == "k" = truncate (n * 1000)
| c == "M" || c == "m" = truncate (n * 1000 * 1000)
| c == "G" || c == "g" = truncate (n * 1000 * 1000 * 1000)
- | otherwise = throwDyn (CmdLineError ("can't decode size: " ++ str))
+ | otherwise = ghcError (CmdLineError ("can't decode size: " ++ str))
where (m, c) = span pred str
n = readRational m
pred c = isDigit c || c == '.'
let ws = sort (nub way_names)
if not (allowed_combination ws)
- then throwDyn (CmdLineError $
+ then ghcError (CmdLineError $
"combination not supported: " ++
foldr1 (\a b -> a ++ '/':b)
(map (wayName . lkupWay) ws))
, "-package concurrent" ]),
(WayNDP, Way "ndp" False "Nested data parallelism"
- [ "-fparr"
+ [ "-XParr"
, "-fvectorise"]),
(WayUser_a, Way "a" False "User way 'a'" ["$WAY_a_REAL_OPTS"]),
projects / ghc-hetmet.git / blobdiff