projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX #2023: substitute for $topdir in haddockInterfaces and haddockHTMLs
[ghc-hetmet.git]
/
compiler
/
main
/
StaticFlags.hs
diff --git
a/compiler/main/StaticFlags.hs
b/compiler/main/StaticFlags.hs
index
2b67159
..
f245d18
100644
(file)
--- a/
compiler/main/StaticFlags.hs
+++ b/
compiler/main/StaticFlags.hs
@@
-1,3
+1,10
@@
+{-# 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
-----------------------------------------------------------------------------
--
-- Static flags
@@
-12,12
+19,14
@@
module StaticFlags (
parseStaticFlags,
staticFlags,
module StaticFlags (
parseStaticFlags,
staticFlags,
+ initStaticOpts,
-- Ways
-- Ways
- WayName(..), v_Ways, v_Build_tag, v_RTS_Build_tag,
+ WayName(..), v_Ways, v_Build_tag, v_RTS_Build_tag, isRTSWay,
-- Output style options
opt_PprUserLength,
-- Output style options
opt_PprUserLength,
+ opt_SuppressUniques,
opt_PprStyle_Debug,
-- profiling opts
opt_PprStyle_Debug,
-- profiling opts
@@
-29,7
+38,6
@@
module StaticFlags (
-- Hpc opts
opt_Hpc,
-- Hpc opts
opt_Hpc,
- opt_Hpc_Tracer,
-- language opts
opt_DictsStrict,
-- language opts
opt_DictsStrict,
@@
-41,8
+49,8
@@
module StaticFlags (
-- optimisation opts
opt_NoMethodSharing,
opt_NoStateHack,
-- optimisation opts
opt_NoMethodSharing,
opt_NoStateHack,
+ opt_SpecInlineJoinPoints,
opt_CprOff,
opt_CprOff,
- opt_RulesOff,
opt_SimplNoPreInlining,
opt_SimplExcessPrecision,
opt_MaxWorkerArgs,
opt_SimplNoPreInlining,
opt_SimplExcessPrecision,
opt_MaxWorkerArgs,
@@
-52,7
+60,6
@@
module StaticFlags (
opt_UF_UseThreshold,
opt_UF_FunAppDiscount,
opt_UF_KeenessFactor,
opt_UF_UseThreshold,
opt_UF_FunAppDiscount,
opt_UF_KeenessFactor,
- opt_UF_UpdateInPlace,
opt_UF_DearOp,
-- Related to linking
opt_UF_DearOp,
-- Related to linking
@@
-86,13
+93,16
@@
import Data.IORef
import System.IO.Unsafe ( unsafePerformIO )
import Control.Monad ( when )
import Data.Char ( isDigit )
import System.IO.Unsafe ( unsafePerformIO )
import Control.Monad ( when )
import Data.Char ( isDigit )
-import Data.List ( sort, intersperse, nub )
+import Data.List
-----------------------------------------------------------------------------
-- Static flags
parseStaticFlags :: [String] -> IO [String]
parseStaticFlags args = do
-----------------------------------------------------------------------------
-- Static flags
parseStaticFlags :: [String] -> IO [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
when (not (null errs)) $ throwDyn (UsageError (unlines errs))
(leftover, errs) <- processArgs static_flags args
when (not (null errs)) $ throwDyn (UsageError (unlines errs))
@@
-116,9
+126,17
@@
parseStaticFlags args = do
let cg_flags | tablesNextToCode = ["-optc-DTABLES_NEXT_TO_CODE"]
| otherwise = []
let cg_flags | tablesNextToCode = ["-optc-DTABLES_NEXT_TO_CODE"]
| otherwise = []
+ -- HACK: -fexcess-precision is both a static and a dynamic flag. If
+ -- the static flag parser has slurped it, we must return it as a
+ -- leftover too. ToDo: make -fexcess-precision dynamic only.
+ let excess_prec | opt_SimplExcessPrecision = ["-fexcess-precision"]
+ | otherwise = []
+
when (not (null errs)) $ ghcError (UsageError (unlines errs))
when (not (null errs)) $ ghcError (UsageError (unlines errs))
- return (cg_flags++more_leftover++leftover)
+ return (excess_prec++cg_flags++more_leftover++leftover)
+initStaticOpts :: IO ()
+initStaticOpts = writeIORef v_opt_C_ready True
static_flags :: [(String, OptKind IO)]
-- All the static flags should appear in this list. It describes how each
static_flags :: [(String, OptKind IO)]
-- All the static flags should appear in this list. It describes how each
@@
-141,7
+159,6
@@
static_flags = [
------- ways --------------------------------------------------------
, ( "prof" , NoArg (addWay WayProf) )
------- ways --------------------------------------------------------
, ( "prof" , NoArg (addWay WayProf) )
- , ( "unreg" , NoArg (addWay WayUnreg) )
, ( "ticky" , NoArg (addWay WayTicky) )
, ( "parallel" , NoArg (addWay WayPar) )
, ( "gransim" , NoArg (addWay WayGran) )
, ( "ticky" , NoArg (addWay WayTicky) )
, ( "parallel" , NoArg (addWay WayPar) )
, ( "gransim" , NoArg (addWay WayGran) )
@@
-152,15
+169,11
@@
static_flags = [
-- ToDo: user ways
------ Debugging ----------------------------------------------------
-- ToDo: user ways
------ Debugging ----------------------------------------------------
- , ( "dppr-debug", PassFlag addOpt )
- , ( "dppr-user-length", AnySuffix addOpt )
+ , ( "dppr-debug", PassFlag addOpt )
+ , ( "dsuppress-uniques", PassFlag addOpt )
+ , ( "dppr-user-length", AnySuffix addOpt )
-- rest of the debugging flags are dynamic
-- rest of the debugging flags are dynamic
- --------- Haskell Program Coverage -----------------------------------
-
- , ( "fhpc" , PassFlag addOpt )
- , ( "fhpc-tracer" , PassFlag addOpt )
-
--------- Profiling --------------------------------------------------
, ( "auto-all" , NoArg (addOpt "-fauto-sccs-on-all-toplevs") )
, ( "auto" , NoArg (addOpt "-fauto-sccs-on-exported-toplevs") )
--------- Profiling --------------------------------------------------
, ( "auto-all" , NoArg (addOpt "-fauto-sccs-on-all-toplevs") )
, ( "auto" , NoArg (addOpt "-fauto-sccs-on-exported-toplevs") )
@@
-212,7
+225,7
@@
GLOBAL_VAR(v_opt_C_ready, False, Bool)
staticFlags = unsafePerformIO $ do
ready <- readIORef v_opt_C_ready
if (not ready)
staticFlags = unsafePerformIO $ do
ready <- readIORef v_opt_C_ready
if (not ready)
- then panic "a static opt was looked at too early!"
+ then panic "Static flags have not been initialised!\n Please call GHC.newSession or GHC.parseStaticFlags early enough."
else readIORef v_opt_C
-- -static is the default
else readIORef v_opt_C
-- -static is the default
@@
-270,6
+283,7
@@
unpacked_opts =
opt_IgnoreDotGhci = lookUp FSLIT("-ignore-dot-ghci")
-- debugging opts
opt_IgnoreDotGhci = lookUp FSLIT("-ignore-dot-ghci")
-- debugging opts
+opt_SuppressUniques = lookUp FSLIT("-dsuppress-uniques")
opt_PprStyle_Debug = lookUp FSLIT("-dppr-debug")
opt_PprUserLength = lookup_def_int "-dppr-user-length" 5 --ToDo: give this a name
opt_PprStyle_Debug = lookUp FSLIT("-dppr-debug")
opt_PprUserLength = lookup_def_int "-dppr-user-length" 5 --ToDo: give this a name
@@
-278,14
+292,10
@@
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_AutoSccsOnExportedToplevs = lookUp FSLIT("-fauto-sccs-on-exported-toplevs")
opt_AutoSccsOnIndividualCafs = lookUp FSLIT("-fauto-sccs-on-individual-cafs")
opt_SccProfilingOn = lookUp FSLIT("-fscc-profiling")
-opt_DoTickyProfiling = lookUp FSLIT("-fticky-ticky")
-
+opt_DoTickyProfiling = WayTicky `elem` (unsafePerformIO $ readIORef v_Ways)
-- Hpc opts
-- Hpc opts
-
opt_Hpc = lookUp FSLIT("-fhpc")
opt_Hpc = lookUp FSLIT("-fhpc")
- || opt_Hpc_Tracer
-opt_Hpc_Tracer = lookUp FSLIT("-fhpc-tracer")
-- language opts
opt_DictsStrict = lookUp FSLIT("-fdicts-strict")
-- language opts
opt_DictsStrict = lookUp FSLIT("-fdicts-strict")
@@
-294,15
+304,15
@@
opt_Parallel = lookUp FSLIT("-fparallel")
opt_Flatten = lookUp FSLIT("-fflatten")
-- optimisation opts
opt_Flatten = lookUp FSLIT("-fflatten")
-- 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_NoStateHack = lookUp FSLIT("-fno-state-hack")
opt_NoMethodSharing = lookUp FSLIT("-fno-method-sharing")
opt_CprOff = lookUp FSLIT("-fcpr-off")
-opt_RulesOff = lookUp FSLIT("-frules-off")
-- Switch off CPR analysis in the new demand analyser
opt_MaxWorkerArgs = lookup_def_int "-fmax-worker-args" (10::Int)
opt_GranMacros = lookUp FSLIT("-fgransim")
-- Switch off CPR analysis in the new demand analyser
opt_MaxWorkerArgs = lookup_def_int "-fmax-worker-args" (10::Int)
opt_GranMacros = lookUp FSLIT("-fgransim")
-opt_HiVersion = read (cProjectVersionInt ++ cProjectPatchLevel) :: Int
+opt_HiVersion = read (cProjectVersionInt ++ cProjectPatchLevel) :: Integer
opt_HistorySize = lookup_def_int "-fhistory-size" 20
opt_OmitBlackHoling = lookUp FSLIT("-dno-black-holing")
opt_RuntimeTypes = lookUp FSLIT("-fruntime-types")
opt_HistorySize = lookup_def_int "-fhistory-size" 20
opt_OmitBlackHoling = lookUp FSLIT("-dno-black-holing")
opt_RuntimeTypes = lookUp FSLIT("-fruntime-types")
@@
-318,7
+328,6
@@
opt_UF_CreationThreshold = lookup_def_int "-funfolding-creation-threshold" (45:
opt_UF_UseThreshold = lookup_def_int "-funfolding-use-threshold" (8::Int) -- Discounts can be big
opt_UF_FunAppDiscount = lookup_def_int "-funfolding-fun-discount" (6::Int) -- It's great to inline a fn
opt_UF_KeenessFactor = lookup_def_float "-funfolding-keeness-factor" (1.5::Float)
opt_UF_UseThreshold = lookup_def_int "-funfolding-use-threshold" (8::Int) -- Discounts can be big
opt_UF_FunAppDiscount = lookup_def_int "-funfolding-fun-discount" (6::Int) -- It's great to inline a fn
opt_UF_KeenessFactor = lookup_def_float "-funfolding-keeness-factor" (1.5::Float)
-opt_UF_UpdateInPlace = lookUp FSLIT("-funfolding-update-in-place")
opt_UF_DearOp = ( 4 :: Int)
opt_UF_DearOp = ( 4 :: Int)
@@
-354,8
+363,8
@@
isStaticFlag f =
"fauto-sccs-on-exported-toplevs",
"fauto-sccs-on-individual-cafs",
"fscc-profiling",
"fauto-sccs-on-exported-toplevs",
"fauto-sccs-on-individual-cafs",
"fscc-profiling",
- "fticky-ticky",
"fdicts-strict",
"fdicts-strict",
+ "fspec-inline-join-points",
"firrefutable-tuples",
"fparallel",
"fflatten",
"firrefutable-tuples",
"fparallel",
"fflatten",
@@
-367,16
+376,16
@@
isStaticFlag f =
"fruntime-types",
"fno-pre-inlining",
"fexcess-precision",
"fruntime-types",
"fno-pre-inlining",
"fexcess-precision",
- "funfolding-update-in-place",
"static",
"static",
+ "fhardwire-lib-paths",
"funregisterised",
"fext-core",
"funregisterised",
"fext-core",
- "frules-off",
"fcpr-off",
"ferror-spans",
"fcpr-off",
"ferror-spans",
- "fPIC"
+ "fPIC",
+ "fhpc"
]
]
- || any (flip prefixMatch f) [
+ || any (`isPrefixOf` f) [
"fliberate-case-threshold",
"fmax-worker-args",
"fhistory-size",
"fliberate-case-threshold",
"fmax-worker-args",
"fhistory-size",
@@
-410,7
+419,7
@@
decodeSize str
| c == "G" || c == "g" = truncate (n * 1000 * 1000 * 1000)
| otherwise = throwDyn (CmdLineError ("can't decode size: " ++ str))
where (m, c) = span pred str
| c == "G" || c == "g" = truncate (n * 1000 * 1000 * 1000)
| otherwise = throwDyn (CmdLineError ("can't decode size: " ++ str))
where (m, c) = span pred str
- n = read m :: Double
+ n = readRational m
pred c = isDigit c || c == '.'
pred c = isDigit c || c == '.'
@@
-446,7
+455,6
@@
data WayName
= WayThreaded
| WayDebug
| WayProf
= WayThreaded
| WayDebug
| WayProf
- | WayUnreg
| WayTicky
| WayPar
| WayGran
| WayTicky
| WayPar
| WayGran
@@
-483,7
+491,6
@@
allowed_combination way = and [ x `allowedWith` y
_ `allowedWith` WayDebug = True
WayDebug `allowedWith` _ = True
_ `allowedWith` WayDebug = True
WayDebug `allowedWith` _ = True
- WayProf `allowedWith` WayUnreg = True
WayProf `allowedWith` WayNDP = True
_ `allowedWith` _ = False
WayProf `allowedWith` WayNDP = True
_ `allowedWith` _ = False
@@
-517,6
+524,8
@@
lkupWay w =
Nothing -> error "findBuildTag"
Just details -> details
Nothing -> error "findBuildTag"
Just details -> details
+isRTSWay = wayRTSOnly . lkupWay
+
data Way = Way {
wayTag :: String,
wayRTSOnly :: Bool,
data Way = Way {
wayTag :: String,
wayRTSOnly :: Bool,
@@
-548,13
+557,9
@@
way_details =
, "-optc-DPROFILING" ]),
(WayTicky, Way "t" True "Ticky-ticky Profiling"
, "-optc-DPROFILING" ]),
(WayTicky, Way "t" True "Ticky-ticky Profiling"
- [ "-fticky-ticky"
- , "-DTICKY_TICKY"
+ [ "-DTICKY_TICKY"
, "-optc-DTICKY_TICKY" ]),
, "-optc-DTICKY_TICKY" ]),
- (WayUnreg, Way "u" False "Unregisterised"
- unregFlags ),
-
-- optl's below to tell linker where to find the PVM library -- HWL
(WayPar, Way "mp" False "Parallel"
[ "-fparallel"
-- optl's below to tell linker where to find the PVM library -- HWL
(WayPar, Way "mp" False "Parallel"
[ "-fparallel"