From patchwork Fri Oct 25 16:17:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 1184284 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-511780-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="QQucaW1+"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4708Qw5HDpz9sPZ for ; Sat, 26 Oct 2019 03:17:44 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=aZnFT8cPWPBOJ47r5EopWGIzWNB0dkm7nmN735S+MFG2TTRx+O MBsDzuEaLJPF9lvkGdpsQ0MQ0vn9R3UnN3R+b6QvKVpaim4qllgoIqGZqchkCPwa jeAR/IPVT/88J4LdlAh3iICHFKUXCfo5iZlqCDKK4XPMWQ0UcYlyznKdE= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; s= default; bh=+P1P7OGMYzQHlyUDLhl5RX/zpE4=; b=QQucaW1+Be/v93us1bPb kVwBE9DAqBH1Nomwa7u4hNZZWq7O2EP2xtJvqNkSJpDDwLbBKGMWPJUPWbv0eFkn srLcDDQ6QGycSs+3UME+a3gYMMOqBGpBuDMrpAcqYS3maa07hiXdDnDsNAEdwo0/ Xyw7Lkwb8q2hcSGmnIN73d8= Received: (qmail 109547 invoked by alias); 25 Oct 2019 16:17:37 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 109529 invoked by uid 89); 25 Oct 2019 16:17:37 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-17.7 required=5.0 tests=AWL, BAYES_00, GARBLED_SUBJECT, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy=sk:use_dev, sk:omp_wor, UD:omp_workshare2.f, UD:strassen.f90 X-HELO: esa4.mentor.iphmx.com Received: from esa4.mentor.iphmx.com (HELO esa4.mentor.iphmx.com) (68.232.137.252) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 25 Oct 2019 16:17:35 +0000 IronPort-SDR: eZXzaH5wkrYWA0fi2ex+ZHXXL3TvJjrG/mt3RmktJnZA6mUg0CEbwC4Q87Cd5sE/8tBW0Fl89c HMm5qw0xPo02XkyPNxnso5/MdTmwHCfnD4I6L4k2PLDF12w8/rbRvFc5Xp78P7jKXUwpToPGm/ U9cju/6PTIobCMHC4UEkcVxkQwS4DX/hd6UG8Z8+KnXwN8Ihc0LzJVlCpPSRgmh3BpPzKjji8+ Q+c/p+DOfMFEn5pgAClx5liSIDBBdA9BtjZm74dWfQwe+sfVtn7/z+mxsItGEKnENErturWEDv sVI= Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 25 Oct 2019 08:17:33 -0800 IronPort-SDR: dY1GOfD7wu9RFcXByqB4fEWIjQsc/qrHp6T6XkG31xLLwruDxAd3oW6pVDp2JpjLvmHqqfZzB6 3rNFO9eLLhu1pJVEze2tURiQlGpNqg2rc7IWs9MJkLQsg8iE59A02J9WSfVSqMAIx0AegV6+77 Q6jKEvZB56dISAioStJC9jKh8QlG/xYZpiJWmelBX3vj7cMSG+jaFb6Ng68E3EDS48tg4LnNj5 90fp96s+9O1e0pHuzrImMGg6snumj4rC4BJrDygdRjcivKURa45JB+4j+qWEtyPz5gBfWoJ5++ dhE= To: gcc-patches , fortran , Jakub Jelinek From: Tobias Burnus Subject: =?utf-8?q?=5BPatch=5D=5BFortran=5D_OpenMP_=E2=80=93_libgomp/test?= =?utf-8?b?c3VpdGUg4oCTIHVzZSAnc3RvcCcgYW5kICdkZy1kbyBydW4n?= Message-ID: <56e2be4c-707c-9b09-e18b-1bf25e912296@codesourcery.com> Date: Fri, 25 Oct 2019 18:17:26 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.2 MIME-Version: 1.0 X-IsSubscribed: yes This patch is about: libgomp/testsuite/libgomp.fortran/, only The two test cases I added recently use 'call abort()', which is nowadays frowned on as that's a ventor extension. Hence, I change it to  'stop'. Additionally, the 'fortran.exp' in the directory states: "For Fortran we're doing torture testing, as Fortran has far more tests with arrays etc. that testing just -O0 or -O2 is insufficient, that is typically not the case for C/C++." The torture testing is only done if there is a "dg-do run"; without dg-do, it also does run, but only with a single compile flag setting. I have only selectively added it; I think 'dg-do run' does not make sense for: * condinc*.f – only do uses '!$ include' * omp_cond*.f* – only tests '!$' code, including comments. Hence, I excluded those and only changed the others. (However, one can still argue about the remaining ones – such as 'omp_hello.f' or tabs*.f*.) OK for the trunk? Add/remove for 'dg-do run' from additional test cases? Tobias libgomp/ * testsuite/libgomp.fortran/target-simd.f90: Use stop not abort. * testsuite/libgomp.fortran/use_device_ptr-optional-1.f90: Ditto; add 'dg-do run' for torture testing. * testsuite/libgomp.fortran/display-affinity-1.f90: Add 'dg-do run'. * testsuite/libgomp.fortran/lastprivate1.f90: Ditto. * testsuite/libgomp.fortran/lastprivate2.f90: Ditto. * testsuite/libgomp.fortran/nestedfn4.f90: Ditto. * testsuite/libgomp.fortran/omp_hello.f: Ditto. * testsuite/libgomp.fortran/omp_orphan.f: Ditto. * testsuite/libgomp.fortran/omp_reduction.f: Ditto. * testsuite/libgomp.fortran/omp_workshare1.f: Ditto. * testsuite/libgomp.fortran/omp_workshare2.f: Ditto. * testsuite/libgomp.fortran/pr25219.f90: Ditto. * testsuite/libgomp.fortran/pr28390.f: Ditto. * testsuite/libgomp.fortran/pr35130.f90: Ditto. * testsuite/libgomp.fortran/pr90779.f90: Ditto. * testsuite/libgomp.fortran/strassen.f90: Ditto. * testsuite/libgomp.fortran/task2.f90: Ditto. * testsuite/libgomp.fortran/taskgroup1.f90: Ditto. * testsuite/libgomp.fortran/taskloop1.f90: Ditto. * testsuite/libgomp.fortran/use_device_addr-1.f90: Ditto. * testsuite/libgomp.fortran/use_device_addr-2.f90: Ditto. * testsuite/libgomp.fortran/workshare1.f90: Ditto. * testsuite/libgomp.fortran/workshare2.f90: Ditto. diff --git a/libgomp/testsuite/libgomp.fortran/display-affinity-1.f90 b/libgomp/testsuite/libgomp.fortran/display-affinity-1.f90 index 4811b6f801b..4e732e5427f 100644 --- a/libgomp/testsuite/libgomp.fortran/display-affinity-1.f90 +++ b/libgomp/testsuite/libgomp.fortran/display-affinity-1.f90 @@ -0,0 +1 @@ +! { dg-do run } diff --git a/libgomp/testsuite/libgomp.fortran/lastprivate1.f90 b/libgomp/testsuite/libgomp.fortran/lastprivate1.f90 index 132617b5c27..62a5ef9d96c 100644 --- a/libgomp/testsuite/libgomp.fortran/lastprivate1.f90 +++ b/libgomp/testsuite/libgomp.fortran/lastprivate1.f90 @@ -0,0 +1 @@ +! { dg-do run } diff --git a/libgomp/testsuite/libgomp.fortran/lastprivate2.f90 b/libgomp/testsuite/libgomp.fortran/lastprivate2.f90 index 6cd5760206c..97b6007e1ef 100644 --- a/libgomp/testsuite/libgomp.fortran/lastprivate2.f90 +++ b/libgomp/testsuite/libgomp.fortran/lastprivate2.f90 @@ -0,0 +1 @@ +! { dg-do run } diff --git a/libgomp/testsuite/libgomp.fortran/nestedfn4.f90 b/libgomp/testsuite/libgomp.fortran/nestedfn4.f90 index bc8614a340a..6143bfb283c 100644 --- a/libgomp/testsuite/libgomp.fortran/nestedfn4.f90 +++ b/libgomp/testsuite/libgomp.fortran/nestedfn4.f90 @@ -0,0 +1 @@ +! { dg-do run } diff --git a/libgomp/testsuite/libgomp.fortran/omp_hello.f b/libgomp/testsuite/libgomp.fortran/omp_hello.f index ba445312625..0e795482dcf 100644 --- a/libgomp/testsuite/libgomp.fortran/omp_hello.f +++ b/libgomp/testsuite/libgomp.fortran/omp_hello.f @@ -0,0 +1 @@ +C { dg-do run } diff --git a/libgomp/testsuite/libgomp.fortran/omp_orphan.f b/libgomp/testsuite/libgomp.fortran/omp_orphan.f index 7653c78d2e4..306ed4eb64d 100644 --- a/libgomp/testsuite/libgomp.fortran/omp_orphan.f +++ b/libgomp/testsuite/libgomp.fortran/omp_orphan.f @@ -0,0 +1 @@ +C { dg-do run } diff --git a/libgomp/testsuite/libgomp.fortran/omp_reduction.f b/libgomp/testsuite/libgomp.fortran/omp_reduction.f index 0560bd8963d..222f20d010a 100644 --- a/libgomp/testsuite/libgomp.fortran/omp_reduction.f +++ b/libgomp/testsuite/libgomp.fortran/omp_reduction.f @@ -0,0 +1 @@ +C { dg-do run } diff --git a/libgomp/testsuite/libgomp.fortran/omp_workshare1.f b/libgomp/testsuite/libgomp.fortran/omp_workshare1.f index 8aef69406de..6fb8aad3ad0 100644 --- a/libgomp/testsuite/libgomp.fortran/omp_workshare1.f +++ b/libgomp/testsuite/libgomp.fortran/omp_workshare1.f @@ -0,0 +1 @@ +C { dg-do run } diff --git a/libgomp/testsuite/libgomp.fortran/omp_workshare2.f b/libgomp/testsuite/libgomp.fortran/omp_workshare2.f index 9e61da91e9b..3280dca9e6a 100644 --- a/libgomp/testsuite/libgomp.fortran/omp_workshare2.f +++ b/libgomp/testsuite/libgomp.fortran/omp_workshare2.f @@ -0,0 +1 @@ +C { dg-do run } diff --git a/libgomp/testsuite/libgomp.fortran/pr25219.f90 b/libgomp/testsuite/libgomp.fortran/pr25219.f90 index 61dd1bc04e6..3b10fceb8b7 100644 --- a/libgomp/testsuite/libgomp.fortran/pr25219.f90 +++ b/libgomp/testsuite/libgomp.fortran/pr25219.f90 @@ -0,0 +1 @@ +! { dg-do run } diff --git a/libgomp/testsuite/libgomp.fortran/pr28390.f b/libgomp/testsuite/libgomp.fortran/pr28390.f index a667e08f73e..9b2d29d2f73 100644 --- a/libgomp/testsuite/libgomp.fortran/pr28390.f +++ b/libgomp/testsuite/libgomp.fortran/pr28390.f @@ -0,0 +1 @@ +! { dg-do run } diff --git a/libgomp/testsuite/libgomp.fortran/pr35130.f90 b/libgomp/testsuite/libgomp.fortran/pr35130.f90 index e6be64f15f5..940531e823a 100644 --- a/libgomp/testsuite/libgomp.fortran/pr35130.f90 +++ b/libgomp/testsuite/libgomp.fortran/pr35130.f90 @@ -0,0 +1 @@ +! { dg-do run } diff --git a/libgomp/testsuite/libgomp.fortran/pr90779.f90 b/libgomp/testsuite/libgomp.fortran/pr90779.f90 index a6d687abfe6..c14dc87dd00 100644 --- a/libgomp/testsuite/libgomp.fortran/pr90779.f90 +++ b/libgomp/testsuite/libgomp.fortran/pr90779.f90 @@ -0,0 +1 @@ +! { dg-do run } diff --git a/libgomp/testsuite/libgomp.fortran/strassen.f90 b/libgomp/testsuite/libgomp.fortran/strassen.f90 index 84faced494a..06e136911e3 100644 --- a/libgomp/testsuite/libgomp.fortran/strassen.f90 +++ b/libgomp/testsuite/libgomp.fortran/strassen.f90 @@ -0,0 +1 @@ +! { dg-do run } diff --git a/libgomp/testsuite/libgomp.fortran/target-simd.f90 b/libgomp/testsuite/libgomp.fortran/target-simd.f90 index a58e6a57d15..158347b59dc 100644 --- a/libgomp/testsuite/libgomp.fortran/target-simd.f90 +++ b/libgomp/testsuite/libgomp.fortran/target-simd.f90 @@ -17 +17 @@ program test - if (any (b - 5.0 *a > 10.0*epsilon(a))) call abort() + if (any (b - 5.0 *a > 10.0*epsilon(a))) stop 1 @@ -25 +25 @@ program test - if (any (b - 2.0 *a > 10.0*epsilon(a))) call abort() + if (any (b - 2.0 *a > 10.0*epsilon(a))) stop 2 diff --git a/libgomp/testsuite/libgomp.fortran/task2.f90 b/libgomp/testsuite/libgomp.fortran/task2.f90 index 27151415043..4f363b684a5 100644 --- a/libgomp/testsuite/libgomp.fortran/task2.f90 +++ b/libgomp/testsuite/libgomp.fortran/task2.f90 @@ -0,0 +1 @@ +! { dg-do run } diff --git a/libgomp/testsuite/libgomp.fortran/taskgroup1.f90 b/libgomp/testsuite/libgomp.fortran/taskgroup1.f90 index 3f6b38a35f9..145f54f8911 100644 --- a/libgomp/testsuite/libgomp.fortran/taskgroup1.f90 +++ b/libgomp/testsuite/libgomp.fortran/taskgroup1.f90 @@ -0,0 +1 @@ +! { dg-do run } diff --git a/libgomp/testsuite/libgomp.fortran/taskloop1.f90 b/libgomp/testsuite/libgomp.fortran/taskloop1.f90 index 48904b145bd..44a14c2433c 100644 --- a/libgomp/testsuite/libgomp.fortran/taskloop1.f90 +++ b/libgomp/testsuite/libgomp.fortran/taskloop1.f90 @@ -0,0 +1 @@ +! { dg-do run } diff --git a/libgomp/testsuite/libgomp.fortran/use_device_addr-1.f90 b/libgomp/testsuite/libgomp.fortran/use_device_addr-1.f90 index 2e5ce60d47c..69607e03e88 100644 --- a/libgomp/testsuite/libgomp.fortran/use_device_addr-1.f90 +++ b/libgomp/testsuite/libgomp.fortran/use_device_addr-1.f90 @@ -0,0 +1 @@ +! { dg-do run } diff --git a/libgomp/testsuite/libgomp.fortran/use_device_addr-2.f90 b/libgomp/testsuite/libgomp.fortran/use_device_addr-2.f90 index bddb4491414..391a8313aec 100644 --- a/libgomp/testsuite/libgomp.fortran/use_device_addr-2.f90 +++ b/libgomp/testsuite/libgomp.fortran/use_device_addr-2.f90 @@ -0,0 +1 @@ +! { dg-do run } diff --git a/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-1.f90 b/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-1.f90 index 93c61216034..ac69df559c9 100644 --- a/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-1.f90 +++ b/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-1.f90 @@ -0,0 +1 @@ +! { dg-do run } @@ -17,2 +18,2 @@ contains - if (.not.present(ii)) call abort() - if (.not.associated(ii, ixx)) call abort() + if (.not.present(ii)) stop 1 + if (.not.associated(ii, ixx)) stop 2 @@ -20,2 +21,2 @@ contains - if (.not.present(ii)) call abort() - if (.not.associated(ii)) call abort() + if (.not.present(ii)) stop 3 + if (.not.associated(ii)) stop 4 @@ -29,2 +30,2 @@ contains - if (.not.present(jj)) call abort() - if (associated(jj)) call abort() + if (.not.present(jj)) stop 5 + if (associated(jj)) stop 6 @@ -32,2 +33,2 @@ contains - if (.not.present(jj)) call abort() - if (associated(jj)) call abort() + if (.not.present(jj)) stop 7 + if (associated(jj)) stop 8 diff --git a/libgomp/testsuite/libgomp.fortran/workshare1.f90 b/libgomp/testsuite/libgomp.fortran/workshare1.f90 index 1d2ba7d3ee2..f50928e0a47 100644 --- a/libgomp/testsuite/libgomp.fortran/workshare1.f90 +++ b/libgomp/testsuite/libgomp.fortran/workshare1.f90 @@ -0,0 +1 @@ +! { dg-do run } diff --git a/libgomp/testsuite/libgomp.fortran/workshare2.f90 b/libgomp/testsuite/libgomp.fortran/workshare2.f90 index 655a450885e..88b50fbe457 100644 --- a/libgomp/testsuite/libgomp.fortran/workshare2.f90 +++ b/libgomp/testsuite/libgomp.fortran/workshare2.f90 @@ -0,0 +1 @@ +! { dg-do run }