projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup after the OPTIONS parsing was moved.
[ghc-hetmet.git]
/
ghc
/
rts
/
RtsFlags.c
diff --git
a/ghc/rts/RtsFlags.c
b/ghc/rts/RtsFlags.c
index
f086368
..
f24912f
100644
(file)
--- a/
ghc/rts/RtsFlags.c
+++ b/
ghc/rts/RtsFlags.c
@@
-190,6
+190,7
@@
void initRtsFlagsDefaults(void)
RtsFlags.DebugFlags.gran = rtsFalse;
RtsFlags.DebugFlags.par = rtsFalse;
RtsFlags.DebugFlags.linker = rtsFalse;
RtsFlags.DebugFlags.gran = rtsFalse;
RtsFlags.DebugFlags.par = rtsFalse;
RtsFlags.DebugFlags.linker = rtsFalse;
+ RtsFlags.DebugFlags.squeeze = rtsFalse;
#endif
#if defined(PROFILING) || defined(PAR)
#endif
#if defined(PROFILING) || defined(PAR)
@@
-216,7
+217,7
@@
void initRtsFlagsDefaults(void)
RtsFlags.ConcFlags.ctxtSwitchTime = CS_MIN_MILLISECS; /* In milliseconds */
RtsFlags.ConcFlags.ctxtSwitchTime = CS_MIN_MILLISECS; /* In milliseconds */
-#ifdef SMP
+#ifdef THREADED_RTS
RtsFlags.ParFlags.nNodes = 1;
#endif
RtsFlags.ParFlags.nNodes = 1;
#endif
@@
-243,9
+244,9
@@
void initRtsFlagsDefaults(void)
RtsFlags.ParFlags.fishDelay = FISH_DELAY;
#endif
RtsFlags.ParFlags.fishDelay = FISH_DELAY;
#endif
-#if defined(PAR) || defined(SMP)
+#if defined(PAR) || defined(THREADED_RTS)
RtsFlags.ParFlags.maxLocalSparks = 4096;
RtsFlags.ParFlags.maxLocalSparks = 4096;
-#endif /* PAR || SMP */
+#endif /* PAR || THREADED_RTS */
#if defined(GRAN)
/* ToDo: check defaults for GranSim and GUM */
#if defined(GRAN)
/* ToDo: check defaults for GranSim and GUM */
@@
-431,12
+432,13
@@
usage_text[] = {
" -DP DEBUG: par",
" -Dl DEBUG: linker",
" -Dm DEBUG: stm",
" -DP DEBUG: par",
" -Dl DEBUG: linker",
" -Dm DEBUG: stm",
+" -Dz DEBUG: stack squezing",
"",
#endif /* DEBUG */
"",
#endif /* DEBUG */
-#if defined(SMP)
+#if defined(THREADED_RTS)
" -N<n> Use <n> OS threads (default: 1)",
#endif
" -N<n> Use <n> OS threads (default: 1)",
#endif
-#if defined(SMP) || defined(PAR)
+#if defined(THREADED_RTS) || defined(PAR)
" -e<size> Size of spark pools (default 100)",
#endif
#if defined(PAR)
" -e<size> Size of spark pools (default 100)",
#endif
#if defined(PAR)
@@
-446,7
+448,7
@@
usage_text[] = {
" -qd Turn on PVM-ish debugging",
" -qO Disable output for performance measurement",
#endif
" -qd Turn on PVM-ish debugging",
" -qO Disable output for performance measurement",
#endif
-#if defined(SMP) || defined(PAR)
+#if defined(THREADED_RTS) || defined(PAR)
" -e<n> Maximum number of outstanding local sparks (default: 4096)",
#endif
#if defined(PAR)
" -e<n> Maximum number of outstanding local sparks (default: 4096)",
#endif
#if defined(PAR)
@@
-609,14
+611,6
@@
errorBelch("not built for: -prof"); \
error = rtsTrue;
#endif
error = rtsTrue;
#endif
-#ifdef SMP
-# define SMP_BUILD_ONLY(x) x
-#else
-# define SMP_BUILD_ONLY(x) \
-errorBelch("not built for: -smp"); \
-error = rtsTrue;
-#endif
-
#ifdef PAR
# define PAR_BUILD_ONLY(x) x
#else
#ifdef PAR
# define PAR_BUILD_ONLY(x) x
#else
@@
-625,10
+619,18
@@
errorBelch("not built for: -parallel"); \
error = rtsTrue;
#endif
error = rtsTrue;
#endif
-#if defined(SMP) || defined(PAR)
-# define PAR_OR_SMP_BUILD_ONLY(x) x
+#ifdef THREADED_RTS
+# define THREADED_BUILD_ONLY(x) x
#else
#else
-# define PAR_OR_SMP_BUILD_ONLY(x) \
+# define THREADED_BUILD_ONLY(x) \
+errorBelch("not built for: -smp"); \
+error = rtsTrue;
+#endif
+
+#if defined(THREADED_RTS) || defined(PAR)
+# define PAR_OR_THREADED_BUILD_ONLY(x) x
+#else
+# define PAR_OR_THREADED_BUILD_ONLY(x) \
errorBelch("not built for: -parallel or -smp"); \
error = rtsTrue;
#endif
errorBelch("not built for: -parallel or -smp"); \
error = rtsTrue;
#endif
@@
-726,6
+728,9
@@
error = rtsTrue;
case 'm':
RtsFlags.DebugFlags.stm = rtsTrue;
break;
case 'm':
RtsFlags.DebugFlags.stm = rtsTrue;
break;
+ case 'z':
+ RtsFlags.DebugFlags.squeeze = rtsTrue;
+ break;
default:
bad_option( rts_argv[arg] );
}
default:
bad_option( rts_argv[arg] );
}
@@
-1032,9
+1037,9
@@
error = rtsTrue;
}
break;
}
break;
-#ifdef SMP
+#ifdef THREADED_RTS
case 'N':
case 'N':
- SMP_BUILD_ONLY(
+ THREADED_BUILD_ONLY(
if (rts_argv[arg][2] != '\0') {
RtsFlags.ParFlags.nNodes
= strtol(rts_argv[arg]+2, (char **) NULL, 10);
if (rts_argv[arg][2] != '\0') {
RtsFlags.ParFlags.nNodes
= strtol(rts_argv[arg]+2, (char **) NULL, 10);
@@
-1047,7
+1052,7
@@
error = rtsTrue;
#endif
/* =========== PARALLEL =========================== */
case 'e':
#endif
/* =========== PARALLEL =========================== */
case 'e':
- PAR_OR_SMP_BUILD_ONLY(
+ PAR_OR_THREADED_BUILD_ONLY(
if (rts_argv[arg][2] != '\0') {
RtsFlags.ParFlags.maxLocalSparks
= strtol(rts_argv[arg]+2, (char **) NULL, 10);
if (rts_argv[arg][2] != '\0') {
RtsFlags.ParFlags.maxLocalSparks
= strtol(rts_argv[arg]+2, (char **) NULL, 10);