mirror of
https://github.com/Mercury-Language/mercury.git
synced 2025-12-21 00:39:37 +00:00
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.
124 lines
3.1 KiB
C
124 lines
3.1 KiB
C
/*
|
|
** Copyright (C) 1997 The University of Melbourne.
|
|
** This file may only be copied under the terms of the GNU Library General
|
|
** Public License - see the file COPYING.LIB in the Mercury distribution.
|
|
*/
|
|
|
|
/*
|
|
** File: mercury_heap_profile.c.
|
|
** Main authors: zs, fjh
|
|
**
|
|
** This module records information about the allocations of cells on the heap.
|
|
**
|
|
** The information recorded by this module is used by code in
|
|
** library/benchmarking.m.
|
|
*/
|
|
|
|
/*---------------------------------------------------------------------------*/
|
|
|
|
#include "mercury_imp.h"
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include "mercury_prof_mem.h"
|
|
#include "mercury_heap_profile.h"
|
|
|
|
/* all fields of these variables are initialized to 0 */
|
|
MR_memprof_counter MR_memprof_overall;
|
|
MR_memprof_table MR_memprof_procs;
|
|
MR_memprof_table MR_memprof_types;
|
|
|
|
/*
|
|
** Initialize a heap profiling counter.
|
|
*/
|
|
static void
|
|
MR_init_counter(MR_memprof_counter *counter)
|
|
{
|
|
MR_zero_dword(counter->cells_at_period_start);
|
|
MR_zero_dword(counter->words_at_period_start);
|
|
MR_zero_dword(counter->cells_since_period_start);
|
|
MR_zero_dword(counter->words_since_period_start);
|
|
}
|
|
|
|
/*
|
|
** Increment the fields in a heap profiling counter to record the allocation
|
|
** of a single cell of `size' words.
|
|
*/
|
|
static void
|
|
MR_increment_counter(MR_memprof_counter *counter, int size)
|
|
{
|
|
MR_increment_dword(counter->cells_since_period_start, 1);
|
|
MR_increment_dword(counter->words_since_period_start, size);
|
|
}
|
|
|
|
/*
|
|
** Search the specified `table' to find the entry for the given `name'
|
|
** allocating one if there isn't one already, and then increment
|
|
** the counters for that entry for an allocation of the specified `size'.
|
|
*/
|
|
static void
|
|
MR_increment_table_entry(MR_memprof_table *table, const char *name,
|
|
Code *addr, int size)
|
|
{
|
|
bool found;
|
|
int diff;
|
|
MR_memprof_record **node_addr;
|
|
MR_memprof_record *node;
|
|
|
|
/*
|
|
** Search the tree to find the node with this name.
|
|
*/
|
|
found = FALSE;
|
|
node_addr = &table->root;
|
|
while ((node = *node_addr) != NULL) {
|
|
diff = strcmp(name, node->name);
|
|
if (diff < 0) {
|
|
node_addr = &node->left;
|
|
} else if (diff > 0) {
|
|
node_addr = &node->right;
|
|
} else {
|
|
found = TRUE;
|
|
break;
|
|
}
|
|
}
|
|
|
|
/*
|
|
** If the tree didn't already contain a node with this name,
|
|
** create a new node for it.
|
|
*/
|
|
if (!found) {
|
|
node = MR_PROF_NEW(MR_memprof_record);
|
|
node->name = name;
|
|
node->addr = addr;
|
|
node->left = NULL;
|
|
node->right = NULL;
|
|
MR_init_counter(&node->counter);
|
|
|
|
*node_addr = node;
|
|
|
|
table->num_entries++;
|
|
}
|
|
|
|
/* Now record the counts in this node */
|
|
MR_increment_counter(&node->counter, size);
|
|
}
|
|
|
|
/*
|
|
** Record heap profiling information for an allocation of size `size'
|
|
** in procedure `proc' for an object of type `type'.
|
|
*/
|
|
void
|
|
MR_record_allocation(int size, Code *proc_addr,
|
|
const char *proc_name, const char *type)
|
|
{
|
|
/*
|
|
** Increment the overall totals,
|
|
** record the allocation in the per-procedure table, and
|
|
** record the allocation in the per-type table.
|
|
*/
|
|
MR_increment_counter(&MR_memprof_overall, size);
|
|
MR_increment_table_entry(&MR_memprof_procs, proc_name, proc_addr, size);
|
|
MR_increment_table_entry(&MR_memprof_types, type, NULL, size);
|
|
}
|