From 901a9d428e1f22c1e70415ae2d992a2247a7a714 Mon Sep 17 00:00:00 2001 From: davidxl Date: Tue, 7 Jun 2011 19:13:09 +0000 Subject: [PATCH] Handle assembler name in -fdisable/enable options git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@174762 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 4 +++ gcc/doc/invoke.texi | 14 +++++---- gcc/passes.c | 64 ++++++++++++++++++++++++++++++++--------- gcc/testsuite/ChangeLog | 11 +++++++ gcc/testsuite/gcc.dg/inline_1.c | 23 +++++++++++++++ gcc/testsuite/gcc.dg/inline_2.c | 23 +++++++++++++++ gcc/testsuite/gcc.dg/inline_3.c | 23 +++++++++++++++ gcc/testsuite/gcc.dg/inline_4.c | 23 +++++++++++++++ gcc/testsuite/gcc.dg/unroll_1.c | 33 +++++++++++++++++++++ gcc/testsuite/gcc.dg/unroll_2.c | 33 +++++++++++++++++++++ gcc/testsuite/gcc.dg/unroll_3.c | 33 +++++++++++++++++++++ gcc/testsuite/gcc.dg/unroll_4.c | 33 +++++++++++++++++++++ 12 files changed, 297 insertions(+), 20 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/inline_1.c create mode 100644 gcc/testsuite/gcc.dg/inline_2.c create mode 100644 gcc/testsuite/gcc.dg/inline_3.c create mode 100644 gcc/testsuite/gcc.dg/inline_4.c create mode 100644 gcc/testsuite/gcc.dg/unroll_1.c create mode 100644 gcc/testsuite/gcc.dg/unroll_2.c create mode 100644 gcc/testsuite/gcc.dg/unroll_3.c create mode 100644 gcc/testsuite/gcc.dg/unroll_4.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1986a889263..98bda5ce873 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2011-06-07 Xinliang David Li + * passes.c (enable_disable_pass): Handle assembler name. + (is_pass_explicitly_enabled_or_disabled): Ditto. + 2011-06-07 Rainer Orth PR tree-optimization/48497 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index a0690426fd1..5f4c66a1dc1 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -5065,11 +5065,12 @@ appended with a sequential number starting from 1. Disable rtl pass @var{pass}. @var{pass} is the pass name. If the same pass is statically invoked in the compiler multiple times, the pass name should be appended with a sequential number starting from 1. @var{range-list} is a comma -seperated list of function ranges. Each range is a number pair seperated by a colon. -The range is inclusive in both ends. If the range is trivial, the number pair can be -simplified a 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. +seperated list of function ranges or assembler names. Each range is a number +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. @item -fdisable-tree-@var{pass} @item -fdisable-tree-@var{pass}=@var{range-list} @@ -5099,7 +5100,8 @@ of option arguments. -fenable-tree-cunroll=1 # disable gcse2 for functions at the following ranges [1,1], # [300,400], and [400,1000] - -fdisable-rtl-gcse2=1:100,300,400:1000 +# disable gcse2 for functions foo and foo2 + -fdisable-rtl-gcse2=foo,foo2 # disable early inlining -fdisable-tree-einline # disable ipa inlining diff --git a/gcc/passes.c b/gcc/passes.c index 9f328cd2fc5..f06a67c4d90 100644 --- a/gcc/passes.c +++ b/gcc/passes.c @@ -531,6 +531,7 @@ struct uid_range { unsigned int start; unsigned int last; + const char *assem_name; struct uid_range *next; }; @@ -542,6 +543,7 @@ DEF_VEC_ALLOC_P(uid_range_p, heap); static VEC(uid_range_p, heap) *enabled_pass_uid_range_tab = NULL; static VEC(uid_range_p, heap) *disabled_pass_uid_range_tab = NULL; + /* Parse option string for -fdisable- and -fenable- The syntax of the options: @@ -628,6 +630,7 @@ enable_disable_pass (const char *arg, bool is_enable) uid_range_p new_range; char *invalid = NULL; long start; + char *func_name = NULL; next_range = strchr (one_range, ','); if (next_range) @@ -645,17 +648,31 @@ enable_disable_pass (const char *arg, bool is_enable) start = strtol (one_range, &invalid, 10); if (*invalid || start < 0) { - error ("Invalid range %s in option %s", - one_range, - is_enable ? "-fenable" : "-fdisable"); - free (argstr); - return; + if (end_val || (one_range[0] >= '0' + && one_range[0] <= '9')) + { + error ("Invalid range %s in option %s", + one_range, + is_enable ? "-fenable" : "-fdisable"); + free (argstr); + return; + } + func_name = one_range; } if (!end_val) { new_range = XCNEW (struct uid_range); - new_range->start = (unsigned) start; - new_range->last = (unsigned) start; + if (!func_name) + { + new_range->start = (unsigned) start; + new_range->last = (unsigned) start; + } + else + { + new_range->start = (unsigned) -1; + new_range->last = (unsigned) -1; + new_range->assem_name = xstrdup (func_name); + } } else { @@ -677,15 +694,28 @@ enable_disable_pass (const char *arg, bool is_enable) new_range->next = slot; VEC_replace (uid_range_p, *tab, pass->static_pass_number, new_range); - if (is_enable) - inform (UNKNOWN_LOCATION, - "enable pass %s for functions in the range of [%u, %u]", - phase_name, new_range->start, new_range->last); + { + if (new_range->assem_name) + inform (UNKNOWN_LOCATION, + "enable pass %s for function %s", + phase_name, new_range->assem_name); + else + inform (UNKNOWN_LOCATION, + "enable pass %s for functions in the range of [%u, %u]", + phase_name, new_range->start, new_range->last); + } else - inform (UNKNOWN_LOCATION, - "disable pass %s for functions in the range of [%u, %u]", - phase_name, new_range->start, new_range->last); + { + if (new_range->assem_name) + inform (UNKNOWN_LOCATION, + "disable pass %s for function %s", + phase_name, new_range->assem_name); + else + inform (UNKNOWN_LOCATION, + "disable pass %s for functions in the range of [%u, %u]", + phase_name, new_range->start, new_range->last); + } one_range = next_range; } while (next_range); @@ -719,6 +749,7 @@ is_pass_explicitly_enabled_or_disabled (struct opt_pass *pass, { uid_range_p slot, range; int cgraph_uid; + const char *aname = NULL; if (!tab || (unsigned) pass->static_pass_number >= VEC_length (uid_range_p, tab) @@ -730,6 +761,8 @@ is_pass_explicitly_enabled_or_disabled (struct opt_pass *pass, return false; cgraph_uid = func ? cgraph_get_node (func)->uid : 0; + if (func && DECL_ASSEMBLER_NAME_SET_P (func)) + aname = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (func)); range = slot; while (range) @@ -737,6 +770,9 @@ is_pass_explicitly_enabled_or_disabled (struct opt_pass *pass, if ((unsigned) cgraph_uid >= range->start && (unsigned) cgraph_uid <= range->last) return true; + if (range->assem_name && aname + && !strcmp (range->assem_name, aname)) + return true; range = range->next; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1372638aef8..ba89a31f9a8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,14 @@ +2011-06-07 Xinliang David Li + + * testsuite/gcc.dg/inline_2.c: New test. + * testsuite/gcc.dg/unroll_2.c: New test. + * testsuite/gcc.dg/inline_3.c: New test. + * testsuite/gcc.dg/unroll_3.c: New test. + * testsuite/gcc.dg/inline_4.c: New test. + * testsuite/gcc.dg/unroll_4.c: New test. + * testsuite/gcc.dg/inline_1.c: New test. + * testsuite/gcc.dg/unroll_1.c: New test. + 2011-06-07 Rainer Orth gcc/testsuite: diff --git a/gcc/testsuite/gcc.dg/inline_1.c b/gcc/testsuite/gcc.dg/inline_1.c new file mode 100644 index 00000000000..08ccb86f612 --- /dev/null +++ b/gcc/testsuite/gcc.dg/inline_1.c @@ -0,0 +1,23 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized -fdisable-tree-einline -fdisable-ipa-inline" } */ +int g; +__attribute__((always_inline)) void bar (void) +{ + g++; +} + +int foo (void) +{ + bar (); + return g; +} + +int foo2 (void) +{ + bar(); + return g + 1; +} + +/* { dg-final { scan-tree-dump-times "bar" 5 "optimized" } } */ +/* { dg-final { cleanup-tree-dump "optimized" } } */ +/* { dg-excess-errors "extra notes" } */ diff --git a/gcc/testsuite/gcc.dg/inline_2.c b/gcc/testsuite/gcc.dg/inline_2.c new file mode 100644 index 00000000000..efdc76a988d --- /dev/null +++ b/gcc/testsuite/gcc.dg/inline_2.c @@ -0,0 +1,23 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized -fdisable-tree-einline=0:100 -fdisable-ipa-inline" } */ +int g; +__attribute__((always_inline)) void bar (void) +{ + g++; +} + +int foo (void) +{ + bar (); + return g; +} + +int foo2 (void) +{ + bar(); + return g + 1; +} + +/* { dg-final { scan-tree-dump-times "bar" 5 "optimized" } } */ +/* { dg-final { cleanup-tree-dump "optimized" } } */ +/* { dg-excess-errors "extra notes" } */ diff --git a/gcc/testsuite/gcc.dg/inline_3.c b/gcc/testsuite/gcc.dg/inline_3.c new file mode 100644 index 00000000000..70a23665de2 --- /dev/null +++ b/gcc/testsuite/gcc.dg/inline_3.c @@ -0,0 +1,23 @@ +/* { dg-do compile { target i?86-*-linux* x86_64-*-linux* } } */ +/* { dg-options "-O2 -fdump-tree-optimized -fdisable-tree-einline=foo,foo2 -fdisable-ipa-inline" } */ +int g; +__attribute__((always_inline)) void bar (void) +{ + g++; +} + +int foo (void) +{ + bar (); + return g; +} + +int foo2 (void) +{ + bar(); + return g + 1; +} + +/* { dg-final { scan-tree-dump-times "bar" 5 "optimized" } } */ +/* { dg-final { cleanup-tree-dump "optimized" } } */ +/* { dg-excess-errors "extra notes" } */ diff --git a/gcc/testsuite/gcc.dg/inline_4.c b/gcc/testsuite/gcc.dg/inline_4.c new file mode 100644 index 00000000000..9a85242a4b1 --- /dev/null +++ b/gcc/testsuite/gcc.dg/inline_4.c @@ -0,0 +1,23 @@ +/* { dg-do compile { target i?86-*-linux* x86_64-*-linux* } } */ +/* { dg-options "-O2 -fdump-tree-optimized -fdisable-tree-einline=foo2 -fdisable-ipa-inline" } */ +int g; +__attribute__((always_inline)) void bar (void) +{ + g++; +} + +int foo (void) +{ + bar (); + return g; +} + +int foo2 (void) +{ + bar(); + return g + 1; +} + +/* { dg-final { scan-tree-dump-times "bar" 4 "optimized" } } */ +/* { dg-final { cleanup-tree-dump "optimized" } } */ +/* { dg-excess-errors "extra notes" } */ diff --git a/gcc/testsuite/gcc.dg/unroll_1.c b/gcc/testsuite/gcc.dg/unroll_1.c new file mode 100644 index 00000000000..3e8e7a55fdb --- /dev/null +++ b/gcc/testsuite/gcc.dg/unroll_1.c @@ -0,0 +1,33 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-rtl-loop2_unroll -fno-peel-loops -fdisable-tree-cunroll -fdisable-tree-cunrolli -fenable-rtl-loop2_unroll" } */ + +unsigned a[100], b[100]; +inline void bar() +{ + a[10] = b[10]; +} + +int foo(void) +{ + int i; + bar(); + for (i = 0; i < 2; i++) + { + a[i]= b[i] + 1; + } + return 1; +} + +int foo2(void) +{ + int i; + for (i = 0; i < 2; i++) + { + a[i]= b[i] + 1; + } + return 1; +} + +/* { dg-final { scan-rtl-dump-times "Decided to peel loop completely" 2 "loop2_unroll" } } */ +/* { dg-final { cleanup-rtl-dump "loop2_unroll" } } */ +/* { dg-excess-errors "extra notes" } */ diff --git a/gcc/testsuite/gcc.dg/unroll_2.c b/gcc/testsuite/gcc.dg/unroll_2.c new file mode 100644 index 00000000000..12912cf77db --- /dev/null +++ b/gcc/testsuite/gcc.dg/unroll_2.c @@ -0,0 +1,33 @@ +/* { dg-do compile { target i?86-*-linux* x86_64-*-linux* } } */ +/* { dg-options "-O2 -fdump-rtl-loop2_unroll -fno-peel-loops -fdisable-tree-cunroll=foo -fdisable-tree-cunrolli=foo -fenable-rtl-loop2_unroll" } */ + +unsigned a[100], b[100]; +inline void bar() +{ + a[10] = b[10]; +} + +int foo(void) +{ + int i; + bar(); + for (i = 0; i < 2; i++) + { + a[i]= b[i] + 1; + } + return 1; +} + +int foo2(void) +{ + int i; + for (i = 0; i < 2; i++) + { + a[i]= b[i] + 1; + } + return 1; +} + +/* { dg-final { scan-rtl-dump-times "Decided to peel loop completely" 1 "loop2_unroll" } } */ +/* { dg-final { cleanup-rtl-dump "loop2_unroll" } } */ +/* { dg-excess-errors "extra notes" } */ diff --git a/gcc/testsuite/gcc.dg/unroll_3.c b/gcc/testsuite/gcc.dg/unroll_3.c new file mode 100644 index 00000000000..d86ed552aec --- /dev/null +++ b/gcc/testsuite/gcc.dg/unroll_3.c @@ -0,0 +1,33 @@ +/* { dg-do compile { target i?86-*-linux* x86_64-*-linux* } } */ +/* { dg-options "-O2 -fdump-rtl-loop2_unroll -fno-peel-loops -fdisable-tree-cunroll -fdisable-tree-cunrolli -fenable-rtl-loop2_unroll=foo" } */ + +unsigned a[100], b[100]; +inline void bar() +{ + a[10] = b[10]; +} + +int foo(void) +{ + int i; + bar(); + for (i = 0; i < 2; i++) + { + a[i]= b[i] + 1; + } + return 1; +} + +int foo2(void) +{ + int i; + for (i = 0; i < 2; i++) + { + a[i]= b[i] + 1; + } + return 1; +} + +/* { dg-final { scan-rtl-dump-times "Decided to peel loop completely" 1 "loop2_unroll" } } */ +/* { dg-final { cleanup-rtl-dump "loop2_unroll" } } */ +/* { dg-excess-errors "extra notes" } */ diff --git a/gcc/testsuite/gcc.dg/unroll_4.c b/gcc/testsuite/gcc.dg/unroll_4.c new file mode 100644 index 00000000000..7c70157f583 --- /dev/null +++ b/gcc/testsuite/gcc.dg/unroll_4.c @@ -0,0 +1,33 @@ +/* { dg-do compile { target i?86-*-linux* x86_64-*-linux* } } */ +/* { dg-options "-O2 -fdump-rtl-loop2_unroll -fno-peel-loops -fdisable-tree-cunroll -fdisable-tree-cunrolli -fenable-rtl-loop2_unroll=foo2" } */ + +unsigned a[100], b[100]; +inline void bar() +{ + a[10] = b[10]; +} + +int foo(void) +{ + int i; + bar(); + for (i = 0; i < 2; i++) + { + a[i]= b[i] + 1; + } + return 1; +} + +int foo2(void) +{ + int i; + for (i = 0; i < 2; i++) + { + a[i]= b[i] + 1; + } + return 1; +} + +/* { dg-final { scan-rtl-dump-times "Decided to peel loop completely" 1 "loop2_unroll" } } */ +/* { dg-final { cleanup-rtl-dump "loop2_unroll" } } */ +/* { dg-excess-errors "extra notes" } */ -- 2.11.4.GIT