From patchwork Thu Apr 11 16:24:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Glisse X-Patchwork-Id: 235825 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 96F822C00C6 for ; Fri, 12 Apr 2013 02:24:14 +1000 (EST) 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=S4N98HJcEMJZqJeKRZBhfmyy13UsbRN1gNgqprq7a4HBm4caYXfP5 1VsA+4ycNnlen6p21x6wXuXOnnyKyMh+nrvY1j7IoCnQQElXT+zMWh2f0pzW/fHp cwEVMA6yNPlWHwTmvn0h5QKpD8KWFioYDHoo8VkYmyz9Ooje2zFZa4= 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=/QvOd4axkE1udPBfGS1mOba4B/s=; b=auIEcLusoeRT/jdvoLoT mYHyrFKpgLAe1102kKB2iuX96lFUw/kOhwe1l3nJ7p84y24rLztELyrDspCdjfEl kMYiRipAPn4vuDEtwNukhjW2sGzaZhDDvYrV2Ujd8zXwkuGXFNzQ+ue7gWnlUniQ QbCW5zqyqxqkbCSNmnikwrI= Received: (qmail 32143 invoked by alias); 11 Apr 2013 16:24:07 -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 32091 invoked by uid 89); 11 Apr 2013 16:24:06 -0000 X-Spam-SWARE-Status: No, score=-8.2 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD autolearn=ham version=3.3.1 Received: from mail3-relais-sop.national.inria.fr (HELO mail3-relais-sop.national.inria.fr) (192.134.164.104) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Thu, 11 Apr 2013 16:24:05 +0000 Received: from stedding.saclay.inria.fr ([193.55.250.194]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/DHE-RSA-AES128-SHA; 11 Apr 2013 18:24:02 +0200 Received: from glisse (helo=localhost) by stedding.saclay.inria.fr with local-esmtp (Exim 4.80) (envelope-from ) id 1UQKI6-00072y-FC for gcc-patches@gcc.gnu.org; Thu, 11 Apr 2013 18:24:02 +0200 Date: Thu, 11 Apr 2013 18:24:02 +0200 (CEST) From: Marc Glisse To: gcc-patches@gcc.gnu.org Subject: Fold {2, 3, 4, 5} >> 31 Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-Virus-Found: No Hello, here is a patch to handle constant folding of mixed vector-integer operations. I could have shared the loop with the vector-vector case, but that would have meant re-testing if arg2 was a vector at every iteration (I can go back to that version if you prefer). bootstrap+testsuite on x86_64-linux-gnu 2013-04-11 Marc Glisse gcc/ * fold-const.c (const_binop): Handle vector shifts by a scalar. (fold_binary_loc): Call const_binop also for mixed vector-scalar operations. gcc/testsuite/ * gcc.dg/fold-cstvecshift.c: New testcase. Index: gcc/fold-const.c =================================================================== --- gcc/fold-const.c (revision 197797) +++ gcc/fold-const.c (working copy) @@ -1335,34 +1335,56 @@ const_binop (enum tree_code code, tree a return NULL_TREE; } if (real && imag) return build_complex (type, real, imag); } if (TREE_CODE (arg1) == VECTOR_CST && TREE_CODE (arg2) == VECTOR_CST) { - tree type = TREE_TYPE(arg1); + tree type = TREE_TYPE (arg1); int count = TYPE_VECTOR_SUBPARTS (type), i; tree *elts = XALLOCAVEC (tree, count); for (i = 0; i < count; i++) { tree elem1 = VECTOR_CST_ELT (arg1, i); tree elem2 = VECTOR_CST_ELT (arg2, i); elts[i] = const_binop (code, elem1, elem2); /* It is possible that const_binop cannot handle the given code and return NULL_TREE */ - if(elts[i] == NULL_TREE) + if (elts[i] == NULL_TREE) + return NULL_TREE; + } + + return build_vector (type, elts); + } + + /* Shifts allow a scalar offset for a vector. */ + if (TREE_CODE (arg1) == VECTOR_CST) + { + tree type = TREE_TYPE (arg1); + int count = TYPE_VECTOR_SUBPARTS (type), i; + tree *elts = XALLOCAVEC (tree, count); + + for (i = 0; i < count; i++) + { + tree elem1 = VECTOR_CST_ELT (arg1, i); + + elts[i] = const_binop (code, elem1, arg2); + + /* It is possible that const_binop cannot handle the given + code and return NULL_TREE */ + if (elts[i] == NULL_TREE) return NULL_TREE; } return build_vector (type, elts); } return NULL_TREE; } /* Create a sizetype INT_CST node with NUMBER sign extended. KIND indicates which particular sizetype to create. */ @@ -9852,21 +9874,22 @@ fold_binary_loc (location_t loc, STRIP_NOPS (arg1); } /* Note that TREE_CONSTANT isn't enough: static var addresses are constant but we can't do arithmetic on them. */ if ((TREE_CODE (arg0) == INTEGER_CST && TREE_CODE (arg1) == INTEGER_CST) || (TREE_CODE (arg0) == REAL_CST && TREE_CODE (arg1) == REAL_CST) || (TREE_CODE (arg0) == FIXED_CST && TREE_CODE (arg1) == FIXED_CST) || (TREE_CODE (arg0) == FIXED_CST && TREE_CODE (arg1) == INTEGER_CST) || (TREE_CODE (arg0) == COMPLEX_CST && TREE_CODE (arg1) == COMPLEX_CST) - || (TREE_CODE (arg0) == VECTOR_CST && TREE_CODE (arg1) == VECTOR_CST)) + || (TREE_CODE (arg0) == VECTOR_CST && TREE_CODE (arg1) == VECTOR_CST) + || (TREE_CODE (arg0) == VECTOR_CST && TREE_CODE (arg1) == INTEGER_CST)) { if (kind == tcc_binary) { /* Make sure type and arg0 have the same saturating flag. */ gcc_assert (TYPE_SATURATING (type) == TYPE_SATURATING (TREE_TYPE (arg0))); tem = const_binop (code, arg0, arg1); } else if (kind == tcc_comparison) tem = fold_relational_const (code, type, arg0, arg1); Index: gcc/testsuite/gcc.dg/fold-cstvecshift.c =================================================================== --- gcc/testsuite/gcc.dg/fold-cstvecshift.c (revision 0) +++ gcc/testsuite/gcc.dg/fold-cstvecshift.c (revision 0) @@ -0,0 +1,13 @@ +/* { dg-do compile } */ +/* { dg-options "-O -fdump-tree-ccp1" } */ + +typedef int vec __attribute__ ((vector_size (4 * sizeof (int)))); + +void f (vec *r) +{ + vec a = { 2, 3, 4, 5 }; + *r = (a << 2) >> 1; +} + +/* { dg-final { scan-tree-dump "{ 4, 6, 8, 10 }" "ccp1"} } */ +/* { dg-final { cleanup-tree-dump "ccp1" } } */