From patchwork Sat Jan 12 10:39:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 1023881 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-493923-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="hPsq0o+l"; 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 43cGS06gtHz9s9h for ; Sat, 12 Jan 2019 21:38:56 +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:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=K0jDSdCm1A2gkQQIxpkawWcBH7WSb/WyiaT5xLAG5lvfQjvqu07Xm vMtSBIKRhn+i+wxRWOateNoHL4nTvYNQLBlFdXqXJyUK+4Dqm7BDo5jL5PfSeHZY huP93xkfiG54w25heIrfILIXMPA9xgZuGlS5TT34wxDNCjpkEe1gOo= 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:date :from:to:subject:message-id:mime-version:content-type; s= default; bh=HennzRt18VnJpRvSM02KQHTp4Dk=; b=hPsq0o+li8v0D9uDgESt dkrOfv4YzTOachuIQEcDoQ59BZUPQAHDiq1RZTmqOS/UqaUXnUJizQtuIgZrcncs a7WibMgdE7xWlg93J63ZjM/pYSvYfwihdi29TtlMVQD2rO91h5q5Giz2BCeJgNmd ZkXtY3eVoOsDPQ5oBf/FGnY= Received: (qmail 116353 invoked by alias); 12 Jan 2019 10:38:50 -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 116344 invoked by uid 89); 12 Jan 2019 10:38:50 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 12 Jan 2019 10:38:48 +0000 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id B4FB9AD29 for ; Sat, 12 Jan 2019 10:38:46 +0000 (UTC) Date: Sat, 12 Jan 2019 11:39:08 +0100 From: Tom de Vries To: gcc-patches@gcc.gnu.org Subject: [committed][nvptx] Allow default vl to be overridden in nvptx_goacc_validate_dims_1 Message-ID: <20190112103906.GA11521@delia> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-IsSubscribed: yes Hi, In nvptx_goacc_validate_dims_1, allow oacc_default_dims[DIM_VECTOR] to be overridden, by assigning it to a new variable default_vector_length at the start, and using it at the end. Committed to trunk. Thanks, - Tom [nvptx] Allow default vl to be overridden in nvptx_goacc_validate_dims_1 2019-01-11 Tom de Vries * config/nvptx/nvptx.c (nvptx_goacc_validate_dims_1): Add an use new variable default_vector_length. --- gcc/config/nvptx/nvptx.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gcc/config/nvptx/nvptx.c b/gcc/config/nvptx/nvptx.c index a4c79532a1d..95d72d0a4e0 100644 --- a/gcc/config/nvptx/nvptx.c +++ b/gcc/config/nvptx/nvptx.c @@ -5556,6 +5556,7 @@ nvptx_goacc_validate_dims_1 (tree decl, int dims[], int fn_level, unsigned used) bool offload_region_p = false; bool routine_p = false; bool routine_seq_p = false; + int default_vector_length = -1; if (decl == NULL_TREE) { @@ -5654,6 +5655,12 @@ nvptx_goacc_validate_dims_1 (tree decl, int dims[], int fn_level, unsigned used) gcc_assert (dims[GOMP_DIM_GANG] >= -1); } + if (offload_region_p) + default_vector_length = oacc_get_default_dim (GOMP_DIM_VECTOR); + else + /* oacc_default_dims_p. */ + default_vector_length = PTX_DEFAULT_VECTOR_LENGTH; + int old_dims[GOMP_DIM_MAX]; unsigned int i; for (i = 0; i < GOMP_DIM_MAX; ++i) @@ -5673,12 +5680,12 @@ nvptx_goacc_validate_dims_1 (tree decl, int dims[], int fn_level, unsigned used) if (dims[GOMP_DIM_VECTOR] == 0) { vector_reason = G_("using vector_length (%d), ignoring runtime setting"); - dims[GOMP_DIM_VECTOR] = PTX_DEFAULT_VECTOR_LENGTH; + dims[GOMP_DIM_VECTOR] = default_vector_length; } if (dims[GOMP_DIM_VECTOR] > 0 && !nvptx_welformed_vector_length_p (dims[GOMP_DIM_VECTOR])) - dims[GOMP_DIM_VECTOR] = PTX_DEFAULT_VECTOR_LENGTH; + dims[GOMP_DIM_VECTOR] = default_vector_length; nvptx_apply_dim_limits (dims); @@ -5696,7 +5703,7 @@ nvptx_goacc_validate_dims_1 (tree decl, int dims[], int fn_level, unsigned used) if (oacc_default_dims_p) { - dims[GOMP_DIM_VECTOR] = PTX_DEFAULT_VECTOR_LENGTH; + dims[GOMP_DIM_VECTOR] = default_vector_length; if (dims[GOMP_DIM_WORKER] < 0) dims[GOMP_DIM_WORKER] = PTX_DEFAULT_RUNTIME_DIM; if (dims[GOMP_DIM_GANG] < 0) @@ -5715,7 +5722,9 @@ nvptx_goacc_validate_dims_1 (tree decl, int dims[], int fn_level, unsigned used) /* Function oacc_validate_dims will apply the minimal dimension. */ continue; - dims[i] = oacc_get_default_dim (i); + dims[i] = (i == GOMP_DIM_VECTOR + ? default_vector_length + : oacc_get_default_dim (i)); } nvptx_apply_dim_limits (dims);