From ad80ec460bf0747541d016e7159d5262560204ab Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Thu, 5 Dec 2019 08:38:53 +0000 Subject: [PATCH] testsuite/libgomp.oacc-fortran: Update dg-output to fix GCN * testsuite/libgomp.oacc-fortran/error_stop-1.f: Also don't expect dg-output of 'Error termination.' for GCN. * testsuite/libgomp.oacc-fortran/error_stop-2.f: Likewise. * testsuite/libgomp.oacc-fortran/error_stop-3.f: Likewise. Plus: Fix date of a previous commit in: * gcc/fortran/ChangeLog * gcc/testsuite/ChangeLog From-SVN: r278986 --- gcc/fortran/ChangeLog | 2 +- gcc/testsuite/ChangeLog | 2 +- libgomp/ChangeLog | 7 +++++++ libgomp/testsuite/libgomp.oacc-fortran/error_stop-1.f | 11 ++++++++--- libgomp/testsuite/libgomp.oacc-fortran/error_stop-2.f | 11 ++++++++--- libgomp/testsuite/libgomp.oacc-fortran/error_stop-3.f | 11 ++++++++--- 6 files changed, 33 insertions(+), 11 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index faac8fa02f5..bd109f94cfb 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,4 +1,4 @@ -2019-12-12 Tobias Burnus +2019-12-04 Tobias Burnus PR fortran/92754 * intrinsic.c (gfc_intrinsic_func_interface): Set diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 477a3b23a8f..03a97b5f53c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -31,7 +31,7 @@ * gcc.dg/tree-ssa/ssa-fre-84.c: New testcase. -2019-12-12 Tobias Burnus +2019-12-04 Tobias Burnus PR fortran/92754 gfortran.dg/intrinsic_9.f90: New. diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 183e7a6c02d..c67588940f2 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,10 @@ +2019-12-05 Tobias Burnus + + * testsuite/libgomp.oacc-fortran/error_stop-1.f: Also don't + expect dg-output of 'Error termination.' for GCN. + * testsuite/libgomp.oacc-fortran/error_stop-2.f: Likewise. + * testsuite/libgomp.oacc-fortran/error_stop-3.f: Likewise. + 2019-12-04 Jakub Jelinek PR fortran/92756 diff --git a/libgomp/testsuite/libgomp.oacc-fortran/error_stop-1.f b/libgomp/testsuite/libgomp.oacc-fortran/error_stop-1.f index 4965e674c27..e7358f4f20d 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/error_stop-1.f +++ b/libgomp/testsuite/libgomp.oacc-fortran/error_stop-1.f @@ -13,8 +13,13 @@ ! { dg-output "CheCKpOInT(\n|\r\n|\r)+" } ! { dg-output "ERROR STOP (\n|\r\n|\r)+" } -! PR85463. The "minimal" libgfortran implementation used with nvptx -! offloading is a little bit different. -! { dg-output "Error termination.*" { target { ! openacc_nvidia_accel_selected } } } +! +! In gfortran's main program, libfortran's set_options is called - which sets +! compiler_options.backtrace = 1 by default. For an offload libgfortran, this +! is never called and, hence, "Error termination." is never printed. Thus: +! { dg-output "Error termination.*" { target { ! { openacc_nvidia_accel_selected || openacc_amdgcn_accel_selected } } } } +! +! PR85463: ! { dg-output "libgomp: cuStreamSynchronize error.*" { target openacc_nvidia_accel_selected } } +! ! { dg-shouldfail "" } diff --git a/libgomp/testsuite/libgomp.oacc-fortran/error_stop-2.f b/libgomp/testsuite/libgomp.oacc-fortran/error_stop-2.f index 7103fdb5d8e..fca1d960f66 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/error_stop-2.f +++ b/libgomp/testsuite/libgomp.oacc-fortran/error_stop-2.f @@ -13,8 +13,13 @@ ! { dg-output "CheCKpOInT(\n|\r\n|\r)+" } ! { dg-output "ERROR STOP 35(\n|\r\n|\r)+" } -! PR85463. The "minimal" libgfortran implementation used with nvptx -! offloading is a little bit different. -! { dg-output "Error termination.*" { target { ! openacc_nvidia_accel_selected } } } +! +! In gfortran's main program, libfortran's set_options is called - which sets +! compiler_options.backtrace = 1 by default. For an offload libgfortran, this +! is never called and, hence, "Error termination." is never printed. Thus: +! { dg-output "Error termination.*" { target { ! { openacc_nvidia_accel_selected || openacc_amdgcn_accel_selected } } } } +! +! PR85463: ! { dg-output "libgomp: cuStreamSynchronize error.*" { target openacc_nvidia_accel_selected } } +! ! { dg-shouldfail "" } diff --git a/libgomp/testsuite/libgomp.oacc-fortran/error_stop-3.f b/libgomp/testsuite/libgomp.oacc-fortran/error_stop-3.f index 9c217f14ea1..2ae0b0d1602 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/error_stop-3.f +++ b/libgomp/testsuite/libgomp.oacc-fortran/error_stop-3.f @@ -13,8 +13,13 @@ ! { dg-output "CheCKpOInT(\n|\r\n|\r)+" } ! { dg-output "ERROR STOP SiGN(\n|\r\n|\r)+" } -! PR85463. The "minimal" libgfortran implementation used with nvptx -! offloading is a little bit different. -! { dg-output "Error termination.*" { target { ! openacc_nvidia_accel_selected } } } +! +! In gfortran's main program, libfortran's set_options is called - which sets +! compiler_options.backtrace = 1 by default. For an offload libgfortran, this +! is never called and, hence, "Error termination." is never printed. Thus: +! { dg-output "Error termination.*" { target { ! { openacc_nvidia_accel_selected || openacc_amdgcn_accel_selected } } } } +! +! PR85463: ! { dg-output "libgomp: cuStreamSynchronize error.*" { target openacc_nvidia_accel_selected } } +! ! { dg-shouldfail "" } -- 2.30.2