[committed] libgomp/testsuite/*fortran – make 'stop' values unique
diff mbox series

Message ID 59d7e12a-3322-9a47-7f70-f4477b5aa81c@mentor.com
State New
Headers show
Series
  • [committed] libgomp/testsuite/*fortran – make 'stop' values unique
Related show

Commit Message

Tobias Burnus Dec. 9, 2019, 11:21 a.m. UTC
Somehow, I managed to commit non-unique stop codes, again. While they do 
not harm, they make debugging a bit harder. Hence:

Committed as obvious. (Rev. 279117).

Tobias

Patch
diff mbox series

Index: libgomp/ChangeLog
===================================================================
--- libgomp/ChangeLog	(revision 279114)
+++ libgomp/ChangeLog	(working copy)
@@ -1,3 +1,15 @@ 
+2019-12-09  Tobias Burnus  <tobias@codesourcery.com>
+
+	* testsuite/libgomp.fortran/use_device_addr-3.f90: Make 'stop' codes
+	unique.
+	* testsuite/libgomp.fortran/use_device_addr-4.f90: Ditto.
+	* testsuite/libgomp.fortran/use_device_ptr-optional-2.f90: Ditto.
+	* testsuite/libgomp.oacc-fortran/declare-5.f90: Ditto.
+	* testsuite/libgomp.oacc-fortran/optional-data-copyin-by-value.f90:
+	Ditto.
+	* testsuite/libgomp.oacc-fortran/optional-firstprivate.f90: Ditto.
+	* testsuite/libgomp.oacc-fortran/optional-update-host.f90: Ditto.
+
 2019-12-06  Kwok Cheung Yeung  <kcy@codesourcery.com>
 
 	* config/accel/proc.c (omp_get_num_procs): Apply ialias macro.
diff --git a/libgomp/testsuite/libgomp.fortran/use_device_addr-3.f90 b/libgomp/testsuite/libgomp.fortran/use_device_addr-3.f90
index 82cf9ac8070..a917d289fe8 100644
--- a/libgomp/testsuite/libgomp.fortran/use_device_addr-3.f90
+++ b/libgomp/testsuite/libgomp.fortran/use_device_addr-3.f90
@@ -101,2 +101,2 @@  contains
     if (any(abs(aa - 11.0_c_double) > 10.0_c_double * epsilon(aa))) stop [-1-]{+2+}
     if (any(abs(3.0_c_double * aa - bb) > 10.0_c_double * epsilon(aa))) stop [-1-]{+3+}
@@ -107,2 +107,2 @@  contains
     if (any(abs(cc - 33.0_c_double) > 10.0_c_double * epsilon(cc))) stop [-1-]{+4+}
     if (any(abs(3.0_c_double * cc - dd) > 10.0_c_double * epsilon(cc))) stop [-1-]{+5+}
@@ -113,2 +113,2 @@  contains
     if (any(abs(ee - 55.0_c_double) > 10.0_c_double * epsilon(ee))) stop [-1-]{+6+}
     if (any(abs(3.0_c_double * ee - ff) > 10.0_c_double * epsilon(ee))) stop [-1-]{+7+}
@@ -170,2 +170,2 @@  contains
     if (any(abs(aa - 111.0_c_double) > 10.0_c_double * epsilon(aa))) stop [-1-]{+8+}
     if (any(abs(3.0_c_double * aa - bb) > 10.0_c_double * epsilon(aa))) stop [-1-]{+9+}
@@ -178,2 +178,2 @@  contains
     if (any(abs(aa - 1111.0_c_double) > 10.0_c_double * epsilon(aa))) stop [-1-]{+10+}
     if (any(abs(3.0_c_double * aa - bb) > 10.0_c_double * epsilon(aa))) stop [-1-]{+11+}
@@ -186,2 +186,2 @@  contains
     if (any(abs(aa - 11111.0_c_double) > 10.0_c_double * epsilon(aa))) stop [-1-]{+12+}
     if (any(abs(3.0_c_double * aa - bb) > 10.0_c_double * epsilon(aa))) stop [-1-]{+13+}
@@ -190,2 +190,2 @@  contains
     if (any(abs(aa - 11111.0_c_double) > 10.0_c_double * epsilon(aa))) stop [-1-]{+14+}
     if (any(abs(3.0_c_double * aa - bb) > 10.0_c_double * epsilon(aa))) stop [-1-]{+15+}
@@ -205,2 +205,2 @@  contains
     if (any(abs(cc - 333.0_c_double) > 10.0_c_double * epsilon(cc))) stop [-1-]{+16+}
     if (any(abs(3.0_c_double * cc - dd) > 10.0_c_double * epsilon(cc))) stop [-1-]{+17+}
@@ -213,2 +213,2 @@  contains
     if (any(abs(cc - 3333.0_c_double) > 10.0_c_double * epsilon(cc))) stop [-1-]{+18+}
     if (any(abs(3.0_c_double * cc - dd) > 10.0_c_double * epsilon(cc))) stop [-1-]{+19+}
@@ -221,2 +221,2 @@  contains
     if (any(abs(cc - 33333.0_c_double) > 10.0_c_double * epsilon(cc))) stop [-1-]{+20+}
     if (any(abs(3.0_c_double * cc - dd) > 10.0_c_double * epsilon(cc))) stop [-1-]{+21+}
@@ -225,2 +225,2 @@  contains
     if (any(abs(cc - 33333.0_c_double) > 10.0_c_double * epsilon(dd))) stop [-1-]{+22+}
     if (any(abs(3.0_c_double * cc - dd) > 10.0_c_double * epsilon(dd))) stop [-1-]{+23+}
@@ -240,2 +240,2 @@  contains
     if (any(abs(ee - 555.0_c_double) > 10.0_c_double * epsilon(ee))) stop [-1-]{+24+}
     if (any(abs(3.0_c_double * ee - ff) > 10.0_c_double * epsilon(ee))) stop [-1-]{+25+}
@@ -248,2 +248,2 @@  contains
     if (any(abs(ee - 5555.0_c_double) > 10.0_c_double * epsilon(ee))) stop [-1-]{+26+}
     if (any(abs(3.0_c_double * ee - ff) > 10.0_c_double * epsilon(ee))) stop [-1-]{+27+}
@@ -256,2 +256,2 @@  contains
     if (any(abs(ee - 55555.0_c_double) > 10.0_c_double * epsilon(ee))) stop [-1-]{+28+}
     if (any(abs(3.0_c_double * ee - ff) > 10.0_c_double * epsilon(ff))) stop [-1-]{+29+}
@@ -260,2 +260,2 @@  contains
     if (any(abs(ee - 55555.0_c_double) > 10.0_c_double * epsilon(ee))) stop [-1-]{+30+}
     if (any(abs(3.0_c_double * ee - ff) > 10.0_c_double * epsilon(ee))) stop [-1-]{+31+}
@@ -306,3 +306,3 @@  contains
     if (.not.present(aa) .or. .not.present(bb)) stop [-1-]{+32+}
     if (.not.present(cc) .or. .not.present(dd)) stop [-1-]{+33+}
     if (.not.present(ee) .or. .not.present(ff)) stop [-1-]{+34+}
@@ -310,2 +310,2 @@  contains
     if (.not.allocated(cc) .or. .not.allocated(dd)) stop [-1-]{+35+}
     if (.not.associated(ee) .or. .not.associated(ff)) stop [-1-]{+36+}
@@ -314,2 +314,2 @@  contains
     if (.not.present(aa) .or. .not.present(bb)) stop [-1-]{+37+}
     if (.not.c_associated(c_loc(aa)) .or. .not.c_associated(c_loc(bb))) stop [-1-]{+38+}
@@ -318,2 +318,2 @@  contains
     if (any(abs(aa - 11.0_c_double) > 10.0_c_double * epsilon(aa))) stop [-1-]{+39+}
     if (any(abs(3.0_c_double * aa - bb) > 10.0_c_double * epsilon(aa))) stop [-1-]{+40+}
@@ -322,3 +322,3 @@  contains
     if (.not.present(cc) .or. .not.present(dd)) stop [-1-]{+41+}
     if (.not.allocated(cc) .or. .not.allocated(dd)) stop [-1-]{+42+}
     if (.not.c_associated(c_loc(cc)) .or. .not.c_associated(c_loc(dd))) stop [-1-]{+43+}
@@ -327,2 +327,2 @@  contains
     if (any(abs(cc - 33.0_c_double) > 10.0_c_double * epsilon(cc))) stop [-1-]{+44+}
     if (any(abs(3.0_c_double * cc - dd) > 10.0_c_double * epsilon(cc))) stop [-1-]{+45+}
@@ -331,3 +331,3 @@  contains
     if (.not.present(ee) .or. .not.present(ff)) stop [-1-]{+46+}
     if (.not.associated(ee) .or. .not.associated(ff)) stop [-1-]{+47+}
     if (.not.c_associated(c_loc(ee)) .or. .not.c_associated(c_loc(ff))) stop [-1-]{+48+}
@@ -336,2 +336,2 @@  contains
     if (any(abs(ee - 55.0_c_double) > 10.0_c_double * epsilon(ee))) stop [-1-]{+49+}
     if (any(abs(3.0_c_double * ee - ff) > 10.0_c_double * epsilon(ee))) stop [-1-]{+50+}
@@ -349,3 +349,3 @@  contains
     if (present(aa) .or. present(bb)) stop [-1-]{+51+}
     if (present(cc) .or. present(dd)) stop [-1-]{+52+}
     if (present(ee) .or. present(ff)) stop [-1-]{+53+}
@@ -354 +354 @@  contains
     if (present(aa) .or. present(bb)) stop [-1-]{+54+}
@@ -358 +358 @@  contains
     if (present(cc) .or. present(dd)) stop [-1-]{+55+}
@@ -362 +362 @@  contains
     if (present(ee) .or. present(ff)) stop [-1-]{+56+}
@@ -402,3 +402,3 @@  contains
     if (.not.present(aa) .or. .not.present(bb)) stop [-1-]{+57+}
     if (.not.present(cc) .or. .not.present(dd)) stop [-1-]{+58+}
     if (.not.present(ee) .or. .not.present(ff)) stop [-1-]{+59+}
@@ -406,2 +406,2 @@  contains
     if (.not.allocated(cc) .or. .not.allocated(dd)) stop [-1-]{+60+}
     if (.not.associated(ee) .or. .not.associated(ff)) stop [-1-]{+61+}
@@ -418,2 +418,2 @@  contains
     if (.not.present(aa) .or. .not.present(bb)) stop [-1-]{+62+}
     if (.not.c_associated(c_loc(aa)) .or. .not.c_associated(c_loc(bb))) stop [-1-]{+63+}
@@ -424,2 +424,2 @@  contains
     if (.not.c_associated(c_aptr) .or. .not.c_associated(c_bptr)) stop [-1-]{+64+}
     if (.not.associated(aptr) .or. .not.associated(bptr)) stop [-1-]{+65+}
@@ -428,4 +428,4 @@  contains
     if (.not.present(aa) .or. .not.present(bb)) stop [-1-]{+66+}
     if (.not.c_associated(c_loc(aa)) .or. .not.c_associated(c_loc(bb))) stop [-1-]{+67+}
     if (.not.c_associated(c_aptr) .or. .not.c_associated(c_bptr)) stop [-1-]{+68+}
     if (.not.associated(aptr) .or. .not.associated(bptr)) stop [-1-]{+69+}
@@ -436,2 +436,2 @@  contains
     if (any(abs(aa - 111.0_c_double) > 10.0_c_double * epsilon(aa))) stop [-1-]{+70+}
     if (any(abs(3.0_c_double * aa - bb) > 10.0_c_double * epsilon(aa))) stop [-1-]{+71+}
@@ -444,2 +444,2 @@  contains
     if (any(abs(aa - 1111.0_c_double) > 10.0_c_double * epsilon(aa))) stop [-1-]{+72+}
     if (any(abs(3.0_c_double * aa - bb) > 10.0_c_double * epsilon(aa))) stop [-1-]{+73+}
@@ -452,2 +452,2 @@  contains
     if (any(abs(aa - 11111.0_c_double) > 10.0_c_double * epsilon(aa))) stop [-1-]{+74+}
     if (any(abs(3.0_c_double * aa - bb) > 10.0_c_double * epsilon(aa))) stop [-1-]{+75+}
@@ -456,2 +456,2 @@  contains
     if (any(abs(aa - 11111.0_c_double) > 10.0_c_double * epsilon(aa))) stop [-1-]{+76+}
     if (any(abs(3.0_c_double * aa - bb) > 10.0_c_double * epsilon(aa))) stop [-1-]{+77+}
@@ -461,3 +461,3 @@  contains
     if (.not.present(cc) .or. .not.present(dd)) stop [-1-]{+78+}
     if (.not.allocated(cc) .or. .not.allocated(dd)) stop [-1-]{+79+}
     if (.not.c_associated(c_loc(cc)) .or. .not.c_associated(c_loc(dd))) stop [-1-]{+80+}
@@ -468,2 +468,2 @@  contains
     if (.not.c_associated(c_cptr) .or. .not.c_associated(c_dptr)) stop [-1-]{+81+}
     if (.not.associated(cptr) .or. .not.associated(dptr)) stop [-1-]{+82+}
@@ -471,4 +471,4 @@  contains
     if (.not.present(cc) .or. .not.present(dd)) stop [-1-]{+83+}
     if (.not.c_associated(c_loc(cc)) .or. .not.c_associated(c_loc(dd))) stop [-1-]{+84+}
     if (.not.c_associated(c_cptr) .or. .not.c_associated(c_dptr)) stop [-1-]{+85+}
     if (.not.associated(cptr) .or. .not.associated(dptr)) stop [-1-]{+86+}
@@ -479,2 +479,2 @@  contains
     if (any(abs(cc - 333.0_c_double) > 10.0_c_double * epsilon(cc))) stop [-1-]{+87+}
     if (any(abs(3.0_c_double * cc - dd) > 10.0_c_double * epsilon(cc))) stop [-1-]{+88+}
@@ -487,2 +487,2 @@  contains
     if (any(abs(cc - 3333.0_c_double) > 10.0_c_double * epsilon(cc))) stop [-1-]{+89+}
     if (any(abs(3.0_c_double * cc - dd) > 10.0_c_double * epsilon(cc))) stop [-1-]{+90+}
@@ -495,2 +495,2 @@  contains
     if (any(abs(cc - 33333.0_c_double) > 10.0_c_double * epsilon(cc))) stop [-1-]{+91+}
     if (any(abs(3.0_c_double * cc - dd) > 10.0_c_double * epsilon(cc))) stop [-1-]{+92+}
@@ -499,2 +499,2 @@  contains
     if (any(abs(cc - 33333.0_c_double) > 10.0_c_double * epsilon(dd))) stop [-1-]{+93+}
     if (any(abs(3.0_c_double * cc - dd) > 10.0_c_double * epsilon(dd))) stop [-1-]{+94+}
@@ -505,3 +505,3 @@  contains
     if (.not.present(ee) .or. .not.present(ff)) stop [-1-]{+95+}
     if (.not.associated(ee) .or. .not.associated(ff)) stop [-1-]{+96+}
     if (.not.c_associated(c_loc(ee)) .or. .not.c_associated(c_loc(ff))) stop [-1-]{+97+}
@@ -512,2 +512,2 @@  contains
     if (.not.c_associated(c_eptr) .or. .not.c_associated(c_fptr)) stop [-1-]{+98+}
     if (.not.associated(eptr) .or. .not.associated(fptr)) stop [-1-]{+99+}
@@ -515,5 +515,5 @@  contains
     if (.not.present(ee) .or. .not.present(ff)) stop [-1-]{+100+}
     if (.not.associated(ee) .or. .not.associated(ff)) stop [-1-]{+101+}
     if (.not.c_associated(c_loc(ee)) .or. .not.c_associated(c_loc(ff))) stop [-1-]{+102+}
     if (.not.c_associated(c_eptr) .or. .not.c_associated(c_fptr)) stop [-1-]{+103+}
     if (.not.associated(eptr) .or. .not.associated(fptr)) stop [-1-]{+104+}
@@ -524,2 +524,2 @@  contains
     if (any(abs(ee - 555.0_c_double) > 10.0_c_double * epsilon(ee))) stop [-1-]{+105+}
     if (any(abs(3.0_c_double * ee - ff) > 10.0_c_double * epsilon(ee))) stop [-1-]{+106+}
@@ -532,2 +532,2 @@  contains
     if (any(abs(ee - 5555.0_c_double) > 10.0_c_double * epsilon(ee))) stop [-1-]{+107+}
     if (any(abs(3.0_c_double * ee - ff) > 10.0_c_double * epsilon(ee))) stop [-1-]{+108+}
@@ -540,2 +540,2 @@  contains
     if (any(abs(ee - 55555.0_c_double) > 10.0_c_double * epsilon(ee))) stop [-1-]{+109+}
     if (any(abs(3.0_c_double * ee - ff) > 10.0_c_double * epsilon(ff))) stop [-1-]{+110+}
@@ -544,2 +544,2 @@  contains
     if (any(abs(ee - 55555.0_c_double) > 10.0_c_double * epsilon(ee))) stop [-1-]{+111+}
     if (any(abs(3.0_c_double * ee - ff) > 10.0_c_double * epsilon(ee))) stop [-1-]{+112+}
@@ -572 +572 @@  contains
     if (associated(aa) .or. associated(bb)) stop [-1-]{+113+}
@@ -574 +574 @@  contains
     if (c_associated(c_loc(aa)) .or. c_associated(c_loc(bb))) stop [-1-]{+114+}
@@ -579,3 +579,3 @@  contains
     if (c_associated(c_aptr) .or. c_associated(c_bptr)) stop [-1-]{+115+}
     if (associated(aptr) .or. associated(bptr, bb)) stop [-1-]{+116+}
     if (associated(aa) .or. associated(bb)) stop [-1-]{+117+}
@@ -583,3 +583,3 @@  contains
     if (c_associated(c_aptr) .or. c_associated(c_bptr)) stop [-1-]{+118+}
     if (associated(aptr) .or. associated(bptr, bb)) stop [-1-]{+119+}
     if (associated(aa) .or. associated(bb)) stop [-1-]{+120+}
@@ -587 +587 @@  contains
     if (allocated(gg)) stop [-1-]{+121+}
@@ -589 +589 @@  contains
     if (c_associated(c_loc(gg))) stop [-1-]{+122+}
@@ -592,3 +592,3 @@  contains
     if (c_associated(c_gptr)) stop [-1-]{+123+}
     if (associated(gptr)) stop [-1-]{+124+}
     if (allocated(gg)) stop [-1-]{+125+}
@@ -596,3 +596,3 @@  contains
     if (c_associated(c_gptr)) stop [-1-]{+126+}
     if (associated(gptr)) stop [-1-]{+127+}
     if (allocated(gg)) stop [-1-]{+128+}
@@ -611,2 +611,2 @@  contains
     if (.not.present(ee) .or. .not.present(ff)) stop [-1-]{+129+}
     if (associated(ee) .or. associated(ff)) stop [-1-]{+130+}
@@ -615,3 +615,3 @@  contains
     if (.not.present(ee) .or. .not.present(ff)) stop [-1-]{+131+}
     if (associated(ee) .or. associated(ff)) stop [-1-]{+132+}
     if (c_associated(c_loc(ee)) .or. c_associated(c_loc(ff))) stop [-1-]{+133+}
@@ -622,2 +622,2 @@  contains
     if (c_associated(c_eptr) .or. c_associated(c_fptr)) stop [-1-]{+134+}
     if (associated(eptr) .or. associated(fptr)) stop [-1-]{+135+}
@@ -626,2 +626,2 @@  contains
     if (c_associated(c_eptr) .or. c_associated(c_fptr)) stop [-1-]{+136+}
     if (associated(eptr) .or. associated(fptr)) stop [-1-]{+137+}
@@ -629 +629 @@  contains
     if (allocated(hh)) stop [-1-]{+138+}
@@ -631 +631 @@  contains
     if (c_associated(c_loc(hh))) stop [-1-]{+139+}
@@ -634,3 +634,3 @@  contains
     if (c_associated(c_hptr)) stop [-1-]{+140+}
     if (associated(hptr)) stop [-1-]{+141+}
     if (allocated(hh)) stop [-1-]{+142+}
@@ -638,3 +638,3 @@  contains
     if (c_associated(c_hptr)) stop [-1-]{+143+}
     if (associated(hptr)) stop [-1-]{+144+}
     if (allocated(hh)) stop [-1-]{+145+}
@@ -671,2 +671,2 @@  contains
     if (any(abs(cc - 33.0_c_double) > 10.0_c_double * epsilon(cc))) stop [-1-]{+146+}
     if (any(abs(3.0_c_double * cc - dd) > 10.0_c_double * epsilon(cc))) stop [-1-]{+147+}
@@ -677,2 +677,2 @@  contains
     if (any(abs(ee - 55.0_c_double) > 10.0_c_double * epsilon(ee))) stop [-1-]{+148+}
     if (any(abs(3.0_c_double * ee - ff) > 10.0_c_double * epsilon(ee))) stop [-1-]{+149+}
@@ -712,2 +712,2 @@  contains
     if (any(abs(cc - 333.0_c_double) > 10.0_c_double * epsilon(cc))) stop [-1-]{+150+}
     if (any(abs(3.0_c_double * cc - dd) > 10.0_c_double * epsilon(cc))) stop [-1-]{+151+}
@@ -720,2 +720,2 @@  contains
     if (any(abs(cc - 3333.0_c_double) > 10.0_c_double * epsilon(cc))) stop [-1-]{+152+}
     if (any(abs(3.0_c_double * cc - dd) > 10.0_c_double * epsilon(cc))) stop [-1-]{+153+}
@@ -728,2 +728,2 @@  contains
     if (any(abs(cc - 33333.0_c_double) > 10.0_c_double * epsilon(cc))) stop [-1-]{+154+}
     if (any(abs(3.0_c_double * cc - dd) > 10.0_c_double * epsilon(cc))) stop [-1-]{+155+}
@@ -732,2 +732,2 @@  contains
     if (any(abs(cc - 33333.0_c_double) > 10.0_c_double * epsilon(dd))) stop [-1-]{+156+}
     if (any(abs(3.0_c_double * cc - dd) > 10.0_c_double * epsilon(dd))) stop [-1-]{+157+}
@@ -747,2 +747,2 @@  contains
     if (any(abs(ee - 555.0_c_double) > 10.0_c_double * epsilon(ee))) stop [-1-]{+158+}
     if (any(abs(3.0_c_double * ee - ff) > 10.0_c_double * epsilon(ee))) stop [-1-]{+159+}
@@ -755,2 +755,2 @@  contains
     if (any(abs(ee - 5555.0_c_double) > 10.0_c_double * epsilon(ee))) stop [-1-]{+160+}
     if (any(abs(3.0_c_double * ee - ff) > 10.0_c_double * epsilon(ee))) stop [-1-]{+161+}
@@ -763,2 +763,2 @@  contains
     if (any(abs(ee - 55555.0_c_double) > 10.0_c_double * epsilon(ee))) stop [-1-]{+162+}
     if (any(abs(3.0_c_double * ee - ff) > 10.0_c_double * epsilon(ff))) stop [-1-]{+163+}
@@ -767,2 +767,2 @@  contains
     if (any(abs(ee - 55555.0_c_double) > 10.0_c_double * epsilon(ee))) stop [-1-]{+164+}
     if (any(abs(3.0_c_double * ee - ff) > 10.0_c_double * epsilon(ee))) stop [-1-]{+165+}
diff --git a/libgomp/testsuite/libgomp.fortran/use_device_addr-4.f90 b/libgomp/testsuite/libgomp.fortran/use_device_addr-4.f90
index d17249de2bc..e7b6c624f4e 100644
--- a/libgomp/testsuite/libgomp.fortran/use_device_addr-4.f90
+++ b/libgomp/testsuite/libgomp.fortran/use_device_addr-4.f90
@@ -101,2 +101,2 @@  contains
     if (any(abs(aa - 11.0_c_float) > 10.0_c_float * epsilon(aa))) stop [-1-]{+2+}
     if (any(abs(3.0_c_float * aa - bb) > 10.0_c_float * epsilon(aa))) stop [-1-]{+3+}
@@ -107,2 +107,2 @@  contains
     if (any(abs(cc - 33.0_c_float) > 10.0_c_float * epsilon(cc))) stop [-1-]{+4+}
     if (any(abs(3.0_c_float * cc - dd) > 10.0_c_float * epsilon(cc))) stop [-1-]{+5+}
@@ -113,2 +113,2 @@  contains
     if (any(abs(ee - 55.0_c_float) > 10.0_c_float * epsilon(ee))) stop [-1-]{+6+}
     if (any(abs(3.0_c_float * ee - ff) > 10.0_c_float * epsilon(ee))) stop [-1-]{+7+}
@@ -170,2 +170,2 @@  contains
     if (any(abs(aa - 111.0_c_float) > 10.0_c_float * epsilon(aa))) stop [-1-]{+8+}
     if (any(abs(3.0_c_float * aa - bb) > 10.0_c_float * epsilon(aa))) stop [-1-]{+9+}
@@ -178,2 +178,2 @@  contains
     if (any(abs(aa - 1111.0_c_float) > 10.0_c_float * epsilon(aa))) stop [-1-]{+10+}
     if (any(abs(3.0_c_float * aa - bb) > 10.0_c_float * epsilon(aa))) stop [-1-]{+11+}
@@ -186,2 +186,2 @@  contains
     if (any(abs(aa - 11111.0_c_float) > 10.0_c_float * epsilon(aa))) stop [-1-]{+12+}
     if (any(abs(3.0_c_float * aa - bb) > 10.0_c_float * epsilon(aa))) stop [-1-]{+13+}
@@ -190,2 +190,2 @@  contains
     if (any(abs(aa - 11111.0_c_float) > 10.0_c_float * epsilon(aa))) stop [-1-]{+14+}
     if (any(abs(3.0_c_float * aa - bb) > 10.0_c_float * epsilon(aa))) stop [-1-]{+15+}
@@ -205,2 +205,2 @@  contains
     if (any(abs(cc - 333.0_c_float) > 10.0_c_float * epsilon(cc))) stop [-1-]{+16+}
     if (any(abs(3.0_c_float * cc - dd) > 10.0_c_float * epsilon(cc))) stop [-1-]{+17+}
@@ -213,2 +213,2 @@  contains
     if (any(abs(cc - 3333.0_c_float) > 10.0_c_float * epsilon(cc))) stop [-1-]{+18+}
     if (any(abs(3.0_c_float * cc - dd) > 10.0_c_float * epsilon(cc))) stop [-1-]{+19+}
@@ -221,2 +221,2 @@  contains
     if (any(abs(cc - 33333.0_c_float) > 10.0_c_float * epsilon(cc))) stop [-1-]{+20+}
     if (any(abs(3.0_c_float * cc - dd) > 10.0_c_float * epsilon(cc))) stop [-1-]{+21+}
@@ -225,2 +225,2 @@  contains
     if (any(abs(cc - 33333.0_c_float) > 10.0_c_float * epsilon(dd))) stop [-1-]{+22+}
     if (any(abs(3.0_c_float * cc - dd) > 10.0_c_float * epsilon(dd))) stop [-1-]{+23+}
@@ -240,2 +240,2 @@  contains
     if (any(abs(ee - 555.0_c_float) > 10.0_c_float * epsilon(ee))) stop [-1-]{+24+}
     if (any(abs(3.0_c_float * ee - ff) > 10.0_c_float * epsilon(ee))) stop [-1-]{+25+}
@@ -248,2 +248,2 @@  contains
     if (any(abs(ee - 5555.0_c_float) > 10.0_c_float * epsilon(ee))) stop [-1-]{+26+}
     if (any(abs(3.0_c_float * ee - ff) > 10.0_c_float * epsilon(ee))) stop [-1-]{+27+}
@@ -256,2 +256,2 @@  contains
     if (any(abs(ee - 55555.0_c_float) > 10.0_c_float * epsilon(ee))) stop [-1-]{+28+}
     if (any(abs(3.0_c_float * ee - ff) > 10.0_c_float * epsilon(ff))) stop [-1-]{+29+}
@@ -260,2 +260,2 @@  contains
     if (any(abs(ee - 55555.0_c_float) > 10.0_c_float * epsilon(ee))) stop [-1-]{+30+}
     if (any(abs(3.0_c_float * ee - ff) > 10.0_c_float * epsilon(ee))) stop [-1-]{+31+}
@@ -306,3 +306,3 @@  contains
     if (.not.present(aa) .or. .not.present(bb)) stop [-1-]{+32+}
     if (.not.present(cc) .or. .not.present(dd)) stop [-1-]{+33+}
     if (.not.present(ee) .or. .not.present(ff)) stop [-1-]{+34+}
@@ -310,2 +310,2 @@  contains
     if (.not.allocated(cc) .or. .not.allocated(dd)) stop [-1-]{+35+}
     if (.not.associated(ee) .or. .not.associated(ff)) stop [-1-]{+36+}
@@ -314,2 +314,2 @@  contains
     if (.not.present(aa) .or. .not.present(bb)) stop [-1-]{+37+}
     if (.not.c_associated(c_loc(aa)) .or. .not.c_associated(c_loc(bb))) stop [-1-]{+38+}
@@ -318,2 +318,2 @@  contains
     if (any(abs(aa - 11.0_c_float) > 10.0_c_float * epsilon(aa))) stop [-1-]{+39+}
     if (any(abs(3.0_c_float * aa - bb) > 10.0_c_float * epsilon(aa))) stop [-1-]{+40+}
@@ -322,3 +322,3 @@  contains
     if (.not.present(cc) .or. .not.present(dd)) stop [-1-]{+41+}
     if (.not.allocated(cc) .or. .not.allocated(dd)) stop [-1-]{+42+}
     if (.not.c_associated(c_loc(cc)) .or. .not.c_associated(c_loc(dd))) stop [-1-]{+43+}
@@ -327,2 +327,2 @@  contains
     if (any(abs(cc - 33.0_c_float) > 10.0_c_float * epsilon(cc))) stop [-1-]{+44+}
     if (any(abs(3.0_c_float * cc - dd) > 10.0_c_float * epsilon(cc))) stop [-1-]{+45+}
@@ -331,3 +331,3 @@  contains
     if (.not.present(ee) .or. .not.present(ff)) stop [-1-]{+46+}
     if (.not.associated(ee) .or. .not.associated(ff)) stop [-1-]{+47+}
     if (.not.c_associated(c_loc(ee)) .or. .not.c_associated(c_loc(ff))) stop [-1-]{+48+}
@@ -336,2 +336,2 @@  contains
     if (any(abs(ee - 55.0_c_float) > 10.0_c_float * epsilon(ee))) stop [-1-]{+49+}
     if (any(abs(3.0_c_float * ee - ff) > 10.0_c_float * epsilon(ee))) stop [-1-]{+50+}
@@ -349,3 +349,3 @@  contains
     if (present(aa) .or. present(bb)) stop [-1-]{+51+}
     if (present(cc) .or. present(dd)) stop [-1-]{+52+}
     if (present(ee) .or. present(ff)) stop [-1-]{+53+}
@@ -354 +354 @@  contains
     if (present(aa) .or. present(bb)) stop [-1-]{+54+}
@@ -358 +358 @@  contains
     if (present(cc) .or. present(dd)) stop [-1-]{+55+}
@@ -362 +362 @@  contains
     if (present(ee) .or. present(ff)) stop [-1-]{+56+}
@@ -402,3 +402,3 @@  contains
     if (.not.present(aa) .or. .not.present(bb)) stop [-1-]{+57+}
     if (.not.present(cc) .or. .not.present(dd)) stop [-1-]{+58+}
     if (.not.present(ee) .or. .not.present(ff)) stop [-1-]{+59+}
@@ -406,2 +406,2 @@  contains
     if (.not.allocated(cc) .or. .not.allocated(dd)) stop [-1-]{+60+}
     if (.not.associated(ee) .or. .not.associated(ff)) stop [-1-]{+61+}
@@ -418,2 +418,2 @@  contains
     if (.not.present(aa) .or. .not.present(bb)) stop [-1-]{+62+}
     if (.not.c_associated(c_loc(aa)) .or. .not.c_associated(c_loc(bb))) stop [-1-]{+63+}
@@ -424,2 +424,2 @@  contains
     if (.not.c_associated(c_aptr) .or. .not.c_associated(c_bptr)) stop [-1-]{+64+}
     if (.not.associated(aptr) .or. .not.associated(bptr)) stop [-1-]{+65+}
@@ -428,4 +428,4 @@  contains
     if (.not.present(aa) .or. .not.present(bb)) stop [-1-]{+66+}
     if (.not.c_associated(c_loc(aa)) .or. .not.c_associated(c_loc(bb))) stop [-1-]{+67+}
     if (.not.c_associated(c_aptr) .or. .not.c_associated(c_bptr)) stop [-1-]{+68+}
     if (.not.associated(aptr) .or. .not.associated(bptr)) stop [-1-]{+69+}
@@ -436,2 +436,2 @@  contains
     if (any(abs(aa - 111.0_c_float) > 10.0_c_float * epsilon(aa))) stop [-1-]{+70+}
     if (any(abs(3.0_c_float * aa - bb) > 10.0_c_float * epsilon(aa))) stop [-1-]{+71+}
@@ -444,2 +444,2 @@  contains
     if (any(abs(aa - 1111.0_c_float) > 10.0_c_float * epsilon(aa))) stop [-1-]{+72+}
     if (any(abs(3.0_c_float * aa - bb) > 10.0_c_float * epsilon(aa))) stop [-1-]{+73+}
@@ -452,2 +452,2 @@  contains
     if (any(abs(aa - 11111.0_c_float) > 10.0_c_float * epsilon(aa))) stop [-1-]{+74+}
     if (any(abs(3.0_c_float * aa - bb) > 10.0_c_float * epsilon(aa))) stop [-1-]{+75+}
@@ -456,2 +456,2 @@  contains
     if (any(abs(aa - 11111.0_c_float) > 10.0_c_float * epsilon(aa))) stop [-1-]{+76+}
     if (any(abs(3.0_c_float * aa - bb) > 10.0_c_float * epsilon(aa))) stop [-1-]{+77+}
@@ -461,3 +461,3 @@  contains
     if (.not.present(cc) .or. .not.present(dd)) stop [-1-]{+78+}
     if (.not.allocated(cc) .or. .not.allocated(dd)) stop [-1-]{+79+}
     if (.not.c_associated(c_loc(cc)) .or. .not.c_associated(c_loc(dd))) stop [-1-]{+80+}
@@ -468,2 +468,2 @@  contains
     if (.not.c_associated(c_cptr) .or. .not.c_associated(c_dptr)) stop [-1-]{+81+}
     if (.not.associated(cptr) .or. .not.associated(dptr)) stop [-1-]{+82+}
@@ -471,4 +471,4 @@  contains
     if (.not.present(cc) .or. .not.present(dd)) stop [-1-]{+83+}
     if (.not.c_associated(c_loc(cc)) .or. .not.c_associated(c_loc(dd))) stop [-1-]{+84+}
     if (.not.c_associated(c_cptr) .or. .not.c_associated(c_dptr)) stop [-1-]{+85+}
     if (.not.associated(cptr) .or. .not.associated(dptr)) stop [-1-]{+86+}
@@ -479,2 +479,2 @@  contains
     if (any(abs(cc - 333.0_c_float) > 10.0_c_float * epsilon(cc))) stop [-1-]{+87+}
     if (any(abs(3.0_c_float * cc - dd) > 10.0_c_float * epsilon(cc))) stop [-1-]{+88+}
@@ -487,2 +487,2 @@  contains
     if (any(abs(cc - 3333.0_c_float) > 10.0_c_float * epsilon(cc))) stop [-1-]{+89+}
     if (any(abs(3.0_c_float * cc - dd) > 10.0_c_float * epsilon(cc))) stop [-1-]{+90+}
@@ -495,2 +495,2 @@  contains
     if (any(abs(cc - 33333.0_c_float) > 10.0_c_float * epsilon(cc))) stop [-1-]{+91+}
     if (any(abs(3.0_c_float * cc - dd) > 10.0_c_float * epsilon(cc))) stop [-1-]{+92+}
@@ -499,2 +499,2 @@  contains
     if (any(abs(cc - 33333.0_c_float) > 10.0_c_float * epsilon(dd))) stop [-1-]{+93+}
     if (any(abs(3.0_c_float * cc - dd) > 10.0_c_float * epsilon(dd))) stop [-1-]{+94+}
@@ -505,3 +505,3 @@  contains
     if (.not.present(ee) .or. .not.present(ff)) stop [-1-]{+95+}
     if (.not.associated(ee) .or. .not.associated(ff)) stop [-1-]{+96+}
     if (.not.c_associated(c_loc(ee)) .or. .not.c_associated(c_loc(ff))) stop [-1-]{+97+}
@@ -512,2 +512,2 @@  contains
     if (.not.c_associated(c_eptr) .or. .not.c_associated(c_fptr)) stop [-1-]{+98+}
     if (.not.associated(eptr) .or. .not.associated(fptr)) stop [-1-]{+99+}
@@ -515,5 +515,5 @@  contains
     if (.not.present(ee) .or. .not.present(ff)) stop [-1-]{+100+}
     if (.not.associated(ee) .or. .not.associated(ff)) stop [-1-]{+101+}
     if (.not.c_associated(c_loc(ee)) .or. .not.c_associated(c_loc(ff))) stop [-1-]{+102+}
     if (.not.c_associated(c_eptr) .or. .not.c_associated(c_fptr)) stop [-1-]{+103+}
     if (.not.associated(eptr) .or. .not.associated(fptr)) stop [-1-]{+104+}
@@ -524,2 +524,2 @@  contains
     if (any(abs(ee - 555.0_c_float) > 10.0_c_float * epsilon(ee))) stop [-1-]{+105+}
     if (any(abs(3.0_c_float * ee - ff) > 10.0_c_float * epsilon(ee))) stop [-1-]{+106+}
@@ -532,2 +532,2 @@  contains
     if (any(abs(ee - 5555.0_c_float) > 10.0_c_float * epsilon(ee))) stop [-1-]{+107+}
     if (any(abs(3.0_c_float * ee - ff) > 10.0_c_float * epsilon(ee))) stop [-1-]{+108+}
@@ -540,2 +540,2 @@  contains
     if (any(abs(ee - 55555.0_c_float) > 10.0_c_float * epsilon(ee))) stop [-1-]{+109+}
     if (any(abs(3.0_c_float * ee - ff) > 10.0_c_float * epsilon(ff))) stop [-1-]{+110+}
@@ -544,2 +544,2 @@  contains
     if (any(abs(ee - 55555.0_c_float) > 10.0_c_float * epsilon(ee))) stop [-1-]{+111+}
     if (any(abs(3.0_c_float * ee - ff) > 10.0_c_float * epsilon(ee))) stop [-1-]{+112+}
@@ -572 +572 @@  contains
     if (associated(aa) .or. associated(bb)) stop [-1-]{+113+}
@@ -574 +574 @@  contains
     if (c_associated(c_loc(aa)) .or. c_associated(c_loc(bb))) stop [-1-]{+114+}
@@ -579,3 +579,3 @@  contains
     if (c_associated(c_aptr) .or. c_associated(c_bptr)) stop [-1-]{+115+}
     if (associated(aptr) .or. associated(bptr, bb)) stop [-1-]{+116+}
     if (associated(aa) .or. associated(bb)) stop [-1-]{+117+}
@@ -583,3 +583,3 @@  contains
     if (c_associated(c_aptr) .or. c_associated(c_bptr)) stop [-1-]{+118+}
     if (associated(aptr) .or. associated(bptr, bb)) stop [-1-]{+119+}
     if (associated(aa) .or. associated(bb)) stop [-1-]{+120+}
@@ -587 +587 @@  contains
     if (allocated(gg)) stop [-1-]{+121+}
@@ -589 +589 @@  contains
     if (c_associated(c_loc(gg))) stop [-1-]{+122+}
@@ -592,3 +592,3 @@  contains
     if (c_associated(c_gptr)) stop [-1-]{+123+}
     if (associated(gptr)) stop [-1-]{+124+}
     if (allocated(gg)) stop [-1-]{+125+}
@@ -596,3 +596,3 @@  contains
     if (c_associated(c_gptr)) stop [-1-]{+126+}
     if (associated(gptr)) stop [-1-]{+127+}
     if (allocated(gg)) stop [-1-]{+128+}
@@ -611,2 +611,2 @@  contains
     if (.not.present(ee) .or. .not.present(ff)) stop [-1-]{+129+}
     if (associated(ee) .or. associated(ff)) stop [-1-]{+130+}
@@ -615,3 +615,3 @@  contains
     if (.not.present(ee) .or. .not.present(ff)) stop [-1-]{+131+}
     if (associated(ee) .or. associated(ff)) stop [-1-]{+132+}
     if (c_associated(c_loc(ee)) .or. c_associated(c_loc(ff))) stop [-1-]{+133+}
@@ -622,2 +622,2 @@  contains
     if (c_associated(c_eptr) .or. c_associated(c_fptr)) stop [-1-]{+134+}
     if (associated(eptr) .or. associated(fptr)) stop [-1-]{+135+}
@@ -626,2 +626,2 @@  contains
     if (c_associated(c_eptr) .or. c_associated(c_fptr)) stop [-1-]{+136+}
     if (associated(eptr) .or. associated(fptr)) stop [-1-]{+137+}
@@ -629 +629 @@  contains
     if (allocated(hh)) stop [-1-]{+138+}
@@ -631 +631 @@  contains
     if (c_associated(c_loc(hh))) stop [-1-]{+139+}
@@ -634,3 +634,3 @@  contains
     if (c_associated(c_hptr)) stop [-1-]{+140+}
     if (associated(hptr)) stop [-1-]{+141+}
     if (allocated(hh)) stop [-1-]{+142+}
@@ -638,3 +638,3 @@  contains
     if (c_associated(c_hptr)) stop [-1-]{+143+}
     if (associated(hptr)) stop [-1-]{+144+}
     if (allocated(hh)) stop [-1-]{+145+}
@@ -671,2 +671,2 @@  contains
     if (any(abs(cc - 33.0_c_float) > 10.0_c_float * epsilon(cc))) stop [-1-]{+146+}
     if (any(abs(3.0_c_float * cc - dd) > 10.0_c_float * epsilon(cc))) stop [-1-]{+147+}
@@ -677,2 +677,2 @@  contains
     if (any(abs(ee - 55.0_c_float) > 10.0_c_float * epsilon(ee))) stop [-1-]{+148+}
     if (any(abs(3.0_c_float * ee - ff) > 10.0_c_float * epsilon(ee))) stop [-1-]{+149+}
@@ -712,2 +712,2 @@  contains
     if (any(abs(cc - 333.0_c_float) > 10.0_c_float * epsilon(cc))) stop [-1-]{+150+}
     if (any(abs(3.0_c_float * cc - dd) > 10.0_c_float * epsilon(cc))) stop [-1-]{+151+}
@@ -720,2 +720,2 @@  contains
     if (any(abs(cc - 3333.0_c_float) > 10.0_c_float * epsilon(cc))) stop [-1-]{+152+}
     if (any(abs(3.0_c_float * cc - dd) > 10.0_c_float * epsilon(cc))) stop [-1-]{+153+}
@@ -728,2 +728,2 @@  contains
     if (any(abs(cc - 33333.0_c_float) > 10.0_c_float * epsilon(cc))) stop [-1-]{+154+}
     if (any(abs(3.0_c_float * cc - dd) > 10.0_c_float * epsilon(cc))) stop [-1-]{+155+}
@@ -732,2 +732,2 @@  contains
     if (any(abs(cc - 33333.0_c_float) > 10.0_c_float * epsilon(dd))) stop [-1-]{+156+}
     if (any(abs(3.0_c_float * cc - dd) > 10.0_c_float * epsilon(dd))) stop [-1-]{+157+}
@@ -747,2 +747,2 @@  contains
     if (any(abs(ee - 555.0_c_float) > 10.0_c_float * epsilon(ee))) stop [-1-]{+158+}
     if (any(abs(3.0_c_float * ee - ff) > 10.0_c_float * epsilon(ee))) stop [-1-]{+159+}
@@ -755,2 +755,2 @@  contains
     if (any(abs(ee - 5555.0_c_float) > 10.0_c_float * epsilon(ee))) stop [-1-]{+160+}
     if (any(abs(3.0_c_float * ee - ff) > 10.0_c_float * epsilon(ee))) stop [-1-]{+161+}
@@ -763,2 +763,2 @@  contains
     if (any(abs(ee - 55555.0_c_float) > 10.0_c_float * epsilon(ee))) stop [-1-]{+162+}
     if (any(abs(3.0_c_float * ee - ff) > 10.0_c_float * epsilon(ff))) stop [-1-]{+163+}
@@ -767,2 +767,2 @@  contains
     if (any(abs(ee - 55555.0_c_float) > 10.0_c_float * epsilon(ee))) stop [-1-]{+164+}
     if (any(abs(3.0_c_float * ee - ff) > 10.0_c_float * epsilon(ee))) stop [-1-]{+165+}
diff --git a/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-2.f90 b/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-2.f90
index 6eefbe135c4..d33b7d1cce0 100644
--- a/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-2.f90
@@ -40,2 +40,2 @@  contains
        if (c_associated(cptr_in, c_loc(x))) stop [-26-]{+17+}
        stop [-27-]{+18+}
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/declare-5.f90 b/libgomp/testsuite/libgomp.oacc-fortran/declare-5.f90
index 4eb0ecadc76..2fd25d611a9 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/declare-5.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/declare-5.f90
@@ -105,2 +105,2 @@  program test
  if (a /= 3.0) stop [-3-]{+30+}
  if (k /= -378) stop [-3-]{+31+}
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/optional-data-copyin-by-value.f90 b/libgomp/testsuite/libgomp.oacc-fortran/optional-data-copyin-by-value.f90
index 5cadeed44b4..8e842980863 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/optional-data-copyin-by-value.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/optional-data-copyin-by-value.f90
@@ -11 +11 @@  program test
  if (foo(16, 18) .ne. 288) stop [-1-]{+2+}
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/optional-firstprivate.f90 b/libgomp/testsuite/libgomp.oacc-fortran/optional-firstprivate.f90
index 693e6118489..b8ebd6e277e 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/optional-firstprivate.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/optional-firstprivate.f90
@@ -47 +47 @@  program test_firstprivate
    if (res_alloc(i) .ne. a_alloc(i) * b_alloc(i) + c_alloc(i)) stop [-2-]{+3+}
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/optional-update-host.f90 b/libgomp/testsuite/libgomp.oacc-fortran/optional-update-host.f90
index 36b94241b11..dc2b5da3a63 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/optional-update-host.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/optional-update-host.f90
@@ -32 +32 @@  program optional_update_host
    if (res_arr(i) .ne. 0) stop [-1-]{+3+}
@@ -37 +37 @@  program optional_update_host
    if (res_arr(i) .ne. a_arr(i) * b_arr(i)) stop [-2-]{+4+}
@@ -52 +52 @@  program optional_update_host
    if (res_alloc(i) .ne. 0) stop [-1-]{+5+}
@@ -57 +57 @@  program optional_update_host
    if (res_alloc(i) .ne. a_alloc(i) * b_alloc(i)) stop [-2-]{+6+}