From patchwork Wed Jan 24 09:35:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 865268 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-471934-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="tuOXbTKJ"; 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 3zRKmX0tslz9s7n for ; Wed, 24 Jan 2018 20:36:11 +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=cCKuDzjIsdSlx9rqBzChXxi2IxzqQFgO0ELIZ9YtmljJq1RBEA6hp Lpcn43BDlkhLSUds6XPgWU90GRC8a9NVmalQlIqXCzceXjHovGhxwNEQ0spKpiPi ObhQju5z/eGr9VPg2XMt6eknQos0bOF7CqVOZR0bcj7q1dze1ogBcg= 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=F2AFW6BmqGqdrvkIdN1iZJH6ws4=; b=tuOXbTKJN2Z7hYC7Mige t1TY4NayFHj8oR24wOLKRzX2fGS553LiM75+Du6MSFpyoQHn/ysuU94AMAYdeVPe 28BdHs1ix6FYyWRkXaB/ByzYFGRBUWiGLbCiT1PIuJYXkIIdV1oXfgw4u+Ra583f FJ0WB1MB44w8na5FizAaDwE= Received: (qmail 102382 invoked by alias); 24 Jan 2018 09:36:04 -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 102369 invoked by uid 89); 24 Jan 2018 09:36:03 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-10.6 required=5.0 tests=BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, KAM_NUMSUBJECT, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy= X-HELO: mx2.suse.de Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 24 Jan 2018 09:36:01 +0000 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id A2AC2AE29 for ; Wed, 24 Jan 2018 09:35:59 +0000 (UTC) Date: Wed, 24 Jan 2018 10:35:59 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] Fix PR83176 Message-ID: User-Agent: Alpine 2.20 (LSU 67 2015-01-07) MIME-Version: 1.0 The following enhances chrec_fold_plus_1 to handle a case to avoid ICEing during GRAPHITE code-gen. It teaches us to handle (signed T) { (T) x, +, y } + (signed T) z as (signed T) ( { (T) x, +, y } + (T) (singed T) z ) instead of failing with chrec_not_known. Bootstrapped and tested on x86_64-unknown-linux-gnu, applied to trunk. Richard. 2018-01-24 Richard Biener PR tree-optimization/83176 * tree-chrec.c (chrec_fold_plus_1): Handle (signed T){(T) .. } operands. * gcc.dg/graphite/pr83176.c: New testcase. Index: gcc/tree-chrec.c =================================================================== --- gcc/tree-chrec.c (revision 256977) +++ gcc/tree-chrec.c (working copy) @@ -295,8 +295,23 @@ chrec_fold_plus_1 (enum tree_code code, return chrec_fold_plus_poly_poly (code, type, op0, op1); CASE_CONVERT: - if (tree_contains_chrecs (op1, NULL)) - return chrec_dont_know; + { + /* We can strip sign-conversions to signed by performing the + operation in unsigned. */ + tree optype = TREE_TYPE (TREE_OPERAND (op1, 0)); + if (INTEGRAL_TYPE_P (type) + && INTEGRAL_TYPE_P (optype) + && tree_nop_conversion_p (type, optype) + && TYPE_UNSIGNED (optype)) + return chrec_convert (type, + chrec_fold_plus_1 (code, optype, + chrec_convert (optype, + op0, NULL), + TREE_OPERAND (op1, 0)), + NULL); + if (tree_contains_chrecs (op1, NULL)) + return chrec_dont_know; + } /* FALLTHRU */ default: @@ -313,8 +328,23 @@ chrec_fold_plus_1 (enum tree_code code, } CASE_CONVERT: - if (tree_contains_chrecs (op0, NULL)) - return chrec_dont_know; + { + /* We can strip sign-conversions to signed by performing the + operation in unsigned. */ + tree optype = TREE_TYPE (TREE_OPERAND (op0, 0)); + if (INTEGRAL_TYPE_P (type) + && INTEGRAL_TYPE_P (optype) + && tree_nop_conversion_p (type, optype) + && TYPE_UNSIGNED (optype)) + return chrec_convert (type, + chrec_fold_plus_1 (code, optype, + TREE_OPERAND (op0, 0), + chrec_convert (optype, + op1, NULL)), + NULL); + if (tree_contains_chrecs (op0, NULL)) + return chrec_dont_know; + } /* FALLTHRU */ default: Index: gcc/testsuite/gcc.dg/graphite/pr83176.c =================================================================== --- gcc/testsuite/gcc.dg/graphite/pr83176.c (nonexistent) +++ gcc/testsuite/gcc.dg/graphite/pr83176.c (working copy) @@ -0,0 +1,42 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -floop-nest-optimize" } */ + +int wx, qi; + +void +yj (int gw) +{ + int *ak = &gw; + + while (wx != 0) + { + int k2 = (__INTPTR_TYPE__)&ak; + int **xq = (int **)&k2; + +ja: + *xq = &gw; + + while (qi < 1) + { + unsigned short int ey; + +be: + for (ey = 0; ey < 251; ++ey) + { + for (wx = 0; wx < 2; ++wx) + { + } + + *ak += 8555712; + k2 += *ak; + } + ++qi; + } + } + + gw = 1; + if (gw != 0) + goto ja; + else + goto be; +}