From 31a30e6234e3c058ac6b6386b5eede5ee0ffb08d Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 26 Nov 2014 20:36:36 +0100 Subject: [PATCH] e.53.4.c: Add -DITESTITERS=20 to dg-options unless expensive testing is on. * testsuite/libgomp.c/examples-4/e.53.4.c: Add -DITESTITERS=20 to dg-options unless expensive testing is on. (TESTITERS): Define to N if not defined. (main): Use TESTITERS instead of N. * testsuite/libgomp.c/examples-4/e.55.1.c: Define CHUNKSZ from dg-additional-options depending on whether expensive testing is on. * testsuite/libgomp.fortran/examples-4/e.55.1.f90 (e_55_1_mod): Decrease N to 100000 and CHUNKSZ to 10000. From-SVN: r218095 --- libgomp/ChangeLog | 15 +++++++++++++-- libgomp/testsuite/libgomp.c/examples-4/e.53.4.c | 6 +++++- libgomp/testsuite/libgomp.c/examples-4/e.55.1.c | 3 ++- .../libgomp.fortran/examples-4/e.55.1.f90 | 2 +- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 097b36f3ad2..15e5ae35b41 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,8 +1,19 @@ +2014-11-26 Jakub Jelinek + + * testsuite/libgomp.c/examples-4/e.53.4.c: Add -DITESTITERS=20 + to dg-options unless expensive testing is on. + (TESTITERS): Define to N if not defined. + (main): Use TESTITERS instead of N. + * testsuite/libgomp.c/examples-4/e.55.1.c: Define CHUNKSZ from + dg-additional-options depending on whether expensive testing is on. + * testsuite/libgomp.fortran/examples-4/e.55.1.f90 (e_55_1_mod): + Decrease N to 100000 and CHUNKSZ to 10000. + 2014-11-24 Jakub Jelinek PR fortran/63938 - * libgomp.fortran/pr63938-1.f90: New test. - * libgomp.fortran/pr63938-2.f90: New test. + * testsuite/libgomp.fortran/pr63938-1.f90: New test. + * testsuite/libgomp.fortran/pr63938-2.f90: New test. 2014-11-21 Steve Ellcey diff --git a/libgomp/testsuite/libgomp.c/examples-4/e.53.4.c b/libgomp/testsuite/libgomp.c/examples-4/e.53.4.c index 278e1a41707..db70460b309 100644 --- a/libgomp/testsuite/libgomp.c/examples-4/e.53.4.c +++ b/libgomp/testsuite/libgomp.c/examples-4/e.53.4.c @@ -1,9 +1,13 @@ /* { dg-do run } */ +/* { dg-additional-options "-DTESTITERS=20" { target { ! run_expensive_tests } } } */ #include #define EPS 0.00001 #define N 1000 +#ifndef TESTITERS +#define TESTITERS N +#endif #pragma omp declare target float Q[N][N]; @@ -60,7 +64,7 @@ int main () #pragma omp target update to(Q) - for (i = 0; i < N; i++) + for (i = 0; i < TESTITERS; i++) check (accum (i), accum_ref (i)); return 0; diff --git a/libgomp/testsuite/libgomp.c/examples-4/e.55.1.c b/libgomp/testsuite/libgomp.c/examples-4/e.55.1.c index 082e78a7ddb..b2e1f1feef8 100644 --- a/libgomp/testsuite/libgomp.c/examples-4/e.55.1.c +++ b/libgomp/testsuite/libgomp.c/examples-4/e.55.1.c @@ -1,10 +1,11 @@ /* { dg-do run } */ +/* { dg-additional-options "-DCHUNKSZ=5000" { target { ! run_expensive_tests } } } */ +/* { dg-additional-options "-DCHUNKSZ=1000" { target run_expensive_tests } } */ #include #define EPS 0.00001 #define N 100000 -#define CHUNKSZ 1000 float Y[N]; float Z[N]; diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/e.55.1.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/e.55.1.f90 index 0dd00b4ba8c..c3849de335a 100644 --- a/libgomp/testsuite/libgomp.fortran/examples-4/e.55.1.f90 +++ b/libgomp/testsuite/libgomp.fortran/examples-4/e.55.1.f90 @@ -1,7 +1,7 @@ ! { dg-do run } module e_55_1_mod - integer, parameter :: N = 10000000, CHUNKSZ = 100000 + integer, parameter :: N = 100000, CHUNKSZ = 10000 real :: Y(N), Z(N) end module -- 2.30.2