From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 103588 invoked by alias); 9 Dec 2017 23:21:51 -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 103579 invoked by uid 89); 9 Dec 2017 23:21:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.0 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_2,GIT_PATCH_3,KAM_ASCII_DIVIDERS,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-wr0-f175.google.com Received: from mail-wr0-f175.google.com (HELO mail-wr0-f175.google.com) (209.85.128.175) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 09 Dec 2017 23:21:49 +0000 Received: by mail-wr0-f175.google.com with SMTP id l22so14017000wrc.11 for ; Sat, 09 Dec 2017 15:21:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:mail-followup-to:subject:references:date :in-reply-to:message-id:user-agent:mime-version; bh=Aa9aQk3XWGcD8hjxglNyund7ylJYgVmWYBiTffs5nYU=; b=Ffs2loFMbb8X9M2i+ANSPppv6Ftx7HQ97205RGJe9PdRi37BXyZ12EXtGlTMb3Nv4N rXTma85XUpbKWsUvo9bVCVdrfuR7En8WimYaWn76u3ERqY42mIYDw7SbHXDh8oM/7qWK Z6GkwwOFubwSNk+Ni6GPycZ4iQuyWmnt5MsEZj7xxRXlnPJcCN9K2C7oPuc5f3boPTvW pL47HZnlgJri2Kym4/W5VMqByySc2gm5wamttR3oGccLNa6qtm9DMo/ukaVLrV7UbKjd d4DCjf/IxhM8ivMq+P3pvBpemOEqLlV2ovwRxFoCGrbnR5FaRe5PNtH3jjIa3C/P2qDZ fp/Q== X-Gm-Message-State: AJaThX7ompArgtx4xLHzb1wS4melZWaiLKWfMkJPAe65fN9kld3neqz5 ssmDosBjU9cC+7HYCtxJUyY68WeMjuY= X-Google-Smtp-Source: AGs4zMYAlkTMYY+ZjhZv6le+yyDOoDAGbMEqrcn2dd9ZixNKb2Db6bDn2f1nB4r+yRTvRuhKDAWQzg== X-Received: by 10.223.195.198 with SMTP id d6mr30507148wrg.100.1512861706426; Sat, 09 Dec 2017 15:21:46 -0800 (PST) Received: from localhost ([2.25.234.120]) by smtp.gmail.com with ESMTPSA id 187sm5409088wmu.19.2017.12.09.15.21.45 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 09 Dec 2017 15:21:45 -0800 (PST) From: Richard Sandiford To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, richard.sandiford@linaro.org Subject: [09/13] Use explicit encodings for simple permutes References: <87indfmrgt.fsf@linaro.org> Date: Sat, 09 Dec 2017 23:21:00 -0000 In-Reply-To: <87indfmrgt.fsf@linaro.org> (Richard Sandiford's message of "Sat, 09 Dec 2017 23:06:26 +0000") Message-ID: <87d13nlc6v.fsf@linaro.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-SW-Source: 2017-12/txt/msg00562.txt.bz2 This patch makes users of vec_perm_builders use the compressed encoding where possible. This means that they work with variable-length vectors. 2017-12-09 Richard Sandiford gcc/ * optabs.c (expand_vec_perm_var): Use an explicit encoding for the broadcast of the low byte. (expand_mult_highpart): Use an explicit encoding for the permutes. * optabs-query.c (can_mult_highpart_p): Likewise. * tree-vect-loop.c (calc_vec_perm_mask_for_shift): Likewise. * tree-vect-stmts.c (perm_mask_for_reverse): Likewise. (vectorizable_bswap): Likewise. * tree-vect-data-refs.c (vect_grouped_store_supported): Use an explicit encoding for the power-of-2 permutes. (vect_permute_store_chain): Likewise. (vect_grouped_load_supported): Likewise. (vect_permute_load_chain): Likewise. Index: gcc/optabs.c =================================================================== --- gcc/optabs.c 2017-12-09 22:48:47.546825312 +0000 +++ gcc/optabs.c 2017-12-09 22:48:52.266015836 +0000 @@ -5625,15 +5625,14 @@ expand_vec_perm_var (machine_mode mode, NULL, 0, OPTAB_DIRECT); gcc_assert (sel != NULL); - /* Broadcast the low byte each element into each of its bytes. */ - vec_perm_builder const_sel (w, w, 1); - for (i = 0; i < w; ++i) - { - int this_e = i / u * u; - if (BYTES_BIG_ENDIAN) - this_e += u - 1; - const_sel.quick_push (this_e); - } + /* Broadcast the low byte each element into each of its bytes. + The encoding has U interleaved stepped patterns, one for each + byte of an element. */ + vec_perm_builder const_sel (w, u, 3); + unsigned int low_byte_in_u = BYTES_BIG_ENDIAN ? u - 1 : 0; + for (i = 0; i < 3; ++i) + for (unsigned int j = 0; j < u; ++j) + const_sel.quick_push (i * u + low_byte_in_u); sel = gen_lowpart (qimode, sel); sel = expand_vec_perm_const (qimode, sel, sel, const_sel, qimode, NULL); gcc_assert (sel != NULL); @@ -5853,16 +5852,20 @@ expand_mult_highpart (machine_mode mode, expand_insn (optab_handler (tab2, mode), 3, eops); m2 = gen_lowpart (mode, eops[0].value); - vec_perm_builder sel (nunits, nunits, 1); + vec_perm_builder sel; if (method == 2) { - for (i = 0; i < nunits; ++i) + /* The encoding has 2 interleaved stepped patterns. */ + sel.new_vector (nunits, 2, 3); + for (i = 0; i < 6; ++i) sel.quick_push (!BYTES_BIG_ENDIAN + (i & ~1) + ((i & 1) ? nunits : 0)); } else { - for (i = 0; i < nunits; ++i) + /* The encoding has a single interleaved stepped pattern. */ + sel.new_vector (nunits, 1, 3); + for (i = 0; i < 3; ++i) sel.quick_push (2 * i + (BYTES_BIG_ENDIAN ? 0 : 1)); } Index: gcc/optabs-query.c =================================================================== --- gcc/optabs-query.c 2017-12-09 22:48:47.545825268 +0000 +++ gcc/optabs-query.c 2017-12-09 22:48:52.265015799 +0000 @@ -501,8 +501,9 @@ can_mult_highpart_p (machine_mode mode, op = uns_p ? vec_widen_umult_odd_optab : vec_widen_smult_odd_optab; if (optab_handler (op, mode) != CODE_FOR_nothing) { - vec_perm_builder sel (nunits, nunits, 1); - for (i = 0; i < nunits; ++i) + /* The encoding has 2 interleaved stepped patterns. */ + vec_perm_builder sel (nunits, 2, 3); + for (i = 0; i < 6; ++i) sel.quick_push (!BYTES_BIG_ENDIAN + (i & ~1) + ((i & 1) ? nunits : 0)); @@ -518,8 +519,9 @@ can_mult_highpart_p (machine_mode mode, op = uns_p ? vec_widen_umult_lo_optab : vec_widen_smult_lo_optab; if (optab_handler (op, mode) != CODE_FOR_nothing) { - vec_perm_builder sel (nunits, nunits, 1); - for (i = 0; i < nunits; ++i) + /* The encoding has a single stepped pattern. */ + vec_perm_builder sel (nunits, 1, 3); + for (int i = 0; i < 3; ++i) sel.quick_push (2 * i + (BYTES_BIG_ENDIAN ? 0 : 1)); vec_perm_indices indices (sel, 2, nunits); if (can_vec_perm_const_p (mode, indices)) Index: gcc/tree-vect-loop.c =================================================================== --- gcc/tree-vect-loop.c 2017-12-09 22:48:47.547825355 +0000 +++ gcc/tree-vect-loop.c 2017-12-09 22:48:52.267015873 +0000 @@ -3716,8 +3716,10 @@ vect_estimate_min_profitable_iters (loop calc_vec_perm_mask_for_shift (unsigned int offset, unsigned int nelt, vec_perm_builder *sel) { - sel->new_vector (nelt, nelt, 1); - for (unsigned int i = 0; i < nelt; i++) + /* The encoding is a single stepped pattern. Any wrap-around is handled + by vec_perm_indices. */ + sel->new_vector (nelt, 1, 3); + for (unsigned int i = 0; i < 3; i++) sel->quick_push (i + offset); } Index: gcc/tree-vect-stmts.c =================================================================== --- gcc/tree-vect-stmts.c 2017-12-09 22:48:50.360942531 +0000 +++ gcc/tree-vect-stmts.c 2017-12-09 22:48:52.268015910 +0000 @@ -1717,8 +1717,9 @@ perm_mask_for_reverse (tree vectype) nunits = TYPE_VECTOR_SUBPARTS (vectype); - vec_perm_builder sel (nunits, nunits, 1); - for (i = 0; i < nunits; ++i) + /* The encoding has a single stepped pattern. */ + vec_perm_builder sel (nunits, 1, 3); + for (i = 0; i < 3; ++i) sel.quick_push (nunits - 1 - i); vec_perm_indices indices (sel, 1, nunits); @@ -2504,8 +2505,9 @@ vectorizable_bswap (gimple *stmt, gimple unsigned int num_bytes = TYPE_VECTOR_SUBPARTS (char_vectype); unsigned word_bytes = num_bytes / nunits; - vec_perm_builder elts (num_bytes, num_bytes, 1); - for (unsigned i = 0; i < nunits; ++i) + /* The encoding uses one stepped pattern for each byte in the word. */ + vec_perm_builder elts (num_bytes, word_bytes, 3); + for (unsigned i = 0; i < 3; ++i) for (unsigned j = 0; j < word_bytes; ++j) elts.quick_push ((i + 1) * word_bytes - j - 1); Index: gcc/tree-vect-data-refs.c =================================================================== --- gcc/tree-vect-data-refs.c 2017-12-09 22:48:47.546825312 +0000 +++ gcc/tree-vect-data-refs.c 2017-12-09 22:48:52.267015873 +0000 @@ -4566,14 +4566,13 @@ vect_grouped_store_supported (tree vecty if (VECTOR_MODE_P (mode)) { unsigned int i, nelt = GET_MODE_NUNITS (mode); - vec_perm_builder sel (nelt, nelt, 1); - sel.quick_grow (nelt); - if (count == 3) { unsigned int j0 = 0, j1 = 0, j2 = 0; unsigned int i, j; + vec_perm_builder sel (nelt, nelt, 1); + sel.quick_grow (nelt); vec_perm_indices indices; for (j = 0; j < 3; j++) { @@ -4623,7 +4622,10 @@ vect_grouped_store_supported (tree vecty /* If length is not equal to 3 then only power of 2 is supported. */ gcc_assert (pow2p_hwi (count)); - for (i = 0; i < nelt / 2; i++) + /* The encoding has 2 interleaved stepped patterns. */ + vec_perm_builder sel (nelt, 2, 3); + sel.quick_grow (6); + for (i = 0; i < 3; i++) { sel[i * 2] = i; sel[i * 2 + 1] = i + nelt; @@ -4631,7 +4633,7 @@ vect_grouped_store_supported (tree vecty vec_perm_indices indices (sel, 2, nelt); if (can_vec_perm_const_p (mode, indices)) { - for (i = 0; i < nelt; i++) + for (i = 0; i < 6; i++) sel[i] += nelt / 2; indices.new_vector (sel, 2, nelt); if (can_vec_perm_const_p (mode, indices)) @@ -4736,9 +4738,6 @@ vect_permute_store_chain (vec dr_c unsigned int i, n, log_length = exact_log2 (length); unsigned int j, nelt = TYPE_VECTOR_SUBPARTS (vectype); - vec_perm_builder sel (nelt, nelt, 1); - sel.quick_grow (nelt); - result_chain->quick_grow (length); memcpy (result_chain->address (), dr_chain.address (), length * sizeof (tree)); @@ -4747,6 +4746,8 @@ vect_permute_store_chain (vec dr_c { unsigned int j0 = 0, j1 = 0, j2 = 0; + vec_perm_builder sel (nelt, nelt, 1); + sel.quick_grow (nelt); vec_perm_indices indices; for (j = 0; j < 3; j++) { @@ -4808,7 +4809,10 @@ vect_permute_store_chain (vec dr_c /* If length is not equal to 3 then only power of 2 is supported. */ gcc_assert (pow2p_hwi (length)); - for (i = 0, n = nelt / 2; i < n; i++) + /* The encoding has 2 interleaved stepped patterns. */ + vec_perm_builder sel (nelt, 2, 3); + sel.quick_grow (6); + for (i = 0; i < 3; i++) { sel[i * 2] = i; sel[i * 2 + 1] = i + nelt; @@ -4816,7 +4820,7 @@ vect_permute_store_chain (vec dr_c vec_perm_indices indices (sel, 2, nelt); perm_mask_high = vect_gen_perm_mask_checked (vectype, indices); - for (i = 0; i < nelt; i++) + for (i = 0; i < 6; i++) sel[i] += nelt / 2; indices.new_vector (sel, 2, nelt); perm_mask_low = vect_gen_perm_mask_checked (vectype, indices); @@ -5164,11 +5168,11 @@ vect_grouped_load_supported (tree vectyp if (VECTOR_MODE_P (mode)) { unsigned int i, j, nelt = GET_MODE_NUNITS (mode); - vec_perm_builder sel (nelt, nelt, 1); - sel.quick_grow (nelt); if (count == 3) { + vec_perm_builder sel (nelt, nelt, 1); + sel.quick_grow (nelt); vec_perm_indices indices; unsigned int k; for (k = 0; k < 3; k++) @@ -5209,12 +5213,15 @@ vect_grouped_load_supported (tree vectyp /* If length is not equal to 3 then only power of 2 is supported. */ gcc_assert (pow2p_hwi (count)); - for (i = 0; i < nelt; i++) + /* The encoding has a single stepped pattern. */ + vec_perm_builder sel (nelt, 1, 3); + sel.quick_grow (3); + for (i = 0; i < 3; i++) sel[i] = i * 2; vec_perm_indices indices (sel, 2, nelt); if (can_vec_perm_const_p (mode, indices)) { - for (i = 0; i < nelt; i++) + for (i = 0; i < 3; i++) sel[i] = i * 2 + 1; indices.new_vector (sel, 2, nelt); if (can_vec_perm_const_p (mode, indices)) @@ -5332,9 +5339,6 @@ vect_permute_load_chain (vec dr_ch unsigned int i, j, log_length = exact_log2 (length); unsigned nelt = TYPE_VECTOR_SUBPARTS (vectype); - vec_perm_builder sel (nelt, nelt, 1); - sel.quick_grow (nelt); - result_chain->quick_grow (length); memcpy (result_chain->address (), dr_chain.address (), length * sizeof (tree)); @@ -5343,6 +5347,8 @@ vect_permute_load_chain (vec dr_ch { unsigned int k; + vec_perm_builder sel (nelt, nelt, 1); + sel.quick_grow (nelt); vec_perm_indices indices; for (k = 0; k < 3; k++) { @@ -5390,12 +5396,15 @@ vect_permute_load_chain (vec dr_ch /* If length is not equal to 3 then only power of 2 is supported. */ gcc_assert (pow2p_hwi (length)); - for (i = 0; i < nelt; ++i) + /* The encoding has a single stepped pattern. */ + vec_perm_builder sel (nelt, 1, 3); + sel.quick_grow (3); + for (i = 0; i < 3; ++i) sel[i] = i * 2; vec_perm_indices indices (sel, 2, nelt); perm_mask_even = vect_gen_perm_mask_checked (vectype, indices); - for (i = 0; i < nelt; ++i) + for (i = 0; i < 3; ++i) sel[i] = i * 2 + 1; indices.new_vector (sel, 2, nelt); perm_mask_odd = vect_gen_perm_mask_checked (vectype, indices);