X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=be5fc53b9ef9c6632ab245e8d47a2e9f9d9dbe5e;hp=46f3416836b10a0e7ee7e48069b98d7fcf69b400;hb=bfd0c33d39619b580520e2d6e43d306380393ea6;hpb=7fc749a43b4b6b85d234fa95d4928648259584f4 diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs index 46f3416..be5fc53 100644 --- a/compiler/main/StaticFlags.hs +++ b/compiler/main/StaticFlags.hs @@ -9,13 +9,6 @@ -- ----------------------------------------------------------------------------- -{-# 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 - module StaticFlags ( parseStaticFlags, staticFlags, @@ -26,6 +19,7 @@ module StaticFlags ( -- Output style options opt_PprUserLength, + opt_SuppressUniques, opt_PprStyle_Debug, -- profiling opts @@ -42,12 +36,10 @@ module StaticFlags ( opt_DictsStrict, opt_IrrefutableTuples, opt_Parallel, - opt_RuntimeTypes, - opt_Flatten, -- optimisation opts - opt_NoMethodSharing, opt_NoStateHack, + opt_SpecInlineJoinPoints, opt_CprOff, opt_SimplNoPreInlining, opt_SimplExcessPrecision, @@ -58,13 +50,11 @@ module StaticFlags ( opt_UF_UseThreshold, opt_UF_FunAppDiscount, opt_UF_KeenessFactor, - opt_UF_UpdateInPlace, opt_UF_DearOp, -- Related to linking opt_PIC, opt_Static, - opt_HardwireLibPaths, -- misc opts opt_IgnoreDotGhci, @@ -83,7 +73,7 @@ module StaticFlags ( import CmdLineParser import Config -import FastString ( FastString, mkFastString ) +import FastString import Util import Maybes ( firstJust ) import Panic @@ -146,7 +136,7 @@ static_flags :: [(String, OptKind IO)] -- -- 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") +-- 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 @@ -159,7 +149,6 @@ static_flags = [ ------- ways -------------------------------------------------------- , ( "prof" , NoArg (addWay WayProf) ) - , ( "unreg" , NoArg (addWay WayUnreg) ) , ( "ticky" , NoArg (addWay WayTicky) ) , ( "parallel" , NoArg (addWay WayPar) ) , ( "gransim" , NoArg (addWay WayGran) ) @@ -170,8 +159,9 @@ static_flags = [ -- 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 -------------------------------------------------- @@ -205,10 +195,13 @@ static_flags = [ , ( "f", AnySuffixPred (isStaticFlag) addOpt ) ] +addOpt :: String -> IO () addOpt = consIORef v_opt_C +addWay :: WayName -> IO () addWay = consIORef v_Ways +removeOpt :: String -> IO () removeOpt f = do fs <- readIORef v_opt_C writeIORef v_opt_C $! filter (/= f) fs @@ -222,15 +215,19 @@ lookup_str :: String -> Maybe String -- being unsafely read by unpacked_static_opts below. GLOBAL_VAR(v_opt_C, defaultStaticOpts, [String]) GLOBAL_VAR(v_opt_C_ready, False, Bool) + +staticFlags :: [String] 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 +defaultStaticOpts :: [String] defaultStaticOpts = ["-static"] +packed_static_opts :: [FastString] packed_static_opts = map mkFastString staticFlags lookUp sw = sw `elem` packed_static_opts @@ -279,77 +276,107 @@ unpacked_opts = expandAts l = [l] -} - -opt_IgnoreDotGhci = lookUp FSLIT("-ignore-dot-ghci") +opt_IgnoreDotGhci :: Bool +opt_IgnoreDotGhci = lookUp (fsLit "-ignore-dot-ghci") -- debugging opts -opt_PprStyle_Debug = lookUp FSLIT("-dppr-debug") +opt_SuppressUniques :: Bool +opt_SuppressUniques = lookUp (fsLit "-dsuppress-uniques") +opt_PprStyle_Debug :: Bool +opt_PprStyle_Debug = lookUp (fsLit "-dppr-debug") +opt_PprUserLength :: Int opt_PprUserLength = lookup_def_int "-dppr-user-length" 5 --ToDo: give this a name -- profiling opts -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_AutoSccsOnAllToplevs :: Bool +opt_AutoSccsOnAllToplevs = lookUp (fsLit "-fauto-sccs-on-all-toplevs") +opt_AutoSccsOnExportedToplevs :: Bool +opt_AutoSccsOnExportedToplevs = lookUp (fsLit "-fauto-sccs-on-exported-toplevs") +opt_AutoSccsOnIndividualCafs :: Bool +opt_AutoSccsOnIndividualCafs = lookUp (fsLit "-fauto-sccs-on-individual-cafs") +opt_SccProfilingOn :: Bool +opt_SccProfilingOn = lookUp (fsLit "-fscc-profiling") +opt_DoTickyProfiling :: Bool opt_DoTickyProfiling = WayTicky `elem` (unsafePerformIO $ readIORef v_Ways) -- Hpc opts -opt_Hpc = lookUp FSLIT("-fhpc") +opt_Hpc :: Bool +opt_Hpc = lookUp (fsLit "-fhpc") -- language opts -opt_DictsStrict = lookUp FSLIT("-fdicts-strict") -opt_IrrefutableTuples = lookUp FSLIT("-firrefutable-tuples") -opt_Parallel = lookUp FSLIT("-fparallel") -opt_Flatten = lookUp FSLIT("-fflatten") +opt_DictsStrict :: Bool +opt_DictsStrict = lookUp (fsLit "-fdicts-strict") +opt_IrrefutableTuples :: Bool +opt_IrrefutableTuples = lookUp (fsLit "-firrefutable-tuples") +opt_Parallel :: Bool +opt_Parallel = lookUp (fsLit "-fparallel") -- optimisation opts -opt_NoStateHack = lookUp FSLIT("-fno-state-hack") -opt_NoMethodSharing = lookUp FSLIT("-fno-method-sharing") -opt_CprOff = lookUp FSLIT("-fcpr-off") +opt_SpecInlineJoinPoints :: Bool +opt_SpecInlineJoinPoints = lookUp (fsLit "-fspec-inline-join-points") +opt_NoStateHack :: Bool +opt_NoStateHack = lookUp (fsLit "-fno-state-hack") +opt_CprOff :: Bool +opt_CprOff = lookUp (fsLit "-fcpr-off") -- Switch off CPR analysis in the new demand analyser +opt_MaxWorkerArgs :: Int opt_MaxWorkerArgs = lookup_def_int "-fmax-worker-args" (10::Int) -opt_GranMacros = lookUp FSLIT("-fgransim") +opt_GranMacros :: Bool +opt_GranMacros = lookUp (fsLit "-fgransim") +opt_HiVersion :: Integer opt_HiVersion = read (cProjectVersionInt ++ cProjectPatchLevel) :: Integer +opt_HistorySize :: Int opt_HistorySize = lookup_def_int "-fhistory-size" 20 -opt_OmitBlackHoling = lookUp FSLIT("-dno-black-holing") -opt_RuntimeTypes = lookUp FSLIT("-fruntime-types") +opt_OmitBlackHoling :: Bool +opt_OmitBlackHoling = lookUp (fsLit "-dno-black-holing") -- Simplifier switches -opt_SimplNoPreInlining = lookUp FSLIT("-fno-pre-inlining") +opt_SimplNoPreInlining :: Bool +opt_SimplNoPreInlining = lookUp (fsLit "-fno-pre-inlining") -- NoPreInlining is there just to see how bad things -- get if you don't do it! -opt_SimplExcessPrecision = lookUp FSLIT("-fexcess-precision") +opt_SimplExcessPrecision :: Bool +opt_SimplExcessPrecision = lookUp (fsLit "-fexcess-precision") -- Unfolding control +opt_UF_CreationThreshold :: Int opt_UF_CreationThreshold = lookup_def_int "-funfolding-creation-threshold" (45::Int) +opt_UF_UseThreshold :: Int opt_UF_UseThreshold = lookup_def_int "-funfolding-use-threshold" (8::Int) -- Discounts can be big +opt_UF_FunAppDiscount :: Int opt_UF_FunAppDiscount = lookup_def_int "-funfolding-fun-discount" (6::Int) -- It's great to inline a fn +opt_UF_KeenessFactor :: Float opt_UF_KeenessFactor = lookup_def_float "-funfolding-keeness-factor" (1.5::Float) -opt_UF_UpdateInPlace = lookUp FSLIT("-funfolding-update-in-place") +opt_UF_DearOp :: Int opt_UF_DearOp = ( 4 :: Int) - + +opt_PIC :: Bool #if darwin_TARGET_OS && x86_64_TARGET_ARCH opt_PIC = True #else -opt_PIC = lookUp FSLIT("-fPIC") +opt_PIC = lookUp (fsLit "-fPIC") #endif -opt_Static = lookUp FSLIT("-static") -opt_HardwireLibPaths = lookUp FSLIT("-fhardwire-lib-paths") -opt_Unregisterised = lookUp FSLIT("-funregisterised") +opt_Static :: Bool +opt_Static = lookUp (fsLit "-static") +opt_Unregisterised :: Bool +opt_Unregisterised = lookUp (fsLit "-funregisterised") -- Derived, not a real option. Determines whether we will be compiling -- info tables that reside just before the entry code, or with an -- indirection to the entry code. See TABLES_NEXT_TO_CODE in -- includes/InfoTables.h. +tablesNextToCode :: Bool tablesNextToCode = not opt_Unregisterised && cGhcEnableTablesNextToCode == "YES" -opt_EmitExternalCore = lookUp FSLIT("-fext-core") +opt_EmitExternalCore :: Bool +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_ErrorSpans :: Bool +opt_ErrorSpans = lookUp (fsLit "-ferror-spans") -- object files and libraries to be linked in are collected here. @@ -357,6 +384,7 @@ opt_ErrorSpans = lookUp FSLIT("-ferror-spans") -- how to do it though --SDM. GLOBAL_VAR(v_Ld_inputs, [], [String]) +isStaticFlag :: String -> Bool isStaticFlag f = f `elem` [ "fauto-sccs-on-all-toplevs", @@ -364,9 +392,9 @@ isStaticFlag f = "fauto-sccs-on-individual-cafs", "fscc-profiling", "fdicts-strict", + "fspec-inline-join-points", "firrefutable-tuples", "fparallel", - "fflatten", "fgransim", "fno-hi-version-check", "dno-black-holing", @@ -375,7 +403,6 @@ isStaticFlag f = "fruntime-types", "fno-pre-inlining", "fexcess-precision", - "funfolding-update-in-place", "static", "fhardwire-lib-paths", "funregisterised", @@ -455,7 +482,6 @@ data WayName = WayThreaded | WayDebug | WayProf - | WayUnreg | WayTicky | WayPar | WayGran @@ -481,6 +507,7 @@ data WayName GLOBAL_VAR(v_Ways, [] ,[WayName]) +allowed_combination :: [WayName] -> Bool allowed_combination way = and [ x `allowedWith` y | x <- way, y <- way, x < y ] where @@ -492,8 +519,8 @@ allowed_combination way = and [ x `allowedWith` y _ `allowedWith` WayDebug = True WayDebug `allowedWith` _ = True - WayProf `allowedWith` WayUnreg = True WayProf `allowedWith` WayNDP = True + WayThreaded `allowedWith` WayProf = True _ `allowedWith` _ = False @@ -521,11 +548,13 @@ findBuildTag = do mkBuildTag :: [Way] -> String mkBuildTag ways = concat (intersperse "_" (map wayTag ways)) +lkupWay :: WayName -> Way lkupWay w = case lookup w way_details of Nothing -> error "findBuildTag" Just details -> details +isRTSWay :: WayName -> Bool isRTSWay = wayRTSOnly . lkupWay data Way = Way { @@ -562,9 +591,6 @@ way_details = [ "-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" @@ -608,7 +634,7 @@ way_details = (WayNDP, Way "ndp" False "Nested data parallelism" [ "-fparr" - , "-fflatten"]), + , "-fvectorise"]), (WayUser_a, Way "a" False "User way 'a'" ["$WAY_a_REAL_OPTS"]), (WayUser_b, Way "b" False "User way 'b'" ["$WAY_b_REAL_OPTS"]), @@ -629,6 +655,7 @@ way_details = (WayUser_B, Way "B" False "User way 'B'" ["$WAY_B_REAL_OPTS"]) ] +unregFlags :: [String] unregFlags = [ "-optc-DNO_REGS" , "-optc-DUSE_MINIINTERPRETER"