From patchwork Wed Nov 9 17:21:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aldy Hernandez X-Patchwork-Id: 17711 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp462363wru; Wed, 9 Nov 2022 09:23:39 -0800 (PST) X-Google-Smtp-Source: AMsMyM7QGGgCyLRj/GCeQOfEKh4/ELVB0iBks6+NagoBvYodUmgRCRIMDOrsxnAEe3r5mIXwHqBZ X-Received: by 2002:aa7:d650:0:b0:462:d945:3801 with SMTP id v16-20020aa7d650000000b00462d9453801mr60414393edr.117.1668014619401; Wed, 09 Nov 2022 09:23:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668014619; cv=none; d=google.com; s=arc-20160816; b=DFoLn34JIRgOcAHQtZFpDAvLjayWTq40Z950yPqQB9b0R+b7F6K0tmoMVYsklxIkc6 NAdVQ8rzNxE+6lb6EL0KAEWYmZ2Y8CanecWHPK2hi7U4A9eb/jjh5ge2teCJSvLPJ4F6 fhi7cWOmAWh06N+Ud9ReEvjngbyQqUd15TQmYjXU5o/dVkxnFyLnUqkgjaCnrs03l/Nx wNgjXRFWgFS5x7m/hAp+TClSTriaOjD7KsnzTg+BjDJQHEu8oty/MfxvUfmgKrdC2v2S 2kF7CLD2+QINeMmAIAFqZb/Hfg3tADJasiOV/hpp+AWP9+1CN01v7Nbob2ZHGzkO3Qv1 8jFQ== 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-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=+J3M4NnfaqZCKT4thcxu4+LYdg5s4zk4AqI1uLuqP/8=; b=w4MybT05L4TmhIhgS5hEZXg4TI5hXVwYedRpgamBRtnO2uToow5kw03X/MGnf0/hkE 8ax78KMpXEHfrkU/W9KiG1dGiV50q5B6+UwvduDL8FuFCjT/z3jMNEvpxcTxam7YEpKI n8QN2GJ+ucfQWuKWpkosxaADVt6JEP6DRtQg4PGS2+7HzuXXIU0jeZG3cR298sinrldE rtcG+50FMFgDqLhlwqkzyJqhee3AcbK0QaGC45hyM2UdKsigXLJA28QHUqW4aP4G3qk6 qO8la0xlBE3pQ3Pt5yQdVqQmaGCqwgBpxotp+ZI8+EwXYXkrzPgnDL5W40cc1mqjTjIX NUYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=aTZDLnsN; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id f7-20020a056402354700b00461c852af19si18080768edd.633.2022.11.09.09.23.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Nov 2022 09:23:39 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=aTZDLnsN; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 76F293858409 for ; Wed, 9 Nov 2022 17:23:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 76F293858409 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1668014618; bh=+J3M4NnfaqZCKT4thcxu4+LYdg5s4zk4AqI1uLuqP/8=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=aTZDLnsNLzzYadiIOcHatpLv3S9zJVCQWqpe7pI+dQ/aWDoycejP3dxE0lbU1HDY+ dZ552XCuYbVcWluzghrEe+LmyLNHBsOLmDKKg9JoAa7yhCPhTGRfx7G5fIBu2oLlFN 06oUGqUIVDKV0GpatRxXHK8yXDOAeviLzQ5Ez+cY= 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.129.124]) by sourceware.org (Postfix) with ESMTPS id 7049E3858438 for ; Wed, 9 Nov 2022 17:22:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7049E3858438 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-621-Ct5EqYydMoSVSw1Lj4FK6w-1; Wed, 09 Nov 2022 12:22:24 -0500 X-MC-Unique: Ct5EqYydMoSVSw1Lj4FK6w-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 425593850EAA for ; Wed, 9 Nov 2022 17:22:24 +0000 (UTC) Received: from abulafia.quesejoda.com (unknown [10.39.192.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CF9FD2028E90; Wed, 9 Nov 2022 17:22:23 +0000 (UTC) Received: from abulafia.quesejoda.com (localhost [127.0.0.1]) by abulafia.quesejoda.com (8.17.1/8.17.1) with ESMTPS id 2A9HMLwI041372 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 9 Nov 2022 18:22:21 +0100 Received: (from aldyh@localhost) by abulafia.quesejoda.com (8.17.1/8.17.1/Submit) id 2A9HMLwP041371; Wed, 9 Nov 2022 18:22:21 +0100 To: GCC patches Cc: Jakub Jelinek , Andrew MacLeod , Aldy Hernandez Subject: [COMMITTED] Clear NAN when reading back a global range if necessary. Date: Wed, 9 Nov 2022 18:21:48 +0100 Message-Id: <20221109172148.41333-1-aldyh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 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: Aldy Hernandez via Gcc-patches From: Aldy Hernandez Reply-To: Aldy Hernandez 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?1749040097546233288?= X-GMAIL-MSGID: =?utf-8?q?1749040097546233288?= When reading back from the global store, we must clear the NAN bit if necessary. The reason it's not happening is because the constructor sets a NAN by default (when HONOR_NANS). We must be careful to clear the NAN bit if the original range didn't have a NAN. I have commented the reason we use the constructor instead of filling out the fields by hand, because it wasn't clear at re-reading this code. PR 107569/tree-optimization gcc/ChangeLog: * value-range-storage.cc (frange_storage_slot::get_frange): Clear NAN if appropriate. * value-range.cc (range_tests_floats): New test. --- gcc/value-range-storage.cc | 9 ++++++++- gcc/value-range.cc | 9 +++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/gcc/value-range-storage.cc b/gcc/value-range-storage.cc index 462447ba250..b57701f0ea1 100644 --- a/gcc/value-range-storage.cc +++ b/gcc/value-range-storage.cc @@ -276,13 +276,20 @@ frange_storage_slot::get_frange (frange &r, tree type) const return; } - // Use the constructor because it will canonicalize the range. + // We use the constructor to create the new range instead of writing + // out the bits into the frange directly, because the global range + // being read may be being inlined into a function with different + // restrictions as when it was originally written. We want to make + // sure the resulting range is canonicalized correctly for the new + // consumer. r = frange (type, m_min, m_max, m_kind); // The constructor will set the NAN bits for HONOR_NANS, but we must // make sure to set the NAN sign if known. if (HONOR_NANS (type) && (m_pos_nan ^ m_neg_nan) == 1) r.update_nan (m_neg_nan); + else if (!m_pos_nan && !m_neg_nan) + r.clear_nan (); } bool diff --git a/gcc/value-range.cc b/gcc/value-range.cc index 859c7fb4af9..852ac09f2c4 100644 --- a/gcc/value-range.cc +++ b/gcc/value-range.cc @@ -4051,6 +4051,15 @@ range_tests_floats () ASSERT_TRUE (real_isinf (&r0.lower_bound (), true)); ASSERT_TRUE (real_isinf (&r0.upper_bound (), true)); } + + // Test that reading back a global range yields the same result as + // what we wrote into it. + tree ssa = make_temp_ssa_name (float_type_node, NULL, "blah"); + r0.set_varying (float_type_node); + r0.clear_nan (); + set_range_info (ssa, r0); + get_global_range_query ()->range_of_expr (r1, ssa); + ASSERT_EQ (r0, r1); } // Run floating range tests for various combinations of NAN and INF