From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 90887 invoked by alias); 19 Apr 2018 09:06:37 -0000 Mailing-List: contact fortran-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: fortran-owner@gcc.gnu.org Received: (qmail 90859 invoked by uid 89); 19 Apr 2018 09:06:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: =?ISO-8859-1?Q?No, score=-24.9 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_PASS,URIBL_RED autolearn=ham version=3.3.2 spammy=promptly, gr, PROGRAM, gr=c3=bc=c3?= X-Spam-User: qpsmtpd, 3 recipients X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 19 Apr 2018 09:06:33 +0000 Received: from svr-orw-fem-04.mgc.mentorg.com ([147.34.97.41]) by relay1.mentorg.com with esmtps (TLSv1:ECDHE-RSA-AES256-SHA:256) id 1f95WQ-0002ce-Uq from Thomas_Schwinge@mentor.com ; Thu, 19 Apr 2018 02:06:30 -0700 Received: from tftp-cs (147.34.91.1) by svr-orw-fem-04.mgc.mentorg.com (147.34.97.41) with Microsoft SMTP Server id 14.3.224.2; Thu, 19 Apr 2018 02:06:30 -0700 Received: by tftp-cs (Postfix, from userid 49978) id 0DA2DC229E; Thu, 19 Apr 2018 02:06:30 -0700 (PDT) From: Thomas Schwinge To: Thomas =?utf-8?Q?K=C3=B6nig?= , "fortran@gcc.gnu.org" , gcc-patches CC: Subject: PR85463 '[nvptx] "exit" in offloaded region doesn't terminate process' (was: [patch, libfortran, committed] Implement stop_numeric for minimal targets) In-Reply-To: <751060e1-67cb-d290-4fd1-46b15b77fc1a@tkoenig.net> References: <751060e1-67cb-d290-4fd1-46b15b77fc1a@tkoenig.net> User-Agent: Notmuch/0.9-125-g4686d11 (http://notmuchmail.org) Emacs/25.2.2 (x86_64-pc-linux-gnu) Date: Thu, 19 Apr 2018 09:06:00 -0000 Message-ID: <87in8nsgz9.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-SW-Source: 2018-04/txt/msg00099.txt.bz2 Hi! On Wed, 4 Apr 2018 11:30:34 +0200, Thomas K=C3=B6nig wrote: > the recent patch to make the gfortran and libgomp testsuites more > standard conforming, by replacing CALL ABORT() with STOP N, led > to numerous testsuite failures on nvptx because stop_numeric > was not implemented in minimal.c. >=20 > I have committed the patch below in r259072 as obvious after Tom > de Vries had confirmed that it solves the problem. ... for some meaning of "solves the problem"; see below. ;-) Which you couldn't know, of course. (So, definitely thanks anyway, for promptly addressing the issue raised!) > --- runtime/minimal.c (Revision 259055) > +++ runtime/minimal.c (Arbeitskopie) > +void > +stop_numeric (int code, bool quiet) > +{ > + if (!quiet) > + printf ("STOP %d\n", code); > + > + exit (code); > +} Per PR85463 '[nvptx] "exit" in offloaded region doesn't terminate process' that I just filed, we currently have to use "abort" instead of "exit" for nvptx offloading, so I have applied the following in trunk r259491, where I completed this by adding and testing stop_string, error_stop_string, and error_stop_numeric functions, too. commit 6bc09e4fa2e5e59dee18f1c03f2d6529b9b0045b Author: tschwinge Date: Thu Apr 19 08:53:38 2018 +0000 PR85463 '[nvptx] "exit" in offloaded region doesn't terminate process' =20=20=20=20 libgomp/ PR libfortran/85166 * testsuite/libgomp.oacc-fortran/abort-1.f90: Switch back to "c= all abort". * testsuite/libgomp.oacc-fortran/abort-2.f90: Likewise. =20=20=20=20 libgfortran/ PR libfortran/85166 PR libgomp/85463 * runtime/minimal.c (stop_numeric): Reimplement. (stop_string, error_stop_string, error_stop_numeric): New functions. libgomp/ PR libgomp/85463 * testsuite/libgomp.oacc-fortran/error_stop-1.f: New file. * testsuite/libgomp.oacc-fortran/error_stop-2.f: Likewise. * testsuite/libgomp.oacc-fortran/error_stop-3.f: Likewise. * testsuite/libgomp.oacc-fortran/stop-1.f: Likewise. * testsuite/libgomp.oacc-fortran/stop-2.f: Likewise. * testsuite/libgomp.oacc-fortran/stop-3.f: Likewise. =20=20=20=20 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@259491 138bc75d-0d04-04= 10-961f-82ee72b054a4 --- libgfortran/ChangeLog | 8 +++ libgfortran/runtime/minimal.c | 80 ++++++++++++++++++= +++- libgomp/ChangeLog | 15 ++++ libgomp/testsuite/libgomp.oacc-fortran/abort-1.f90 | 5 +- libgomp/testsuite/libgomp.oacc-fortran/abort-2.f90 | 5 +- .../testsuite/libgomp.oacc-fortran/error_stop-1.f | 20 ++++++ .../testsuite/libgomp.oacc-fortran/error_stop-2.f | 20 ++++++ .../testsuite/libgomp.oacc-fortran/error_stop-3.f | 20 ++++++ libgomp/testsuite/libgomp.oacc-fortran/stop-1.f | 22 ++++++ libgomp/testsuite/libgomp.oacc-fortran/stop-2.f | 20 ++++++ libgomp/testsuite/libgomp.oacc-fortran/stop-3.f | 23 +++++++ 11 files changed, 234 insertions(+), 4 deletions(-) diff --git libgfortran/ChangeLog libgfortran/ChangeLog index d4a1fbb..ea4358c 100644 --- libgfortran/ChangeLog +++ libgfortran/ChangeLog @@ -1,3 +1,11 @@ +2018-04-19 Thomas Schwinge + + PR libfortran/85166 + PR libgomp/85463 + * runtime/minimal.c (stop_numeric): Reimplement. + (stop_string, error_stop_string, error_stop_numeric): New + functions. + 2018-04-19 Jakub Jelinek =20 * configure: Regenerated. diff --git libgfortran/runtime/minimal.c libgfortran/runtime/minimal.c index e17666b..0b1efeb 100644 --- libgfortran/runtime/minimal.c +++ libgfortran/runtime/minimal.c @@ -188,6 +188,22 @@ sys_abort (void) abort(); } =20 + +/* runtime/stop.c */ + +#undef report_exception +#define report_exception() do {} while (0) +#undef st_printf +#define st_printf printf +#undef estr_write +#define estr_write printf +/* Map "exit" to "abort"; see PR85463 '[nvptx] "exit" in offloaded region + doesn't terminate process'. */ +#undef exit +#define exit(...) do { abort (); } while (0) +#undef exit_error +#define exit_error(...) do { abort (); } while (0) + /* A numeric STOP statement. */ =20 extern _Noreturn void stop_numeric (int, bool); @@ -197,7 +213,67 @@ void stop_numeric (int code, bool quiet) { if (!quiet) - printf ("STOP %d\n", code); - + { + report_exception (); + st_printf ("STOP %d\n", code); + } exit (code); } + + +/* A character string or blank STOP statement. */ + +void +stop_string (const char *string, size_t len, bool quiet) +{ + if (!quiet) + { + report_exception (); + if (string) + { + estr_write ("STOP "); + (void) write (STDERR_FILENO, string, len); + estr_write ("\n"); + } + } + exit (0); +} + + +/* Per Fortran 2008, section 8.4: "Execution of a STOP statement initiates + normal termination of execution. Execution of an ERROR STOP statement + initiates error termination of execution." Thus, error_stop_string ret= urns + a nonzero exit status code. */ + +extern _Noreturn void error_stop_string (const char *, size_t, bool); +export_proto(error_stop_string); + +void +error_stop_string (const char *string, size_t len, bool quiet) +{ + if (!quiet) + { + report_exception (); + estr_write ("ERROR STOP "); + (void) write (STDERR_FILENO, string, len); + estr_write ("\n"); + } + exit_error (1); +} + + +/* A numeric ERROR STOP statement. */ + +extern _Noreturn void error_stop_numeric (int, bool); +export_proto(error_stop_numeric); + +void +error_stop_numeric (int code, bool quiet) +{ + if (!quiet) + { + report_exception (); + st_printf ("ERROR STOP %d\n", code); + } + exit_error (code); +} diff --git libgomp/ChangeLog libgomp/ChangeLog index 1025acb..f68a4a8 100644 --- libgomp/ChangeLog +++ libgomp/ChangeLog @@ -1,3 +1,18 @@ +2018-04-19 Thomas Schwinge + + PR libgomp/85463 + * testsuite/libgomp.oacc-fortran/error_stop-1.f: New file. + * testsuite/libgomp.oacc-fortran/error_stop-2.f: Likewise. + * testsuite/libgomp.oacc-fortran/error_stop-3.f: Likewise. + * testsuite/libgomp.oacc-fortran/stop-1.f: Likewise. + * testsuite/libgomp.oacc-fortran/stop-2.f: Likewise. + * testsuite/libgomp.oacc-fortran/stop-3.f: Likewise. + + PR libfortran/85166 + * testsuite/libgomp.oacc-fortran/abort-1.f90: Switch back to "call + abort". + * testsuite/libgomp.oacc-fortran/abort-2.f90: Likewise. + 2018-04-19 Jakub Jelinek =20 * configure: Regenerated. diff --git libgomp/testsuite/libgomp.oacc-fortran/abort-1.f90 libgomp/tests= uite/libgomp.oacc-fortran/abort-1.f90 index dde3512..fc0af7f 100644 --- libgomp/testsuite/libgomp.oacc-fortran/abort-1.f90 +++ libgomp/testsuite/libgomp.oacc-fortran/abort-1.f90 @@ -1,9 +1,12 @@ +! Verify that an unconditional "call abort" inside an OpenACC parallel reg= ion +! does the right thing. + program main implicit none =20 print *, "CheCKpOInT" !$acc parallel - STOP 1 + call abort !$acc end parallel =20 end program main diff --git libgomp/testsuite/libgomp.oacc-fortran/abort-2.f90 libgomp/tests= uite/libgomp.oacc-fortran/abort-2.f90 index 68d90e9..97a692b 100644 --- libgomp/testsuite/libgomp.oacc-fortran/abort-2.f90 +++ libgomp/testsuite/libgomp.oacc-fortran/abort-2.f90 @@ -1,3 +1,6 @@ +! Verify that a conditional "call abort" inside an OpenACC parallel region= does +! the right thing. + program main implicit none =20 @@ -6,7 +9,7 @@ program main =20 !$acc parallel copyin(argc) if (argc .ne. 0) then - STOP 1 + call abort end if !$acc end parallel =20 diff --git libgomp/testsuite/libgomp.oacc-fortran/error_stop-1.f libgomp/te= stsuite/libgomp.oacc-fortran/error_stop-1.f new file mode 100644 index 0000000..4965e67 --- /dev/null +++ libgomp/testsuite/libgomp.oacc-fortran/error_stop-1.f @@ -0,0 +1,20 @@ +! { dg-do run } + + PROGRAM MAIN + IMPLICIT NONE + + PRINT *, "CheCKpOInT" +!$ACC PARALLEL + ERROR STOP +!$ACC END PARALLEL + PRINT *, "WrONg WAy" + + END PROGRAM MAIN + +! { 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_sele= cted } } } +! { dg-output "libgomp: cuStreamSynchronize error.*" { target openacc_nvid= ia_accel_selected } } +! { dg-shouldfail "" } diff --git libgomp/testsuite/libgomp.oacc-fortran/error_stop-2.f libgomp/te= stsuite/libgomp.oacc-fortran/error_stop-2.f new file mode 100644 index 0000000..7103fdb --- /dev/null +++ libgomp/testsuite/libgomp.oacc-fortran/error_stop-2.f @@ -0,0 +1,20 @@ +! { dg-do run } + + PROGRAM MAIN + IMPLICIT NONE + + PRINT *, "CheCKpOInT" +!$ACC PARALLEL + ERROR STOP 35 +!$ACC END PARALLEL + PRINT *, "WrONg WAy" + + END PROGRAM MAIN + +! { 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_sele= cted } } } +! { dg-output "libgomp: cuStreamSynchronize error.*" { target openacc_nvid= ia_accel_selected } } +! { dg-shouldfail "" } diff --git libgomp/testsuite/libgomp.oacc-fortran/error_stop-3.f libgomp/te= stsuite/libgomp.oacc-fortran/error_stop-3.f new file mode 100644 index 0000000..9c217f1 --- /dev/null +++ libgomp/testsuite/libgomp.oacc-fortran/error_stop-3.f @@ -0,0 +1,20 @@ +! { dg-do run } + + PROGRAM MAIN + IMPLICIT NONE + + PRINT *, "CheCKpOInT" +!$ACC PARALLEL + ERROR STOP "SiGN" +!$ACC END PARALLEL + PRINT *, "WrONg WAy" + + END PROGRAM MAIN + +! { 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_sele= cted } } } +! { dg-output "libgomp: cuStreamSynchronize error.*" { target openacc_nvid= ia_accel_selected } } +! { dg-shouldfail "" } diff --git libgomp/testsuite/libgomp.oacc-fortran/stop-1.f libgomp/testsuit= e/libgomp.oacc-fortran/stop-1.f new file mode 100644 index 0000000..af267fc --- /dev/null +++ libgomp/testsuite/libgomp.oacc-fortran/stop-1.f @@ -0,0 +1,22 @@ +! { dg-do run } + + PROGRAM MAIN + IMPLICIT NONE + + PRINT *, "CheCKpOInT" +!$ACC PARALLEL + STOP +!$ACC END PARALLEL + PRINT *, "WrONg WAy" + + END PROGRAM MAIN + +! { dg-output "CheCKpOInT(\n|\r\n|\r)+" } +! PR85463. The "minimal" libgfortran implementation used with nvptx +! offloading is a little bit different. +! { dg-output "libgomp: cuStreamSynchronize error.*" { target openacc_nvid= ia_accel_selected } } +! { dg-output "$" } +! PR85463. STOP with code zero (as implied here) should actually +! terminate the process normally, but doesn't in the "minimal" +! libgfortran implementation used with nvptx offloading. +! { dg-shouldfail "" { openacc_nvidia_accel_selected } } diff --git libgomp/testsuite/libgomp.oacc-fortran/stop-2.f libgomp/testsuit= e/libgomp.oacc-fortran/stop-2.f new file mode 100644 index 0000000..13c0684 --- /dev/null +++ libgomp/testsuite/libgomp.oacc-fortran/stop-2.f @@ -0,0 +1,20 @@ +! { dg-do run } + + PROGRAM MAIN + IMPLICIT NONE + + PRINT *, "CheCKpOInT" +!$ACC PARALLEL + STOP 35 +!$ACC END PARALLEL + PRINT *, "WrONg WAy" + + END PROGRAM MAIN + +! { dg-output "CheCKpOInT(\n|\r\n|\r)+" } +! { dg-output "STOP 35(\n|\r\n|\r)+" } +! PR85463. The "minimal" libgfortran implementation used with nvptx +! offloading is a little bit different. +! { dg-output "libgomp: cuStreamSynchronize error.*" { target openacc_nvid= ia_accel_selected } } +! { dg-output "$" } +! { dg-shouldfail "" } diff --git libgomp/testsuite/libgomp.oacc-fortran/stop-3.f libgomp/testsuit= e/libgomp.oacc-fortran/stop-3.f new file mode 100644 index 0000000..3bd7446 --- /dev/null +++ libgomp/testsuite/libgomp.oacc-fortran/stop-3.f @@ -0,0 +1,23 @@ +! { dg-do run } + + PROGRAM MAIN + IMPLICIT NONE + + PRINT *, "CheCKpOInT" +!$ACC PARALLEL + STOP "SiGN" +!$ACC END PARALLEL + PRINT *, "WrONg WAy" + + END PROGRAM MAIN + +! { dg-output "CheCKpOInT(\n|\r\n|\r)+" } +! { dg-output "STOP SiGN(\n|\r\n|\r)+" } +! PR85463. The "minimal" libgfortran implementation used with nvptx +! offloading is a little bit different. +! { dg-output "libgomp: cuStreamSynchronize error.*" { target openacc_nvid= ia_accel_selected } } +! { dg-output "$" } +! PR85463. STOP with code zero (as implied here) should actually +! terminate the process normally, but doesn't in the "minimal" +! libgfortran implementation used with nvptx offloading. +! { dg-shouldfail "" { openacc_nvidia_accel_selected } } Gr=C3=BC=C3=9Fe Thomas