Message ID | 20151127104048.GZ21807@redhat.com |
---|---|
State | New |
Headers | show |
On Fri, Nov 27, 2015 at 11:41 AM, Marek Polacek <polacek@redhat.com> wrote: > In the process of dealing with PR68513, it turned out this test should have > been written with GIMPLE in mind. > > Tested on x86_64-linux, ok for trunk? Maybe we'll want this even for 5, I > don't know yet. Ok. Richard. > 2015-11-27 Marek Polacek <polacek@redhat.com> > > * gcc.dg/pr63568.c: Convert to GIMPLE. > > diff --git gcc/testsuite/gcc.dg/pr63568.c gcc/testsuite/gcc.dg/pr63568.c > index c6b88e7..5c688b0 100644 > --- gcc/testsuite/gcc.dg/pr63568.c > +++ gcc/testsuite/gcc.dg/pr63568.c > @@ -1,53 +1,69 @@ > /* PR middle-end/63568 */ > /* { dg-do compile } */ > -/* { dg-options "-fdump-tree-original" } */ > +/* { dg-options "-O -fdump-tree-cddce1" } */ > > int > fn1 (int a, int b, int m) > { > - return (a & ~m) | (b & m); > + int tem1 = a & ~m; > + int tem2 = b & m; > + return tem1 | tem2; > } > > int > fn2 (int a, int b, int m) > { > - return (a & ~m) | (m & b); > + int tem1 = a & ~m; > + int tem2 = m & b; > + return tem1 | tem2; > } > > int > fn3 (int a, int b, int m) > { > - return (~m & a) | (m & b); > + int tem1 = ~m & a; > + int tem2 = m & b; > + return tem1 | tem2; > } > > int > fn4 (int a, int b, int m) > { > - return (~m & a) | (b & m); > + int tem1 = ~m & a; > + int tem2 = b & m; > + return tem1 | tem2; > } > > int > fn5 (int a, int b, int m) > { > - return (b & m) | (a & ~m); > + int tem1 = b & m; > + int tem2 = a & ~m; > + return tem1 | tem2; > } > > int > fn6 (int a, int b, int m) > { > - return (m & b) | (a & ~m); > + int tem1 = m & b; > + int tem2 = a & ~m; > + return tem1 | tem2; > } > > int > fn7 (int a, int b, int m) > { > - return (m & b) | (~m & a); > + int tem1 = m & b; > + int tem2 = ~m & a; > + return tem1 | tem2; > } > > int > fn8 (int a, int b, int m) > { > - return (b & m) | (~m & a); > + int tem1 = b & m; > + int tem2 = ~m & a; > + return tem1 | tem2; > } > > -/* { dg-final { scan-tree-dump-not " \\| " "original" } } */ > +/* { dg-final { scan-tree-dump-not " \\| " "cddce1" } } */ > > Marek
On Fri, Nov 27, 2015 at 12:30:24PM +0100, Richard Biener wrote: > On Fri, Nov 27, 2015 at 11:41 AM, Marek Polacek <polacek@redhat.com> wrote: > > In the process of dealing with PR68513, it turned out this test should have > > been written with GIMPLE in mind. > > > > Tested on x86_64-linux, ok for trunk? Maybe we'll want this even for 5, I > > don't know yet. > > Ok. I think it is just fine for 5 branch too. You could even use int tem3 = ~m; and use tem3 instead of ~m if you really wanted to test whether GIMPLE folding works. > > > 2015-11-27 Marek Polacek <polacek@redhat.com> > > > > * gcc.dg/pr63568.c: Convert to GIMPLE. > > > > diff --git gcc/testsuite/gcc.dg/pr63568.c gcc/testsuite/gcc.dg/pr63568.c > > index c6b88e7..5c688b0 100644 > > --- gcc/testsuite/gcc.dg/pr63568.c > > +++ gcc/testsuite/gcc.dg/pr63568.c > > @@ -1,53 +1,69 @@ > > /* PR middle-end/63568 */ > > /* { dg-do compile } */ > > -/* { dg-options "-fdump-tree-original" } */ > > +/* { dg-options "-O -fdump-tree-cddce1" } */ > > > > int > > fn1 (int a, int b, int m) > > { > > - return (a & ~m) | (b & m); > > + int tem1 = a & ~m; > > + int tem2 = b & m; > > + return tem1 | tem2; > > } > > > > int > > fn2 (int a, int b, int m) > > { > > - return (a & ~m) | (m & b); > > + int tem1 = a & ~m; > > + int tem2 = m & b; > > + return tem1 | tem2; > > } > > > > int > > fn3 (int a, int b, int m) > > { > > - return (~m & a) | (m & b); > > + int tem1 = ~m & a; > > + int tem2 = m & b; > > + return tem1 | tem2; > > } > > > > int > > fn4 (int a, int b, int m) > > { > > - return (~m & a) | (b & m); > > + int tem1 = ~m & a; > > + int tem2 = b & m; > > + return tem1 | tem2; > > } > > > > int > > fn5 (int a, int b, int m) > > { > > - return (b & m) | (a & ~m); > > + int tem1 = b & m; > > + int tem2 = a & ~m; > > + return tem1 | tem2; > > } > > > > int > > fn6 (int a, int b, int m) > > { > > - return (m & b) | (a & ~m); > > + int tem1 = m & b; > > + int tem2 = a & ~m; > > + return tem1 | tem2; > > } > > > > int > > fn7 (int a, int b, int m) > > { > > - return (m & b) | (~m & a); > > + int tem1 = m & b; > > + int tem2 = ~m & a; > > + return tem1 | tem2; > > } > > > > int > > fn8 (int a, int b, int m) > > { > > - return (b & m) | (~m & a); > > + int tem1 = b & m; > > + int tem2 = ~m & a; > > + return tem1 | tem2; > > } > > > > -/* { dg-final { scan-tree-dump-not " \\| " "original" } } */ > > +/* { dg-final { scan-tree-dump-not " \\| " "cddce1" } } */ > > > > Marek Jakub
On Fri, Nov 27, 2015 at 12:37:32PM +0100, Jakub Jelinek wrote: > I think it is just fine for 5 branch too. Ok, committed there as well. > You could even use int tem3 = ~m; and use tem3 instead of ~m if you really > wanted to test whether GIMPLE folding works. Sure. Marek
diff --git gcc/testsuite/gcc.dg/pr63568.c gcc/testsuite/gcc.dg/pr63568.c index c6b88e7..5c688b0 100644 --- gcc/testsuite/gcc.dg/pr63568.c +++ gcc/testsuite/gcc.dg/pr63568.c @@ -1,53 +1,69 @@ /* PR middle-end/63568 */ /* { dg-do compile } */ -/* { dg-options "-fdump-tree-original" } */ +/* { dg-options "-O -fdump-tree-cddce1" } */ int fn1 (int a, int b, int m) { - return (a & ~m) | (b & m); + int tem1 = a & ~m; + int tem2 = b & m; + return tem1 | tem2; } int fn2 (int a, int b, int m) { - return (a & ~m) | (m & b); + int tem1 = a & ~m; + int tem2 = m & b; + return tem1 | tem2; } int fn3 (int a, int b, int m) { - return (~m & a) | (m & b); + int tem1 = ~m & a; + int tem2 = m & b; + return tem1 | tem2; } int fn4 (int a, int b, int m) { - return (~m & a) | (b & m); + int tem1 = ~m & a; + int tem2 = b & m; + return tem1 | tem2; } int fn5 (int a, int b, int m) { - return (b & m) | (a & ~m); + int tem1 = b & m; + int tem2 = a & ~m; + return tem1 | tem2; } int fn6 (int a, int b, int m) { - return (m & b) | (a & ~m); + int tem1 = m & b; + int tem2 = a & ~m; + return tem1 | tem2; } int fn7 (int a, int b, int m) { - return (m & b) | (~m & a); + int tem1 = m & b; + int tem2 = ~m & a; + return tem1 | tem2; } int fn8 (int a, int b, int m) { - return (b & m) | (~m & a); + int tem1 = b & m; + int tem2 = ~m & a; + return tem1 | tem2; } -/* { dg-final { scan-tree-dump-not " \\| " "original" } } */ +/* { dg-final { scan-tree-dump-not " \\| " "cddce1" } } */