From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 91698 invoked by alias); 24 Jul 2018 20:48:27 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 91220 invoked by uid 89); 24 Jul 2018 20:48:22 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.3 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_PASS,URIBL_RED autolearn=ham version=3.3.2 spammy=sprinkled 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; Tue, 24 Jul 2018 20:48:19 +0000 Received: from svr-orw-mbx-01.mgc.mentorg.com ([147.34.90.201]) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1fi4EE-0006ug-08 from Cesar_Philippidis@mentor.com ; Tue, 24 Jul 2018 13:48:18 -0700 Received: from m3800.philippidis.net (147.34.91.1) by svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Tue, 24 Jul 2018 13:48:15 -0700 From: To: , Subject: [PATCH 10/11] [nvptx] Use MAX, MIN, ROUND_UP macros Date: Tue, 24 Jul 2018 20:48:00 -0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain X-SW-Source: 2018-07/txt/msg01435.txt.bz2 From: Tom de Vries This patch replaces the confusing, in-lined min, max and rounding code sprinkled throughout the nvptx BE with calls to MIN, MAX, and ROUND_UP macros. 2018-XX-YY Tom de Vries Cesar Philippidis gcc/ * config/nvptx/nvptx.c (nvptx_gen_shared_bcast, shared_prop_gen) (nvptx_goacc_expand_accel_var): Use MAX and ROUND_UP. (nvptx_assemble_value, nvptx_output_skip): Use MIN. (nvptx_shared_propagate, nvptx_single, nvptx_expand_shared_addr): Use MAX. (cherry picked from openacc-gcc-7-branch commit d3d6411c160071f70f995bbcd92f617aec67ba10) diff --git a/gcc/config/nvptx/nvptx.c b/gcc/config/nvptx/nvptx.c index 09daedd..7d49b4f 100644 --- a/gcc/config/nvptx/nvptx.c +++ b/gcc/config/nvptx/nvptx.c @@ -1812,9 +1812,8 @@ nvptx_gen_shared_bcast (rtx reg, propagate_mask pm, unsigned rep, { unsigned align = GET_MODE_ALIGNMENT (mode) / BITS_PER_UNIT; - if (align > oacc_bcast_align) - oacc_bcast_align = align; - data->offset = (data->offset + align - 1) & ~(align - 1); + oacc_bcast_align = MAX (oacc_bcast_align, align); + data->offset = ROUND_UP (data->offset, align); addr = data->base; gcc_assert (data->base != NULL); if (data->offset) @@ -1936,8 +1935,7 @@ nvptx_assemble_value (unsigned HOST_WIDE_INT val, unsigned size) { val >>= part * BITS_PER_UNIT; part = init_frag.size - init_frag.offset; - if (part > size) - part = size; + part = MIN (part, size); unsigned HOST_WIDE_INT partial = val << (init_frag.offset * BITS_PER_UNIT); @@ -2000,8 +1998,7 @@ nvptx_output_skip (FILE *, unsigned HOST_WIDE_INT size) if (init_frag.offset) { unsigned part = init_frag.size - init_frag.offset; - if (part > size) - part = (unsigned) size; + part = MIN (part, (unsigned)size); size -= part; nvptx_assemble_value (0, part); } @@ -3957,9 +3954,8 @@ shared_prop_gen (rtx reg, propagate_mask pm, unsigned rep, void *data_, /* Starting a loop, initialize pointer. */ unsigned align = GET_MODE_ALIGNMENT (GET_MODE (reg)) / BITS_PER_UNIT; - if (align > oacc_bcast_align) - oacc_bcast_align = align; - data->offset = (data->offset + align - 1) & ~(align - 1); + oacc_bcast_align = MAX (oacc_bcast_align, align); + data->offset = ROUND_UP (data->offset, align); data->ptr = gen_reg_rtx (Pmode); @@ -4000,8 +3996,7 @@ nvptx_shared_propagate (bool pre_p, bool is_call, basic_block block, rtx init = gen_rtx_SET (data.base, oacc_bcast_sym); emit_insn_after (init, insn); - if (oacc_bcast_size < data.offset) - oacc_bcast_size = data.offset; + oacc_bcast_size = MAX (oacc_bcast_size, data.offset); } return empty; } @@ -4379,8 +4374,7 @@ nvptx_single (unsigned mask, basic_block from, basic_block to) data.base = oacc_bcast_sym; data.ptr = 0; - if (oacc_bcast_size < GET_MODE_SIZE (SImode)) - oacc_bcast_size = GET_MODE_SIZE (SImode); + oacc_bcast_size = MAX (oacc_bcast_size, GET_MODE_SIZE (SImode)); data.offset = 0; emit_insn_before (nvptx_gen_shared_bcast (pvar, PM_read, 0, &data, @@ -5122,13 +5116,11 @@ nvptx_expand_shared_addr (tree exp, rtx target, return target; unsigned align = TREE_INT_CST_LOW (CALL_EXPR_ARG (exp, 2)); - if (align > worker_red_align) - worker_red_align = align; + worker_red_align = MAX (worker_red_align, align); unsigned offset = TREE_INT_CST_LOW (CALL_EXPR_ARG (exp, 0)); unsigned size = TREE_INT_CST_LOW (CALL_EXPR_ARG (exp, 1)); - if (size + offset > worker_red_size) - worker_red_size = size + offset; + worker_red_size = MAX (worker_red_size, size + offset); rtx addr = worker_red_sym; if (offset) -- 2.7.4