From 54e7de934615bef93b8e3140dae28cce83b7f145 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Fri, 8 Jun 2018 12:50:19 +0000 Subject: [PATCH] Convert dump and optgroup flags to enums gcc/brig/ChangeLog: * brigfrontend/brig-to-generic.cc (brig_to_generic::write_globals): Use TDF_NONE rather than 0. (dump_function): Likewise. gcc/c-family/ChangeLog: * c-pretty-print.c (c_pretty_printer::statement): Use TDF_NONE rather than 0. gcc/ChangeLog: * cfg.c (debug): Use TDF_NONE rather than 0. * cfghooks.c (debug): Likewise. * dumpfile.c (DUMP_FILE_INFO): Likewise; also for OPTGROUP. (struct dump_option_value_info): Convert to... (struct kv_pair): ...this template type. (dump_options): Convert to kv_pair; use TDF_NONE rather than 0. (optinfo_verbosity_options): Likewise. (optgroup_options): Convert to kv_pair; use OPTGROUP_NONE. (gcc::dump_manager::dump_register): Use optgroup_flags_t rather than int for "optgroup_flags" param. (dump_generic_expr_loc): Use dump_flags_t rather than int for "dump_kind" param. (dump_dec): Likewise. (dump_finish): Use TDF_NONE rather than 0. (gcc::dump_manager::opt_info_enable_passes): Use optgroup_flags_t rather than int for "optgroup_flags" param. Use TDF_NONE rather than 0. Update for change to option_ptr. (opt_info_switch_p_1): Convert "optgroup_flags" param from int * to optgroup_flags_t *. Use TDF_NONE and OPTGROUP_NONE rather than 0. Update for changes to optinfo_verbosity_options and optgroup_options. (opt_info_switch_p): Convert optgroup_flags from int to optgroup_flags_t. (dump_basic_block): Use dump_flags_t rather than int for "dump_kind" param. * dumpfile.h (TDF_ADDRESS, TDF_SLIM, TDF_RAW, TDF_DETAILS, TDF_STATS, TDF_BLOCKS, TDF_VOPS, TDF_LINENO, TDF_UID) TDF_STMTADDR, TDF_GRAPH, TDF_MEMSYMS, TDF_RHS_ONLY, TDF_ASMNAME, TDF_EH, TDF_NOUID, TDF_ALIAS, TDF_ENUMERATE_LOCALS, TDF_CSELIB, TDF_SCEV, TDF_GIMPLE, TDF_FOLDING, MSG_OPTIMIZED_LOCATIONS, MSG_MISSED_OPTIMIZATION, MSG_NOTE, MSG_ALL, TDF_COMPARE_DEBUG, TDF_NONE): Convert from macros to... (enum dump_flag): ...this new enum. (dump_flags_t): Update to use enum. (operator|, operator&, operator~, operator|=, operator&=): Implement for dump_flags_t. (OPTGROUP_NONE, OPTGROUP_IPA, OPTGROUP_LOOP, OPTGROUP_INLINE, OPTGROUP_OMP, OPTGROUP_VEC, OPTGROUP_OTHER, OPTGROUP_ALL): Convert from macros to... (enum optgroup_flag): ...this new enum. (optgroup_flags_t): New typedef. (operator|, operator|=): Implement for optgroup_flags_t. (struct dump_file_info): Convert field "alt_flags" to dump_flags_t. Convert field "optgroup_flags" to optgroup_flags_t. (dump_basic_block): Use dump_flags_t rather than int for param. (dump_generic_expr_loc): Likewise. (dump_dec): Likewise. (dump_register): Convert param "optgroup_flags" to optgroup_flags_t. (opt_info_enable_passes): Likewise. * early-remat.c (early_remat::dump_edge_list): Use TDF_NONE rather than 0. * gimple-pretty-print.c (debug): Likewise. * gimple-ssa-store-merging.c (bswap_replace): Likewise. (merged_store_group::apply_stores): Likewise. * gimple-ssa-strength-reduction.c (insert_initializers): Likewise. * gimple.c (verify_gimple_pp): Likewise. * graphite-poly.c (print_pbb_body): Likewise. * passes.c (pass_manager::register_one_dump_file): Convert local "optgroup_flags" to optgroup_flags_t. * print-tree.c (print_node): Use TDF_NONE rather than 0. (debug): Likewise. (debug_body): Likewise. * tree-pass.h (struct pass_data): Convert field "optgroup_flags" to optgroup_flags_t. * tree-pretty-print.c (print_struct_decl): Use TDF_NONE rather than 0. * tree-ssa-math-opts.c (convert_mult_to_fma_1): Likewise. (convert_mult_to_fma): Likewise. * tree-ssa-reassoc.c (undistribute_ops_list): Likewise. * tree-ssa-sccvn.c (vn_eliminate): Likewise. * tree-vect-data-refs.c (dump_lower_bound): Convert param "dump_kind" to dump_flags_t. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@261325 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 79 +++++++++++ gcc/brig/ChangeLog | 6 + gcc/brig/brigfrontend/brig-to-generic.cc | 9 +- gcc/c-family/ChangeLog | 5 + gcc/c-family/c-pretty-print.c | 2 +- gcc/cfg.c | 4 +- gcc/cfghooks.c | 2 +- gcc/dumpfile.c | 70 +++++----- gcc/dumpfile.h | 231 +++++++++++++++++++++++-------- gcc/early-remat.c | 2 +- gcc/gimple-pretty-print.c | 2 +- gcc/gimple-ssa-store-merging.c | 6 +- gcc/gimple-ssa-strength-reduction.c | 2 +- gcc/gimple.c | 2 +- gcc/graphite-poly.c | 2 +- gcc/passes.c | 2 +- gcc/print-tree.c | 7 +- gcc/tree-pass.h | 2 +- gcc/tree-pretty-print.c | 2 +- gcc/tree-ssa-math-opts.c | 4 +- gcc/tree-ssa-reassoc.c | 2 +- gcc/tree-ssa-sccvn.c | 2 +- gcc/tree-vect-data-refs.c | 2 +- 23 files changed, 326 insertions(+), 121 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 190683cd668..231f673bda5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,82 @@ +2018-06-08 David Malcolm + + * cfg.c (debug): Use TDF_NONE rather than 0. + * cfghooks.c (debug): Likewise. + * dumpfile.c (DUMP_FILE_INFO): Likewise; also for OPTGROUP. + (struct dump_option_value_info): Convert to... + (struct kv_pair): ...this template type. + (dump_options): Convert to kv_pair; use TDF_NONE + rather than 0. + (optinfo_verbosity_options): Likewise. + (optgroup_options): Convert to kv_pair; use + OPTGROUP_NONE. + (gcc::dump_manager::dump_register): Use optgroup_flags_t rather + than int for "optgroup_flags" param. + (dump_generic_expr_loc): Use dump_flags_t rather than int for + "dump_kind" param. + (dump_dec): Likewise. + (dump_finish): Use TDF_NONE rather than 0. + (gcc::dump_manager::opt_info_enable_passes): Use optgroup_flags_t + rather than int for "optgroup_flags" param. Use TDF_NONE rather + than 0. Update for change to option_ptr. + (opt_info_switch_p_1): Convert "optgroup_flags" param from int * + to optgroup_flags_t *. Use TDF_NONE and OPTGROUP_NONE rather than + 0. Update for changes to optinfo_verbosity_options and + optgroup_options. + (opt_info_switch_p): Convert optgroup_flags from int to + optgroup_flags_t. + (dump_basic_block): Use dump_flags_t rather than int + for "dump_kind" param. + * dumpfile.h (TDF_ADDRESS, TDF_SLIM, TDF_RAW, TDF_DETAILS, + TDF_STATS, TDF_BLOCKS, TDF_VOPS, TDF_LINENO, TDF_UID) + TDF_STMTADDR, TDF_GRAPH, TDF_MEMSYMS, TDF_RHS_ONLY, TDF_ASMNAME, + TDF_EH, TDF_NOUID, TDF_ALIAS, TDF_ENUMERATE_LOCALS, TDF_CSELIB, + TDF_SCEV, TDF_GIMPLE, TDF_FOLDING, MSG_OPTIMIZED_LOCATIONS, + MSG_MISSED_OPTIMIZATION, MSG_NOTE, MSG_ALL, TDF_COMPARE_DEBUG, + TDF_NONE): Convert from macros to... + (enum dump_flag): ...this new enum. + (dump_flags_t): Update to use enum. + (operator|, operator&, operator~, operator|=, operator&=): + Implement for dump_flags_t. + (OPTGROUP_NONE, OPTGROUP_IPA, OPTGROUP_LOOP, OPTGROUP_INLINE, + OPTGROUP_OMP, OPTGROUP_VEC, OPTGROUP_OTHER, OPTGROUP_ALL): + Convert from macros to... + (enum optgroup_flag): ...this new enum. + (optgroup_flags_t): New typedef. + (operator|, operator|=): Implement for optgroup_flags_t. + (struct dump_file_info): Convert field "alt_flags" to + dump_flags_t. Convert field "optgroup_flags" to + optgroup_flags_t. + (dump_basic_block): Use dump_flags_t rather than int for param. + (dump_generic_expr_loc): Likewise. + (dump_dec): Likewise. + (dump_register): Convert param "optgroup_flags" to + optgroup_flags_t. + (opt_info_enable_passes): Likewise. + * early-remat.c (early_remat::dump_edge_list): Use TDF_NONE rather + than 0. + * gimple-pretty-print.c (debug): Likewise. + * gimple-ssa-store-merging.c (bswap_replace): Likewise. + (merged_store_group::apply_stores): Likewise. + * gimple-ssa-strength-reduction.c (insert_initializers): Likewise. + * gimple.c (verify_gimple_pp): Likewise. + * graphite-poly.c (print_pbb_body): Likewise. + * passes.c (pass_manager::register_one_dump_file): Convert + local "optgroup_flags" to optgroup_flags_t. + * print-tree.c (print_node): Use TDF_NONE rather than 0. + (debug): Likewise. + (debug_body): Likewise. + * tree-pass.h (struct pass_data): Convert field "optgroup_flags" + to optgroup_flags_t. + * tree-pretty-print.c (print_struct_decl): Use TDF_NONE rather + than 0. + * tree-ssa-math-opts.c (convert_mult_to_fma_1): Likewise. + (convert_mult_to_fma): Likewise. + * tree-ssa-reassoc.c (undistribute_ops_list): Likewise. + * tree-ssa-sccvn.c (vn_eliminate): Likewise. + * tree-vect-data-refs.c (dump_lower_bound): Convert param + "dump_kind" to dump_flags_t. + 2018-06-08 Segher Boessenkool * config/rs6000/rs6000.c (min, max): Delete. diff --git a/gcc/brig/ChangeLog b/gcc/brig/ChangeLog index 8b2e06551f2..90c51a06e04 100644 --- a/gcc/brig/ChangeLog +++ b/gcc/brig/ChangeLog @@ -1,3 +1,9 @@ +2018-06-08 David Malcolm + + * brigfrontend/brig-to-generic.cc + (brig_to_generic::write_globals): Use TDF_NONE rather than 0. + (dump_function): Likewise. + 2018-05-18 Richard Sandiford * brigfrontend/brig-function.cc diff --git a/gcc/brig/brigfrontend/brig-to-generic.cc b/gcc/brig/brigfrontend/brig-to-generic.cc index ee212b1f7b4..6629db0fdf5 100644 --- a/gcc/brig/brigfrontend/brig-to-generic.cc +++ b/gcc/brig/brigfrontend/brig-to-generic.cc @@ -932,8 +932,9 @@ brig_to_generic::write_globals () fprintf (m_dump_file, "\n;; Function %s", kern_name.c_str()); fprintf (m_dump_file, "\n;; enabled by -%s\n\n", dump_flag_name (TDI_original)); - print_generic_decl (m_dump_file, launcher, 0); - print_generic_expr (m_dump_file, DECL_SAVED_TREE (launcher), 0); + print_generic_decl (m_dump_file, launcher, TDF_NONE); + print_generic_expr (m_dump_file, DECL_SAVED_TREE (launcher), + TDF_NONE); fprintf (m_dump_file, "\n"); } @@ -1018,8 +1019,8 @@ dump_function (FILE *dump_file, brig_function *f) fprintf (dump_file, "\n;; Function %s", f->m_name.c_str ()); fprintf (dump_file, "\n;; enabled by -%s\n\n", dump_flag_name (TDI_original)); - print_generic_decl (dump_file, f->m_func_decl, 0); - print_generic_expr (dump_file, f->m_current_bind_expr, 0); + print_generic_decl (dump_file, f->m_func_decl, TDF_NONE); + print_generic_expr (dump_file, f->m_current_bind_expr, TDF_NONE); fprintf (dump_file, "\n"); } } diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 28ff01ae241..0ac89d432da 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,8 @@ +2018-06-08 David Malcolm + + * c-pretty-print.c (c_pretty_printer::statement): Use TDF_NONE + rather than 0. + 2018-06-08 Martin Liska * c-attribs.c (handle_bnd_variable_size_attribute): Remove support diff --git a/gcc/c-family/c-pretty-print.c b/gcc/c-family/c-pretty-print.c index dc76c9957d3..efb41c5b905 100644 --- a/gcc/c-family/c-pretty-print.c +++ b/gcc/c-family/c-pretty-print.c @@ -2341,7 +2341,7 @@ c_pretty_printer::statement (tree stmt) if (pp_needs_newline (this)) pp_newline_and_indent (this, 0); - dump_generic_node (this, stmt, pp_indentation (this), 0, true); + dump_generic_node (this, stmt, pp_indentation (this), TDF_NONE, true); } diff --git a/gcc/cfg.c b/gcc/cfg.c index 11026e7209a..6d55516adad 100644 --- a/gcc/cfg.c +++ b/gcc/cfg.c @@ -545,8 +545,8 @@ DEBUG_FUNCTION void debug (edge_def &ref) { /* FIXME (crowl): Is this desireable? */ - dump_edge_info (stderr, &ref, 0, false); - dump_edge_info (stderr, &ref, 0, true); + dump_edge_info (stderr, &ref, TDF_NONE, false); + dump_edge_info (stderr, &ref, TDF_NONE, true); } DEBUG_FUNCTION void diff --git a/gcc/cfghooks.c b/gcc/cfghooks.c index 87d864c6022..ea106e0cb32 100644 --- a/gcc/cfghooks.c +++ b/gcc/cfghooks.c @@ -288,7 +288,7 @@ dump_bb (FILE *outf, basic_block bb, int indent, dump_flags_t flags) DEBUG_FUNCTION void debug (basic_block_def &ref) { - dump_bb (stderr, &ref, 0, 0); + dump_bb (stderr, &ref, 0, TDF_NONE); } DEBUG_FUNCTION void diff --git a/gcc/dumpfile.c b/gcc/dumpfile.c index 0f16d4f044f..e94e2747829 100644 --- a/gcc/dumpfile.c +++ b/gcc/dumpfile.c @@ -50,8 +50,8 @@ const char *dump_file_name; dump_flags_t dump_flags; #define DUMP_FILE_INFO(suffix, swtch, dkind, num) \ - {suffix, swtch, NULL, NULL, NULL, NULL, NULL, dkind, 0, 0, 0, 0, 0, num, \ - false, false} + {suffix, swtch, NULL, NULL, NULL, NULL, NULL, dkind, TDF_NONE, TDF_NONE, \ + OPTGROUP_NONE, 0, 0, num, false, false} /* Table of tree dump switches. This must be consistent with the TREE_DUMP_INDEX enumeration in dumpfile.h. */ @@ -74,15 +74,16 @@ static struct dump_file_info dump_files[TDI_end] = }; /* Define a name->number mapping for a dump flag value. */ -struct dump_option_value_info +template +struct kv_pair { const char *const name; /* the name of the value */ - const dump_flags_t value; /* the value of the name */ + const ValueType value; /* the value of the name */ }; /* Table of dump options. This must be consistent with the TDF_* flags in dumpfile.h and opt_info_options below. */ -static const struct dump_option_value_info dump_options[] = +static const kv_pair dump_options[] = { {"address", TDF_ADDRESS}, {"asmname", TDF_ASMNAME}, @@ -114,23 +115,23 @@ static const struct dump_option_value_info dump_options[] = {"all", dump_flags_t (~(TDF_RAW | TDF_SLIM | TDF_LINENO | TDF_GRAPH | TDF_STMTADDR | TDF_RHS_ONLY | TDF_NOUID | TDF_ENUMERATE_LOCALS | TDF_SCEV | TDF_GIMPLE))}, - {NULL, 0} + {NULL, TDF_NONE} }; /* A subset of the dump_options table which is used for -fopt-info types. This must be consistent with the MSG_* flags in dumpfile.h. */ -static const struct dump_option_value_info optinfo_verbosity_options[] = +static const kv_pair optinfo_verbosity_options[] = { {"optimized", MSG_OPTIMIZED_LOCATIONS}, {"missed", MSG_MISSED_OPTIMIZATION}, {"note", MSG_NOTE}, {"all", MSG_ALL}, - {NULL, 0} + {NULL, TDF_NONE} }; /* Flags used for -fopt-info groups. */ -static const struct dump_option_value_info optgroup_options[] = +static const kv_pair optgroup_options[] = { {"ipa", OPTGROUP_IPA}, {"loop", OPTGROUP_LOOP}, @@ -138,7 +139,7 @@ static const struct dump_option_value_info optgroup_options[] = {"omp", OPTGROUP_OMP}, {"vec", OPTGROUP_VEC}, {"optall", OPTGROUP_ALL}, - {NULL, 0} + {NULL, OPTGROUP_NONE} }; gcc::dump_manager::dump_manager (): @@ -173,7 +174,8 @@ gcc::dump_manager::~dump_manager () unsigned int gcc::dump_manager:: dump_register (const char *suffix, const char *swtch, const char *glob, - dump_kind dkind, int optgroup_flags, bool take_ownership) + dump_kind dkind, optgroup_flags_t optgroup_flags, + bool take_ownership) { int num = m_next_dump++; @@ -425,7 +427,7 @@ dump_generic_expr (dump_flags_t dump_kind, dump_flags_t extra_dump_flags, location. */ void -dump_generic_expr_loc (int dump_kind, source_location loc, +dump_generic_expr_loc (dump_flags_t dump_kind, source_location loc, dump_flags_t extra_dump_flags, tree t) { if (dump_file && (dump_kind & pflags)) @@ -492,7 +494,7 @@ dump_printf_loc (dump_flags_t dump_kind, source_location loc, template void -dump_dec (int dump_kind, const poly_int &value) +dump_dec (dump_flags_t dump_kind, const poly_int &value) { STATIC_ASSERT (poly_coeff_traits::signedness >= 0); signop sgn = poly_coeff_traits::signedness ? SIGNED : UNSIGNED; @@ -503,11 +505,11 @@ dump_dec (int dump_kind, const poly_int &value) print_dec (value, alt_dump_file, sgn); } -template void dump_dec (int, const poly_uint16 &); -template void dump_dec (int, const poly_int64 &); -template void dump_dec (int, const poly_uint64 &); -template void dump_dec (int, const poly_offset_int &); -template void dump_dec (int, const poly_widest_int &); +template void dump_dec (dump_flags_t, const poly_uint16 &); +template void dump_dec (dump_flags_t, const poly_int64 &); +template void dump_dec (dump_flags_t, const poly_uint64 &); +template void dump_dec (dump_flags_t, const poly_offset_int &); +template void dump_dec (dump_flags_t, const poly_widest_int &); /* Start a dump for PHASE. Store user-supplied dump flags in *FLAG_PTR. Return the number of streams opened. Set globals @@ -581,9 +583,9 @@ dump_finish (int phase) dfi->pstream = NULL; dump_file = NULL; alt_dump_file = NULL; - dump_flags = TDI_none; - alt_flags = 0; - pflags = 0; + dump_flags = TDF_NONE; + alt_flags = TDF_NONE; + pflags = TDF_NONE; } /* Begin a tree dump for PHASE. Stores any user supplied flag in @@ -749,7 +751,7 @@ dump_enable_all (dump_kind dkind, dump_flags_t flags, const char *filename) int gcc::dump_manager:: -opt_info_enable_passes (int optgroup_flags, dump_flags_t flags, +opt_info_enable_passes (optgroup_flags_t optgroup_flags, dump_flags_t flags, const char *filename) { int n = 0; @@ -816,11 +818,11 @@ dump_switch_p_1 (const char *arg, struct dump_file_info *dfi, bool doglob) return 0; ptr = option_value; - flags = 0; + flags = TDF_NONE; while (*ptr) { - const struct dump_option_value_info *option_ptr; + const struct kv_pair *option_ptr; const char *end_ptr; const char *eq_ptr; unsigned length; @@ -902,8 +904,8 @@ dump_switch_p (const char *arg) and filename. Return non-zero if it is a recognized switch. */ static int -opt_info_switch_p_1 (const char *arg, dump_flags_t *flags, int *optgroup_flags, - char **filename) +opt_info_switch_p_1 (const char *arg, dump_flags_t *flags, + optgroup_flags_t *optgroup_flags, char **filename) { const char *option_value; const char *ptr; @@ -912,15 +914,14 @@ opt_info_switch_p_1 (const char *arg, dump_flags_t *flags, int *optgroup_flags, ptr = option_value; *filename = NULL; - *flags = 0; - *optgroup_flags = 0; + *flags = TDF_NONE; + *optgroup_flags = OPTGROUP_NONE; if (!ptr) return 1; /* Handle '-fopt-info' without any additional options. */ while (*ptr) { - const struct dump_option_value_info *option_ptr; const char *end_ptr; const char *eq_ptr; unsigned length; @@ -937,8 +938,8 @@ opt_info_switch_p_1 (const char *arg, dump_flags_t *flags, int *optgroup_flags, end_ptr = ptr + strlen (ptr); length = end_ptr - ptr; - for (option_ptr = optinfo_verbosity_options; option_ptr->name; - option_ptr++) + for (const kv_pair *option_ptr = optinfo_verbosity_options; + option_ptr->name; option_ptr++) if (strlen (option_ptr->name) == length && !memcmp (option_ptr->name, ptr, length)) { @@ -946,7 +947,8 @@ opt_info_switch_p_1 (const char *arg, dump_flags_t *flags, int *optgroup_flags, goto found; } - for (option_ptr = optgroup_options; option_ptr->name; option_ptr++) + for (const kv_pair *option_ptr = optgroup_options; + option_ptr->name; option_ptr++) if (strlen (option_ptr->name) == length && !memcmp (option_ptr->name, ptr, length)) { @@ -981,7 +983,7 @@ int opt_info_switch_p (const char *arg) { dump_flags_t flags; - int optgroup_flags; + optgroup_flags_t optgroup_flags; char *filename; static char *file_seen = NULL; gcc::dump_manager *dumps = g->get_dumps (); @@ -1012,7 +1014,7 @@ opt_info_switch_p (const char *arg) /* Print basic block on the dump streams. */ void -dump_basic_block (int dump_kind, basic_block bb, int indent) +dump_basic_block (dump_flags_t dump_kind, basic_block bb, int indent) { if (dump_file && (dump_kind & pflags)) dump_bb (dump_file, bb, indent, TDF_DETAILS); diff --git a/gcc/dumpfile.h b/gcc/dumpfile.h index 21803a60580..153f91ef57e 100644 --- a/gcc/dumpfile.h +++ b/gcc/dumpfile.h @@ -58,65 +58,175 @@ 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. */ -#define TDF_ADDRESS (1 << 0) /* dump node addresses */ -#define TDF_SLIM (1 << 1) /* don't go wild following links */ -#define TDF_RAW (1 << 2) /* don't unparse the function */ -#define TDF_DETAILS (1 << 3) /* show more detailed info about - each pass */ -#define TDF_STATS (1 << 4) /* dump various statistics about - each pass */ -#define TDF_BLOCKS (1 << 5) /* display basic block boundaries */ -#define TDF_VOPS (1 << 6) /* display virtual operands */ -#define TDF_LINENO (1 << 7) /* display statement line numbers */ -#define TDF_UID (1 << 8) /* display decl UIDs */ - -#define TDF_STMTADDR (1 << 9) /* Address of stmt. */ - -#define TDF_GRAPH (1 << 10) /* a graph dump is being emitted */ -#define TDF_MEMSYMS (1 << 11) /* display memory symbols in expr. - Implies TDF_VOPS. */ - -#define TDF_RHS_ONLY (1 << 12) /* a flag to only print the RHS of - a gimple stmt. */ -#define TDF_ASMNAME (1 << 13) /* display asm names of decls */ -#define TDF_EH (1 << 14) /* display EH region number - holding this gimple statement. */ -#define TDF_NOUID (1 << 15) /* omit UIDs from dumps. */ -#define TDF_ALIAS (1 << 16) /* display alias information */ -#define TDF_ENUMERATE_LOCALS (1 << 17) /* Enumerate locals by uid. */ -#define TDF_CSELIB (1 << 18) /* Dump cselib details. */ -#define TDF_SCEV (1 << 19) /* Dump SCEV details. */ -#define TDF_GIMPLE (1 << 20) /* Dump in GIMPLE FE syntax */ -#define TDF_FOLDING (1 << 21) /* Dump folding details. */ -#define MSG_OPTIMIZED_LOCATIONS (1 << 22) /* -fopt-info optimized sources */ -#define MSG_MISSED_OPTIMIZATION (1 << 23) /* missed opportunities */ -#define MSG_NOTE (1 << 24) /* general optimization info */ -#define MSG_ALL (MSG_OPTIMIZED_LOCATIONS | MSG_MISSED_OPTIMIZATION \ - | MSG_NOTE) -#define TDF_COMPARE_DEBUG (1 << 25) /* Dumping for -fcompare-debug. */ - - -/* Value of TDF_NONE is used just for bits filtered by TDF_KIND_MASK. */ - -#define TDF_NONE 0 +enum dump_flag +{ + /* Value of TDF_NONE is used just for bits filtered by TDF_KIND_MASK. */ + TDF_NONE = 0, + + /* Dump node addresses. */ + TDF_ADDRESS = (1 << 0), + + /* Don't go wild following links. */ + TDF_SLIM = (1 << 1), + + /* Don't unparse the function. */ + TDF_RAW = (1 << 2), + + /* Show more detailed info about each pass. */ + TDF_DETAILS = (1 << 3), + + /* Dump various statistics about each pass. */ + TDF_STATS = (1 << 4), + + /* Display basic block boundaries. */ + TDF_BLOCKS = (1 << 5), + + /* Display virtual operands. */ + TDF_VOPS = (1 << 6), + + /* Display statement line numbers. */ + TDF_LINENO = (1 << 7), + + /* Display decl UIDs. */ + TDF_UID = (1 << 8), + + /* Address of stmt. */ + TDF_STMTADDR = (1 << 9), + + /* A graph dump is being emitted. */ + TDF_GRAPH = (1 << 10), + + /* Display memory symbols in expr. + Implies TDF_VOPS. */ + TDF_MEMSYMS = (1 << 11), + + /* A flag to only print the RHS of a gimple stmt. */ + TDF_RHS_ONLY = (1 << 12), + + /* Display asm names of decls. */ + TDF_ASMNAME = (1 << 13), + + /* Display EH region number holding this gimple statement. */ + TDF_EH = (1 << 14), + + /* Omit UIDs from dumps. */ + TDF_NOUID = (1 << 15), + + /* Display alias information. */ + TDF_ALIAS = (1 << 16), + + /* Enumerate locals by uid. */ + TDF_ENUMERATE_LOCALS = (1 << 17), + + /* Dump cselib details. */ + TDF_CSELIB = (1 << 18), + + /* Dump SCEV details. */ + TDF_SCEV = (1 << 19), + + /* Dump in GIMPLE FE syntax */ + TDF_GIMPLE = (1 << 20), + + /* Dump folding details. */ + TDF_FOLDING = (1 << 21), + + /* -fopt-info optimized sources. */ + MSG_OPTIMIZED_LOCATIONS = (1 << 22), + + /* Missed opportunities. */ + MSG_MISSED_OPTIMIZATION = (1 << 23), + + /* General optimization info. */ + MSG_NOTE = (1 << 24), + + MSG_ALL = (MSG_OPTIMIZED_LOCATIONS + | MSG_MISSED_OPTIMIZATION + | MSG_NOTE), + + /* Dumping for -fcompare-debug. */ + TDF_COMPARE_DEBUG = (1 << 25) +}; + +/* Dump flags type. */ + +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); +} + +static inline dump_flags_t +operator& (dump_flags_t lhs, dump_flags_t rhs) +{ + return (dump_flags_t)((int)lhs & (int)rhs); +} + +static inline dump_flags_t +operator~ (dump_flags_t flags) +{ + return (dump_flags_t)~((int)flags); +} + +static inline dump_flags_t & +operator|= (dump_flags_t &lhs, dump_flags_t rhs) +{ + lhs = (dump_flags_t)((int)lhs | (int)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); + return lhs; +} /* Flags to control high-level -fopt-info dumps. Usually these flags define a group of passes. An optimization pass can be part of multiple groups. */ -#define OPTGROUP_NONE (0) -#define OPTGROUP_IPA (1 << 1) /* IPA optimization passes */ -#define OPTGROUP_LOOP (1 << 2) /* Loop optimization passes */ -#define OPTGROUP_INLINE (1 << 3) /* Inlining passes */ -#define OPTGROUP_OMP (1 << 4) /* OMP (Offloading and Multi - Processing) transformations */ -#define OPTGROUP_VEC (1 << 5) /* Vectorization passes */ -#define OPTGROUP_OTHER (1 << 6) /* All other passes */ -#define OPTGROUP_ALL (OPTGROUP_IPA | OPTGROUP_LOOP | OPTGROUP_INLINE \ - | OPTGROUP_OMP | OPTGROUP_VEC | OPTGROUP_OTHER) -/* Dump flags type. */ +enum optgroup_flag +{ + OPTGROUP_NONE = 0, + + /* IPA optimization passes */ + OPTGROUP_IPA = (1 << 1), + + /* Loop optimization passes */ + OPTGROUP_LOOP = (1 << 2), + + /* Inlining passes */ + OPTGROUP_INLINE = (1 << 3), -typedef uint64_t dump_flags_t; + /* OMP (Offloading and Multi Processing) transformations */ + OPTGROUP_OMP = (1 << 4), + + /* Vectorization passes */ + OPTGROUP_VEC = (1 << 5), + + /* All other passes */ + OPTGROUP_OTHER = (1 << 6), + + OPTGROUP_ALL = (OPTGROUP_IPA | OPTGROUP_LOOP | OPTGROUP_INLINE + | OPTGROUP_OMP | OPTGROUP_VEC | OPTGROUP_OTHER) +}; + +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); +} + +static inline optgroup_flags_t & +operator|= (optgroup_flags_t &lhs, optgroup_flags_t rhs) +{ + lhs = (optgroup_flags_t)((int)lhs | (int)rhs); + return lhs; +} /* Define a tree dump switch. */ struct dump_file_info @@ -140,9 +250,9 @@ struct dump_file_info /* Dump flags. */ dump_flags_t pflags; /* A pass flags for -fopt-info. */ - int alt_flags; + dump_flags_t alt_flags; /* Flags for -fopt-info given by a user. */ - int optgroup_flags; + optgroup_flags_t optgroup_flags; /* State of pass-specific stream. */ int pstate; /* State of the -fopt-info stream. */ @@ -166,8 +276,8 @@ extern void dump_printf (dump_flags_t, const char *, ...) ATTRIBUTE_PRINTF_2; extern void dump_printf_loc (dump_flags_t, source_location, const char *, ...) ATTRIBUTE_PRINTF_3; extern void dump_function (int phase, tree fn); -extern void dump_basic_block (int, basic_block, int); -extern void dump_generic_expr_loc (int, source_location, int, tree); +extern void dump_basic_block (dump_flags_t, basic_block, int); +extern void dump_generic_expr_loc (dump_flags_t, source_location, dump_flags_t, tree); extern void dump_generic_expr (dump_flags_t, dump_flags_t, tree); extern void dump_gimple_stmt_loc (dump_flags_t, source_location, dump_flags_t, gimple *, int); @@ -176,7 +286,7 @@ extern void print_combine_total_stats (void); extern bool enable_rtl_dump_file (void); template -void dump_dec (int, const poly_int &); +void dump_dec (dump_flags_t, const poly_int &); /* In tree-dump.c */ extern void dump_node (const_tree, dump_flags_t, FILE *); @@ -214,7 +324,8 @@ public: SUFFIX, SWTCH, and GLOB. */ unsigned int dump_register (const char *suffix, const char *swtch, const char *glob, - dump_kind dkind, int optgroup_flags, bool take_ownership); + dump_kind dkind, optgroup_flags_t optgroup_flags, + bool take_ownership); /* Allow languages and middle-end to register their dumps before the optimization passes. */ @@ -275,7 +386,7 @@ private: dump_enable_all (dump_kind dkind, dump_flags_t flags, const char *filename); int - opt_info_enable_passes (int optgroup_flags, dump_flags_t flags, + opt_info_enable_passes (optgroup_flags_t optgroup_flags, dump_flags_t flags, const char *filename); private: diff --git a/gcc/early-remat.c b/gcc/early-remat.c index 28eb9b4b2de..776b2d03f43 100644 --- a/gcc/early-remat.c +++ b/gcc/early-remat.c @@ -657,7 +657,7 @@ early_remat::dump_edge_list (basic_block bb, bool do_succ) edge e; edge_iterator ei; FOR_EACH_EDGE (e, ei, do_succ ? bb->succs : bb->preds) - dump_edge_info (dump_file, e, 0, do_succ); + dump_edge_info (dump_file, e, TDF_NONE, do_succ); } /* Print information about basic block BB to the dump file. */ diff --git a/gcc/gimple-pretty-print.c b/gcc/gimple-pretty-print.c index c0d6e153857..405d9e3e3bc 100644 --- a/gcc/gimple-pretty-print.c +++ b/gcc/gimple-pretty-print.c @@ -153,7 +153,7 @@ print_gimple_stmt (FILE *file, gimple *g, int spc, dump_flags_t flags) DEBUG_FUNCTION void debug (gimple &ref) { - print_gimple_stmt (stderr, &ref, 0, 0); + print_gimple_stmt (stderr, &ref, 0, TDF_NONE); } DEBUG_FUNCTION void diff --git a/gcc/gimple-ssa-store-merging.c b/gcc/gimple-ssa-store-merging.c index 007419bfe61..6d7e0ebe717 100644 --- a/gcc/gimple-ssa-store-merging.c +++ b/gcc/gimple-ssa-store-merging.c @@ -1083,7 +1083,7 @@ bswap_replace (gimple_stmt_iterator gsi, gimple *ins_stmt, tree fndecl, print_gimple_stmt (dump_file, cur_stmt, 0); else { - print_generic_expr (dump_file, tgt, 0); + print_generic_expr (dump_file, tgt, TDF_NONE); fprintf (dump_file, "\n"); } } @@ -1153,7 +1153,7 @@ bswap_replace (gimple_stmt_iterator gsi, gimple *ins_stmt, tree fndecl, print_gimple_stmt (dump_file, cur_stmt, 0); else { - print_generic_expr (dump_file, tgt, 0); + print_generic_expr (dump_file, tgt, TDF_NONE); fprintf (dump_file, "\n"); } } @@ -2020,7 +2020,7 @@ merged_store_group::apply_stores () if (ret) { fputs ("After writing ", dump_file); - print_generic_expr (dump_file, cst, 0); + print_generic_expr (dump_file, cst, TDF_NONE); fprintf (dump_file, " of size " HOST_WIDE_INT_PRINT_DEC " at position %d\n", info->bitsize, pos_in_buffer); fputs (" the merged value contains ", dump_file); diff --git a/gcc/gimple-ssa-strength-reduction.c b/gcc/gimple-ssa-strength-reduction.c index b86ce858dc2..ea81adca7ea 100644 --- a/gcc/gimple-ssa-strength-reduction.c +++ b/gcc/gimple-ssa-strength-reduction.c @@ -3379,7 +3379,7 @@ insert_initializers (slsr_cand_t c) fputs ("Using existing initializer: ", dump_file); print_gimple_stmt (dump_file, SSA_NAME_DEF_STMT (incr_vec[i].initializer), - 0, 0); + 0, TDF_NONE); } continue; } diff --git a/gcc/gimple.c b/gcc/gimple.c index abd28079b2d..afdf583256c 100644 --- a/gcc/gimple.c +++ b/gcc/gimple.c @@ -3153,7 +3153,7 @@ static void verify_gimple_pp (const char *expected, gimple *stmt) { pretty_printer pp; - pp_gimple_stmt_1 (&pp, stmt, 0 /* spc */, 0 /* flags */); + pp_gimple_stmt_1 (&pp, stmt, 0 /* spc */, TDF_NONE /* flags */); ASSERT_STREQ (expected, pp_formatted_text (&pp)); } diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c index bede7ba3d34..51ca03895e4 100644 --- a/gcc/graphite-poly.c +++ b/gcc/graphite-poly.c @@ -402,7 +402,7 @@ static void print_pbb_body (FILE *file, poly_bb_p pbb) { fprintf (file, "Body (\n"); - dump_bb (file, pbb_bb (pbb), 0, 0); + dump_bb (file, pbb_bb (pbb), 0, TDF_NONE); fprintf (file, ")\n"); } diff --git a/gcc/passes.c b/gcc/passes.c index 6e614029864..01a441ab280 100644 --- a/gcc/passes.c +++ b/gcc/passes.c @@ -746,7 +746,7 @@ pass_manager::register_one_dump_file (opt_pass *pass) char num[11]; dump_kind dkind; int id; - int optgroup_flags = OPTGROUP_NONE; + optgroup_flags_t optgroup_flags = OPTGROUP_NONE; gcc::dump_manager *dumps = m_ctxt->get_dumps (); /* See below in next_pass_1. */ diff --git a/gcc/print-tree.c b/gcc/print-tree.c index caf5f260147..5c736c5b129 100644 --- a/gcc/print-tree.c +++ b/gcc/print-tree.c @@ -894,7 +894,8 @@ print_node (FILE *file, const char *prefix, tree node, int indent, { pretty_printer buffer; buffer.buffer->stream = file; - pp_gimple_stmt_1 (&buffer, SSA_NAME_DEF_STMT (node), indent + 4, 0); + pp_gimple_stmt_1 (&buffer, SSA_NAME_DEF_STMT (node), indent + 4, + TDF_NONE); pp_flush (&buffer); } @@ -1039,7 +1040,7 @@ dump_tree_via_hooks (const tree_node *ptr, dump_flags_t options) DEBUG_FUNCTION void debug (const tree_node &ref) { - dump_tree_via_hooks (&ref, 0); + dump_tree_via_hooks (&ref, TDF_NONE); } DEBUG_FUNCTION void @@ -1070,7 +1071,7 @@ DEBUG_FUNCTION void debug_body (const tree_node &ref) { if (TREE_CODE (&ref) == FUNCTION_DECL) - dump_function_to_file (const_cast (&ref), stderr, 0); + dump_function_to_file (const_cast (&ref), stderr, TDF_NONE); else debug (ref); } diff --git a/gcc/tree-pass.h b/gcc/tree-pass.h index 8ec32ccbcc1..af15adc8e0c 100644 --- a/gcc/tree-pass.h +++ b/gcc/tree-pass.h @@ -47,7 +47,7 @@ struct pass_data const char *name; /* The -fopt-info optimization group flags as defined in dumpfile.h. */ - unsigned int optinfo_flags; + optgroup_flags_t optinfo_flags; /* The timevar id associated with this pass. */ /* ??? Ideally would be dynamically assigned. */ diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c index 94410541e05..63276bce5be 100644 --- a/gcc/tree-pretty-print.c +++ b/gcc/tree-pretty-print.c @@ -3416,7 +3416,7 @@ print_struct_decl (pretty_printer *pp, const_tree node, int spc, || TREE_CODE (node) == QUAL_UNION_TYPE)) pp_string (pp, "union "); - dump_generic_node (pp, TYPE_NAME (node), spc, 0, false); + dump_generic_node (pp, TYPE_NAME (node), spc, TDF_NONE, false); } /* Print the contents of the structure. */ diff --git a/gcc/tree-ssa-math-opts.c b/gcc/tree-ssa-math-opts.c index 273396da073..187ca5a3b01 100644 --- a/gcc/tree-ssa-math-opts.c +++ b/gcc/tree-ssa-math-opts.c @@ -2711,7 +2711,7 @@ convert_mult_to_fma_1 (tree mul_result, tree op1, tree op2) if (dump_file && (dump_flags & TDF_DETAILS)) { fprintf (dump_file, "Generated FMA "); - print_gimple_stmt (dump_file, gsi_stmt (gsi), 0, 0); + print_gimple_stmt (dump_file, gsi_stmt (gsi), 0, TDF_NONE); fprintf (dump_file, "\n"); } @@ -3047,7 +3047,7 @@ convert_mult_to_fma (gimple *mul_stmt, tree op1, tree op2, if (dump_file && (dump_flags & TDF_DETAILS)) { fprintf (dump_file, "Deferred generating FMA for multiplication "); - print_gimple_stmt (dump_file, mul_stmt, 0, 0); + print_gimple_stmt (dump_file, mul_stmt, 0, TDF_NONE); fprintf (dump_file, "\n"); } diff --git a/gcc/tree-ssa-reassoc.c b/gcc/tree-ssa-reassoc.c index 48d402b99fb..97a53cd27cd 100644 --- a/gcc/tree-ssa-reassoc.c +++ b/gcc/tree-ssa-reassoc.c @@ -1606,7 +1606,7 @@ undistribute_ops_list (enum tree_code opcode, { fprintf (dump_file, "searching for un-distribute opportunities "); print_generic_expr (dump_file, - (*ops)[bitmap_first_set_bit (candidates)]->op, 0); + (*ops)[bitmap_first_set_bit (candidates)]->op, TDF_NONE); fprintf (dump_file, " %d\n", nr_candidates); } diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c index b6cc8846435..3d025c288dd 100644 --- a/gcc/tree-ssa-sccvn.c +++ b/gcc/tree-ssa-sccvn.c @@ -5992,7 +5992,7 @@ vn_eliminate (bitmap inserted_exprs) if (dump_file && (dump_flags & TDF_DETAILS)) { fprintf (dump_file, "Removing dead stmt "); - print_gimple_stmt (dump_file, stmt, 0, 0); + print_gimple_stmt (dump_file, stmt, 0, TDF_NONE); } gimple_stmt_iterator gsi = gsi_for_stmt (stmt); diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c index 0b84f23d81a..3eb67c93dff 100644 --- a/gcc/tree-vect-data-refs.c +++ b/gcc/tree-vect-data-refs.c @@ -3254,7 +3254,7 @@ dependence_distance_ge_vf (data_dependence_relation *ddr, /* Dump LOWER_BOUND using flags DUMP_KIND. Dumps are known to be enabled. */ static void -dump_lower_bound (int dump_kind, const vec_lower_bound &lower_bound) +dump_lower_bound (dump_flags_t dump_kind, const vec_lower_bound &lower_bound) { dump_printf (dump_kind, "%s (", lower_bound.unsigned_p ? "unsigned" : "abs"); dump_generic_expr (dump_kind, TDF_SLIM, lower_bound.expr); -- 2.11.4.GIT