[m-rev.] For review: Remove --region-analysis option

[Quan Phan]

On Thu, Aug 09, 2007 at 12:27:40AM +1000, Julien Fischer wrote:
> 
> 
> 
> On Wed, 8 Aug 2007, Quan Phan wrote:
> 
> >Estimate hours taken: 0.5
> >
> >Remove option --region-analysis because it is no longer needed. To turn on
> >region-based memory management now we just use --use-regions in .rbmm 
> >grade.
> >
> >compiler/options.m:
> >	Remove the --region-analysis option.
> >	An unrelated change but no harm: provide default values for some
> >	region structures.
> >
> >compiler/mercury_compile.m
> >	Use --use-regions to turn on region analysis.
> >
> >Regards,
> >Quan
> >
> 
> You also need to delete refrences to that option from the predicates
> long_option/2 and option_defaults_2/2.
> There is also some commented out documentation for it in options.m,
I did that but somehow I did not put the whole diff into the email. 

> as well as in the user's guide - please delete that also.
It is deleted now. Thanks.
The whole diff is below.

Regards
Quan.

Index: compiler/mercury_compile.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mercury_compile.m,v
retrieving revision 1.446
diff -u -r1.446 mercury_compile.m
--- compiler/mercury_compile.m	8 Aug 2007 05:08:40 -0000	1.446
+++ compiler/mercury_compile.m	8 Aug 2007 15:28:22 -0000
@@ -4248,7 +4248,7 @@
 
 maybe_region_analysis(Verbose, Stats, !HLDS, !IO) :-
     module_info_get_globals(!.HLDS, Globals),
-    globals.lookup_bool_option(Globals, region_analysis, Analysis),
+    globals.lookup_bool_option(Globals, use_regions, Analysis),
     (
         Analysis = yes,
         maybe_write_string(Verbose, "% Analysing regions ...\n", !IO),
Index: compiler/options.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/options.m,v
retrieving revision 1.581
diff -u -r1.581 options.m
--- compiler/options.m	31 Jul 2007 07:58:42 -0000	1.581
+++ compiler/options.m	8 Aug 2007 15:28:24 -0000
@@ -587,7 +587,6 @@
     ;       distance_granularity
     ;       parallelism_target
     ;       implicit_parallelism
-    ;       region_analysis
 
     % Stuff for the CTGC system (structure sharing / structure reuse).
     ;       structure_sharing_analysis
@@ -1195,15 +1194,15 @@
     use_minimal_model_stack_copy_pneg   -   bool(no),
     use_minimal_model_stack_copy_cut    -   bool(no), 
     disable_trail_ops                   -   bool(no),
-    % The size_region_* values are just dummies for now; Quan, please set them.
+    % The values here must be consistent with those in mercury_region.h.
     size_region_ite_fixed               -   int(4),
     size_region_disj_fixed              -   int(4),
-    size_region_commit_fixed            -   int(4),
-    size_region_ite_protect             -   int(0),
-    size_region_ite_snapshot            -   int(0),
-    size_region_disj_protect            -   int(0),
-    size_region_disj_snapshot           -   int(0),
-    size_region_commit_entry            -   int(0)
+    size_region_commit_fixed            -   int(3),
+    size_region_ite_protect             -   int(1),
+    size_region_ite_snapshot            -   int(4),
+    size_region_disj_protect            -   int(2),
+    size_region_disj_snapshot           -   int(4),
+    size_region_commit_entry            -   int(1)
 ]).
 option_defaults_2(code_gen_option, [
     % Code Generation Options
@@ -1377,7 +1376,6 @@
     distance_granularity                -   int(0),
     parallelism_target                  -   int(4),
     implicit_parallelism                -   bool(no),
-    region_analysis                     -   bool(no),
 
     % HLDS -> LLDS
     smart_indexing                      -   bool(no),
@@ -1893,7 +1891,6 @@
 long_option("record-term-sizes-as-words", record_term_sizes_as_words).
 long_option("record-term-sizes-as-cells", record_term_sizes_as_cells).
 long_option("experimental-complexity",  experimental_complexity).
-long_option("region-analysis",      region_analysis).
 % (c) miscellaneous optional features
 long_option("gc",                   gc).
 long_option("garbage-collection",   gc).
@@ -4467,9 +4464,6 @@
         "\tinformation generated by mdprof_feedback.",
         "\tThe profiling feedback file can be specified using the",
         "\t--feedback file option."
-% `--region-analysis' is not documented because it is still experimental.
-%       "--region-analysis",
-%       "\tEnable the analysis for region based-memory management."
     ]).
 
 :- pred options_help_hlds_llds_optimization(io::di, io::uo) is det.
Index: doc/user_guide.texi
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/doc/user_guide.texi,v
retrieving revision 1.538
diff -u -r1.538 user_guide.texi
--- doc/user_guide.texi	31 Jul 2007 07:58:42 -0000	1.538
+++ doc/user_guide.texi	8 Aug 2007 15:28:28 -0000
@@ -8306,12 +8306,6 @@
 mdprof_feedback. The profiling feedback file can be specified using the 
 --feedback-file option.
 
- at c This is not documented because it is still experimental.
- at c @sp 1
- at c @item --region-analysis
- at c @findex --region-analysis
- at c Enable the analysis for region-based memory management.
-
 @end table
 
 @node MLDS backend (MLDS -> MLDS) optimization options
> 
> Julien.
> --------------------------------------------------------------------------
> mercury-reviews mailing list
> Post messages to:       mercury-reviews at csse.unimelb.edu.au
> Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
> Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
> --------------------------------------------------------------------------
--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------