X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=52a86948e48514c223a285cb048298aa551463f3;hp=8035211a7cea3b749a850b6112b07aa632a67321;hb=190b2d90f92f61eb802275729106b5d9fb9a7a7c;hpb=a5288c551349a0adab0d931a429b10a096d9444d diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs index 8035211..52a8694 100644 --- a/compiler/main/StaticFlags.hs +++ b/compiler/main/StaticFlags.hs @@ -22,7 +22,9 @@ module StaticFlags ( -- Output style options opt_PprUserLength, opt_SuppressUniques, - opt_PprStyle_Debug, + opt_SuppressCoercions, + opt_SuppressModulePrefixes, + opt_PprStyle_Debug, opt_TraceLevel, opt_NoDebugOutput, -- profiling opts @@ -40,7 +42,6 @@ module StaticFlags ( opt_DsMultiTyVar, opt_NoStateHack, opt_SimpleListLiterals, - opt_SpecInlineJoinPoints, opt_CprOff, opt_SimplNoPreInlining, opt_SimplExcessPrecision, @@ -50,6 +51,7 @@ module StaticFlags ( opt_UF_CreationThreshold, opt_UF_UseThreshold, opt_UF_FunAppDiscount, + opt_UF_DictDiscount, opt_UF_KeenessFactor, opt_UF_DearOp, @@ -71,6 +73,7 @@ module StaticFlags ( v_Ld_inputs, tablesNextToCode, opt_StubDeadValues, + opt_Ticky, -- For the parser addOpt, removeOpt, addWay, getWayFlags, v_opt_C_ready @@ -182,12 +185,26 @@ opt_IgnoreDotGhci = lookUp (fsLit "-ignore-dot-ghci") -- debugging opts opt_SuppressUniques :: Bool opt_SuppressUniques = lookUp (fsLit "-dsuppress-uniques") + +opt_SuppressCoercions :: Bool +opt_SuppressCoercions = lookUp (fsLit "-dsuppress-coercions") + +opt_SuppressModulePrefixes :: Bool +opt_SuppressModulePrefixes = lookUp (fsLit "-dsuppress-module-prefixes") + opt_PprStyle_Debug :: Bool -opt_PprStyle_Debug = lookUp (fsLit "-dppr-debug") +opt_PprStyle_Debug = lookUp (fsLit "-dppr-debug") + +opt_TraceLevel :: Int +opt_TraceLevel = lookup_def_int "-dtrace-level" 1 -- Standard level is 1 + -- Less verbose is 0 + opt_PprUserLength :: Int opt_PprUserLength = lookup_def_int "-dppr-user-length" 5 --ToDo: give this a name + opt_Fuel :: Int opt_Fuel = lookup_def_int "-dopt-fuel" maxBound + opt_NoDebugOutput :: Bool opt_NoDebugOutput = lookUp (fsLit "-dno-debug-output") @@ -203,8 +220,10 @@ opt_Hpc = lookUp (fsLit "-fhpc") -- language opts 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") @@ -213,9 +232,6 @@ 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_SimpleListLiterals :: Bool opt_SimpleListLiterals = lookUp (fsLit "-fsimple-list-literals") @@ -230,12 +246,16 @@ opt_MaxWorkerArgs = lookup_def_int "-fmax-worker-args" (10::Int) 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 :: Bool opt_OmitBlackHoling = lookUp (fsLit "-dno-black-holing") + opt_StubDeadValues :: Bool opt_StubDeadValues = lookUp (fsLit "-dstub-dead-values") @@ -248,23 +268,26 @@ 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" (6::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 +-- See Note [Discounts and thresholds] in CoreUnfold + +opt_UF_CreationThreshold, opt_UF_UseThreshold :: Int +opt_UF_DearOp, opt_UF_FunAppDiscount, opt_UF_DictDiscount :: Int opt_UF_KeenessFactor :: Float -opt_UF_KeenessFactor = lookup_def_float "-funfolding-keeness-factor" (1.5::Float) -opt_UF_DearOp :: Int -opt_UF_DearOp = ( 4 :: Int) +opt_UF_CreationThreshold = lookup_def_int "-funfolding-creation-threshold" (45::Int) +opt_UF_UseThreshold = lookup_def_int "-funfolding-use-threshold" (6::Int) +opt_UF_FunAppDiscount = lookup_def_int "-funfolding-fun-discount" (6::Int) +opt_UF_DictDiscount = lookup_def_int "-funfolding-dict-discount" (1::Int) +opt_UF_KeenessFactor = lookup_def_float "-funfolding-keeness-factor" (1.5::Float) +opt_UF_DearOp = ( 4 :: Int) -- Related to linking opt_PIC :: Bool #if darwin_TARGET_OS && x86_64_TARGET_ARCH opt_PIC = True +#elif darwin_TARGET_OS +opt_PIC = lookUp (fsLit "-fPIC") || not opt_Static #else opt_PIC = lookUp (fsLit "-fPIC") #endif @@ -285,6 +308,8 @@ tablesNextToCode = not opt_Unregisterised opt_ErrorSpans :: Bool opt_ErrorSpans = lookUp (fsLit "-ferror-spans") +opt_Ticky :: Bool +opt_Ticky = lookUp (fsLit "-ticky") -- object files and libraries to be linked in are collected here. -- ToDo: perhaps this could be done without a global, it wasn't obvious @@ -301,7 +326,7 @@ GLOBAL_VAR(v_Ld_inputs, [], [String]) -- non-profiling objects. -- After parsing the command-line options, we determine which "way" we --- are building - this might be a combination way, eg. profiling+ticky-ticky. +-- are building - this might be a combination way, eg. profiling+threaded. -- We then find the "build-tag" associated with this way, and this -- becomes the suffix used to find .hi files and libraries used in @@ -312,7 +337,6 @@ data WayName | WayDebug | WayProf | WayEventLog - | WayTicky | WayPar | WayGran | WayNDP @@ -389,6 +413,9 @@ way_details = -- the problems are our fault or theirs, but it seems that using the -- alternative 1:1 threading library libthr works around it: "-optl-lthr" +#elif defined(openbsd_TARGET_OS) + "-optc-pthread" + , "-optl-pthread" #elif defined(solaris2_TARGET_OS) "-optl-lrt" #endif @@ -398,7 +425,18 @@ way_details = Way WayDyn "dyn" False "Dynamic" [ "-DDYNAMIC" - , "-optc-DDYNAMIC" ], + , "-optc-DDYNAMIC" +#if defined(mingw32_TARGET_OS) + -- On Windows, code that is to be linked into a dynamic library must be compiled + -- with -fPIC. Labels not in the current package are assumed to be in a DLL + -- different from the current one. + , "-fPIC" +#elif defined(openbsd_TARGET_OS) + -- Without this, linking the shared libHSffi fails because + -- it uses pthread mutexes. + , "-optl-pthread" +#endif + ], Way WayProf "p" False "Profiling" [ "-fscc-profiling" @@ -409,10 +447,6 @@ way_details = [ "-DTRACING" , "-optc-DTRACING" ], - Way WayTicky "t" True "Ticky-ticky Profiling" - [ "-DTICKY_TICKY" - , "-optc-DTICKY_TICKY" ], - Way WayPar "mp" False "Parallel" [ "-fparallel" , "-D__PARALLEL_HASKELL__"