summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--compiler/cmm/CLabel.hs9
-rw-r--r--compiler/cmm/cmm-notes1
-rw-r--r--compiler/codeGen/StgCmmBind.hs5
-rw-r--r--compiler/main/DynFlags.hs12
-rw-r--r--mk/ways.mk8
-rw-r--r--rts/RtsMain.c2
-rw-r--r--rts/Schedule.h2
-rw-r--r--rts/Sparks.h2
-rw-r--r--rts/Threads.c2
9 files changed, 4 insertions, 39 deletions
diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs
index ebf902f149..b56cbed98a 100644
--- a/compiler/cmm/CLabel.hs
+++ b/compiler/cmm/CLabel.hs
@@ -903,15 +903,6 @@ labelDynamic dflags this_pkg this_mod lbl =
_ -> False
where os = platformOS (targetPlatform dflags)
-{-
-OLD?: These GRAN functions are needed for spitting out GRAN_FETCH() at the
-right places. It is used to detect when the abstractC statement of an
-CCodeBlock actually contains the code for a slow entry point. -- HWL
-
-We need at least @Eq@ for @CLabels@, because we want to avoid
-duplicate declarations in generating C (see @labelSeenTE@ in
-@PprAbsC@).
--}
-----------------------------------------------------------------------------
-- Printing out CLabels.
diff --git a/compiler/cmm/cmm-notes b/compiler/cmm/cmm-notes
index 99b2599a4c..2b7e0a40fb 100644
--- a/compiler/cmm/cmm-notes
+++ b/compiler/cmm/cmm-notes
@@ -109,7 +109,6 @@ StgCmmCon.hs
StgCmmEnv.hs
StgCmmExpr.hs
StgCmmForeign.hs
-StgCmmGran.hs
StgCmmHeap.hs
StgCmmHpc.hs
StgCmmLayout.hs
diff --git a/compiler/codeGen/StgCmmBind.hs b/compiler/codeGen/StgCmmBind.hs
index 123d385aa3..9cedfcdd62 100644
--- a/compiler/codeGen/StgCmmBind.hs
+++ b/compiler/codeGen/StgCmmBind.hs
@@ -451,10 +451,7 @@ closureCodeBody :: Bool -- whether this is a top-level binding
* If there is *at least one* argument, then this closure is in
normal form, so there is no need to set up an update frame.
-
- The Macros for GrAnSim are produced at the beginning of the
- argSatisfactionCheck (by calling fetchAndReschedule).
- There info if Node points to closure is available. -- HWL -}
+-}
closureCodeBody top_lvl bndr cl_info cc _args arity body fv_details
| arity == 0 -- No args i.e. thunk
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 2c1a82c787..8e0499f249 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -404,7 +404,6 @@ data GeneralFlag
| Opt_DeferTypeErrors
| Opt_DeferTypedHoles
| Opt_Parallel
- | Opt_GranMacros
| Opt_PIC
| Opt_SccProfilingOn
| Opt_Ticky
@@ -1195,7 +1194,6 @@ data Way
| WayProf
| WayEventLog
| WayPar
- | WayGran
| WayNDP
| WayDyn
deriving (Eq, Ord, Show)
@@ -1233,7 +1231,6 @@ wayTag WayDyn = "dyn"
wayTag WayProf = "p"
wayTag WayEventLog = "l"
wayTag WayPar = "mp"
-wayTag WayGran = "mg"
wayTag WayNDP = "ndp"
wayRTSOnly :: Way -> Bool
@@ -1244,7 +1241,6 @@ wayRTSOnly WayDyn = False
wayRTSOnly WayProf = False
wayRTSOnly WayEventLog = True
wayRTSOnly WayPar = False
-wayRTSOnly WayGran = False
wayRTSOnly WayNDP = False
wayDesc :: Way -> String
@@ -1255,7 +1251,6 @@ wayDesc WayDyn = "Dynamic"
wayDesc WayProf = "Profiling"
wayDesc WayEventLog = "RTS Event Logging"
wayDesc WayPar = "Parallel"
-wayDesc WayGran = "GranSim"
wayDesc WayNDP = "Nested data parallelism"
-- Turn these flags on when enabling this way
@@ -1274,7 +1269,6 @@ wayGeneralFlags _ WayDyn = [Opt_PIC]
wayGeneralFlags _ WayProf = [Opt_SccProfilingOn]
wayGeneralFlags _ WayEventLog = []
wayGeneralFlags _ WayPar = [Opt_Parallel]
-wayGeneralFlags _ WayGran = [Opt_GranMacros]
wayGeneralFlags _ WayNDP = []
-- Turn these flags off when enabling this way
@@ -1290,7 +1284,6 @@ wayUnsetGeneralFlags _ WayDyn = [-- There's no point splitting objects
wayUnsetGeneralFlags _ WayProf = []
wayUnsetGeneralFlags _ WayEventLog = []
wayUnsetGeneralFlags _ WayPar = []
-wayUnsetGeneralFlags _ WayGran = []
wayUnsetGeneralFlags _ WayNDP = []
wayExtras :: Platform -> Way -> DynFlags -> DynFlags
@@ -1301,7 +1294,6 @@ wayExtras _ WayDyn dflags = dflags
wayExtras _ WayProf dflags = dflags
wayExtras _ WayEventLog dflags = dflags
wayExtras _ WayPar dflags = exposePackage' "concurrent" dflags
-wayExtras _ WayGran dflags = exposePackage' "concurrent" dflags
wayExtras _ WayNDP dflags = setExtensionFlag' Opt_ParallelArrays
$ setGeneralFlag' Opt_Vectorise dflags
@@ -1316,7 +1308,6 @@ wayOptc _ WayDyn = []
wayOptc _ WayProf = ["-DPROFILING"]
wayOptc _ WayEventLog = ["-DTRACING"]
wayOptc _ WayPar = ["-DPAR", "-w"]
-wayOptc _ WayGran = ["-DGRAN"]
wayOptc _ WayNDP = []
wayOptl :: Platform -> Way -> [String]
@@ -1338,7 +1329,6 @@ wayOptl _ WayEventLog = []
wayOptl _ WayPar = ["-L${PVM_ROOT}/lib/${PVM_ARCH}",
"-lpvm3",
"-lgpvm3"]
-wayOptl _ WayGran = []
wayOptl _ WayNDP = []
wayOptP :: Platform -> Way -> [String]
@@ -1349,7 +1339,6 @@ wayOptP _ WayDyn = []
wayOptP _ WayProf = ["-DPROFILING"]
wayOptP _ WayEventLog = ["-DTRACING"]
wayOptP _ WayPar = ["-D__PARALLEL_HASKELL__"]
-wayOptP _ WayGran = ["-D__GRANSIM__"]
wayOptP _ WayNDP = []
whenGeneratingDynamicToo :: MonadIO m => DynFlags -> m () -> m ()
@@ -2274,7 +2263,6 @@ dynamic_flags = [
, defGhcFlag "prof" (NoArg (addWay WayProf))
, defGhcFlag "eventlog" (NoArg (addWay WayEventLog))
, defGhcFlag "parallel" (NoArg (addWay WayPar))
- , defGhcFlag "gransim" (NoArg (addWay WayGran))
, defGhcFlag "smp"
(NoArg (addWay WayThreaded >> deprecate "Use -threaded instead"))
, defGhcFlag "debug" (NoArg (addWay WayDebug))
diff --git a/mk/ways.mk b/mk/ways.mk
index cbe035b4fb..2354693bc8 100644
--- a/mk/ways.mk
+++ b/mk/ways.mk
@@ -22,10 +22,10 @@
#
# The ways currently defined.
#
-ALL_WAYS=v p t l s mp mg debug dyn thr thr_l p_dyn debug_dyn thr_dyn thr_p_dyn thr_debug_dyn thr_p thr_debug debug_p thr_debug_p l_dyn thr_l_dyn
+ALL_WAYS=v p t l s mp debug dyn thr thr_l p_dyn debug_dyn thr_dyn thr_p_dyn thr_debug_dyn thr_p thr_debug debug_p thr_debug_p l_dyn thr_l_dyn
#
-# The following ways currently have treated specially, p t mg,
+# The following ways currently are treated specially,
# as the driver script treats these guys specially and needs to carefully be told
# about the options for these. Hence, we hide the required command line options
# for these in the driver, as this is the only place they are needed.
@@ -48,10 +48,6 @@ WAY_l_HC_OPTS= -static -eventlog
WAY_mp_NAME=parallel
WAY_mp_HC_OPTS= -static -parallel
-# Way `mg':
-WAY_mg_NAME=GranSim
-WAY_mg_HC_OPTS= -static -gransim
-
#
# These ways apply to the RTS only:
#
diff --git a/rts/RtsMain.c b/rts/RtsMain.c
index 154eafa0e0..48df8e9db7 100644
--- a/rts/RtsMain.c
+++ b/rts/RtsMain.c
@@ -54,8 +54,6 @@ int hs_main ( int argc, char *argv[], // program args
// to mainIO_closure representing the computation of the overall program;
// then enter the scheduler with this thread and off we go;
//
- // the same for GranSim (we have only one instance of this code)
- //
// in a parallel setup, where we have many instances of this code
// running on different PEs, we should do this only for the main PE
// (IAmMainThread is set in startupHaskell)
diff --git a/rts/Schedule.h b/rts/Schedule.h
index d61be04bb7..eb5135b365 100644
--- a/rts/Schedule.h
+++ b/rts/Schedule.h
@@ -96,8 +96,6 @@ extern volatile StgWord recent_activity;
/* Thread queues.
* Locks required : sched_mutex
- *
- * In GranSim we have one run/blocked_queue per PE.
*/
extern StgTSO *blackhole_queue;
#if !defined(THREADED_RTS)
diff --git a/rts/Sparks.h b/rts/Sparks.h
index e381dd540f..98ee3c872d 100644
--- a/rts/Sparks.h
+++ b/rts/Sparks.h
@@ -2,7 +2,7 @@
*
* (c) The GHC Team, 2000-2009
*
- * Sparking support for GRAN, PAR and THREADED_RTS versions of the RTS.
+ * Sparking support for PAR and THREADED_RTS versions of the RTS.
*
* ---------------------------------------------------------------------------*/
diff --git a/rts/Threads.c b/rts/Threads.c
index 99f2be7304..ce297bd34e 100644
--- a/rts/Threads.c
+++ b/rts/Threads.c
@@ -53,8 +53,6 @@ static StgThreadID next_thread_id = 1;
createGenThread() and createIOThread() (in SchedAPI.h) are
convenient packaged versions of this function.
-
- currently pri (priority) is only used in a GRAN setup -- HWL
------------------------------------------------------------------------ */
StgTSO *
createThread(Capability *cap, W_ size)
View Lorry Controller Status