X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=30489593f1e0a10526efb1a0fa41a8679a59f833;hb=ab272eb88f58835d4ad6293813b88d2d6acc23c9;hp=9378c0afa9500cb5111ec7978dba06465456b75d;hpb=da9b43e1c5d143bfcc5f6a669001e94cf7654a30;p=ghc-hetmet.git diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs index 9378c0a..3048959 100644 --- a/compiler/main/StaticFlags.hs +++ b/compiler/main/StaticFlags.hs @@ -27,6 +27,10 @@ module StaticFlags ( opt_SccProfilingOn, opt_DoTickyProfiling, + -- Hpc opts + opt_Hpc, + opt_Hpc_Tracer, + -- language opts opt_DictsStrict, opt_IrrefutableTuples, @@ -37,7 +41,6 @@ module StaticFlags ( -- optimisation opts opt_NoMethodSharing, opt_NoStateHack, - opt_LiberateCaseThreshold, opt_CprOff, opt_RulesOff, opt_SimplNoPreInlining, @@ -52,6 +55,10 @@ module StaticFlags ( opt_UF_UpdateInPlace, opt_UF_DearOp, + -- Related to linking + opt_PIC, + opt_Static, + -- misc opts opt_IgnoreDotGhci, opt_ErrorSpans, @@ -59,10 +66,8 @@ module StaticFlags ( opt_HiVersion, opt_HistorySize, opt_OmitBlackHoling, - opt_Static, opt_Unregisterised, opt_EmitExternalCore, - opt_PIC, v_Ld_inputs, tablesNextToCode ) where @@ -74,7 +79,7 @@ import Config import FastString ( FastString, mkFastString ) import Util import Maybes ( firstJust ) -import Panic ( GhcException(..), ghcError ) +import Panic import Control.Exception ( throwDyn ) import Data.IORef @@ -92,7 +97,7 @@ parseStaticFlags args = do when (not (null errs)) $ throwDyn (UsageError (unlines errs)) -- deal with the way flags: the way (eg. prof) gives rise to - -- futher flags, some of which might be static. + -- further flags, some of which might be static. way_flags <- findBuildTag -- if we're unregisterised, add some more flags @@ -101,6 +106,9 @@ parseStaticFlags args = do (more_leftover, errs) <- processArgs static_flags (unreg_flags ++ way_flags) + -- see sanity code in staticOpts + writeIORef v_opt_C_ready True + -- TABLES_NEXT_TO_CODE affects the info table layout. -- Be careful to do this *after* all processArgs, -- because evaluating tablesNextToCode involves looking at the global @@ -112,11 +120,20 @@ parseStaticFlags args = do return (cg_flags++more_leftover++leftover) --- note that ordering is important in the following list: any flag which +static_flags :: [(String, OptKind 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 +-- (b) a command-line flag may remove, or add, other flags; e.g. the "-fno-X" things +-- +-- The common (PassFlag addOpt) action puts the static flag into the bunch of +-- things that are searched up by the top-level definitions like +-- opt_foo = lookUp FSLIT("-dfoo") + +-- Note that ordering is important in the following list: any flag which -- is a prefix flag (i.e. HasArg, Prefix, OptPrefix, AnySuffix) will override -- flags further down the list with the same prefix. -static_flags :: [(String, OptKind IO)] static_flags = [ ------- GHCi ------------------------------------------------------- ( "ignore-dot-ghci", PassFlag addOpt ) @@ -135,11 +152,15 @@ static_flags = [ -- ToDo: user ways ------ Debugging ---------------------------------------------------- - , ( "dppr-noprags", PassFlag addOpt ) , ( "dppr-debug", PassFlag addOpt ) , ( "dppr-user-length", AnySuffix addOpt ) -- 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") ) @@ -187,7 +208,12 @@ lookup_str :: String -> Maybe String -- holds the static opts while they're being collected, before -- being unsafely read by unpacked_static_opts below. GLOBAL_VAR(v_opt_C, defaultStaticOpts, [String]) -staticFlags = unsafePerformIO (readIORef v_opt_C) +GLOBAL_VAR(v_opt_C_ready, False, Bool) +staticFlags = unsafePerformIO $ do + ready <- readIORef v_opt_C_ready + if (not ready) + then panic "a static opt was looked at too early!" + else readIORef v_opt_C -- -static is the default defaultStaticOpts = ["-static"] @@ -254,6 +280,13 @@ opt_AutoSccsOnIndividualCafs = lookUp FSLIT("-fauto-sccs-on-individual-cafs") opt_SccProfilingOn = lookUp FSLIT("-fscc-profiling") opt_DoTickyProfiling = lookUp FSLIT("-fticky-ticky") + +-- Hpc opts + +opt_Hpc = lookUp FSLIT("-fhpc") + || opt_Hpc_Tracer +opt_Hpc_Tracer = lookUp FSLIT("-fhpc-tracer") + -- language opts opt_DictsStrict = lookUp FSLIT("-fdicts-strict") opt_IrrefutableTuples = lookUp FSLIT("-firrefutable-tuples") @@ -266,11 +299,10 @@ 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_LiberateCaseThreshold = lookup_def_int "-fliberate-case-threshold" (10::Int) 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") @@ -290,6 +322,11 @@ opt_UF_UpdateInPlace = lookUp FSLIT("-funfolding-update-in-place") opt_UF_DearOp = ( 4 :: Int) +#if darwin_TARGET_OS && x86_64_TARGET_ARCH +opt_PIC = True +#else +opt_PIC = lookUp FSLIT("-fPIC") +#endif opt_Static = lookUp FSLIT("-static") opt_Unregisterised = lookUp FSLIT("-funregisterised") @@ -305,7 +342,6 @@ opt_EmitExternalCore = lookUp FSLIT("-fext-core") -- Include full span info in error messages, instead of just the start position. opt_ErrorSpans = lookUp FSLIT("-ferror-spans") -opt_PIC = lookUp FSLIT("-fPIC") -- object files and libraries to be linked in are collected here. -- ToDo: perhaps this could be done without a global, it wasn't obvious @@ -381,13 +417,8 @@ decodeSize str ----------------------------------------------------------------------------- -- RTS Hooks -#if __GLASGOW_HASKELL__ >= 504 foreign import ccall unsafe "setHeapSize" setHeapSize :: Int -> IO () foreign import ccall unsafe "enableTimingStats" enableTimingStats :: IO () -#else -foreign import "setHeapSize" unsafe setHeapSize :: Int -> IO () -foreign import "enableTimingStats" unsafe enableTimingStats :: IO () -#endif ----------------------------------------------------------------------------- -- Ways @@ -461,6 +492,7 @@ findBuildTag :: IO [String] -- new options findBuildTag = do way_names <- readIORef v_Ways let ws = sort (nub way_names) + if not (allowed_combination ws) then throwDyn (CmdLineError $ "combination not supported: " ++ @@ -475,6 +507,8 @@ findBuildTag = do writeIORef v_RTS_Build_tag rts_tag return (concat flags) + + mkBuildTag :: [Way] -> String mkBuildTag ways = concat (intersperse "_" (map wayTag ways)) @@ -513,7 +547,7 @@ way_details = , "-DPROFILING" , "-optc-DPROFILING" ]), - (WayTicky, Way "t" False "Ticky-ticky Profiling" + (WayTicky, Way "t" True "Ticky-ticky Profiling" [ "-fticky-ticky" , "-DTICKY_TICKY" , "-optc-DTICKY_TICKY" ]),