From a0e6ac44380249e8dfa4e6e4c533edfc6ad46d5b Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Fri, 10 Nov 2017 20:01:50 +0100 Subject: [PATCH] force-indirect-call-1.c: Merge scan strings. * gcc.target/i386/force-indirect-call-1.c: Merge scan strings. * gcc.target/i386/force-indirect-call-2.c: Ditto. Require fpic effective target. * gcc.target/i386/force-indirect-call-3.c: Ditto. Require lp64 effective target. From-SVN: r254635 --- gcc/testsuite/ChangeLog | 28 ++++++++++++++-------- .../gcc.target/i386/force-indirect-call-1.c | 4 ++-- .../gcc.target/i386/force-indirect-call-2.c | 5 ++-- .../gcc.target/i386/force-indirect-call-3.c | 5 ++-- 4 files changed, 26 insertions(+), 16 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index bc9c8ad..92379eb 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,15 +1,23 @@ +2017-11-10 Uros Bizjak + + * gcc.target/i386/force-indirect-call-1.c: Merge scan strings. + * gcc.target/i386/force-indirect-call-2.c: Ditto. + Require fpic effective target. + * gcc.target/i386/force-indirect-call-3.c: Ditto. + Require lp64 effective target. + 2017-11-10 Julia Koval - * gcc.target/i386/avx-1.c: Handle new intrinsics. - * gcc.target/i386/avx512f-gf2p8affineqb-2.c: New runtime tests. - * gcc.target/i386/avx512vl-gf2p8affineqb-2.c: Ditto. - * gcc.target/i386/gfni-1.c: Add tests for GF2P8AFFINE. - * gcc.target/i386/gfni-2.c: Ditto. - * gcc.target/i386/gfni-3.c: Ditto. - * gcc.target/i386/gfni-4.c: Ditto. - * gcc.target/i386/sse-13.c: Handle new tests. - * gcc.target/i386/sse-14.c: Handle new tests. - * gcc.target/i386/sse-23.c: Handle new tests. + * gcc.target/i386/avx-1.c: Handle new intrinsics. + * gcc.target/i386/avx512f-gf2p8affineqb-2.c: New runtime tests. + * gcc.target/i386/avx512vl-gf2p8affineqb-2.c: Ditto. + * gcc.target/i386/gfni-1.c: Add tests for GF2P8AFFINE. + * gcc.target/i386/gfni-2.c: Ditto. + * gcc.target/i386/gfni-3.c: Ditto. + * gcc.target/i386/gfni-4.c: Ditto. + * gcc.target/i386/sse-13.c: Handle new tests. + * gcc.target/i386/sse-14.c: Handle new tests. + * gcc.target/i386/sse-23.c: Handle new tests. 2017-11-10 Thomas Preud'homme diff --git a/gcc/testsuite/gcc.target/i386/force-indirect-call-1.c b/gcc/testsuite/gcc.target/i386/force-indirect-call-1.c index be1be2c..6ecf598 100644 --- a/gcc/testsuite/gcc.target/i386/force-indirect-call-1.c +++ b/gcc/testsuite/gcc.target/i386/force-indirect-call-1.c @@ -1,7 +1,7 @@ /* { dg-do compile } */ /* { dg-options "-O2 -mforce-indirect-call" } */ -/* { dg-final { scan-assembler-times "call\[ \\t\]+\\*%" 2 } } */ -/* { dg-final { scan-assembler-times "jmp\[ \\t\]+\\*%" 1 } } */ +/* { dg-final { scan-assembler-times "(?:call|jmp)\[ \\t\]+\\*%" 3 } } */ + int x; int y; diff --git a/gcc/testsuite/gcc.target/i386/force-indirect-call-2.c b/gcc/testsuite/gcc.target/i386/force-indirect-call-2.c index dd0df25..2f70236 100644 --- a/gcc/testsuite/gcc.target/i386/force-indirect-call-2.c +++ b/gcc/testsuite/gcc.target/i386/force-indirect-call-2.c @@ -1,5 +1,6 @@ /* { dg-do compile } */ /* { dg-options "-O2 -mforce-indirect-call -fPIC" } */ -/* { dg-final { scan-assembler-times "call\[ \\t\]+\\*%" 2 } } */ -/* { dg-final { scan-assembler-times "jmp\[ \\t\]+\\*%" 1 } } */ +/* { dg-require-effective-target fpic } */ +/* { dg-final { scan-assembler-times "(?:call|jmp)\[ \\t\]+\\*%" 3 } } */ + #include "force-indirect-call-1.c" diff --git a/gcc/testsuite/gcc.target/i386/force-indirect-call-3.c b/gcc/testsuite/gcc.target/i386/force-indirect-call-3.c index 28d8c98..37bc01b 100644 --- a/gcc/testsuite/gcc.target/i386/force-indirect-call-3.c +++ b/gcc/testsuite/gcc.target/i386/force-indirect-call-3.c @@ -1,5 +1,6 @@ /* { dg-do compile } */ /* { dg-options "-O2 -mforce-indirect-call -mcmodel=medium" } */ -/* { dg-final { scan-assembler-times "call\[ \\t\]+\\*%" 2 } } */ -/* { dg-final { scan-assembler-times "jmp\[ \\t\]+\\*%" 1 } } */ +/* { dg-require-effective-target lp64 } */ +/* { dg-final { scan-assembler-times "(?:call|jmp)\[ \\t\]+\\*%" 3 } } */ + #include "force-indirect-call-1.c" -- 2.7.4