===================================================================
@@ -1,3 +1,4 @@
+
/* Performance monitoring unit (PMU) profiler. If available, use an
external tool to collect hardware performance counter data and
write it in the .gcda files.
@@ -74,12 +75,6 @@ static void destroy_load_latency_infos (void *info
static void destroy_branch_mispredict_infos (void *info);
static gcov_unsigned_t gcov_tag_pmu_tool_header_length (gcov_pmu_tool_header_t
*header);
-static void gcov_write_tool_header (gcov_pmu_tool_header_t *header);
-static void gcov_write_load_latency_infos (void *info);
-static void gcov_write_branch_mispredict_infos (void *info);
-static void gcov_write_ll_line (const gcov_pmu_ll_info_t *ll_info);
-static void gcov_write_branch_mispredict_line (const gcov_pmu_brm_info_t
- *brm_info);
/* Convert a fractional PCT to an unsigned integer after
muliplying by 100. */
@@ -156,11 +151,11 @@ init_pmu_branch_mispredict (void)
/* Write the load latency information LL_INFO into the gcda file. */
-static void
+void
gcov_write_ll_line (const gcov_pmu_ll_info_t *ll_info)
{
- gcov_unsigned_t len = GCOV_TAG_PMU_LOAD_LATENCY_LENGTH (ll_info->filename);
- gcov_write_tag_length (GCOV_TAG_PMU_LOAD_LATENCY_INFO, len);
+ gcov_write_tag_length (GCOV_TAG_PMU_LOAD_LATENCY_INFO,
+ GCOV_TAG_PMU_LOAD_LATENCY_LENGTH());
gcov_write_unsigned (ll_info->counts);
gcov_write_unsigned (ll_info->self);
gcov_write_unsigned (ll_info->cum);
@@ -174,27 +169,38 @@ gcov_write_ll_line (const gcov_pmu_ll_info_t *ll_i
gcov_write_counter (ll_info->code_addr);
gcov_write_unsigned (ll_info->line);
gcov_write_unsigned (ll_info->discriminator);
- gcov_write_string (ll_info->filename);
+ gcov_write_unsigned (ll_info->filetag);
}
/* Write the branch mispredict information BRM_INFO into the gcda file. */
-static void
+void
gcov_write_branch_mispredict_line (const gcov_pmu_brm_info_t *brm_info)
{
- gcov_unsigned_t len = GCOV_TAG_PMU_BRANCH_MISPREDICT_LENGTH (
- brm_info->filename);
- gcov_write_tag_length (GCOV_TAG_PMU_BRANCH_MISPREDICT_INFO, len);
+ gcov_write_tag_length (GCOV_TAG_PMU_BRANCH_MISPREDICT_INFO,
+ GCOV_TAG_PMU_BRANCH_MISPREDICT_LENGTH());
gcov_write_unsigned (brm_info->counts);
gcov_write_unsigned (brm_info->self);
gcov_write_unsigned (brm_info->cum);
gcov_write_counter (brm_info->code_addr);
gcov_write_unsigned (brm_info->line);
gcov_write_unsigned (brm_info->discriminator);
- gcov_write_string (brm_info->filename);
+ gcov_write_unsigned (brm_info->filetag);
}
+/* Write the string table entry ST_ENTRY into the gcda file. */
+
+void
+gcov_write_string_table_entry (const gcov_pmu_st_entry_t *st_entry)
+{
+ gcov_write_tag_length (GCOV_TAG_PMU_STRING_TABLE_ENTRY,
+ GCOV_TAG_PMU_STRING_TABLE_ENTRY_LENGTH(
+ st_entry->str));
+ gcov_write_unsigned(st_entry->index);
+ gcov_write_string(st_entry->str);
+}
+
/* Compute TOOL_HEADER length for writing into the gcov file. */
static gcov_unsigned_t
@@ -216,7 +222,7 @@ gcov_tag_pmu_tool_header_length (gcov_pmu_tool_hea
/* Write tool header into the gcda file. It assumes that the gcda file
has already been opened and is available for writing. */
-static void
+void
gcov_write_tool_header (gcov_pmu_tool_header_t *header)
{
gcov_unsigned_t len = gcov_tag_pmu_tool_header_length (header);
===================================================================
@@ -222,6 +222,7 @@ typedef struct pmu_data
{
ll_infos_t ll_infos;
brm_infos_t brm_infos;
+ string_table_t string_table;
} pmu_data_t;
/* Describes a single line of source. Contains a chain of basic blocks
@@ -975,6 +976,7 @@ release_structures (void)
function_t *fn;
ll_infos_t *ll_infos = &pmu_global_info.ll_infos;
brm_infos_t *brm_infos = &pmu_global_info.brm_infos;
+ string_table_t *string_table = &pmu_global_info.string_table;
for (ix = n_sources; ix--;)
{
@@ -1008,8 +1010,6 @@ release_structures (void)
/* delete each element */
for (i = 0; i < ll_infos->ll_count; ++i)
{
- if (ll_infos->ll_array[i]->filename)
- XDELETE (ll_infos->ll_array[i]->filename);
XDELETE (ll_infos->ll_array[i]);
}
/* delete the array itself */
@@ -1026,8 +1026,6 @@ release_structures (void)
/* delete each element */
for (i = 0; i < brm_infos->brm_count; ++i)
{
- if (brm_infos->brm_array[i]->filename)
- XDELETE (brm_infos->brm_array[i]->filename);
XDELETE (brm_infos->brm_array[i]);
}
/* delete the array itself */
@@ -1035,6 +1033,22 @@ release_structures (void)
brm_infos->brm_array = NULL;
brm_infos->brm_count = 0;
}
+
+ /* Cleanup PMU string table entries. */
+ if (string_table->st_count)
+ {
+ unsigned i;
+
+ /* delete each element */
+ for (i = 0; i < string_table->st_count; ++i)
+ {
+ XDELETE (string_table->st_array[i]);
+ }
+ /* delete the array itself */
+ XDELETE (string_table->st_array);
+ string_table->st_array = NULL;
+ string_table->st_count = 0;
+ }
}
/* Generate the names of the graph and data files. If OBJECT_DIRECTORY
@@ -2263,17 +2277,21 @@ filter_pmu_data_lines (source_t *src)
int changed;
ll_infos_t *ll_infos; /* load latency information for this source */
brm_infos_t *brm_infos; /* branch mispredict information for this source */
+ string_table_t *string_table; /* string table information for this source */
if (pmu_global_info.ll_infos.ll_count == 0 &&
- pmu_global_info.brm_infos.brm_count == 0)
+ pmu_global_info.brm_infos.brm_count == 0 &&
+ pmu_global_info.string_table.st_count == 0)
/* If there are no global entries, there is nothing to filter. */
return;
src->pmu_data = XCNEW (pmu_data_t);
ll_infos = &src->pmu_data->ll_infos;
brm_infos = &src->pmu_data->brm_infos;
+ string_table = &src->pmu_data->string_table;
ll_infos->pmu_tool_header = pmu_global_info.ll_infos.pmu_tool_header;
brm_infos->pmu_tool_header = pmu_global_info.brm_infos.pmu_tool_header;
+ string_table->pmu_tool_header = pmu_global_info.string_table.pmu_tool_header;
ll_infos->ll_array = 0;
brm_infos->brm_array = 0;
@@ -2282,7 +2300,8 @@ filter_pmu_data_lines (source_t *src)
for (i = 0; i < pmu_global_info.ll_infos.ll_count; ++i)
{
gcov_pmu_ll_info_t *ll_info = pmu_global_info.ll_infos.ll_array[i];
- if (0 == strcmp (src->name, ll_info->filename))
+ if (0 == strcmp (src->name,
+ string_table->st_array[ll_info->filetag - 1]->str))
{
if (!ll_infos->ll_array)
{
@@ -2295,9 +2314,9 @@ filter_pmu_data_lines (source_t *src)
ll_infos->ll_count++;
if (ll_infos->ll_count >= ll_infos->alloc_ll_count)
{
- /* need to realloc */
+ /* need to realloc */
ll_infos->ll_array = (gcov_pmu_ll_info_t **)
- xrealloc (ll_infos->ll_array, 2 * ll_infos->alloc_ll_count);
+ xrealloc (ll_infos->ll_array, 2 * ll_infos->alloc_ll_count);
}
ll_infos->ll_array[ll_infos->ll_count - 1] = ll_info;
}
@@ -2308,7 +2327,8 @@ filter_pmu_data_lines (source_t *src)
for (i = 0; i < pmu_global_info.brm_infos.brm_count; ++i)
{
gcov_pmu_brm_info_t *brm_info = pmu_global_info.brm_infos.brm_array[i];
- if (0 == strcmp (src->name, brm_info->filename))
+ if (0 == strcmp (src->name,
+ string_table->st_array[brm_info->filetag - 1]->str))
{
if (!brm_infos->brm_array)
{
@@ -2323,12 +2343,14 @@ filter_pmu_data_lines (source_t *src)
{
/* need to realloc */
brm_infos->brm_array = (gcov_pmu_brm_info_t **)
- xrealloc (brm_infos->brm_array, 2 * brm_infos->alloc_brm_count);
+ xrealloc (brm_infos->brm_array,
+ 2 * brm_infos->alloc_brm_count);
}
brm_infos->brm_array[brm_infos->brm_count - 1] = brm_info;
}
}
+
/* Sort the load latency data according to the line numbers because
we later iterate over sources in line number order. Normally we
expect the PMU tool to provide sorted data, but a few entries can
@@ -2914,6 +2936,7 @@ static void process_pmu_profile (void)
int error = 0;
ll_infos_t *ll_infos = &pmu_global_info.ll_infos;
brm_infos_t *brm_infos = &pmu_global_info.brm_infos;
+ string_table_t *string_table = &pmu_global_info.string_table;
/* Construct path for pmuprofile.gcda filename. */
create_file_names (pmu_profile_filename);
@@ -2953,6 +2976,11 @@ static void process_pmu_profile (void)
brm_infos->brm_array = XCNEWVEC (gcov_pmu_brm_info_t *,
brm_infos->alloc_brm_count);
+ string_table->st_count = 0;
+ string_table->alloc_st_count = 64;
+ string_table->st_array = XCNEWVEC (gcov_pmu_st_entry_t *,
+ string_table->alloc_st_count);
+
while ((tag = gcov_read_unsigned ()))
{
unsigned length = gcov_read_unsigned ();
@@ -2991,7 +3019,24 @@ static void process_pmu_profile (void)
ll_infos->pmu_tool_header = tool_header;
brm_infos->pmu_tool_header = tool_header;
}
+ else if (tag == GCOV_TAG_PMU_STRING_TABLE_ENTRY)
+ {
+ gcov_pmu_st_entry_t *st_entry = XCNEW (gcov_pmu_st_entry_t);
+ gcov_read_pmu_string_table_entry (st_entry, length);
+ /* Verify that we read string table entries in the right order */
+ gcc_assert (st_entry->index == string_table->st_count);
+ string_table->st_count++;
+ if (string_table->st_count >= string_table->alloc_st_count)
+ {
+ string_table->alloc_st_count *= 2;
+ string_table->st_array = (gcov_pmu_st_entry_t **)
+ xrealloc (string_table->st_array,
+ string_table->alloc_st_count);
+ }
+ string_table->st_array[string_table->st_count - 1] = st_entry;
+ }
+
gcov_sync (base, length);
if ((error = gcov_is_error ()))
{
===================================================================
@@ -242,7 +242,6 @@ GCOV_LINKAGE void
gcov_read_pmu_load_latency_info (gcov_pmu_ll_info_t *ll_info,
gcov_unsigned_t len ATTRIBUTE_UNUSED)
{
- const char *filename;
ll_info->counts = gcov_read_unsigned ();
ll_info->self = gcov_read_unsigned ();
ll_info->cum = gcov_read_unsigned ();
@@ -256,11 +255,7 @@ gcov_read_pmu_load_latency_info (gcov_pmu_ll_info_
ll_info->code_addr = gcov_read_counter ();
ll_info->line = gcov_read_unsigned ();
ll_info->discriminator = gcov_read_unsigned ();
- filename = gcov_read_string ();
- if (filename)
- ll_info->filename = gcov_canonical_filename (xstrdup (filename));
- else
- ll_info->filename = 0;
+ ll_info->filetag = gcov_read_unsigned ();
}
/* Read LEN words and construct branch mispredict info BRM_INFO. */
@@ -269,20 +264,29 @@ GCOV_LINKAGE void
gcov_read_pmu_branch_mispredict_info (gcov_pmu_brm_info_t *brm_info,
gcov_unsigned_t len ATTRIBUTE_UNUSED)
{
- const char *filename;
brm_info->counts = gcov_read_unsigned ();
brm_info->self = gcov_read_unsigned ();
brm_info->cum = gcov_read_unsigned ();
brm_info->code_addr = gcov_read_counter ();
brm_info->line = gcov_read_unsigned ();
brm_info->discriminator = gcov_read_unsigned ();
- filename = gcov_read_string ();
- if (filename)
- brm_info->filename = gcov_canonical_filename (xstrdup (filename));
- else
- brm_info->filename = 0;
+ brm_info->filetag = gcov_read_unsigned ();
}
+/* Read LEN words from an open gcov file and construct data into a
+ string table entry */
+
+GCOV_LINKAGE void
+gcov_read_pmu_string_table_entry (gcov_pmu_st_entry_t *st_entry,
+ gcov_unsigned_t len ATTRIBUTE_UNUSED)
+{
+ const char *str;
+
+ st_entry->index = gcov_read_unsigned ();
+ str = gcov_read_string ();
+ st_entry->str = str ? gcov_canonical_filename (xstrdup(str)) : 0;
+}
+
/* Read LEN words from an open gcov file and construct data into pmu
tool header TOOL_HEADER. */
@@ -779,7 +783,7 @@ print_load_latency_line (FILE *fp, const gcov_pmu_
if (!ll_info)
return;
fprintf (fp, " %u %.2f%% %.2f%% %.2f%% %.2f%% %.2f%% %.2f%% %.2f%% "
- "%.2f%% %.2f%% " HOST_WIDEST_INT_PRINT_HEX " %s %d %d",
+ "%.2f%% %.2f%% " HOST_WIDEST_INT_PRINT_HEX " %d %d %d",
ll_info->counts,
convert_unsigned_to_pct (ll_info->self),
convert_unsigned_to_pct (ll_info->cum),
@@ -791,7 +795,7 @@ print_load_latency_line (FILE *fp, const gcov_pmu_
convert_unsigned_to_pct (ll_info->gt_1024),
convert_unsigned_to_pct (ll_info->wself),
ll_info->code_addr,
- ll_info->filename,
+ ll_info->filetag,
ll_info->line,
ll_info->discriminator);
if (newline == add_newline)
@@ -807,18 +811,32 @@ print_branch_mispredict_line (FILE *fp, const gcov
{
if (!brm_info)
return;
- fprintf (fp, " %u %.2f%% %.2f%% " HOST_WIDEST_INT_PRINT_HEX " %s %d %d",
+ fprintf (fp, " %u %.2f%% %.2f%% " HOST_WIDEST_INT_PRINT_HEX " %d %d %d",
brm_info->counts,
convert_unsigned_to_pct (brm_info->self),
convert_unsigned_to_pct (brm_info->cum),
brm_info->code_addr,
- brm_info->filename,
+ brm_info->filetag,
brm_info->line,
brm_info->discriminator);
if (newline == add_newline)
fprintf (fp, "\n");
}
+/* Print STRING_TABLE_ENTRY into the file pointed by FP. NEWLINE specifies
+ whether or not to print a trailing newline. */
+
+GCOV_LINKAGE void
+print_pmu_string_table_entry (FILE *fp, const gcov_pmu_st_entry_t *st_entry,
+ const enum print_newline newline)
+{
+ if (!st_entry)
+ return;
+ fprintf (fp, " %d %s", st_entry->index, st_entry->str);
+ if (newline == add_newline)
+ fprintf (fp, "\n");
+}
+
/* Print TOOL_HEADER into the file pointed by FP. NEWLINE specifies
whether or not to print a trailing newline. */
===================================================================
@@ -442,13 +442,14 @@ typedef HOST_WIDEST_INT gcov_type;
#define GCOV_TAG_SUMMARY_LENGTH \
(1 + GCOV_COUNTERS_SUMMABLE * (3 + 3 * 2))
#define GCOV_TAG_PMU_LOAD_LATENCY_INFO ((gcov_unsigned_t)0xa5000000)
-#define GCOV_TAG_PMU_LOAD_LATENCY_LENGTH(filename) \
- (gcov_string_length (filename) + 12 + 2)
+#define GCOV_TAG_PMU_LOAD_LATENCY_LENGTH() (15)
#define GCOV_TAG_PMU_BRANCH_MISPREDICT_INFO ((gcov_unsigned_t)0xa7000000)
-#define GCOV_TAG_PMU_BRANCH_MISPREDICT_LENGTH(filename) \
- (gcov_string_length (filename) + 5 + 2)
+#define GCOV_TAG_PMU_BRANCH_MISPREDICT_LENGTH() (8)
#define GCOV_TAG_PMU_TOOL_HEADER ((gcov_unsigned_t)0xa9000000)
#define GCOV_TAG_MODULE_INFO ((gcov_unsigned_t)0xab000000)
+#define GCOV_TAG_PMU_STRING_TABLE_ENTRY ((gcov_unsigned_t)0xad000000)
+#define GCOV_TAG_PMU_STRING_TABLE_ENTRY_LENGTH(filename) \
+ (gcov_string_length (filename) + 1)
/* Counters that are collected. */
#define GCOV_COUNTER_ARCS 0 /* Arc transitions. */
@@ -635,7 +636,7 @@ typedef struct gcov_pmu_load_latency_info
gcov_type code_addr; /* the actual miss address (pc+1 for Intel) */
gcov_unsigned_t line; /* line number corresponding to this miss */
gcov_unsigned_t discriminator; /* discriminator information for this miss */
- char *filename; /* filename corresponding to this miss */
+ gcov_unsigned_t filetag; /* location in string table of filename */
} gcov_pmu_ll_info_t;
/* This structure is used during runtime as well as in gcov. */
@@ -665,7 +666,7 @@ typedef struct gcov_pmu_branch_mispredict_info
gcov_type code_addr; /* the actual mispredict address */
gcov_unsigned_t line; /* line number corresponding to this event */
gcov_unsigned_t discriminator; /* discriminator for this event */
- char *filename; /* filename corresponding to this event */
+ gcov_unsigned_t filetag; /* location in string table of filename */
} gcov_pmu_brm_info_t;
/* This structure is used during runtime as well as in gcov. */
@@ -682,6 +683,25 @@ typedef struct branch_mispredict_infos
gcov_pmu_tool_header_t *pmu_tool_header;
} brm_infos_t;
+typedef struct gcov_pmu_string_table_entry
+{
+ gcov_unsigned_t index; /* The corresponding string table index */
+ char* str; /* The string that belongs at this index */
+} gcov_pmu_st_entry_t;
+
+typedef struct string_table
+{
+ /* An array describing the total number of string table entries. */
+ gcov_pmu_st_entry_t **st_array;
+ /* The total number of entries in the above array. */
+ unsigned st_count;
+ /* The total number of entries currently allocated in the array.
+ Used for bookkeeping. */
+ unsigned alloc_st_count;
+ /* PMU tool header */
+ gcov_pmu_tool_header_t *pmu_tool_header;
+} string_table_t;
+
/* Structures embedded in coveraged program. The structures generated
by write_profile must match these. */
@@ -871,8 +891,13 @@ GCOV_LINKAGE void
gcov_read_pmu_branch_mispredict_info (gcov_pmu_brm_info_t *brm_info,
gcov_unsigned_t len) ATTRIBUTE_HIDDEN;
GCOV_LINKAGE void
+gcov_read_pmu_string_table_entry (gcov_pmu_st_entry_t *entry,
+ gcov_unsigned_t len) ATTRIBUTE_HIDDEN;
+
+GCOV_LINKAGE void
gcov_read_pmu_tool_header (gcov_pmu_tool_header_t *tool_header,
gcov_unsigned_t len) ATTRIBUTE_HIDDEN;
+
#ifndef __GCOV_KERNEL__
GCOV_LINKAGE float convert_unsigned_to_pct (
const unsigned number) ATTRIBUTE_HIDDEN;
@@ -887,6 +912,9 @@ GCOV_LINKAGE void print_load_latency_line (FILE *f
GCOV_LINKAGE void
print_branch_mispredict_line (FILE *fp, const gcov_pmu_brm_info_t *brm_info,
const enum print_newline);
+GCOV_LINKAGE void
+print_pmu_string_table_entry (FILE* fp, const gcov_pmu_st_entry_t *entry,
+ const enum print_newline);
GCOV_LINKAGE void print_pmu_tool_header (FILE *fp,
gcov_pmu_tool_header_t *tool_header,
const enum print_newline);
@@ -905,7 +933,16 @@ GCOV_LINKAGE void gcov_write_tag_length (gcov_unsi
GCOV_LINKAGE void gcov_write_summary (gcov_unsigned_t /*tag*/,
const struct gcov_summary *)
ATTRIBUTE_HIDDEN;
-
+GCOV_LINKAGE void
+gcov_write_tool_header (gcov_pmu_tool_header_t *header) ATTRIBUTE_HIDDEN;
+GCOV_LINKAGE void
+gcov_write_ll_line (const gcov_pmu_ll_info_t *ll_info) ATTRIBUTE_HIDDEN;
+GCOV_LINKAGE void
+gcov_write_branch_mispredict_line (const gcov_pmu_brm_info_t
+ *brm_info) ATTRIBUTE_HIDDEN;
+GCOV_LINKAGE void
+gcov_write_string_table_entry (const gcov_pmu_st_entry_t
+ *st_entry) ATTRIBUTE_HIDDEN;
GCOV_LINKAGE void gcov_write_module_infos (struct gcov_info *mod_info)
ATTRIBUTE_HIDDEN;
GCOV_LINKAGE const struct dyn_imp_mod **
===================================================================
@@ -43,6 +43,7 @@ static void tag_summary (const char *, unsigned, u
static void tag_module_info (const char *, unsigned, unsigned);
static void tag_pmu_load_latency_info (const char *, unsigned, unsigned);
static void tag_pmu_branch_mispredict_info (const char *, unsigned, unsigned);
+static void tag_pmu_string_table_entry (const char*, unsigned, unsigned);
static void tag_pmu_tool_header (const char *, unsigned, unsigned);
extern int main (int, char **);
@@ -84,6 +85,8 @@ static const tag_format_t tag_table[] =
{GCOV_TAG_PMU_BRANCH_MISPREDICT_INFO, "PMU_BRANCH_MISPREDICT_INFO",
tag_pmu_branch_mispredict_info},
{GCOV_TAG_PMU_TOOL_HEADER, "PMU_TOOL_HEADER", tag_pmu_tool_header},
+ {GCOV_TAG_PMU_STRING_TABLE_ENTRY, "PMU_STRING_TABLE_ENTRY",
+ tag_pmu_string_table_entry},
{0, NULL, NULL}
};
@@ -573,7 +576,6 @@ tag_pmu_load_latency_info (const char *filename AT
gcov_pmu_ll_info_t ll_info;
gcov_read_pmu_load_latency_info (&ll_info, length);
print_load_latency_line (stdout, &ll_info, no_newline);
- free (ll_info.filename);
}
/* Read gcov tag GCOV_TAG_PMU_BRANCH_MISPREDICT_INFO from the gcda
@@ -586,9 +588,17 @@ tag_pmu_branch_mispredict_info (const char *filena
gcov_pmu_brm_info_t brm_info;
gcov_read_pmu_branch_mispredict_info (&brm_info, length);
print_branch_mispredict_line (stdout, &brm_info, no_newline);
- free (brm_info.filename);
}
+static void
+tag_pmu_string_table_entry (const char *filename ATTRIBUTE_UNUSED,
+ unsigned tag ATTRIBUTE_UNUSED, unsigned length)
+{
+ gcov_pmu_st_entry_t st_entry;
+ gcov_read_pmu_string_table_entry(&st_entry, length);
+ print_pmu_string_table_entry(stdout, &st_entry, no_newline);
+ free(st_entry.str);
+}
/* Read gcov tag GCOV_TAG_PMU_TOOL_HEADER from the gcda file and print
the contents in a human readable form. */