KJ16609/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2026-02-22 12:00:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Comment trace_ranger, and tweak various dumping outputs.

Browse Source 
From-SVN: r266410
This commit is contained in:
Andrew Macleod
2018-11-23 17:25:03 +00:00
parent 1202aa3ca5
commit 449233c5c4
4 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
gcc/ssa-range-gori.cc
View File

@@ -349,12 +349,16 @@ void
gori_map::dump(FILE *f, basic_block bb)
{
tree t;
bool header = false;
const char *header_string = "bb%-4d ";
const char *header2 = " ";
bool printed_something = false;;
unsigned x, y;
bitmap_iterator bi;
if (!m_outgoing[bb->index])
{
fprintf (f, "BB%d was not processed.\n", bb->index);
fprintf (f, "bb%d was not processed.\n", bb->index);
return;
}
@@ -368,14 +372,17 @@ gori_map::dump(FILE *f, basic_block bb)
bitmap chain = (has_def_chain (name) ? get_def_chain (name) : NULL);
if (stmt && gimple_bb (stmt) == bb && chain && !bitmap_empty_p (chain))
{
fprintf (f, header_string, bb->index);
header_string = header2;
header = true;
print_generic_expr (f, name, TDF_SLIM);
if ((t = terminal_name (name)))
{
fprintf (f, " : (single import : ");
fprintf (f, " : (terminal ");
print_generic_expr (f, t, TDF_SLIM);
fprintf (f, ")");
}
fprintf (f, " :");
fprintf (f, " : ");
EXECUTE_IF_SET_IN_BITMAP (chain, 0, y, bi)
{
print_generic_expr (f, ssa_name (y), TDF_SLIM);
@@ -385,22 +392,46 @@ gori_map::dump(FILE *f, basic_block bb)
}
}
printed_something |= header;
// Now dump the incoming vector.
fprintf (f, "BB%d imports: ",bb->index);
header = false;
EXECUTE_IF_SET_IN_BITMAP (m_incoming[bb->index], 0, y, bi)
{
if (!header)
{
fprintf (f, header_string, bb->index);
fprintf (f, "imports: ");
header_string = header2;
header = true;
}
print_generic_expr (f, ssa_name (y), TDF_SLIM);
fprintf (f, " ");
}
if (header)
fputc ('\n', f);
// Now dump the export vector.
fprintf (f, "\nBB%d exports: ",bb->index);
printed_something |= header;
header = false;
EXECUTE_IF_SET_IN_BITMAP (m_outgoing[bb->index], 0, y, bi)
{
if (!header)
{
fprintf (f, header_string, bb->index);
fprintf (f, "exports: ");
header_string = header2;
header = true;
}
print_generic_expr (f, ssa_name (y), TDF_SLIM);
fprintf (f, " ");
}
fprintf (f, "\n");
if (header)
fputc ('\n', f);
printed_something |= header;
if (printed_something)
fprintf (f, "\n");
}
// Dump the entire GORI map structure to file F.
@@ -411,9 +442,7 @@ gori_map::dump(FILE *f)
basic_block bb;
FOR_EACH_BB_FN (bb, cfun)
{
fprintf (f, "----BB %d----\n", bb->index);
dump (f, bb);
fprintf (f, "\n");
}
}

4
gcc/ssa-range-vrp.c
View File

@@ -149,7 +149,7 @@ execute_ranger_vrp ()
if (details)
{
global_ranger e;
e.exercise (dump_file);
e.calculate_and_dump (dump_file);
}
trace_ranger ranger;
@@ -206,7 +206,7 @@ execute_ranger_vrp_conditional ()
if (details)
{
global_ranger e;
e.exercise (dump_file);
e.calculate_and_dump (dump_file);
}
global_ranger ranger;

96
gcc/ssa-range.cc
View File

