aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog10
-rw-r--r--gcc/cgraphunit.c3
-rw-r--r--gcc/common.opt4
-rw-r--r--gcc/doc/invoke.texi9
-rw-r--r--gcc/passes.c106
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/gcc.dg/dump-pass.c14
-rw-r--r--gcc/tree-pass.h1
8 files changed, 144 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6e87f93..fd2912f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,15 @@
2011-06-09 David Li <davidxl@google.com>
+ * cgraphunit.c (cgraph_finalize_compilation_unit): Pass dump.
+ * passes.c (passr_eq): New function.
+ (create_pass_tab): New function.
+ (pass_traverse): New function.
+ (dump_one_pass): New function.
+ (dump_pass_list): New function.
+ (dump_passes): New function.
+
+2011-06-09 David Li <davidxl@google.com>
+
* tree-complex.c (tree_lower_complex): Gate cleanup.
* tree-stdarg.c (check_all_va_list_escapes): Ditto.
(execute_optimize_stdarg): Ditto.
diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 614b785..66e7117 100644
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -1117,6 +1117,9 @@ cgraph_finalize_compilation_unit (void)
fflush (stderr);
}
+ if (flag_dump_passes)
+ dump_passes ();
+
/* Gimplify and lower all functions, compute reachability and
remove unreachable nodes. */
cgraph_analyze_functions ();
diff --git a/gcc/common.opt b/gcc/common.opt
index 5a53607..53c4983 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -1012,6 +1012,10 @@ fdump-noaddr
Common Report Var(flag_dump_noaddr)
Suppress output of addresses in debugging dumps
+fdump-passes
+Common Var(flag_dump_passes) Init(0)
+Dump optimization passes
+
fdump-unnumbered
Common Report Var(flag_dump_unnumbered)
Suppress output of instruction numbers, line number notes and addresses in debugging dumps
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 0069f78..9062152 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -291,6 +291,7 @@ Objective-C and Objective-C++ Dialects}.
-fdump-translation-unit@r{[}-@var{n}@r{]} @gol
-fdump-class-hierarchy@r{[}-@var{n}@r{]} @gol
-fdump-ipa-all -fdump-ipa-cgraph -fdump-ipa-inline @gol
+-fdump-passes @gol
-fdump-statistics @gol
-fdump-tree-all @gol
-fdump-tree-original@r{[}-@var{n}@r{]} @gol
@@ -5071,7 +5072,8 @@ pair seperated by a colon. The range is inclusive in both ends. If the range
is trivial, the number pair can be simplified as a single number. If the
function's cgraph node's @var{uid} is falling within one of the specified ranges,
the @var{pass} is disabled for that function. The @var{uid} is shown in the
-function header of a dump file.
+function header of a dump file, and pass names can be dumped by using option
+@option{-fdump-passes}.
@item -fdisable-tree-@var{pass}
@item -fdisable-tree-@var{pass}=@var{range-list}
@@ -5495,6 +5497,11 @@ Dump after function inlining.
@end table
+@item -fdump-passes
+@opindex fdump-passes
+Dump the list of optimization passes that are turned on and off by
+the current command line options.
+
@item -fdump-statistics-@var{option}
@opindex fdump-statistics
Enable and control dumping of pass statistics in a separate file. The
diff --git a/gcc/passes.c b/gcc/passes.c
index f06a67c..4c31a23 100644
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -478,7 +478,7 @@ passr_eq (const void *p1, const void *p2)
return !strcmp (s1->unique_name, s2->unique_name);
}
-static htab_t pass_name_tab = NULL;
+static htab_t name_to_pass_map = NULL;
/* Register PASS with NAME. */
@@ -488,11 +488,11 @@ register_pass_name (struct opt_pass *pass, const char *name)
struct pass_registry **slot;
struct pass_registry pr;
- if (!pass_name_tab)
- pass_name_tab = htab_create (256, passr_hash, passr_eq, NULL);
+ if (!name_to_pass_map)
+ name_to_pass_map = htab_create (256, passr_hash, passr_eq, NULL);
pr.unique_name = name;
- slot = (struct pass_registry **) htab_find_slot (pass_name_tab, &pr, INSERT);
+ slot = (struct pass_registry **) htab_find_slot (name_to_pass_map, &pr, INSERT);
if (!*slot)
{
struct pass_registry *new_pr;
@@ -506,6 +506,101 @@ register_pass_name (struct opt_pass *pass, const char *name)
return; /* Ignore plugin passes. */
}
+/* Map from pass id to canonicalized pass name. */
+
+typedef const char *char_ptr;
+DEF_VEC_P(char_ptr);
+DEF_VEC_ALLOC_P(char_ptr, heap);
+static VEC(char_ptr, heap) *pass_tab = NULL;
+
+/* Callback function for traversing NAME_TO_PASS_MAP. */
+
+static int
+pass_traverse (void **slot, void *data ATTRIBUTE_UNUSED)
+{
+ struct pass_registry **p = (struct pass_registry **)slot;
+ struct opt_pass *pass = (*p)->pass;
+
+ gcc_assert (pass->static_pass_number > 0);
+ gcc_assert (pass_tab);
+
+ VEC_replace (char_ptr, pass_tab, pass->static_pass_number,
+ (*p)->unique_name);
+
+ return 1;
+}
+
+/* The function traverses NAME_TO_PASS_MAP and creates a pass info
+ table for dumping purpose. */
+
+static void
+create_pass_tab (void)
+{
+ if (!flag_dump_passes)
+ return;
+
+ VEC_safe_grow_cleared (char_ptr, heap,
+ pass_tab, passes_by_id_size + 1);
+ htab_traverse (name_to_pass_map, pass_traverse, NULL);
+}
+
+static bool override_gate_status (struct opt_pass *, tree, bool);
+
+/* Dump the instantiated name for PASS. IS_ON indicates if PASS
+ is turned on or not. */
+
+static void
+dump_one_pass (struct opt_pass *pass, int pass_indent)
+{
+ int indent = 3 * pass_indent;
+ const char *pn;
+ bool is_on, is_really_on;
+
+ is_on = (pass->gate == NULL) ? true : pass->gate();
+ is_really_on = override_gate_status (pass, NULL, is_on);
+
+ if (pass->static_pass_number <= 0)
+ pn = pass->name;
+ else
+ pn = VEC_index (char_ptr, pass_tab, pass->static_pass_number);
+
+ fprintf (stderr, "%*s%-40s%*s:%s%s\n", indent, " ", pn,
+ (15 - indent < 0 ? 0 : 15 - indent), " ",
+ is_on ? " ON" : " OFF",
+ ((!is_on) == (!is_really_on) ? ""
+ : (is_really_on ? " (FORCED_ON)" : " (FORCED_OFF)")));
+}
+
+/* Dump pass list PASS with indentation INDENT. */
+
+static void
+dump_pass_list (struct opt_pass *pass, int indent)
+{
+ do
+ {
+ dump_one_pass (pass, indent);
+ if (pass->sub)
+ dump_pass_list (pass->sub, indent + 1);
+ pass = pass->next;
+ }
+ while (pass);
+}
+
+/* Dump all optimization passes. */
+
+void
+dump_passes (void)
+{
+ create_pass_tab();
+
+ dump_pass_list (all_lowering_passes, 1);
+ dump_pass_list (all_small_ipa_passes, 1);
+ dump_pass_list (all_regular_ipa_passes, 1);
+ dump_pass_list (all_lto_gen_passes, 1);
+ dump_pass_list (all_passes, 1);
+}
+
+
/* Returns the pass with NAME. */
static struct opt_pass *
@@ -513,9 +608,8 @@ get_pass_by_name (const char *name)
{
struct pass_registry **slot, pr;
- gcc_assert (pass_name_tab);
pr.unique_name = name;
- slot = (struct pass_registry **) htab_find_slot (pass_name_tab,
+ slot = (struct pass_registry **) htab_find_slot (name_to_pass_map,
&pr, NO_INSERT);
if (!slot || !*slot)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6bece57..b63904b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-09 David Li <davidxl@google.com>
+
+ * testsuite/gcc.dg/dump-pass.c: New test.
+
2011-06-09 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/29003
diff --git a/gcc/testsuite/gcc.dg/dump-pass.c b/gcc/testsuite/gcc.dg/dump-pass.c
new file mode 100644
index 0000000..bcdf99a
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/dump-pass.c
@@ -0,0 +1,14 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-passes" } */
+
+unsigned res;
+
+void
+foo (unsigned code, int len)
+{
+ int i;
+ for (i = 0; i < len; i++)
+ res |= code & 1;
+}
+
+/* { dg-prune-output ".*" } */
diff --git a/gcc/tree-pass.h b/gcc/tree-pass.h
index daf7202..f3a03b0 100644
--- a/gcc/tree-pass.h
+++ b/gcc/tree-pass.h
@@ -639,5 +639,6 @@ extern void do_per_function_toporder (void (*) (void *), void *);
extern void disable_pass (const char *);
extern void enable_pass (const char *);
+extern void dump_passes (void);
#endif /* GCC_TREE_PASS_H */