[m-rev.] diff: Enable MR_PROFILE_PARALLEL_EXECUTION for nightly builds on taura.

[Paul Bone]

On Mon, Jul 13, 2009 at 11:26:55PM +1000, Julien Fischer wrote:
> On Mon, 13 Jul 2009, Paul Bone wrote:
>>
>> Enable MR_PROFILE_PARALLEL_EXECUTION in nightly builds on taura.
>
> MR_PROFILE_PARALLEL_EXECUTION is currently defined as an enumeration
> constant.  You cannot also use it as preprocessor macro - the resulting
> expansion will cause the enum declaration to be syntatically invalid.
>
> I notice that you have defined (but not documented) a macro
> MR_PROFILE_PARALLEL_EXECUTION_SUPPORT.  That appears to be the one
> you should be using.  Note that such configuration parameters should
> be documented in runtime/mercury_conf_param.h.

This change addresses these issues:

Fix a mistake in my previous two patches where I used
MR_PROFILE_PARALLEL_EXECUTION instead of
MR_PROFILE_PARALLEL_EXECUTION_SUPPORT

tools/test_mercury:
doc/user_guide.texi:
    As above.

runtime/mercury_conf_param.h:
	Document MR_PROFILE_PARALLEL_EXECUTION_SUPPORT

Index: doc/user_guide.texi
===================================================================
RCS file: /home/mercury1/repository/mercury/doc/user_guide.texi,v
retrieving revision 1.587
diff -u -p -b -r1.587 user_guide.texi
--- doc/user_guide.texi	13 Jul 2009 05:27:12 -0000	1.587
+++ doc/user_guide.texi	14 Jul 2009 02:29:02 -0000
@@ -9593,7 +9593,8 @@ grade.
 @c Tells the runtime to collect and write out parallel execution profiling
 @c information to a file named @file{parallel_execution_profile.txt}.
 @c This only has an effect if the executable was built in a parallel grade
- at c with the @samp{MR_PROFILE_PARALLEL_EXECUTION} C macro defined.
+ at c and the @samp{MR_PROFILE_PARALLEL_EXECUTION_SUPPORT} C macro was
+ at c defined when the runtime system was compiled.
 
 @c @item -r @var{num}
 @c @findex -r (runtime option)
Index: runtime/mercury_conf_param.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_conf_param.h,v
retrieving revision 1.108
diff -u -p -b -r1.108 mercury_conf_param.h
--- runtime/mercury_conf_param.h	27 Apr 2009 12:39:53 -0000	1.108
+++ runtime/mercury_conf_param.h	14 Jul 2009 00:22:23 -0000
@@ -113,6 +113,11 @@
 ** MR_THREAD_SAFE
 **	Enable support for parallelism.
 **
+** MR_PROFILE_PARALLEL_EXECUTION_SUPPORT
+**  Enable support for profiling parallel execution.  This only has an
+**  effect of MR_THREAD_SAFE is also defined.  This must also be enabled
+**  with the --profile-parallel-execution runtime option.
+**
 ** MR_NO_BACKWARDS_COMPAT
 **	Disable backwards compatibility with C code using obsolete low-level
 **	constructs, e.g. referring to variables and macros without their MR_
Index: tools/test_mercury
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.353
diff -u -p -b -r1.353 test_mercury
--- tools/test_mercury	13 Jul 2009 05:41:48 -0000	1.353
+++ tools/test_mercury	14 Jul 2009 00:15:59 -0000
@@ -263,7 +263,7 @@ case $HOST in
         # inlineing which is confusing for programmers using the deep profiler.
         OPTIMIZE="-O5 --intermodule-optimization"
         EXTRA_INSTALL_MCFLAGS="--profile-for-implicit-parallelism"
-        EXTRA_INSTALL_CFLAGS="-DMR_PROFILE_PARALLEL_EXECUTION"
+        EXTRA_INSTALL_CFLAGS="-DMR_PROFILE_PARALLEL_EXECUTION_SUPPORT"
         ;;
 
     goliath)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 489 bytes
Desc: Digital signature
URL: <http://lists.mercurylang.org/archives/reviews/attachments/20090714/188f1a51/attachment.sig>