From patchwork Fri Aug 2 20:12:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julian Brown X-Patchwork-Id: 1141379 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-506142-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="s0JMMq+m"; 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 460df02GQ5z9s00 for ; Sat, 3 Aug 2019 06:13:44 +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:from :to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; q=dns; s= default; b=fn9NP/ZSzXToJBk9MwG5YodwVhO0FzYNij0iRENNvOieHrS2Qr2VT 7BLcgRKS6RaKwgCk/bJvJXExqvBvkIz5CmRmuD4SWgm5C0hpA6nBJVTk10Voijms ThW8bnFDhucedOfAaykBMirwmc4cHYjC4A0GEVRy/1Ie5gLGJmTpGo= 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:from :to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s=default; bh=XxPWXexSGRekmMpstzjQRY0OKOM=; b=s0JMMq+m2r8ATsv4O9iPGm3xWWVT aaLO6ov7x4tNl2y7viv4USFGB6C7cBfnmZe3XaV0r9MzAzK4XUTr31ew5keB7/fl TUauPKxoiv4eZF7l7otEpXUAIBvmybZ5l+MW2okNDdgs110AHQb+3oesLDxJR+cu Lg6hocIpmUj67Zo= Received: (qmail 7166 invoked by alias); 2 Aug 2019 20:13:07 -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 7120 invoked by uid 89); 2 Aug 2019 20:13:07 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 spammy= 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; Fri, 02 Aug 2019 20:13:05 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-MBX-04.mgc.mentorg.com) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1htdvE-0001CM-5r from Julian_Brown@mentor.com ; Fri, 02 Aug 2019 13:13:04 -0700 Received: from build5-trusty-cs.sje.mentorg.com (147.34.91.1) by SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Fri, 2 Aug 2019 21:13:00 +0100 From: Julian Brown To: CC: Andrew Stubbs , Jakub Jelinek Subject: [PATCH 8/8] [og9] Update parallel-dims.c and serial-dims.c warning line numbering. Date: Fri, 2 Aug 2019 13:12:43 -0700 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-IsSubscribed: yes This patch adjusts the parallel-dims.c and serial-dims.c tests to use relative, rather than absolute, line numbers for expected warning emission. ChangeLog 2019-07-31 Julian Brown * testsuite/libgomp.oacc-c-c++-common/parallel-dims.c: Use relative line numbers for warning. * testsuite/libgomp.oacc-c-c++-common/serial-dims.c: Likewise. --- libgomp/ChangeLog.openacc | 6 ++++++ .../testsuite/libgomp.oacc-c-c++-common/parallel-dims.c | 2 +- libgomp/testsuite/libgomp.oacc-c-c++-common/serial-dims.c | 8 ++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libgomp/ChangeLog.openacc b/libgomp/ChangeLog.openacc index c850203e145..a187ebb7295 100644 --- a/libgomp/ChangeLog.openacc +++ b/libgomp/ChangeLog.openacc @@ -1,3 +1,9 @@ +2019-07-31 Julian Brown + + * testsuite/libgomp.oacc-c-c++-common/parallel-dims.c: Use relative + line numbers for warning. + * testsuite/libgomp.oacc-c-c++-common/serial-dims.c: Likewise. + 2019-07-31 Julian Brown * config/nvptx/gomp_print.c (gomp_print_string, gomp_print_integer, 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 ec63e3fe2c9..d9f2c75e868 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 } 157 } */ \ + /* { dg-warning "using vector_length \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } .-1 } */ \ 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 d4692091b84..fd4b17c40c2 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 *-*-* } 58 } */ - /* { dg-warning "region contains worker partitioned code but is not worker partitioned" "" { target *-*-* } 58 } */ - /* { dg-warning "region contains vector partitioned code but is not vector partitioned" "" { target *-*-* } 58 } */ - /* { dg-warning "using vector_length \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } 58 } */ + /* { 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 } */ { if (acc_on_device (acc_device_nvidia)) {