@@ -759,57 +759,6 @@ ssa_range::range_p (basic_block bb, tree name)
return false;
}
// This routine will loop through all the edges and block in the program and
// ask for the range of each ssa-name. THis exercises the ranger to make sure
// there are no ICEs for unexpected questions, as well as provides a
// convenient way to show all the ranges that could be calculated.
void
ssa_range::exercise (FILE *output)
{
basic_block bb;
irange range;
FOR_EACH_BB_FN (bb, cfun)
{
edge_iterator ei;
edge e;
bool printed = false;
FOR_EACH_EDGE (e, ei, bb->succs)
{
unsigned x;
for (x = 1; x < num_ssa_names; x++)
{
tree name = ssa_name (x);
if (name && outgoing_edge_range_p (range, e, name))
{
if (output)
{
printed = true;
fprintf (output, "BB%3d: ", bb->index);
if (e->flags & EDGE_TRUE_VALUE)
fprintf (output, " T: ");
else if (e->flags & EDGE_FALSE_VALUE)
fprintf (output, " F: ");
print_generic_expr (output, name, TDF_SLIM);
fprintf(output, " \t");
range.dump(output);
}
}
}
}
if (printed)
fprintf (output, "\n");
}
if (output)
dump (output);
}
// Class used to track non-null references of an ssa-name
// A vector of bitmaps indexed by ssa-name is maintained. When indexed by
// Basic Block, an on-bit indicates there is a non-null dereference for
@@ -1043,7 +992,7 @@ public:
bool bb_range_p (tree name, const basic_block bb);
void dump (FILE *f);
void dump (FILE *f, basic_block bb, bool print_varying = false);
void dump (FILE *f, basic_block bb, bool print_varying = true);
private:
vec<ssa_block_ranges *> m_ssa_ranges;
ssa_block_ranges& get_block_ranges (tree name);
@@ -1277,14 +1226,17 @@ ssa_global_cache::dump (FILE *f)
{
unsigned x;
irange r;
fprintf (f, "Non-varying global ranges:\n");
fprintf (f, "=========================:\n");
for ( x = 1; x < num_ssa_names; x++)
if (ssa_range::valid_ssa_p (ssa_name (x)) &&
get_global_range (r, ssa_name (x)))
get_global_range (r, ssa_name (x)) && !r.varying_p ())
{
print_generic_expr (f, ssa_name (x), TDF_NONE);
fprintf (f, " : ");
r.dump (f);
}
fputc ('\n', dump_file);
}
@@ -1717,7 +1669,7 @@ global_ranger::dump(FILE *f)
{
if (!range.varying_p ())
{
fprintf (f, " %d->%d ", e->src->index,
fprintf (f, "%d->%d ", e->src->index,
e->dest->index);
if (e->flags & EDGE_TRUE_VALUE)
fprintf (f, " (T) ");
@@ -1734,15 +1686,19 @@ global_ranger::dump(FILE *f)
}
}
}
dump_global_ssa_range (dump_file);
if (dump_flags & TDF_DETAILS)
ssa_range::dump (dump_file);
}
// Exercise the ranger by visiting every block and asking for the range of
// every ssa_name on each outgoing edge, and optionally providing a dump
// of everything than can be calculated by the ranger to file OUTPUT.
// Calculate all ranges by visiting every block and asking for the range of
// each ssa_name on each statement, and then dump those ranges to OUTPUT.
void
global_ranger::exercise (FILE *output)
global_ranger::calculate_and_dump (FILE *output)
{
basic_block bb;
irange r;
@@ -1780,6 +1736,7 @@ global_ranger::exercise (FILE *output)
dump (output);
}
// Constructor for trace_ranger.
trace_ranger::trace_ranger ()
{
@@ -1787,7 +1744,7 @@ trace_ranger::trace_ranger ()
counter = 0;
}
// If dumping, return true and print the prefix for the next output line.
inline bool
trace_ranger::dumping ()
@@ -1795,7 +1752,8 @@ trace_ranger::dumping ()
counter++;
if (dump_file && (dump_flags & TDF_DETAILS))
{
fprintf (dump_file, "%-7u", counter);
// Print counter index as well as INDENT spaces.
fprintf (dump_file, " %-7u", counter);
unsigned x;
for (x = 0; x< indent; x++)
fputc (' ', dump_file);
@@ -1804,6 +1762,9 @@ trace_ranger::dumping ()
return false;
}
// After calling a routine, if dumping, print the CALLER, NAME, and RESULT,
// returning RESULT.
bool
trace_ranger::trailer (const char *caller, bool result, tree name,
const irange &r)
@@ -1828,6 +1789,7 @@ trace_ranger::trailer (const char *caller, bool result, tree name,
return result;
}
// Tracing version of range_of_expr. Call it with printing wrappers.
bool
trace_ranger::range_of_expr (irange &r, tree expr, gimple *s)
@@ -1850,6 +1812,8 @@ trace_ranger::range_of_expr (irange &r, tree expr, gimple *s)
return trailer ("range_of_expr", res, expr, r);
}
// Tracing version of edge range_of_expr. Call it with printing wrappers.
bool
trace_ranger::range_of_expr (irange &r, tree expr, edge e)
{
@@ -1867,6 +1831,8 @@ trace_ranger::range_of_expr (irange &r, tree expr, edge e)
return trailer ("range_of_expr", res, expr, r);
}
// Tracing version of range_on_edge. Call it with printing wrappers.
bool
trace_ranger::range_on_edge (irange &r, edge e, tree name)
{
@@ -1884,6 +1850,8 @@ trace_ranger::range_on_edge (irange &r, edge e, tree name)
return trailer ("range_on_edge", res, name, r);
}
// Tracing version of range_on_entry. Call it with printing wrappers.
bool
trace_ranger::range_on_entry (irange &r, basic_block bb, tree name)
{
@@ -1901,6 +1869,8 @@ trace_ranger::range_on_entry (irange &r, basic_block bb, tree name)
return trailer ("range_on_entry", res, name, r);
}
// Tracing version of range_on_exit. Call it with printing wrappers.
bool
trace_ranger::range_on_exit (irange &r, basic_block bb, tree name)
{
@@ -1918,6 +1888,8 @@ trace_ranger::range_on_exit (irange &r, basic_block bb, tree name)
return trailer ("range_on_exit", res, name, r);
}
// Tracing version of range_of_stmt. Call it with printing wrappers.
bool
trace_ranger::range_of_stmt (irange &r, gimple *s, tree name)
{
@@ -1937,8 +1909,8 @@ trace_ranger::range_of_stmt (irange &r, gimple *s, tree name)
return trailer ("range_of_stmt", res, name, r);
}
// Tracing version of outgoing_edge_range_p. Call it with printing wrappers.
// Calculate a range on edge E only if it is defined by E.
bool
trace_ranger::outgoing_edge_range_p (irange &r, edge e, tree name,
irange *name_range)
@@ -1948,7 +1920,7 @@ trace_ranger::outgoing_edge_range_p (irange &r, edge e, tree name,
{
fprintf (dump_file, "outgoing_edge_range_p (");
print_generic_expr (dump_file, name, TDF_SLIM);
fprintf (dump_file, ") on edge %d->%d, name_range :", e->src->index,
fprintf (dump_file, ") on edge %d->%d, with range ", e->src->index,
e->dest->index);
if (name_range)
name_range->dump (dump_file);

3
gcc/ssa-range.h
View File

@@ -97,7 +97,6 @@ class ssa_range
tree terminal_name (tree name);
void dump (FILE *f);
void exercise (FILE *f);
protected:
// Calculate the range for NAME if the result of statement S is the range LHS.
class gori_compute *m_gori; /* Generates Outgoing Range Info. */
@@ -151,7 +150,7 @@ public:
virtual bool range_of_stmt (irange &r, gimple *s, tree name = NULL_TREE);
void dump (FILE *f);
void exercise (FILE *f); /* Calculate all stmts and dump */
void calculate_and_dump (FILE *f); /* Calculate all stmts and dump */
private:
void dump_global_ssa_range (FILE *f);