Message ID | 20211023091428.99315-1-aldyh@redhat.com |
---|---|
State | New |
Headers | show |
Series | [PR,testsuite/102857] Tweak ssa-dom-thread-7.c for aarch64. | expand |
On Sat, Oct 23, 2021 at 2:15 AM Aldy Hernandez via Gcc-patches <gcc-patches@gcc.gnu.org> wrote: > > First, ssa-dom-thread-7 was looking at a dump file that was not > being generated. This probably happened in the detangling of the VRP > threader from VRP, and I didn't notice because the test came back as > with UNRESOLVED instead of FAIL. > > Second, aarch64 gets far more threads than other architectures (20 > versus 12). The difference is sufficiently different to make the > regex awkward. > > We already have special casing for aarch64 in other parts of this > test, so perhaps it's simplest to have an arch specific test > for the thread3 count. > > I don't know perhaps there's a better way. I wake up with chills in > the middle of the night thinking about this test ;-). I guess you have never had a customer ask for coremark benchmark numbers before :). https://www.eembc.org/coremark/ (for reference). Thanks, Andrew Pinski > > Tested on x86-64 Linux and aarch64 Linux. > > OK? > > gcc/testsuite/ChangeLog: > > PR testsuite/102857 > * gcc.dg/tree-ssa/ssa-dom-thread-7.c: Add -fdump-tree-vrp2-stats. > Tweak for aarch64. > --- > gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-7.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-7.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-7.c > index 1da00a691c8..001319ab9e9 100644 > --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-7.c > +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-7.c > @@ -1,7 +1,6 @@ > /* { dg-do compile } */ > -/* { dg-options "-O2 -fdump-tree-thread1-stats -fdump-tree-thread2-stats -fdump-tree-dom2-stats -fdump-tree-thread3-stats -fdump-tree-dom3-stats -fdump-tree-vrp2-stats -fno-guess-branch-probability" } */ > +/* { dg-options "-O2 -fdump-tree-dom2-stats -fdump-tree-thread3-stats -fdump-tree-dom3-stats -fdump-tree-vrp-thread2-stats -fno-guess-branch-probability" } */ > > -/* { dg-final { scan-tree-dump "Jumps threaded: 12" "thread3" } } */ > /* { dg-final { scan-tree-dump-not "Jumps threaded" "dom2" } } */ > > /* aarch64 has the highest CASE_VALUES_THRESHOLD in GCC. It's high enough > @@ -9,6 +8,8 @@ > jump threading opportunities. Skip the later tests on aarch64. */ > /* { dg-final { scan-tree-dump-not "Jumps threaded" "dom3" { target { ! aarch64*-*-* } } } } */ > /* { dg-final { scan-tree-dump-not "Jumps threaded" "vrp-thread2" { target { ! aarch64*-*-* } } } } */ > +/* { dg-final { scan-tree-dump "Jumps threaded: 12" "thread3" { target { ! aarch64*-*-* } } } } */ > +/* { dg-final { scan-tree-dump "Jumps threaded: 20" "thread3" { target { aarch64*-*-* } } } } */ > > enum STATE { > S0=0, > -- > 2.31.1 >
On 10/23/2021 3:14 AM, Aldy Hernandez wrote: > First, ssa-dom-thread-7 was looking at a dump file that was not > being generated. This probably happened in the detangling of the VRP > threader from VRP, and I didn't notice because the test came back as > with UNRESOLVED instead of FAIL. > > Second, aarch64 gets far more threads than other architectures (20 > versus 12). The difference is sufficiently different to make the > regex awkward. > > We already have special casing for aarch64 in other parts of this > test, so perhaps it's simplest to have an arch specific test > for the thread3 count. > > I don't know perhaps there's a better way. I wake up with chills in > the middle of the night thinking about this test ;-). > > Tested on x86-64 Linux and aarch64 Linux. > > OK? > > gcc/testsuite/ChangeLog: > > PR testsuite/102857 > * gcc.dg/tree-ssa/ssa-dom-thread-7.c: Add -fdump-tree-vrp2-stats. > Tweak for aarch64. OK jeff
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-7.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-7.c index 1da00a691c8..001319ab9e9 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-7.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-7.c @@ -1,7 +1,6 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-thread1-stats -fdump-tree-thread2-stats -fdump-tree-dom2-stats -fdump-tree-thread3-stats -fdump-tree-dom3-stats -fdump-tree-vrp2-stats -fno-guess-branch-probability" } */ +/* { dg-options "-O2 -fdump-tree-dom2-stats -fdump-tree-thread3-stats -fdump-tree-dom3-stats -fdump-tree-vrp-thread2-stats -fno-guess-branch-probability" } */ -/* { dg-final { scan-tree-dump "Jumps threaded: 12" "thread3" } } */ /* { dg-final { scan-tree-dump-not "Jumps threaded" "dom2" } } */ /* aarch64 has the highest CASE_VALUES_THRESHOLD in GCC. It's high enough @@ -9,6 +8,8 @@ jump threading opportunities. Skip the later tests on aarch64. */ /* { dg-final { scan-tree-dump-not "Jumps threaded" "dom3" { target { ! aarch64*-*-* } } } } */ /* { dg-final { scan-tree-dump-not "Jumps threaded" "vrp-thread2" { target { ! aarch64*-*-* } } } } */ +/* { dg-final { scan-tree-dump "Jumps threaded: 12" "thread3" { target { ! aarch64*-*-* } } } } */ +/* { dg-final { scan-tree-dump "Jumps threaded: 20" "thread3" { target { aarch64*-*-* } } } } */ enum STATE { S0=0,