From patchwork Fri Nov 11 19:53:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew MacLeod X-Patchwork-Id: 18982 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp935842wru; Fri, 11 Nov 2022 11:54:49 -0800 (PST) X-Google-Smtp-Source: AA0mqf4yRjDxqt9LvyXKXGTHSA9fP2Bc+/D2g7i6bOJHjxvmFRg8H7onhIVJGIYZrUvWWIvVgQGc X-Received: by 2002:a05:6402:1a53:b0:463:bef9:b64a with SMTP id bf19-20020a0564021a5300b00463bef9b64amr2871009edb.422.1668196488998; Fri, 11 Nov 2022 11:54:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668196488; cv=none; d=google.com; s=arc-20160816; b=o3GliWCY2n9kSbSZaS+/LcGcFdXqD8/QJTfDhau9vnP6ETsiQES9E2zjj7mQXJCi+6 2VrcyI2mJNOx/a6sQMdWe9P3IBw2sLxa0YKCgnIAj5m1/NN0Yzldm01S/veqPIoYirKP 8YzvGsSXp7d+Hg0+GQ7hdAIZk+cTNb7RuLgwEptDTr0MT5OfM4RGRyA0zLjxmpHzEWyz dpU/GAa9ROgC0QW1rIPvtPR7/6zEFaIh/tonEEkHlB4+2BVak8TC8krAUWOM5PJLttvj 3W5+nVKSCVtUUkd68TOrIl9IAeDHDXDvUiiQE0fMbYqhv51a3jCWg64AK2HnEyZrg6eb oFyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:content-language :subject:cc:to:user-agent:mime-version:date:message-id:dmarc-filter :delivered-to:dkim-signature:dkim-filter; bh=QHFm1Uj4CPr2qFGXdSF6diZ93J5BEKywg2vlhA/l+tk=; b=rjR90slfYzyLjDjG6TvvIbCyX/yVQsUl1eAtU5VZqcaZmvf60cwlyWTDaDpYk8qL2T i0/985UICs9Eb20vKnt+4jC79QyY+kd6e+b1uAYK72DMXFJLtj4+b+8nIk8yFSBq5D1f pIwW9zfVc8fovN+/6ay9h4+5dGus/ykbVykVB5CvQSOAjkw/Puk/IqmNl0Ye3quG/GnM 4i2X6qd8xukewTd8sd6OSdzN606okErS2rrEka+w/w4p9h8OtZOyMqdNeqpu7pmvt+rs PuSlFGW6Ruh9Frk9WjlR5Y4vP3Xn83iEYU9WrwnvAER2wLf2vjUYsMkmSfene6Gf37rm 7HZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=SGFzoPTJ; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id bt15-20020a170906b14f00b007adf9d69424si1975010ejb.586.2022.11.11.11.54.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 11:54:48 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=SGFzoPTJ; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F1F7C384BC3A for ; Fri, 11 Nov 2022 19:54:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F1F7C384BC3A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1668196484; bh=QHFm1Uj4CPr2qFGXdSF6diZ93J5BEKywg2vlhA/l+tk=; h=Date:To:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=SGFzoPTJYgPSkkKaFPHJGmg0t2z7jzGSUs5+MM0Ec9R8Sxed3r5zFGddlhL7Ua4HS ydZbzITQlNwDqVQRmZE364gl/P7Gn6tShQ/UBYFQncJXjOT1i8b4/9ukarNB6aXruK Nmql78nOOgzpfW1EVhBILPoKM5KHCwDmhkWYrw6c= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 2AAA53858438 for ; Fri, 11 Nov 2022 19:53:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2AAA53858438 Received: from mail-il1-f197.google.com (mail-il1-f197.google.com [209.85.166.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-224-gGiPDAhzNBOpO0Xvr6ZbyA-1; Fri, 11 Nov 2022 14:53:32 -0500 X-MC-Unique: gGiPDAhzNBOpO0Xvr6ZbyA-1 Received: by mail-il1-f197.google.com with SMTP id c4-20020a056e020bc400b0030098df879dso4587797ilu.6 for ; Fri, 11 Nov 2022 11:53:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=rAozhlWnCf7ES339ZCF1LlKJVPbMzsJT5Vm3VhC/Fvs=; b=xRVPOWHij5U7p5gUSDyckIYZNM3RJnNAGa8dEdZL6/6aOp2jPHF95q3zLAPL8gSy67 whyWEuZQgk9HirbZPGZi4572j8vzvWpnOMKHO1bRlp9m0XnqIEV86PbEaFlg5j8aTMpj CKAPExmkhMRJ89Qno1LsG+yc03WMBciyeFqlDRTer4aiABB6mlD1Yi6Vog3P2EO+uILw 7yUHzvj761CC34l0KHGuKgDzvWu2+cd6/kg3hncjueLL+s0vec6UoF1B0N5xaUevzvcQ f1BmtZpt0HjFuR2KHeIFbNkRbpXZlJm54P95wPITbAzHQW4U5w/jBzeORil6E/rImbPZ H0qQ== X-Gm-Message-State: ANoB5pnuNSbdRoeWc3m3vK5PbbJZKP5HEud2vhxhq7pzc+X8TjqGBmsw zxZ6rmnEtj3vIlYYmQC0rtqSnZfjPZHWeWyY8/yoliRCLKq+XXowWd5y8Ht0VEXAlc/Kmr1L9IN EdeS5fWLn1sMIO0Sq6gSdiTHg8UyuA8xOLdZTaPCaEtAROvSr1RpeCW0OMmy7sjkxWdzNvQ== X-Received: by 2002:a05:6e02:143:b0:300:ec01:ee4a with SMTP id j3-20020a056e02014300b00300ec01ee4amr1801827ilr.74.1668196410879; Fri, 11 Nov 2022 11:53:30 -0800 (PST) X-Received: by 2002:a05:6e02:143:b0:300:ec01:ee4a with SMTP id j3-20020a056e02014300b00300ec01ee4amr1801820ilr.74.1668196410581; Fri, 11 Nov 2022 11:53:30 -0800 (PST) Received: from ?IPV6:2607:fea8:a263:f600::b081? ([2607:fea8:a263:f600::b081]) by smtp.gmail.com with ESMTPSA id s11-20020a92cc0b000000b0030237bcb9bdsm950073ilp.12.2022.11.11.11.53.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 11 Nov 2022 11:53:29 -0800 (PST) Message-ID: <914466c0-8b44-bee7-20b9-fe8d856308d7@redhat.com> Date: Fri, 11 Nov 2022 14:53:24 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.2.1 To: gcc-patches Cc: "hernandez, aldy" Subject: [COMMITTED] PR tree-optimization/107523 - Don't add dependencies in update_stmt. X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew MacLeod via Gcc-patches From: Andrew MacLeod Reply-To: Andrew MacLeod Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749230801689228308?= X-GMAIL-MSGID: =?utf-8?q?1749230801689228308?= This adjusts gimple-ranger::update_stmt (which inform the range engine that a statement has changed under the covers.  I was calculating the statement using a fur_depend class instead of a fur_stmt. (FUR is Fold Using Range) The difference between the 2 is that a fur_depend will reigster any relations or dependencies it sees with the oracle and GORI. The problem is, update_stmt has no context of where this is being done.  The path ranger was performing a simplification, and a relation was being set globally even though it should not have been. THe fix is simple, we're only trying to recalculate the result.. limit it to that. Bootstraps on x86_64-pc-linux-gnu with no regressions.  Pushed. Andrew commit 0a7b437ca71e2721e9bcf070762fc54ef7991aeb Author: Andrew MacLeod Date: Fri Nov 11 12:22:33 2022 -0500 Don't add dependencies in update_stmt. gimple_ranger::update_stmt has no idea what the context of an update is, and should not be adding relations when it re-evaluates a stmt. PR tree-optimization/107523 gcc/ * gimple-range.cc (gimple_ranger::update_stmt): Use fur_stmt rather than fur_depend. gcc/testsuite/ * gcc.dg/pr107523.c: New. diff --git a/gcc/gimple-range.cc b/gcc/gimple-range.cc index 2885d0fa21e..ecd6039e0fd 100644 --- a/gcc/gimple-range.cc +++ b/gcc/gimple-range.cc @@ -546,7 +546,7 @@ gimple_ranger::update_stmt (gimple *s) // Re-calculate a new value using just cache values. Value_Range tmp (TREE_TYPE (lhs)); fold_using_range f; - fur_depend src (s, &(gori ()), &m_cache); + fur_stmt src (s, &m_cache); f.fold_stmt (tmp, s, src, lhs); // Combine the new value with the old value to check for a change. diff --git a/gcc/testsuite/gcc.dg/pr107523.c b/gcc/testsuite/gcc.dg/pr107523.c new file mode 100644 index 00000000000..1e5ed46c636 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr107523.c @@ -0,0 +1,32 @@ +/* { dg-do run } */ +/* { dg-options "-O2 " } */ + +int a, b = 1; +unsigned int c = 1; +int main() { + int d = 1, f; + if (b) + d = 0; + a = -1; + b = ~d ^ 465984011; + L1:; + if (b < 2) + f = b; + b = f; + if (f <= a) { + int g = -(a && 1), h = g - f && a, i = ~(c / f) && 1 % (a | h); + if (c) { + g = f; + if (i || (g && (g > -465984012))) + goto L2; + } + c = g | f / c; + } + if (0) + L2: + a = 0; + if (a <= c) + goto L1; + return 0; +} +