OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More consistently dump GIMPLE FE consumable stmts 

The following makes more stmts consumable with the GIMPLE FE
when dumping with -gimple.  In particular addresses in GIMPLE
operand position require wrapping with _Literal.

The TDF_ flag space is now exhausted and I've removed overlaps
and re-ordered things as to how it is supposed to work and
made it uint32_t and prepared the operator overloads for an
easy migration to uint64_t once required.

2021-10-05  Richard Biener  <rguenther@suse.de>

	PR c/102605
	* dumpfile.h (TDF_GIMPLE_VAL): New.
	(dump_flag): Re-order and adjust TDF_* flags.  Make
	the enum uint32_t.  Use std::underlying_type in the
	operator overloads.
	(optgroup_flag): Likewise for the operator overloads.
	* tree-pretty-print.c (dump_generic_node): Wrap ADDR_EXPR
	in _Literal if TDF_GIMPLE_VAL.
	* gimple-pretty-print.c (dump_gimple_assign): Add
	TDF_GIMPLE_VAL to flags when dumping operands where only
	is_gimple_val are allowed.
	(dump_gimple_cond): Likewise.
This commit is contained in:
Richard Biener 2021-10-05 14:49:42 +02:00
parent ba837323db
commit 90c3a62272
3 changed files with 57 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
gcc/dumpfile.h
View File

