From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id A84AC3858D1E for ; Thu, 22 Dec 2022 12:54:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A84AC3858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671713660; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=I0xHIsqLQEZQTJ/uB/1MRC4os+na/8onvAYsjhqUs9I=; b=WfltztURDfrtWmz39am0BlI5nGHf74Q5AxuWxSOxifIeQJIMzT56Sg8nF3xkeyGgO0Uqo3 GVgWru7ACnlZaGT/urBzZK/S0ui9RG1qOdyCpDJq54gDZorfC9EyZS+kz+3j4RMcxhN/oZ mKfYrYzbiQ5pK2s7N7nmZ8LiQczwl1Y= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-49-1vO2rUC9PQeMmR83PJvolQ-1; Thu, 22 Dec 2022 07:54:17 -0500 X-MC-Unique: 1vO2rUC9PQeMmR83PJvolQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3B1BF811E6E; Thu, 22 Dec 2022 12:54:17 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E238C40C2064; Thu, 22 Dec 2022 12:54:16 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 2BMCsEmP1197337 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 22 Dec 2022 13:54:14 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 2BMCsDjZ1197336; Thu, 22 Dec 2022 13:54:13 +0100 Date: Thu, 22 Dec 2022 13:54:12 +0100 From: Jakub Jelinek To: Aldy Hernandez Cc: Richard Biener , gcc-patches , Andrew MacLeod Subject: [PATCH] phiopt: Adjust instead of reset phires range Message-ID: Reply-To: Jakub Jelinek References: MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="oX1MAcZB1Qz6IanU" Content-Disposition: inline X-Spam-Status: No, score=-3.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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 List-Id: --oX1MAcZB1Qz6IanU Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Dec 22, 2022 at 01:09:21PM +0100, Aldy Hernandez wrote: > INTEGER_CST singleton and > > union that into the SSA_NAMEs range and then do set_range_info > > with the altered range I guess. > > > > Note that set_range_info is an intersect operation. It should really be > called update_range_info. Up to now, there were no users that wanted to > clobber old ranges completely. Thanks. That would be then (I've committed the previous patch, also for reasons of backporting) following incremental patch. For the just committed testcase, it does the right thing, # RANGE [irange] int [-INF, -1][1, +INF] # iftmp.2_9 = PHI is before the range (using -fdump-tree-all-alias) and r below is [irange] int [-INF, -1][1, +INF], unioned with carg of 0 into VARYING. If I try attached testcase though (which just uses signed char d instead of int d to give more interesting range info), then I see: # RANGE [irange] int [-128, -1][1, 127] # iftmp.2_10 = PHI but strangely r I get from range_of_expr is [irange] int [-128, 127] rather than the expected [irange] int [-128, -1][1, 127]. Sure, it is later unioned with 0, so it doesn't change anything, but I wonder what is the difference. Note, this is before actually replacing the phi arg 8(5) with iftmp.3_11(5). At that point bb4 is: [local count: 966367640]: # RANGE [irange] int [-128, 127] # iftmp.3_11 = PHI if (iftmp.3_11 != 0) goto ; [56.25%] else goto ; [43.75%] and bb 5 is empty forwarder, so [-128, -1][1, 127] is actually correct. Either iftmp.3_11 is non-zero, then iftmp.2_10 is that value and its range, or it is zero and then iftmp.2_10 is 8, so [-128, -1][1, 127] U [8, 8], but more importantly SSA_NAME_RANGE_INFO should be at least according to what is printed be without 0. 2022-12-22 Jakub Jelinek Aldy Hernandez * tree-ssa-phiopt.cc (value_replacement): Instead of resetting phires range info, union it with oarg. --- gcc/tree-ssa-phiopt.cc.jj 2022-12-22 12:52:36.588469821 +0100 +++ gcc/tree-ssa-phiopt.cc 2022-12-22 13:11:51.145060050 +0100 @@ -1492,11 +1492,25 @@ value_replacement (basic_block cond_bb, basic_block middle_bb, break; } if (equal_p) - /* After the optimization PHI result can have value - which it couldn't have previously. - We could instead of resetting it union the range - info with oarg. */ - reset_flow_sensitive_info (gimple_phi_result (phi)); + { + tree phires = gimple_phi_result (phi); + if (SSA_NAME_RANGE_INFO (phires)) + { + /* After the optimization PHI result can have value + which it couldn't have previously. */ + value_range r; + if (get_global_range_query ()->range_of_expr (r, phires, + phi)) + { + int_range<2> tmp (carg, carg); + r.union_ (tmp); + reset_flow_sensitive_info (phires); + set_range_info (phires, r); + } + else + reset_flow_sensitive_info (phires); + } + } if (equal_p && MAY_HAVE_DEBUG_BIND_STMTS) { imm_use_iterator imm_iter; Jakub --oX1MAcZB1Qz6IanU Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="pr108166-2.C" // PR tree-optimization/108166 // { dg-do run } bool a, b; signed char d; int c; const int & foo (const int &f, const int &g) { return !f ? f : g; } __attribute__((noipa)) void bar (int) { } int main () { c = foo (b, 0) > ((b ? d : b) ?: 8); a = b ? d : b; bar (a); if (a != 0) __builtin_abort (); } --oX1MAcZB1Qz6IanU--