diff options
| author | Tom de Vries <tdevries@suse.de> | 2018-12-19 10:17:31 +0000 |
|---|---|---|
| committer | Tom de Vries <vries@gcc.gnu.org> | 2018-12-19 10:17:31 +0000 |
| commit | 3c55d60f405e4429cbcd2cf5c27c048ac226b502 (patch) | |
| tree | abce9c890f806b979599388730df401168b90e71 /gcc | |
| parent | a0b3b5c4af07ba34991c4f253496725a760104c2 (diff) | |
| download | gcc-3c55d60f405e4429cbcd2cf5c27c048ac226b502.zip gcc-3c55d60f405e4429cbcd2cf5c27c048ac226b502.tar.gz gcc-3c55d60f405e4429cbcd2cf5c27c048ac226b502.tar.bz2 | |
[nvptx] Use MAX, MIN, ROUND_UP macros
Use MAX, MIN, and ROUND_UP macros to simplify code.
Build and reg-tested on x86_64 with nvptx accelerator.
2018-12-19 Tom de Vries <tdevries@suse.de>
* 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.
From-SVN: r267261
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/config/nvptx/nvptx.c | 28 |
2 files changed, 18 insertions, 18 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ee201a5..b850704 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,13 @@ 2018-12-19 Tom de Vries <tdevries@suse.de> + * 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. + +2018-12-19 Tom de Vries <tdevries@suse.de> + * config/nvptx/nvptx.c (nvptx_gen_wcast): Rename as nvptx_gen_warp_bcast. (nvptx_gen_wcast): Rename to nvptx_gen_shared_bcast, add bool diff --git a/gcc/config/nvptx/nvptx.c b/gcc/config/nvptx/nvptx.c index 163f226..2a2d638 100644 --- a/gcc/config/nvptx/nvptx.c +++ b/gcc/config/nvptx/nvptx.c @@ -1810,9 +1810,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) @@ -1934,8 +1933,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); @@ -1998,8 +1996,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); } @@ -3927,9 +3924,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); @@ -3970,8 +3966,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; } @@ -4346,8 +4341,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, @@ -5044,13 +5038,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) |