projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix whitespace
[ghc-hetmet.git]
/
compiler
/
main
/
StaticFlags.hs
diff --git
a/compiler/main/StaticFlags.hs
b/compiler/main/StaticFlags.hs
index
e71c5c7
..
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
@@
-19,6
+26,7
@@
module StaticFlags (
-- Output style options
opt_PprUserLength,
-- Output style options
opt_PprUserLength,
+ opt_SuppressUniques,
opt_PprStyle_Debug,
-- profiling opts
opt_PprStyle_Debug,
-- profiling opts
@@
-41,6
+49,7
@@
module StaticFlags (
-- optimisation opts
opt_NoMethodSharing,
opt_NoStateHack,
-- optimisation opts
opt_NoMethodSharing,
opt_NoStateHack,
+ opt_SpecInlineJoinPoints,
opt_CprOff,
opt_SimplNoPreInlining,
opt_SimplExcessPrecision,
opt_CprOff,
opt_SimplNoPreInlining,
opt_SimplExcessPrecision,
@@
-51,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
@@
-151,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) )
@@
-162,8
+169,9
@@
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
--------- Profiling --------------------------------------------------
-- rest of the debugging flags are dynamic
--------- Profiling --------------------------------------------------
@@
-217,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
@@
-275,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
@@
-295,6
+304,7
@@
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")
@@
-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)
@@
-355,6
+364,7
@@
isStaticFlag f =
"fauto-sccs-on-individual-cafs",
"fscc-profiling",
"fdicts-strict",
"fauto-sccs-on-individual-cafs",
"fscc-profiling",
"fdicts-strict",
+ "fspec-inline-join-points",
"firrefutable-tuples",
"fparallel",
"fflatten",
"firrefutable-tuples",
"fparallel",
"fflatten",
@@
-366,8
+376,8
@@
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",
"fcpr-off",
"funregisterised",
"fext-core",
"fcpr-off",
@@
-409,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 == '.'
@@
-445,7
+455,6
@@
data WayName
= WayThreaded
| WayDebug
| WayProf
= WayThreaded
| WayDebug
| WayProf
- | WayUnreg
| WayTicky
| WayPar
| WayGran
| WayTicky
| WayPar
| WayGran
@@
-482,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
@@
-552,9
+560,6
@@
way_details =
[ "-DTICKY_TICKY"
, "-optc-DTICKY_TICKY" ]),
[ "-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"