@ -74,7 +74,7 @@ enum dump_kind
the DUMP_OPTIONS array in dumpfile.c. The TDF_* flags coexist with
MSG_* flags (for -fopt-info) and the bit values must be chosen to
allow that. */
enum dump_flag
enum dump_flag : uint32_t
{
/* Value of TDF_NONE is used just for bits filtered by TDF_KIND_MASK. */
TDF_NONE = 0,
@ -140,23 +140,26 @@ enum dump_flag
/* Dump SCEV details. */
TDF_SCEV = (1 << 19),
/* Dump in GIMPLE FE syntax */
/* Dump in GIMPLE FE syntax. */
TDF_GIMPLE = (1 << 20),
/* Dump folding details. */
TDF_FOLDING = (1 << 21),
/* Dumping for range path solver. */
TDF_THREADING = (1 << 22),
/* MSG_* flags for expressing the kinds of message to
be emitted by -fopt-info. */
/* -fopt-info optimized sources. */
MSG_OPTIMIZED_LOCATIONS = (1 << 22),
MSG_OPTIMIZED_LOCATIONS = (1 << 23),
/* Missed opportunities. */
MSG_MISSED_OPTIMIZATION = (1 << 23),
MSG_MISSED_OPTIMIZATION = (1 << 24),
/* General optimization info. */
MSG_NOTE = (1 << 24),
MSG_NOTE = (1 << 25),
/* Mask for selecting MSG_-kind flags. */
MSG_ALL_KINDS = (MSG_OPTIMIZED_LOCATIONS
@ -175,33 +178,33 @@ enum dump_flag
sub-option of -fopt-info to show the internal messages. */
/* Implicitly supplied for messages at the top-level dump scope. */
MSG_PRIORITY_USER_FACING = (1 << 25),
MSG_PRIORITY_USER_FACING = (1 << 26),
/* Implicitly supplied for messages within nested dump scopes. */
MSG_PRIORITY_INTERNALS = (1 << 26),
MSG_PRIORITY_INTERNALS = (1 << 27),
/* Supplied when an opt_problem generated in a nested scope is re-emitted
at the top-level. We want to default to showing these in -fopt-info
output, but to *not* show them in dump files, as the message would be
shown twice, messing up "scan-tree-dump-times" in DejaGnu tests. */
MSG_PRIORITY_REEMITTED = (1 << 27),
MSG_PRIORITY_REEMITTED = (1 << 28),
/* Mask for selecting MSG_PRIORITY_* flags. */
MSG_ALL_PRIORITIES = (MSG_PRIORITY_USER_FACING
| MSG_PRIORITY_INTERNALS
| MSG_PRIORITY_REEMITTED),
/* All -fdump- flags. */
TDF_ALL_VALUES = (1 << 29) - 1,
/* Dumping for -fcompare-debug. */
TDF_COMPARE_DEBUG = (1 << 28),
TDF_COMPARE_DEBUG = (1 << 29),
/* Dump a GIMPLE value which means wrapping certain things with _Literal. */
TDF_GIMPLE_VAL = (1 << 30),
/* For error. */
TDF_ERROR = (1 << 26),
/* Dumping for range path solver. */
TDF_THREADING = (1 << 27),
/* All values. */
TDF_ALL_VALUES = (1 << 29) - 1
TDF_ERROR = ((uint32_t)1 << 31),
};
/* Dump flags type. */
@ -211,32 +214,36 @@ typedef enum dump_flag dump_flags_t;
static inline dump_flags_t
operator| (dump_flags_t lhs, dump_flags_t rhs)
{
return (dump_flags_t)((int)lhs | (int)rhs);
return (dump_flags_t)((std::underlying_type<dump_flags_t>::type)lhs
| (std::underlying_type<dump_flags_t>::type)rhs);
}
static inline dump_flags_t
operator& (dump_flags_t lhs, dump_flags_t rhs)
{
return (dump_flags_t)((int)lhs & (int)rhs);
return (dump_flags_t)((std::underlying_type<dump_flags_t>::type)lhs
& (std::underlying_type<dump_flags_t>::type)rhs);
}
static inline dump_flags_t
operator~ (dump_flags_t flags)
{
return (dump_flags_t)~((int)flags);
return (dump_flags_t)~((std::underlying_type<dump_flags_t>::type)flags);
}
static inline dump_flags_t &
operator|= (dump_flags_t &lhs, dump_flags_t rhs)
{
lhs = (dump_flags_t)((int)lhs | (int)rhs);
lhs = (dump_flags_t)((std::underlying_type<dump_flags_t>::type)lhs
| (std::underlying_type<dump_flags_t>::type)rhs);
return lhs;
}
static inline dump_flags_t &
operator&= (dump_flags_t &lhs, dump_flags_t rhs)
{
lhs = (dump_flags_t)((int)lhs & (int)rhs);
lhs = (dump_flags_t)((std::underlying_type<dump_flags_t>::type)lhs
& (std::underlying_type<dump_flags_t>::type)rhs);
return lhs;
}
@ -275,13 +282,15 @@ typedef enum optgroup_flag optgroup_flags_t;
static inline optgroup_flags_t
operator| (optgroup_flags_t lhs, optgroup_flags_t rhs)
{
return (optgroup_flags_t)((int)lhs | (int)rhs);
return (optgroup_flags_t)((std::underlying_type<dump_flags_t>::type)lhs
| (std::underlying_type<dump_flags_t>::type)rhs);
}
static inline optgroup_flags_t &
operator|= (optgroup_flags_t &lhs, optgroup_flags_t rhs)
{
lhs = (optgroup_flags_t)((int)lhs | (int)rhs);
lhs = (optgroup_flags_t)((std::underlying_type<dump_flags_t>::type)lhs
| (std::underlying_type<dump_flags_t>::type)rhs);
return lhs;
}

21
gcc/gimple-pretty-print.c
View File

@ -677,11 +677,18 @@ dump_gimple_assign (pretty_printer *buffer, const gassign *gs, int spc,
}
if (gimple_num_ops (gs) == 2)
dump_unary_rhs (buffer, gs, spc, flags);
dump_unary_rhs (buffer, gs, spc,
((flags & TDF_GIMPLE)
&& gimple_assign_rhs_class (gs) != GIMPLE_SINGLE_RHS)
? (flags | TDF_GIMPLE_VAL) : flags);
else if (gimple_num_ops (gs) == 3)
dump_binary_rhs (buffer, gs, spc, flags);
dump_binary_rhs (buffer, gs, spc,
(flags & TDF_GIMPLE)
? (flags | TDF_GIMPLE_VAL) : flags);
else if (gimple_num_ops (gs) == 4)
dump_ternary_rhs (buffer, gs, spc, flags);
dump_ternary_rhs (buffer, gs, spc,
(flags & TDF_GIMPLE)
? (flags | TDF_GIMPLE_VAL) : flags);
else
gcc_unreachable ();
if (!(flags & TDF_RHS_ONLY))
@ -1085,11 +1092,15 @@ dump_gimple_cond (pretty_printer *buffer, const gcond *gs, int spc,
{
if (!(flags & TDF_RHS_ONLY))
pp_string (buffer, "if (");
dump_generic_node (buffer, gimple_cond_lhs (gs), spc, flags, false);
dump_generic_node (buffer, gimple_cond_lhs (gs), spc,
flags | ((flags & TDF_GIMPLE) ? TDF_GIMPLE_VAL : TDF_NONE),
false);
pp_space (buffer);
pp_string (buffer, op_symbol_code (gimple_cond_code (gs)));
pp_space (buffer);
dump_generic_node (buffer, gimple_cond_rhs (gs), spc, flags, false);
dump_generic_node (buffer, gimple_cond_rhs (gs), spc,
flags | ((flags & TDF_GIMPLE) ? TDF_GIMPLE_VAL : TDF_NONE),
false);
if (!(flags & TDF_RHS_ONLY))
{
edge_iterator ei;

10
gcc/tree-pretty-print.c
View File

@ -2873,10 +2873,18 @@ dump_generic_node (pretty_printer *pp, tree node, int spc, dump_flags_t flags,
break;
/* Unary arithmetic and logic expressions. */
case ADDR_EXPR:
if (flags & TDF_GIMPLE_VAL)
{
pp_string (pp, "_Literal (");
dump_generic_node (pp, TREE_TYPE (node), spc,
flags & ~TDF_GIMPLE_VAL, false);
pp_character (pp, ')');
}
/* Fallthru. */
case NEGATE_EXPR:
case BIT_NOT_EXPR:
case TRUTH_NOT_EXPR:
case ADDR_EXPR:
case PREDECREMENT_EXPR:
case PREINCREMENT_EXPR:
case INDIRECT_REF: