-----------------------------------------------------------------------------
--- $Id: DriverState.hs,v 1.57 2001/09/14 15:51:42 simonpj Exp $
+-- $Id: DriverState.hs,v 1.76 2002/04/05 23:24:29 sof Exp $
--
-- Settings for the driver
--
--- (c) The University of Glasgow 2000
+-- (c) The University of Glasgow 2002
--
-----------------------------------------------------------------------------
import List
import Char
import Monad
+import Maybe ( fromJust, isJust )
import Directory ( doesDirectoryExist )
-----------------------------------------------------------------------------
| DoMake -- ghc --make
| DoInteractive -- ghc --interactive
| DoLink -- [ the default ]
- deriving (Eq)
+ deriving (Eq,Show)
-GLOBAL_VAR(v_GhcMode, error "mode not set", GhcMode)
+GLOBAL_VAR(v_GhcMode, DoLink, GhcMode)
+GLOBAL_VAR(v_GhcModeFlag, "", String)
+
+setMode :: GhcMode -> String -> IO ()
+setMode m flag = do
+ old_mode <- readIORef v_GhcMode
+ old_flag <- readIORef v_GhcModeFlag
+ when (notNull (old_flag)) $
+ throwDyn (UsageError
+ ("cannot use `" ++ old_flag ++ "' with `" ++ flag ++ "'"))
+ writeIORef v_GhcMode m
+ writeIORef v_GhcModeFlag flag
+
+isCompManagerMode DoMake = True
+isCompManagerMode DoInteractive = True
+isCompManagerMode _ = False
-----------------------------------------------------------------------------
-- Global compilation flags
]
{-# NOINLINE v_Hs_source_cpp_opts #-}
+
-- Keep output from intermediate phases
GLOBAL_VAR(v_Keep_hi_diffs, False, Bool)
GLOBAL_VAR(v_Keep_hc_files, False, Bool)
GLOBAL_VAR(v_Keep_s_files, False, Bool)
GLOBAL_VAR(v_Keep_raw_s_files, False, Bool)
GLOBAL_VAR(v_Keep_tmp_files, False, Bool)
+#ifdef ILX
+GLOBAL_VAR(v_Keep_il_files, False, Bool)
+GLOBAL_VAR(v_Keep_ilx_files, False, Bool)
+#endif
-- Misc
GLOBAL_VAR(v_Scale_sizes_by, 1.0, Double)
GLOBAL_VAR(v_Excess_precision, False, Bool)
GLOBAL_VAR(v_Read_DotGHCi, True, Bool)
+-- Preprocessor flags
+GLOBAL_VAR(v_Hs_source_pp_opts, [], [String])
+
-----------------------------------------------------------------------------
-- Splitting object files (for libraries)
-----------------------------------------------------------------------------
-- Compiler output options
-defaultHscLang
- | cGhcWithNativeCodeGen == "YES" &&
- (prefixMatch "i386" cTARGETPLATFORM ||
- prefixMatch "sparc" cTARGETPLATFORM) = HscAsm
- | otherwise = HscC
-
GLOBAL_VAR(v_Output_dir, Nothing, Maybe String)
GLOBAL_VAR(v_Output_file, Nothing, Maybe String)
GLOBAL_VAR(v_Output_hi, Nothing, Maybe String)
+-- called to verify that the output files & directories
+-- point somewhere valid.
+--
+-- The assumption is that the directory portion of these output
+-- options will have to exist by the time 'verifyOutputFiles'
+-- is invoked.
+--
+verifyOutputFiles :: IO ()
+verifyOutputFiles = do
+ odir <- readIORef v_Output_dir
+ when (isJust odir) $ do
+ let dir = fromJust odir
+ flg <- doesDirectoryExist dir
+ when (not flg) (nonExistentDir "-odir" dir)
+ ofile <- readIORef v_Output_file
+ when (isJust ofile) $ do
+ let fn = fromJust ofile
+ flg <- doesDirNameExist fn
+ when (not flg) (nonExistentDir "-o" fn)
+ ohi <- readIORef v_Output_hi
+ when (isJust ohi) $ do
+ let hi = fromJust ohi
+ flg <- doesDirNameExist hi
+ when (not flg) (nonExistentDir "-ohi" hi)
+ where
+ nonExistentDir flg dir =
+ throwDyn (CmdLineError ("error: directory portion of " ++
+ show dir ++ " does not exist (used with " ++
+ show flg ++ " option.)"))
+
GLOBAL_VAR(v_Object_suf, Nothing, Maybe String)
GLOBAL_VAR(v_HC_suf, Nothing, Maybe String)
GLOBAL_VAR(v_Hi_dir, Nothing, Maybe String)
GLOBAL_VAR(v_OptLevel, 0, Int)
-setOptLevel :: String -> IO ()
-setOptLevel "" = do { writeIORef v_OptLevel 1 }
-setOptLevel "not" = writeIORef v_OptLevel 0
-setOptLevel [c] | isDigit c = do
- let level = ord c - ord '0'
- writeIORef v_OptLevel level
-setOptLevel s = unknownFlagErr ("-O"++s)
+setOptLevel :: Int -> IO ()
+setOptLevel n = do
+ when (n >= 1) $ setLang HscC -- turn on -fvia-C with -O
+ writeIORef v_OptLevel n
GLOBAL_VAR(v_minus_o2_for_C, False, Bool)
GLOBAL_VAR(v_MaxSimplifierIterations, 4, Int)
GLOBAL_VAR(v_StgStats, False, Bool)
GLOBAL_VAR(v_UsageSPInf, False, Bool) -- Off by default
GLOBAL_VAR(v_Strictness, True, Bool)
+#ifdef OLD_STRICTNESS
GLOBAL_VAR(v_CPR, True, Bool)
+#endif
GLOBAL_VAR(v_CSE, True, Bool)
GLOBAL_VAR(v_RuleCheck, Nothing, Maybe String)
max_iter <- readIORef v_MaxSimplifierIterations
usageSP <- readIORef v_UsageSPInf
strictness <- readIORef v_Strictness
+#ifdef OLD_STRICTNESS
cpr <- readIORef v_CPR
+#endif
cse <- readIORef v_CSE
rule_check <- readIORef v_RuleCheck
if opt_level == 0 then return
[
- CoreDoSimplify (isAmongSimpl [
+ CoreDoSimplify (SimplPhase 0) [
MaxSimplifierIterations max_iter
- ])
+ ]
]
else {- opt_level >= 1 -} return [
-- initial simplify: mk specialiser happy: minimum effort please
- CoreDoSimplify (isAmongSimpl [
- SimplInlinePhase 0,
+ CoreDoSimplify SimplGently [
+ -- Simplify "gently"
-- Don't inline anything till full laziness has bitten
-- In particular, inlining wrappers inhibits floating
-- e.g. ...(case f x of ...)...
-- ==> ...(case (case x of I# x# -> fw x#) of ...)...
-- ==> ...(case x of I# x# -> case fw x# of ...)...
-- and now the redex (f x) isn't floatable any more
- DontApplyRules,
-- Similarly, don't apply any rules until after full
-- laziness. Notably, list fusion can prevent floating.
+
NoCaseOfCase,
-- Don't do case-of-case transformations.
-- This makes full laziness work better
MaxSimplifierIterations max_iter
- ]),
+ ],
-- Specialisation is best done before full laziness
-- so that overloaded functions have all their dictionary lambdas manifest
CoreDoSpecialising,
- CoreDoFloatOutwards False{-not full-},
+ CoreDoFloatOutwards (FloatOutSw False False),
CoreDoFloatInwards,
- CoreDoSimplify (isAmongSimpl [
- SimplInlinePhase 1,
- -- Want to run with inline phase 1 after the specialiser to give
+ CoreDoSimplify (SimplPhase 2) [
+ -- Want to run with inline phase 2 after the specialiser to give
-- maximum chance for fusion to work before we inline build/augment
- -- in phase 2. This made a difference in 'ansi' where an
+ -- in phase 1. This made a difference in 'ansi' where an
-- overloaded function wasn't inlined till too late.
MaxSimplifierIterations max_iter
- ]),
+ ],
+ case rule_check of { Just pat -> CoreDoRuleCheck 2 pat; Nothing -> CoreDoNothing },
-- infer usage information here in case we need it later.
-- (add more of these where you need them --KSW 1999-04)
if usageSP then CoreDoUSPInf else CoreDoNothing,
- CoreDoSimplify (isAmongSimpl [
+ CoreDoSimplify (SimplPhase 1) [
-- Need inline-phase2 here so that build/augment get
-- inlined. I found that spectral/hartel/genfft lost some useful
-- strictness in the function sumcode' if augment is not inlined
-- before strictness analysis runs
- SimplInlinePhase 2,
MaxSimplifierIterations max_iter
- ]),
+ ],
+ case rule_check of { Just pat -> CoreDoRuleCheck 1 pat; Nothing -> CoreDoNothing },
- CoreDoSimplify (isAmongSimpl [
- MaxSimplifierIterations 3
- -- No -finline-phase: allow all Ids to be inlined now
+ CoreDoSimplify (SimplPhase 0) [
+ -- Phase 0: allow all Ids to be inlined now
-- This gets foldr inlined before strictness analysis
- --
+
+ MaxSimplifierIterations 3
-- At least 3 iterations because otherwise we land up with
-- huge dead expressions because of an infelicity in the
-- simpifier.
-- ==> let k = BIG in letrec go = \xs -> ...(k x).... in go xs
-- ==> let k = BIG in letrec go = \xs -> ...(BIG x).... in go xs
-- Don't stop now!
- ]),
+ ],
+ case rule_check of { Just pat -> CoreDoRuleCheck 0 pat; Nothing -> CoreDoNothing },
+
+#ifdef OLD_STRICTNESS
if cpr then CoreDoCPResult else CoreDoNothing,
+#endif
if strictness then CoreDoStrictness else CoreDoNothing,
CoreDoWorkerWrapper,
CoreDoGlomBinds,
- CoreDoSimplify (isAmongSimpl [
+ CoreDoSimplify (SimplPhase 0) [
MaxSimplifierIterations max_iter
- -- No -finline-phase: allow all Ids to be inlined now
- ]),
+ ],
- CoreDoFloatOutwards False{-not full-},
+ CoreDoFloatOutwards (FloatOutSw False -- Not lambdas
+ True), -- Float constants
-- nofib/spectral/hartel/wang doubles in speed if you
-- do full laziness late in the day. It only happens
-- after fusion and other stuff, so the early pass doesn't
-- f_el22 (f_el21 r_midblock)
--- Leave out lambda lifting for now
--- "-fsimplify", -- Tidy up results of full laziness
--- "[",
--- "-fmax-simplifier-iterations2",
--- "]",
--- "-ffloat-outwards-full",
-
-- We want CSE to follow the final full-laziness pass, because it may
-- succeed in commoning up things floated out by full laziness.
-- CSE used to rely on the no-shadowing invariant, but it doesn't any more
-- Case-liberation for -O2. This should be after
-- strictness analysis and the simplification which follows it.
+ case rule_check of { Just pat -> CoreDoRuleCheck 0 pat; Nothing -> CoreDoNothing },
+
if opt_level >= 2 then
CoreLiberateCase
else
CoreDoNothing,
-- Final clean-up simplification:
- CoreDoSimplify (isAmongSimpl [
+ CoreDoSimplify (SimplPhase 0) [
MaxSimplifierIterations max_iter
- -- No -finline-phase: allow all Ids to be inlined now
- ]),
-
- case rule_check of { Just pat -> CoreDoRuleCheck pat; Nothing -> CoreDoNothing }
+ ]
]
buildStgToDo :: IO [ StgToDo ]
addToDirList ref path
= do paths <- readIORef ref
shiny_new_ones <- splitUp path
- writeIORef ref (paths ++ shiny_new_ones)
-
+ writeIORef ref (paths ++ filter notNull shiny_new_ones)
+ -- empty paths are ignored: there might be a trailing
+ -- ':' in the initial list, for example. Empty paths can
+ -- cause confusion when they are translated into -I options
+ -- for passing to gcc.
where
splitUp ::String -> IO [String]
#ifdef mingw32_TARGET_OS
-- Packages
-- package list is maintained in dependency order
-GLOBAL_VAR(v_Packages, ("std":"rts":"gmp":[]), [String])
+GLOBAL_VAR(v_Packages, ("haskell98":"base":"rts":[]), [String])
readPackageConf :: String -> IO ()
readPackageConf conf_file = do
top_dir <- getTopDir
let pkg_details = mungePackagePaths top_dir proto_pkg_details
old_pkg_details <- readIORef v_Package_details
- let intersection = filter (`elem` map name old_pkg_details)
- (map name pkg_details)
- if (not (null intersection))
- then throwDyn (InstallationError ("package `" ++ head intersection ++ "' is already defined"))
- else do
- writeIORef v_Package_details (pkg_details ++ old_pkg_details)
+
+ let -- new package override old ones
+ new_pkg_names = map name pkg_details
+ filtered_old_pkg_details =
+ filter (\p -> name p `notElem` new_pkg_names) old_pkg_details
+
+ writeIORef v_Package_details (pkg_details ++ filtered_old_pkg_details)
addPackage :: String -> IO ()
addPackage package
getPackageImportPath :: IO [String]
getPackageImportPath = do
ps <- getPackageInfo
- return (nub (filter (not.null) (concatMap import_dirs ps)))
+ return (nub (filter notNull (concatMap import_dirs ps)))
getPackageIncludePath :: IO [String]
getPackageIncludePath = do
ps <- getPackageInfo
- return (nub (filter (not.null) (concatMap include_dirs ps)))
+ return (nub (filter notNull (concatMap include_dirs ps)))
-- includes are in reverse dependency order (i.e. rts first)
getPackageCIncludes :: IO [String]
getPackageCIncludes = do
ps <- getPackageInfo
- return (reverse (nub (filter (not.null) (concatMap c_includes ps))))
+ return (reverse (nub (filter notNull (concatMap c_includes ps))))
getPackageLibraryPath :: IO [String]
getPackageLibraryPath = do
ps <- getPackageInfo
- return (nub (filter (not.null) (concatMap library_dirs ps)))
+ return (nub (filter notNull (concatMap library_dirs ps)))
getPackageLibraries :: IO [String]
getPackageLibraries = do
where
-- This is a totally horrible (temporary) hack, for Win32. Problem is
-- that package.conf for Win32 says that the main prelude lib is
- -- split into HSstd1 and HSstd2, which is needed due to limitations in
+ -- split into HSbase1 and HSbase2, which is needed due to limitations in
-- the PEi386 file format, to make GHCi work. However, we still only
- -- have HSstd.a for static linking, not HSstd1.a and HSstd2.a.
+ -- have HSbase.a for static linking, not HSbase1.a and HSbase2.a.
-- getPackageLibraries is called to find the .a's to add to the static
- -- link line. On Win32, this hACK detects HSstd1 and HSstd2 and
- -- replaces them with HSstd, so static linking still works.
+ -- link line. On Win32, this hACK detects HSbase1 and HSbase2 and
+ -- replaces them with HSbase, so static linking still works.
-- Libraries needed for dynamic (GHCi) linking are discovered via
-- different route (in InteractiveUI.linkPackage).
- -- See driver/PackageSrc.hs for the HSstd1/HSstd2 split definition.
+ -- See driver/PackageSrc.hs for the HSbase1/HSbase2 split definition.
-- THIS IS A STRICTLY TEMPORARY HACK (famous last words ...)
-- JRS 04 Sept 01: Same appalling hack for HSwin32[1,2]
+ -- KAA 29 Mar 02: Same appalling hack for HSobjectio[1,2,3,4]
hACK libs
# ifndef mingw32_TARGET_OS
= libs
# else
- = if "HSstd1" `elem` libs && "HSstd2" `elem` libs
- then "HSstd" : filter ((/= "HSstd").(take 5)) libs
+ = if "HSbase1" `elem` libs && "HSbase2" `elem` libs
+ then "HSbase" : filter (not.(isPrefixOf "HSbase")) libs
else
if "HSwin321" `elem` libs && "HSwin322" `elem` libs
- then "HSwin32" : filter ((/= "HSwin32").(take 7)) libs
+ then "HSwin32" : filter (not.(isPrefixOf "HSwin32")) libs
+ else
+ if "HSobjectio1" `elem` libs && "HSobjectio2" `elem` libs && "HSobjectio3" `elem` libs && "HSobjectio4" `elem` libs
+ then "HSobjectio" : filter (not.(isPrefixOf "HSobjectio")) libs
else
libs
# endif
| WayPar
| WayGran
| WaySMP
+ | WayNDP
| WayDebug
| WayUser_a
| WayUser_b
allowed_combination way = way `elem` combs
where -- the sub-lists must be ordered according to WayName,
-- because findBuildTag sorts them
- combs = [ [WayProf,WayUnreg], [WayProf,WaySMP] ]
+ combs = [ [WayProf, WayUnreg],
+ [WayProf, WaySMP] ,
+ [WayProf, WayNDP] ]
findBuildTag :: IO [String] -- new options
findBuildTag = do
, "-optc-DSMP"
, "-fvia-C" ]),
+ (WayNDP, Way "ndp" "Nested data parallelism"
+ [ "-fparr"
+ , "-fflatten"]),
+
(WayUser_a, Way "a" "User way 'a'" ["$WAY_a_REAL_OPTS"]),
(WayUser_b, Way "b" "User way 'b'" ["$WAY_b_REAL_OPTS"]),
(WayUser_c, Way "c" "User way 'c'" ["$WAY_c_REAL_OPTS"]),
projects / ghc-hetmet.git / blobdiff