From c22898f1ed3bd239412f80369a36e9794fbf2933 Mon Sep 17 00:00:00 2001 From: Martin Sebor Date: Wed, 12 Jun 2019 20:43:27 +0000 Subject: [PATCH] Tweak tests to avoid fallout from MEM_REF changes on targets that don't enable... Tweak tests to avoid fallout from MEM_REF changes on targets that don't enable store merging but achieve the same effect by other means (DSE). gcc/testsuite?ChangeLog: PR middle-end/90676 * gcc.dg/tree-ssa/pr30375.c: Adjust and simplify expected test output some more. * gcc.dg/tree-ssa/slsr-27.c: Ditto. * gcc.dg/tree-ssa/slsr-28.c: Ditto. * gcc.dg/tree-ssa/slsr-29.c: Ditto. * gcc.dg/tree-ssa/ssa-dse-24.c: Ditto. From-SVN: r272218 --- gcc/testsuite/ChangeLog | 10 ++++++++++ gcc/testsuite/gcc.dg/tree-ssa/pr30375.c | 4 +--- gcc/testsuite/gcc.dg/tree-ssa/slsr-27.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/slsr-28.c | 3 +-- gcc/testsuite/gcc.dg/tree-ssa/slsr-29.c | 3 +-- gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-24.c | 3 +-- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ebc738bfc05..9dc9ee8bd6a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2019-06-12 Martin Sebor + + PR middle-end/90676 + * gcc.dg/tree-ssa/pr30375.c: Adjust and simplify expected test + output some more. + * gcc.dg/tree-ssa/slsr-27.c: Ditto. + * gcc.dg/tree-ssa/slsr-28.c: Ditto. + * gcc.dg/tree-ssa/slsr-29.c: Ditto. + * gcc.dg/tree-ssa/ssa-dse-24.c: Ditto. + 2019-06-12 Marek Polacek PR c++/90736 - bogus error with alignof. diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr30375.c b/gcc/testsuite/gcc.dg/tree-ssa/pr30375.c index 5c068a3ddc0..b3ac2c397e3 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/pr30375.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr30375.c @@ -22,6 +22,4 @@ void test_signed_msg_encoding(void) f(); } -/* { dg-final { scan-tree-dump-times "MEM\\\[\\(struct _s \\*\\)&signInfo \\+ \[0-9\]+B\\\] = {}" 1 "dse1" { target { ! store_merge } } } } - { dg-final { scan-tree-dump-times "MEM \\\[\\(struct _s \\*\\)&signInfo \\+ \[0-9\]+B\\\] = {}" 1 "dse1" { target { store_merge } } } } */ - +/* { dg-final { scan-tree-dump-times "MEM \\\[\\(struct _s \\*\\)&signInfo \\+ \[0-9\]+B\\\] = {}" 1 "dse1" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-27.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-27.c index e3560ee5d9a..c8f8e612da2 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-27.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-27.c @@ -19,5 +19,5 @@ f (struct x *p, unsigned int n) /* { dg-final { scan-tree-dump-times "\\* 4;" 1 "dom3" { target { int32 } } } } */ /* { dg-final { scan-tree-dump-times "\\* 2;" 1 "dom3" { target { int16 } } } } */ /* { dg-final { scan-tree-dump-times "p_\\d\+\\(D\\) \\+ \[^\r\n\]*_\\d\+;" 1 "dom3" } } */ -/* { dg-final { scan-tree-dump-times "MEM\\\[\\(struct x \\*\\)\[^\r\n\]*_\\d\+" 3 "dom3" { target { ! store_merge } } } } */ -/* { dg-final { scan-tree-dump-times "MEM \\\[\\(struct x \\*\\)\[^\r\n\]*_\\d\+" 3 "dom3" { target { store_merge } } } } */ +/* + { dg-final { scan-tree-dump-times "MEM *? *\\\[\\(struct x \\*\\)\[^\r\n\]*_\\d\+" 3 "dom3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-28.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-28.c index 0db27af76ce..b18e9c1fe21 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-28.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-28.c @@ -23,5 +23,4 @@ f (struct x *p, unsigned int n) /* { dg-final { scan-tree-dump-times "\\* 4;" 1 "dom3" { target { int32 } } } } */ /* { dg-final { scan-tree-dump-times "\\* 2;" 1 "dom3" { target { int16 } } } } */ /* { dg-final { scan-tree-dump-times "p_\\d\+\\(D\\) \\+ \[^\r\n\]*_\\d\+" 1 "dom3" } } */ -/* { dg-final { scan-tree-dump-times "MEM\\\[\\(struct x \\*\\)\[^\r\n\]*_\\d\+" 9 "dom3" { target { ! store_merge } } } } */ -/* { dg-final { scan-tree-dump-times "MEM \\\[\\(struct x \\*\\)\[^\r\n\]*_\\d\+" 9 "dom3" { target { store_merge } } } } */ +/* { dg-final { scan-tree-dump-times "MEM *? *\\\[\\(struct x \\*\\)\[^\r\n\]*_\\d\+" 9 "dom3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-29.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-29.c index 0f6169df312..00e8d2b52b3 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-29.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-29.c @@ -25,5 +25,4 @@ f (struct x *p, unsigned int n) /* { dg-final { scan-tree-dump-times "\\* 4;" 1 "dom3" { target { int32 } } } } */ /* { dg-final { scan-tree-dump-times "\\* 2;" 1 "dom3" { target { int16 } } } } */ /* { dg-final { scan-tree-dump-times "p_\\d\+\\(D\\) \\+ \[^\r\n\]*_\\d\+" 1 "dom3" } } */ -/* { dg-final { scan-tree-dump-times "MEM\\\[\\(struct x \\*\\)\[^\r\n\]*_\\d\+" 9 "dom3" { target { ! store_merge } } } } */ -/* { dg-final { scan-tree-dump-times "MEM \\\[\\(struct x \\*\\)\[^\r\n\]*_\\d\+" 9 "dom3" { target { store_merge } } } } */ +/* { dg-final { scan-tree-dump-times "MEM *? *\\\[\\(struct x \\*\\)\[^\r\n\]*_\\d\+" 9 "dom3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-24.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-24.c index 240c9063717..bc4b071b616 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-24.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-24.c @@ -59,5 +59,4 @@ void foo(int prec, bar (&info); } -/* { dg-final { scan-tree-dump-times "MEM\\\[\\(struct printf_info \\*\\)&info \\+ \[0-9\]+B\\\] = {}" 1 "dse1" { target { ! store_merge } } } } - { dg-final { scan-tree-dump-times "MEM \\\[\\(struct printf_info \\*\\)&info \\+ \[0-9\]+B\\\] = {}" 1 "dse1" { target { store_merge } } } } */ +/* { dg-final { scan-tree-dump-times "MEM \\\[\\(struct printf_info \\*\\)&info \\+ \[0-9\]+B\\\] = {}" 1 "dse1" } } */ -- 2.30.2