From patchwork Thu Oct 20 14:13:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aldy Hernandez X-Patchwork-Id: 1692539 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.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=kT6yHdbh; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MtV3W5nj1z1ygT for ; Fri, 21 Oct 2022 01:14:46 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A938B385040E for ; Thu, 20 Oct 2022 14:14:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A938B385040E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666275284; bh=lyMXZ8hHC+LaPA81zxdLzpG1g7H3gqk+U2T3YGXLW+4=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=kT6yHdbhnTJKDLNgwi76B/47FDbAesCQFflSmi68al1JzEldx0REcSVLIKHkGojeL xIwl1Kgwr3gMfRYWbs8F89yJnlpO0X2VKtXuys/fABcnhiBPAZAYUsz/SZK1Mti+Ur XZ8+1VZviunPltiK6TmaXiYK4R4z1eiSZtiknS0g= 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 8E9F7385084D for ; Thu, 20 Oct 2022 14:14:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8E9F7385084D 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-657-ZDWs1PDFM0yv8frzou1CoA-1; Thu, 20 Oct 2022 10:14:14 -0400 X-MC-Unique: ZDWs1PDFM0yv8frzou1CoA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 89957296A629 for ; Thu, 20 Oct 2022 14:14:04 +0000 (UTC) Received: from abulafia.quesejoda.com (unknown [10.39.192.217]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EC44239D7C; Thu, 20 Oct 2022 14:13:55 +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 29KEDqtL229270 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 20 Oct 2022 16:13:52 +0200 Received: (from aldyh@localhost) by abulafia.quesejoda.com (8.17.1/8.17.1/Submit) id 29KEDqUC229269; Thu, 20 Oct 2022 16:13:52 +0200 To: GCC patches Subject: [COMMITTED] Do not set NAN flags for VARYING ranges when !HONOR_NANS. Date: Thu, 20 Oct 2022 16:13:36 +0200 Message-Id: <20221020141336.228799-2-aldyh@redhat.com> In-Reply-To: <20221020141336.228799-1-aldyh@redhat.com> References: <20221020141336.228799-1-aldyh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.1 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Since NANs can't appear in ranges for !HONOR_NANS, there's no reason to set them in a VARYING range. gcc/ChangeLog: * value-range.h (frange::set_varying): Do not set NAN flags for !HONOR_NANS. * value-range.cc (frange::normalize_kind): Adjust for no NAN when !HONOR_NANS. (frange::verify_range): Same. * range-op-float.cc (maybe_isnan): Remove flag_finite_math_only check. --- gcc/range-op-float.cc | 3 --- gcc/value-range.cc | 11 ++++++++--- gcc/value-range.h | 12 ++++++++++-- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/gcc/range-op-float.cc b/gcc/range-op-float.cc index 2a4a99ba467..a9e74c86877 100644 --- a/gcc/range-op-float.cc +++ b/gcc/range-op-float.cc @@ -171,9 +171,6 @@ range_operator_float::op1_op2_relation (const frange &lhs ATTRIBUTE_UNUSED) cons static inline bool maybe_isnan (const frange &op1, const frange &op2) { - if (flag_finite_math_only) - return false; - return op1.maybe_isnan () || op2.maybe_isnan (); } diff --git a/gcc/value-range.cc b/gcc/value-range.cc index 511cd0ad767..bcda4987307 100644 --- a/gcc/value-range.cc +++ b/gcc/value-range.cc @@ -388,7 +388,7 @@ frange::normalize_kind () && frange_val_is_min (m_min, m_type) && frange_val_is_max (m_max, m_type)) { - if (m_pos_nan && m_neg_nan) + if (!HONOR_NANS (m_type) || (m_pos_nan && m_neg_nan)) { set_varying (m_type); return true; @@ -396,7 +396,7 @@ frange::normalize_kind () } else if (m_kind == VR_VARYING) { - if (!m_pos_nan || !m_neg_nan) + if (HONOR_NANS (m_type) && (!m_pos_nan || !m_neg_nan)) { m_kind = VR_RANGE; m_min = frange_val_min (m_type); @@ -712,14 +712,19 @@ frange::supports_type_p (const_tree type) const void frange::verify_range () { + if (flag_finite_math_only) + gcc_checking_assert (!maybe_isnan ()); switch (m_kind) { case VR_UNDEFINED: gcc_checking_assert (!m_type); return; case VR_VARYING: + if (flag_finite_math_only) + gcc_checking_assert (!m_pos_nan && !m_neg_nan); + else + gcc_checking_assert (m_pos_nan && m_neg_nan); gcc_checking_assert (m_type); - gcc_checking_assert (m_pos_nan && m_neg_nan); gcc_checking_assert (frange_val_is_min (m_min, m_type)); gcc_checking_assert (frange_val_is_max (m_max, m_type)); return; diff --git a/gcc/value-range.h b/gcc/value-range.h index 60b989b2b50..b48542a68aa 100644 --- a/gcc/value-range.h +++ b/gcc/value-range.h @@ -1103,8 +1103,16 @@ frange::set_varying (tree type) m_type = type; m_min = frange_val_min (type); m_max = frange_val_max (type); - m_pos_nan = true; - m_neg_nan = true; + if (HONOR_NANS (m_type)) + { + m_pos_nan = true; + m_neg_nan = true; + } + else + { + m_pos_nan = false; + m_neg_nan = false; + } } inline void