mirror of
https://github.com/Mercury-Language/mercury.git
synced 2025-12-18 23:35:25 +00:00
Add support for memory profiling.
Estimated hours taken: 40 (+ unknown time by Zoltan)
Add support for memory profiling.
(A significant part of this change is actuallly Zoltan's work. Zoltan
did the changes to the compiler and a first go at the changes to the
runtime and library. I rewrote much of Zoltan's changes to the runtime
and library, added support for the new options/grades, added code to
interface with mprof, did the changes to the profiler, and wrote the
documentation.)
[TODO: add test cases.]
NEWS:
Mention support for memory profiling.
runtime/mercury_heap_profile.h:
runtime/mercury_heap_profile.c:
New files. These contain code to record heap profiling information.
runtime/mercury_heap.h:
Add new macros incr_hp_msg(), tag_incr_hp_msg(),
incr_hp_atomic_msg(), and tag_incr_hp_atomic_msg().
These are like the non-`msg' versions, except that if
PROFILE_MEMORY is defined, they also call MR_record_allocation()
from mercury_heap_profile.h to record heap profiling information.
Also, fix up the indentation in lots of places.
runtime/mercury_prof.h:
runtime/mercury_prof.c:
Added code to dump out memory profiling information to files
`Prof.MemoryWords' and `Prof.MemoryCells' (for use by mprof).
Change the format of the `Prof.Counts' file so that the
first line says what it is counting, the units, and a scale
factor. Prof.MemoryWords and Prof.MemoryCells can thus have
exactly the same format as Prof.Counts.
Also cleaned up the interface to mercury_prof.c a bit, and did
various other minor cleanups -- indentation changes, changes to
use MR_ prefixes, additional comments, etc.
runtime/mercury_prof_mem.h:
runtime/mercury_prof_mem.c:
Rename prof_malloc() as MR_prof_malloc().
Rename prof_make() as MR_PROF_NEW() and add MR_PROF_NEW_ARRAY().
runtime/mercury_wrapper.h:
Minor modifications to reflect the new interface to mercury_prof.c.
runtime/mercury_wrapper.c:
runtime/mercury_label.c:
Rename the old `-p' (primary cache size) option as `-C'.
Add a new `-p' option to disable profiling.
runtime/Mmakefile:
Add mercury_heap_profile.[ch].
Put the list of files in alphabetical order.
Delete some obsolete stuff for supporting `.mod' files.
Mention that libmer_dll.h and libmer_globals.h are
produced by Makefile.DLLs.
runtime/mercury_imp.h:
Mention that libmer_dll.h is produced by Makefile.DLLs.
runtime/mercury_dummy.c:
Change a comment to refer to libmer_dll.h rather than
libmer_globals.h.
compiler/llds.m:
Add a new field to `create' and `incr_hp' instructions
holding the name of the type, for heap profiling.
compiler/unify_gen.m:
Initialize the new field of `create' instructions with
the appropriate type name.
compiler/llds_out.m:
Output incr_hp_msg() / tag_incr_hp_msg() instead of
incr_hp() / tag_incr_hp().
compiler/*.m:
Minor changes to most files in the compiler back-end to
accomodate the new field in `incr_hp' and `create' instructions.
library/io.m:
Add `io__report_full_memory_stats'.
library/benchmarking.m:
Add `report_full_memory_stats'. This uses the information saved
by runtime/mercury_heap_profile.{c,h} to print out a report
of memory usage by procedures and by types.
Also modify `report_stats' to print out some of that information.
compiler/mercury_compile.m:
If `--statistics' is enabled, call io__report_full_memory_stats
at the end of main/2. This will print out full memory statistics,
if the compiler was compiled with memory profiling enabled.
compiler/options.m:
compiler/handle_options.m:
runtime/mercury_grade.h:
scripts/ml.in:
scripts/mgnuc.in:
scripts/init_grade_options.sh-subr:
scripts/parse_grade_options.sh-subr:
Add new option `--memory-profiling' and new grade `.memprof'.
Add `--time-profiling' as a new synonym for `--profiling'.
Also add `--profile-memory' for more fine-grained control:
`--memory-profiling' implies both `--profile-memory' and
`--profile-calls'.
scripts/mprof_merge_runs:
Update to handle the new format of Prof.Counts and to
also merge Prof.MemoryWords and Prof.MemoryCells.
profiler/options.m:
profiler/mercury_profile.m:
Add new options `--profile memory-words' (`-m'),
`--profile memory-cells' (`-M') and `--profile time' (`-t').
Thes options make the profiler select a different count file,
Prof.MemoryWords or Prof.MemoryCells instead of Prof.Counts.
specific to time profiling.
profiler/read.m:
profiler/process_file.m:
profiler/prof_info.m:
profiler/generate_output.m:
Update to handle the new format of the counts file.
When reading the counts file, look at the first line of
the file to determine what is being profiled.
profiler/globals.m:
Add a new global variable `what_to_profile' that records
what is being profiled.
profiler/output.m:
Change the headings to reflect what is being profiled.
doc/user_guide.texi:
Document memory profiling.
Document new options.
doc/user_guide.texi:
compiler/options.m:
Comment out the documentation for `.proftime'/`--profile-time',
since doing time and call profiling seperately doesn't work,
because the code addresses change when you recompile with a
different grade. Ditto for `.profmem'/`--profile-memory'.
Also comment out the documentation for
`.profcalls'/`--profile-calls', since it is redundant --
`.memprof' produces the same information and more.
configure.in:
Build a `.memprof' grade. (Hmm, should we do this only
if `--enable-all-grades' is specified?)
Don't ever build a `.profcalls' grade.
This commit is contained in:
@@ -187,7 +187,7 @@ exprn_aux__imported_is_constant(NonLocalGotos, AsmLabels, IsConst) :-
|
||||
|
||||
exprn_aux__rval_contains_lval(lval(Lval0), Lval) :-
|
||||
exprn_aux__lval_contains_lval(Lval0, Lval).
|
||||
exprn_aux__rval_contains_lval(create(_, Rvals, _, _), Lval) :-
|
||||
exprn_aux__rval_contains_lval(create(_, Rvals, _, _, _), Lval) :-
|
||||
exprn_aux__args_contain_lval(Rvals, Lval).
|
||||
exprn_aux__rval_contains_lval(mkword(_, Rval), Lval) :-
|
||||
exprn_aux__rval_contains_lval(Rval, Lval).
|
||||
@@ -247,7 +247,7 @@ exprn_aux__rval_contains_rval(Rval0, Rval) :-
|
||||
Rval0 = lval(Lval),
|
||||
exprn_aux__lval_contains_rval(Lval, Rval)
|
||||
;
|
||||
Rval0 = create(_, Rvals, _, _),
|
||||
Rval0 = create(_, Rvals, _, _, _),
|
||||
exprn_aux__args_contain_rval(Rvals, Rval)
|
||||
;
|
||||
Rval0 = mkword(_, Rval1),
|
||||
@@ -289,7 +289,7 @@ exprn_aux__args_contain_rval([M | Ms], Rval) :-
|
||||
exprn_aux__vars_in_rval(lval(Lval), Vars) :-
|
||||
exprn_aux__vars_in_lval(Lval, Vars).
|
||||
exprn_aux__vars_in_rval(var(Var), [Var]).
|
||||
exprn_aux__vars_in_rval(create(_, Rvals, _, _), Vars) :-
|
||||
exprn_aux__vars_in_rval(create(_, Rvals, _, _, _), Vars) :-
|
||||
exprn_aux__vars_in_args(Rvals, Vars).
|
||||
exprn_aux__vars_in_rval(mkword(_, Rval), Vars) :-
|
||||
exprn_aux__vars_in_rval(Rval, Vars).
|
||||
@@ -363,10 +363,10 @@ exprn_aux__substitute_lval_in_rval(OldLval, NewLval, Rval0, Rval) :-
|
||||
Rval0 = var(_Var),
|
||||
Rval = Rval0
|
||||
;
|
||||
Rval0 = create(Tag, Rvals0, Unique, Num),
|
||||
Rval0 = create(Tag, Rvals0, Unique, Num, Msg),
|
||||
exprn_aux__substitute_lval_in_args(OldLval, NewLval,
|
||||
Rvals0, Rvals),
|
||||
Rval = create(Tag, Rvals, Unique, Num)
|
||||
Rval = create(Tag, Rvals, Unique, Num, Msg)
|
||||
;
|
||||
Rval0 = mkword(Tag, Rval1),
|
||||
exprn_aux__substitute_lval_in_rval(OldLval, NewLval,
|
||||
@@ -524,10 +524,10 @@ exprn_aux__substitute_rval_in_rval(OldRval, NewRval, Rval0, Rval) :-
|
||||
Rval0 = var(_),
|
||||
Rval = Rval0
|
||||
;
|
||||
Rval0 = create(Tag, Rvals0, Unique, Num),
|
||||
Rval0 = create(Tag, Rvals0, Unique, Num, Msg),
|
||||
exprn_aux__substitute_rval_in_args(OldRval, NewRval,
|
||||
Rvals0, Rvals),
|
||||
Rval = create(Tag, Rvals, Unique, Num)
|
||||
Rval = create(Tag, Rvals, Unique, Num, Msg)
|
||||
;
|
||||
Rval0 = mkword(Tag, Rval1),
|
||||
exprn_aux__substitute_rval_in_rval(OldRval, NewRval,
|
||||
@@ -714,7 +714,7 @@ exprn_aux__simplify_rval(Rval0, Rval) :-
|
||||
|
||||
exprn_aux__simplify_rval_2(Rval0, Rval) :-
|
||||
(
|
||||
Rval0 = lval(field(Tag, create(Tag, Args, _, _), Field)),
|
||||
Rval0 = lval(field(Tag, create(Tag, Args, _, _, _), Field)),
|
||||
Field = const(int_const(FieldNum))
|
||||
->
|
||||
list__index0_det(Args, FieldNum, yes(Rval))
|
||||
@@ -724,11 +724,11 @@ exprn_aux__simplify_rval_2(Rval0, Rval) :-
|
||||
->
|
||||
Rval = lval(field(Tag, Rval2, Num))
|
||||
;
|
||||
Rval0 = create(Tag, Args0, Unique, CNum),
|
||||
Rval0 = create(Tag, Args0, Unique, CNum, Msg),
|
||||
exprn_aux__simplify_args(Args0, Args),
|
||||
Args \= Args0
|
||||
->
|
||||
Rval = create(Tag, Args, Unique, CNum)
|
||||
Rval = create(Tag, Args, Unique, CNum, Msg)
|
||||
;
|
||||
Rval0 = unop(UOp, Rval1),
|
||||
exprn_aux__simplify_rval_2(Rval1, Rval2)
|
||||
@@ -771,7 +771,7 @@ exprn_aux__simplify_args([MR0 | Ms0], [MR | Ms]) :-
|
||||
exprn_aux__rval_addrs(lval(Lval), CodeAddrs, DataAddrs) :-
|
||||
exprn_aux__lval_addrs(Lval, CodeAddrs, DataAddrs).
|
||||
exprn_aux__rval_addrs(var(_), [], []).
|
||||
exprn_aux__rval_addrs(create(_, MaybeRvals, _, _), CodeAddrs, DataAddrs) :-
|
||||
exprn_aux__rval_addrs(create(_, MaybeRvals, _, _, _), CodeAddrs, DataAddrs) :-
|
||||
exprn_aux__maybe_rval_list_addrs(MaybeRvals, CodeAddrs, DataAddrs).
|
||||
exprn_aux__rval_addrs(mkword(_Tag, Rval), CodeAddrs, DataAddrs) :-
|
||||
exprn_aux__rval_addrs(Rval, CodeAddrs, DataAddrs).
|
||||
|
||||
Reference in New Issue
Block a user