From patchwork Fri Oct 16 19:09:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew MacLeod X-Patchwork-Id: 1383516 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=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=nLgFhiOz; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CCbLw1bSxz9sSf for ; Sat, 17 Oct 2020 06:10:00 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5401538618E8; Fri, 16 Oct 2020 19:09:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5401538618E8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1602875397; bh=DHynm95BP8IsxysyzHCtjeMBfjHyDnWnqy3bAPdf9hE=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=nLgFhiOzDhmrDZDVZSHZhyVMh8nPUE85I9kAjljGeDdk9ZKW9ejtfb0kamej0BPqV 4LJ499jeE3C5ULaROy/G57iDRZs9iNZ23+hZdOm389KOlLGQlRcZhpvJQrtDSIiP3C nSUOUZk3TWSFucfZnCbXgvWFF+tnDvPtkwdqnOas= 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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 9A9D83857824 for ; Fri, 16 Oct 2020 19:09:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9A9D83857824 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-559-4HMpBNjWP8u5fhl-AIBz1g-1; Fri, 16 Oct 2020 15:09:52 -0400 X-MC-Unique: 4HMpBNjWP8u5fhl-AIBz1g-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 06DD71868410 for ; Fri, 16 Oct 2020 19:09:51 +0000 (UTC) Received: from [10.10.118.239] (ovpn-118-239.rdu2.redhat.com [10.10.118.239]) by smtp.corp.redhat.com (Postfix) with ESMTP id A522255775 for ; Fri, 16 Oct 2020 19:09:50 +0000 (UTC) To: gcc-patches Subject: [PATCH] Don't invoke range_of_expr multiple times. Message-ID: <2f625d96-7527-d68c-993d-e12c0855da9b@redhat.com> Date: Fri, 16 Oct 2020 15:09:49 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-Spam-Status: No, score=-12.6 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_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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@gcc.gnu.org Sender: "Gcc-patches" In the hybrid folder, range_of_stmt and range_on_edge invoke the same routines in both evrp_folder and ranger_folder and compare results. In implementing hybrid folder, I inherited it from evrp_folder since EVRP has a few pre-and post statement things to do. when the hybdrid folder calls evrp_folder::range_on_edge (or stmt) the evrp folder simple invokes range_of_expr() for evaluation. Because I inherited from evrp_folder, this actually calls hybrid_folder::range_of_expr(), which in turns invokes both evrp_folder AND ranger on the query. This was not my intention, and results in additional ranger queries without any context.    Instead, the calls should be made directly to evrp_folder::range_of_expr. Bootstrapped on x86_64-pc-linux-gnu,  no regressions, pushed. Andrew 2020-10-16 Andrew MacLeod * gimple-ssa-evrp.c (hybrid_folder::value_on_edge): Call evrp_folder::value_of_expr directly. (hybrid_folder::value_of_stmt): Ditto. diff --git a/gcc/gimple-ssa-evrp.c b/gcc/gimple-ssa-evrp.c index 7688e4aa4bd..309cdd94c21 100644 --- a/gcc/gimple-ssa-evrp.c +++ b/gcc/gimple-ssa-evrp.c @@ -239,7 +239,9 @@ hybrid_folder::value_of_expr (tree op, gimple *stmt) tree hybrid_folder::value_on_edge (edge e, tree op) { - tree evrp_ret = evrp_folder::value_on_edge (e, op); + // Call evrp::value_of_expr directly. Otherwise another dual call is made + // via hybrid_folder::value_of_expr, but without an edge. + tree evrp_ret = evrp_folder::value_of_expr (op, NULL); tree ranger_ret = m_ranger->value_on_edge (e, op); return choose_value (evrp_ret, ranger_ret); } @@ -247,7 +249,14 @@ hybrid_folder::value_on_edge (edge e, tree op) tree hybrid_folder::value_of_stmt (gimple *stmt, tree op) { - tree evrp_ret = evrp_folder::value_of_stmt (stmt, op); + // Call evrp::value_of_expr directly. Otherwise another dual call is made + // via hybrid_folder::value_of_expr, but without a stmt. + tree evrp_ret; + if (op) + evrp_ret = evrp_folder::value_of_expr (op, NULL); + else + evrp_ret = NULL_TREE; + tree ranger_ret = m_ranger->value_of_stmt (stmt, op); return choose_value (evrp_ret, ranger_ret); }