From patchwork Wed Sep 18 11:51:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 1163921 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-509210-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="HSuR0C0p"; 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 46YJHK61P5z9s4Y for ; Wed, 18 Sep 2019 21:51:55 +1000 (AEST) 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=vr3ovdFjEpKjcfXTry1EYQnCqJWHYR8jLXZs/uFCooHjCekIXD zDL1IfbGWE7MyRpwca3crQ3CsDWgaaXJKw0J2VJ/+adF+gacDseAbBE2KAuCygj8 U5YfcJu0/9QcQhZWT49Mmlw2yx5C4ugCX3iqGTKWGfRKHX8sLlvdx9qoA= 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=v/51H9P3RZqLVSZW+RsYqvkgNWA=; b=HSuR0C0p24sg9a5Cqqc5 eskAJR6ZTC/csIeLe4lvhXuI4ts3ggMB7yfScvyd6Wfc+cHOTSgS0YMslAr+MBzP rUG4RjxBwGFom8K/AQcYTJBBgd/U6RTHc+RH7aDCOkMbPp5uLDCyIn9JnsZqru6m yyzu9y5WitPiOyvp3Mj86pI= Received: (qmail 110395 invoked by alias); 18 Sep 2019 11:51:47 -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 110378 invoked by uid 89); 18 Sep 2019 11:51:47 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.1 spammy=serial 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; Wed, 18 Sep 2019 11:51:46 +0000 IronPort-SDR: AoHFA32qPuvYHgNqUphK0xSuiHNxGYzA8wSn+ckNCi4TA6WWjaq6Gm1SxST4XJszv9Uui1dgiO 1Efdbf2yCNscQ0/Lcabo3QKnZuYI6gcYtMdCIy4o8CPdkJBxMPTRDXn0F7Qhs2PpZZryRzQeI5 FTvWiRnwuBm3/9LU3mqPnmLoJgiDQ4sTfrWNkcNZaPnLWNDCxwXws0u/h/faMYXtfV50BcSpUz BAX/4gWeclNoLox2NCWxirOmOaCRv7yTXeTyaNFtckfoxu9QYowFYDPFIGlUHke1dyZ8v8S5sn eyg= Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 18 Sep 2019 03:51:44 -0800 IronPort-SDR: ny2XtO7dm/+4JO1TASUDXh3x/BR8bCEp5YFA9ulmHvu1J++ka0J0jPJ6A7xscSBgNcFFjMcwZ/ 3lf0jUxRXmituScan71kXAHUM7QsD0ONfPcgF+SlqrPb/eadbcsWP/Kp4z97ZL9xMpacamtnEu 8WwVik5XuaVJburvCIFRbFAVoTi58uLu9RgiIsrg/wamygNUcc2mBFc4KkEueyvAylzAkvDpIP 5QZ0+tv9s/xbfR89diZg25qhsVIIQ8cRzWcGpkcp7X179N8PlUfl49fiIZ0c0ut6bK6MKAyZb/ fMg= To: From: Tobias Burnus Subject: [Patch,committed][OG9] Fix dg-warning line numbers in libgomp Message-ID: Date: Wed, 18 Sep 2019 13:51:33 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 X-IsSubscribed: yes This fixes the line numbers of dg-warnings (cf. 2019-07-31 commit fcea4b6e384e30231ab6d88b1f9feb1007b3e96b). Committed to the openacc-gcc-9-branch. Tobias commit 0f2a4240229e97fdbcd3c8299642ed4b85f5b347 Author: Tobias Burnus Date: Wed Sep 18 13:45:34 2019 +0200 libgomp - fix dg-warning line numbers libgomp/ * testsuite/libgomp.oacc-c-c++-common/parallel-dims.c: Fix dg-warning line numbers. * testsuite/libgomp.oacc-c-c++-common/serial-dims.c: Likewise. diff --git a/libgomp/ChangeLog.openacc b/libgomp/ChangeLog.openacc index db7f2a43b80..943a9e4a933 100644 --- a/libgomp/ChangeLog.openacc +++ b/libgomp/ChangeLog.openacc @@ -1,3 +1,9 @@ +2019-09-18 Tobias Burnus + + * testsuite/libgomp.oacc-c-c++-common/parallel-dims.c: Fix dg-warning + line numbers. + * testsuite/libgomp.oacc-c-c++-common/serial-dims.c: Likewise. + 2019-09-18 Tobias Burnus * linux/gomp_print.c (gomp_print_integer): Use PRId64 if available, diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-dims.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-dims.c index d9f2c75e868..2c14f9c545a 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-dims.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-dims.c @@ -158,7 +158,7 @@ int main () gangs_min = workers_min = vectors_min = INT_MAX; gangs_max = workers_max = vectors_max = INT_MIN; #pragma acc parallel copy (vectors_actual) /* { dg-warning "region contains vector partitioned code but is not vector partitioned" } */ \ - /* { dg-warning "using vector_length \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } .-1 } */ \ + /* { dg-warning "using vector_length \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } 160 } */ \ vector_length (VECTORS) /* { dg-warning "'vector_length' value must be positive" "" { target c++ } } */ { /* We're actually executing with vector_length (1), just the GCC nvptx diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/serial-dims.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/serial-dims.c index fd4b17c40c2..3895405b2cf 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/serial-dims.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/serial-dims.c @@ -59,10 +59,10 @@ int main () gangs_max = workers_max = vectors_max = INT_MIN; gangs_actual = workers_actual = vectors_actual = 1; #pragma acc serial - /* { dg-warning "region contains gang partitioned code but is not gang partitioned" "" { target *-*-* } .-1 } */ - /* { dg-warning "region contains worker partitioned code but is not worker partitioned" "" { target *-*-* } .-2 } */ - /* { dg-warning "region contains vector partitioned code but is not vector partitioned" "" { target *-*-* } .-3 } */ - /* { dg-warning "using vector_length \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } .-4 } */ + /* { dg-warning "region contains gang partitioned code but is not gang partitioned" "" { target *-*-* } 61 } */ + /* { dg-warning "region contains worker partitioned code but is not worker partitioned" "" { target *-*-* } 61 } */ + /* { dg-warning "region contains vector partitioned code but is not vector partitioned" "" { target *-*-* } 61 } */ + /* { dg-warning "using vector_length \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } 61 } */ { if (acc_on_device (acc_device_nvidia)) {