Commit 96bfb6e1 by Thomas Schwinge

'libgomp.oacc-fortran/{error_,}stop-{1,2,3}.f': initialize before the checkpoint

If, for example, GCC is configured such that 'libgomp-plugin-nvptx.so.1'
dynamically links against 'libcuda.so.1', but testing is run on a system where
there is no 'libcuda.so.1', this produces output such as:

    PASS: libgomp.oacc-fortran/error_stop-1.f -DACC_DEVICE_TYPE_host=1 -DACC_MEM_SHARED=1 -foffload=disable  -O0  (test for excess errors)
    PASS: libgomp.oacc-fortran/error_stop-1.f -DACC_DEVICE_TYPE_host=1 -DACC_MEM_SHARED=1 -foffload=disable  -O0  execution test
    FAIL: libgomp.oacc-fortran/error_stop-1.f -DACC_DEVICE_TYPE_host=1 -DACC_MEM_SHARED=1 -foffload=disable  -O0  output pattern test, is  CheCKpOInT

    libgomp: while loading libgomp-plugin-nvptx.so.1: libcuda.so.1: cannot open shared object file: No such file or directory
    ERROR STOP

    Error termination. Backtrace: [...]
    , should match CheCKpOInT(
    |
    |^M)+ERROR STOP (
    |
    |^M)+Error termination.*

..., where after 'CheCKpOInT' we got 'libgomp: while loading [...]' injected
before the expected 'ERROR STOP'.

	libgomp/
	* testsuite/libgomp.oacc-fortran/error_stop-1.f: Initialize before
	the checkpoint.
	* 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.

(cherry picked from commit 1e378edd8f038c52914bc6cac8f6dd5a5c4f8a98)
parent 6effd8a7
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
PROGRAM MAIN PROGRAM MAIN
IMPLICIT NONE IMPLICIT NONE
! Initialize before the checkpoint, in case this produces any output.
!$ACC PARALLEL
!$ACC END PARALLEL
PRINT *, "CheCKpOInT" PRINT *, "CheCKpOInT"
!$ACC PARALLEL !$ACC PARALLEL
ERROR STOP ERROR STOP
......
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
PROGRAM MAIN PROGRAM MAIN
IMPLICIT NONE IMPLICIT NONE
! Initialize before the checkpoint, in case this produces any output.
!$ACC PARALLEL
!$ACC END PARALLEL
PRINT *, "CheCKpOInT" PRINT *, "CheCKpOInT"
!$ACC PARALLEL !$ACC PARALLEL
ERROR STOP 35 ERROR STOP 35
......
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
PROGRAM MAIN PROGRAM MAIN
IMPLICIT NONE IMPLICIT NONE
! Initialize before the checkpoint, in case this produces any output.
!$ACC PARALLEL
!$ACC END PARALLEL
PRINT *, "CheCKpOInT" PRINT *, "CheCKpOInT"
!$ACC PARALLEL !$ACC PARALLEL
ERROR STOP "SiGN" ERROR STOP "SiGN"
......
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
PROGRAM MAIN PROGRAM MAIN
IMPLICIT NONE IMPLICIT NONE
! Initialize before the checkpoint, in case this produces any output.
!$ACC PARALLEL
!$ACC END PARALLEL
PRINT *, "CheCKpOInT" PRINT *, "CheCKpOInT"
!$ACC PARALLEL !$ACC PARALLEL
STOP STOP
......
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
PROGRAM MAIN PROGRAM MAIN
IMPLICIT NONE IMPLICIT NONE
! Initialize before the checkpoint, in case this produces any output.
!$ACC PARALLEL
!$ACC END PARALLEL
PRINT *, "CheCKpOInT" PRINT *, "CheCKpOInT"
!$ACC PARALLEL !$ACC PARALLEL
STOP 35 STOP 35
......
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
PROGRAM MAIN PROGRAM MAIN
IMPLICIT NONE IMPLICIT NONE
! Initialize before the checkpoint, in case this produces any output.
!$ACC PARALLEL
!$ACC END PARALLEL
PRINT *, "CheCKpOInT" PRINT *, "CheCKpOInT"
!$ACC PARALLEL !$ACC PARALLEL
STOP "SiGN" STOP "SiGN"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment