And with attached patch …
On 12/5/19 9:39 AM, Tobias Burnus wrote:
The comment in the patch give the reason, why that line is missing
with AMDGCN (and nvptx). – For the extra line of nvptx, see referenced
PR (last comment).
Applied as Rev. 278986 after testing w/o offloading configured and
with nvptx + amdgcn offloading.
------------------------------------------------------------------------
r278986 | burnus | 2019-12-05 09:38:53 +0100 (Thu, 05 Dec 2019) | 11 lines
Changed paths:
M /trunk/gcc/fortran/ChangeLog
M /trunk/gcc/testsuite/ChangeLog
M /trunk/libgomp/ChangeLog
M /trunk/libgomp/testsuite/libgomp.oacc-fortran/error_stop-1.f
M /trunk/libgomp/testsuite/libgomp.oacc-fortran/error_stop-2.f
M /trunk/libgomp/testsuite/libgomp.oacc-fortran/error_stop-3.f
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
------------------------------------------------------------------------
Index: libgomp/ChangeLog
===================================================================
--- libgomp/ChangeLog (revision 278985)
+++ libgomp/ChangeLog (revision 278986)
@@ -1,3 +1,10 @@
+2019-12-05 Tobias Burnus <tob...@codesourcery.com>
+
+ * 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 <ja...@redhat.com>
PR fortran/92756
Index: libgomp/testsuite/libgomp.oacc-fortran/error_stop-1.f
===================================================================
--- libgomp/testsuite/libgomp.oacc-fortran/error_stop-1.f (revision 278985)
+++ libgomp/testsuite/libgomp.oacc-fortran/error_stop-1.f (revision 278986)
@@ -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 "" }
Index: libgomp/testsuite/libgomp.oacc-fortran/error_stop-2.f
===================================================================
--- libgomp/testsuite/libgomp.oacc-fortran/error_stop-2.f (revision 278985)
+++ libgomp/testsuite/libgomp.oacc-fortran/error_stop-2.f (revision 278986)
@@ -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 "" }
Index: libgomp/testsuite/libgomp.oacc-fortran/error_stop-3.f
===================================================================
--- libgomp/testsuite/libgomp.oacc-fortran/error_stop-3.f (revision 278985)
+++ libgomp/testsuite/libgomp.oacc-fortran/error_stop-3.f (revision 278986)
@@ -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 "" }
Index: gcc/testsuite/ChangeLog
===================================================================
--- gcc/testsuite/ChangeLog (revision 278985)
+++ gcc/testsuite/ChangeLog (revision 278986)
@@ -31,7 +31,7 @@
* gcc.dg/tree-ssa/ssa-fre-84.c: New testcase.
-2019-12-12 Tobias Burnus <tob...@codesourcery.com>
+2019-12-04 Tobias Burnus <tob...@codesourcery.com>
PR fortran/92754
gfortran.dg/intrinsic_9.f90: New.
Index: gcc/fortran/ChangeLog
===================================================================
--- gcc/fortran/ChangeLog (revision 278985)
+++ gcc/fortran/ChangeLog (revision 278986)
@@ -1,4 +1,4 @@
-2019-12-12 Tobias Burnus <tob...@codesourcery.com>
+2019-12-04 Tobias Burnus <tob...@codesourcery.com>
PR fortran/92754
* intrinsic.c (gfc_intrinsic_func_interface): Set
