From patchwork Thu Dec 5 11:15:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1204581 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-515213-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="pX3KDlCO"; 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 47TCpJ1l57z9sP6 for ; Thu, 5 Dec 2019 22:16:22 +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=kCIkoMUKaM4bf1J9iJSb66TTfEQ5SMsYB5A6OAbwlQsDzA/a2B3c8 ofb/srln/mHp2cN6XHCunMbSBRAzDvh0qBVhScEqcGzKTQCfyc4+DtQTYU9buEb/ qSRiwLL29VW6WiVmkXwD+IXDS+2NZLjv5lrSWWhTEeH2uRxKIOLrfg= 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=calvTXYZcJniENgGEBT4W8+p5SY=; b=pX3KDlCO5NjFhUMoH4vw KXs4B3aQDg6g7SzAyCAzRMBICffkiDHt73RIMvGexGVltgipEKuHfOCZayXmLO9X duksl1rWY26nj3ofCnDaFH0pT4C25MptO9kqKZAyEnAqrtd9O4LVr4Z6LtBtDehd KfldR0hWcHeGOgaBDwRjfoE= Received: (qmail 110991 invoked by alias); 5 Dec 2019 11:16:11 -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 110771 invoked by uid 89); 5 Dec 2019 11:15:51 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-10.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, KAM_NUMSUBJECT, SPF_PASS autolearn=ham version=3.3.1 spammy=regtest, bit_insert_expr, BIT_INSERT_EXPR 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; Thu, 05 Dec 2019 11:15:47 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 202B8AE3D for ; Thu, 5 Dec 2019 11:15:45 +0000 (UTC) Date: Thu, 5 Dec 2019 12:15:45 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] Fix PR92818 Message-ID: User-Agent: Alpine 2.21 (LSU 202 2017-01-01) MIME-Version: 1.0 The following fixes a typo in the vec_perm to bit_insert pattern and adjusts forwprop heuristic to make it trigger. This improves code-gen for the testcase back to a simple movhpd like we emitted with GCC 9. Bootstrap / regtest running on x86_64-unknown-linux-gnu. Richard. 2019-12-05 Richard Biener PR middle-end/92818 * tree-ssa-forwprop.c (simplify_vector_constructor): Improve heuristics on what don't care element to choose. * match.pd (VEC_PERM_EXPR -> BIT_INSERT_EXPR): Fix typo. * gcc.target/i386/pr92818.c: New testcase. Index: gcc/tree-ssa-forwprop.c =================================================================== --- gcc/tree-ssa-forwprop.c (revision 278992) +++ gcc/tree-ssa-forwprop.c (working copy) @@ -2265,9 +2265,12 @@ simplify_vector_constructor (gimple_stmt sel.quick_push (elts[i].second + elts[i].first * refnelts); /* And fill the tail with "something". It's really don't care, and ideally we'd allow VEC_PERM to have a smaller destination - vector. */ + vector. As heuristic try to preserve a uniform orig[0] which + facilitates later pattern-matching VEC_PERM_EXPR to a + BIT_INSERT_EXPR. */ for (; i < refnelts; ++i) - sel.quick_push (i - elts.length ()); + sel.quick_push ((elts[0].second == 0 && elts[0].first == 0 + ? 0 : refnelts) + i); vec_perm_indices indices (sel, orig[1] ? 2 : 1, refnelts); if (!can_vec_perm_const_p (TYPE_MODE (perm_type), indices)) return false; Index: gcc/match.pd =================================================================== --- gcc/match.pd (revision 278992) +++ gcc/match.pd (working copy) @@ -6049,7 +6049,7 @@ (define_operator_list COND_TERNARY break; if (at < encoded_nelts && sel.series_p (at + 1, 1, at + 1, 1)) { - if (known_lt (at, nelts)) + if (known_lt (poly_uint64 (sel[at]), nelts)) ins = fold_read_from_vector (cop0, sel[at]); else ins = fold_read_from_vector (cop1, sel[at] - nelts); Index: gcc/testsuite/gcc.target/i386/pr92818.c =================================================================== --- gcc/testsuite/gcc.target/i386/pr92818.c (nonexistent) +++ gcc/testsuite/gcc.target/i386/pr92818.c (working copy) @@ -0,0 +1,14 @@ +/* { dg-do compile } */ +/* { dg-options "-O -mavx2 -fdump-tree-forwprop1" } */ + +typedef double v4df __attribute__((vector_size (32))); +typedef double v2df __attribute__((vector_size (16))); + +v2df +bar (v4df x, double *p) +{ + return (v2df) { x[0], *p }; +} + +/* { dg-final { scan-tree-dump "BIT_INSERT_EXPR" "forwprop1" } } */ +/* { dg-final { scan-assembler "movhpd" } } */