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 09D6238AA27B for ; Mon, 5 Dec 2022 15:34:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 09D6238AA27B 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=1670254443; 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=Sj0ZTIZeLgIdtVEBdGjR9+gtVklnFBomHjcff3JjBps=; b=A0ImguGc43Z4i8ejvY0PigXsecD4+o0EVIb3yRzYrc2aIDAKURnn/kB/+b6jQgQaphNT6v 8DSrgVSs3ERbd0WVZxL7lEILavpAjQH0BxHobAlZJAtP/pn6ELwoLNfcnHjBbU3682IbEU Hl3rxaMmClYjss7lqbQMejhXaFw4+MU= 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-283-xV7fo3zfMdGSez6pfzl2tg-1; Mon, 05 Dec 2022 10:33:59 -0500 X-MC-Unique: xV7fo3zfMdGSez6pfzl2tg-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 957533813F26 for ; Mon, 5 Dec 2022 15:33:59 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A8222027062; Mon, 5 Dec 2022 15:33:59 +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 2B5FXsvf3418473 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 5 Dec 2022 16:33:54 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 2B5FXsdr3418472; Mon, 5 Dec 2022 16:33:54 +0100 Date: Mon, 5 Dec 2022 16:33:53 +0100 From: Jakub Jelinek To: Aldy Hernandez Cc: gcc-patches@gcc.gnu.org, Andrew MacLeod Subject: [PATCH] range-op-float: Improve binary reverse operations Message-ID: Reply-To: Jakub Jelinek References: <1f2b50a8-8f3c-690a-182b-c636fc2f86ed@redhat.com> <32b96813-616d-ba73-811f-8a36e70f9ecd@redhat.com> MIME-Version: 1.0 In-Reply-To: <32b96813-616d-ba73-811f-8a36e70f9ecd@redhat.com> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="opU2QKMeSaS7YWCy" Content-Disposition: inline X-Spam-Status: No, score=-3.9 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: --opU2QKMeSaS7YWCy Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi! On Mon, Dec 05, 2022 at 02:29:36PM +0100, Aldy Hernandez wrote: > > So like this for multiplication op1/2_range if it passes bootstrap/regtest? > > For division I'll need to go to a drawing board... > > Sure, looks good to me. Ulrich just filed PR107972, so in the light of that PR the following patch attempts to do that differently. Is this also ok if it passes bootstrap/regtest? As for testcase, I've tried both attached testcases, but unfortunately it seems that in neither of the cases we actually figure out that res range is finite (or for last function non-zero ordered). So there is further work needed on that. 2022-12-05 Jakub Jelinek PR tree-optimization/107972 * range-op-float.cc (frange_drop_infs): New function. (float_binary_op_range_finish): Add OP argument. If OP is not RDIV_EXPR and lhs is finite, r must be finite too. (foperator_plus::op1_range, foperator_minus::op1_range, foperator_minus::op2_range, foperator_mult::op1_range): Pass operation code to float_binary_op_range_finish. (foperator_div::op1_range): Pass RDIV_EXPR to float_binary_op_range_finish. If lhs is finite, r must be finite too. (foperator_div::op2_range): Pass RDIV_EXPR to float_binary_op_range_finish. If lhs is not NAN nor zero, r must be finite. --- gcc/range-op-float.cc.jj 2022-12-05 11:17:34.900573272 +0100 +++ gcc/range-op-float.cc 2022-12-05 16:13:54.414845672 +0100 @@ -330,6 +330,18 @@ frange_drop_ninf (frange &r, tree type) r.intersect (tmp); } +// Crop R to [MIN, MAX] where MAX is the maximum representable number +// for TYPE and MIN the minimum representable number for TYPE. + +static inline void +frange_drop_infs (frange &r, tree type) +{ + REAL_VALUE_TYPE max = real_max_representable (type); + REAL_VALUE_TYPE min = real_min_representable (type); + frange tmp (type, min, max); + r.intersect (tmp); +} + // If zero is in R, make sure both -0.0 and +0.0 are in the range. static inline void @@ -1883,7 +1895,7 @@ foperator_unordered_equal::op1_range (fr static bool float_binary_op_range_finish (bool ret, frange &r, tree type, - const frange &lhs) + const frange &lhs, enum tree_code op) { if (!ret) return false; @@ -1904,7 +1916,16 @@ float_binary_op_range_finish (bool ret, // If lhs isn't NAN, then neither operand could be NAN, // even if the reverse operation does introduce a maybe_nan. if (!lhs.maybe_isnan ()) - r.clear_nan (); + { + r.clear_nan (); + if (op != RDIV_EXPR + && !real_isinf (&lhs.lower_bound ()) + && !real_isinf (&lhs.upper_bound ())) + // For reverse + or - or *, if result is finite, then r must + // be finite too, as X + INF or X - INF or X * INF is always + // +-INF or NAN. For division handle it in the caller. + frange_drop_infs (r, type); + } // If lhs is a maybe or known NAN, the operand could be // NAN. else @@ -2020,7 +2041,7 @@ public: if (!minus) return false; return float_binary_op_range_finish (minus.fold_range (r, type, lhs, op2), - r, type, lhs); + r, type, lhs, PLUS_EXPR); } virtual bool op2_range (frange &r, tree type, const frange &lhs, @@ -2067,7 +2088,7 @@ public: return false; return float_binary_op_range_finish (fop_plus.fold_range (r, type, lhs, op2), - r, type, lhs); + r, type, lhs, MINUS_EXPR); } virtual bool op2_range (frange &r, tree type, const frange &lhs, @@ -2077,7 +2098,7 @@ public: if (lhs.undefined_p ()) return false; return float_binary_op_range_finish (fold_range (r, type, op1, lhs), - r, type, lhs); + r, type, lhs, MINUS_EXPR); } private: void rv_fold (REAL_VALUE_TYPE &lb, REAL_VALUE_TYPE &ub, bool &maybe_nan, @@ -2166,7 +2187,7 @@ public: // or if lhs must be zero and op2 doesn't include zero, it would be // UNDEFINED, while rdiv.fold_range computes a zero or singleton INF // range. Those are supersets of UNDEFINED, so let's keep that way. - return float_binary_op_range_finish (ret, r, type, lhs); + return float_binary_op_range_finish (ret, r, type, lhs, MULT_EXPR); } virtual bool op2_range (frange &r, tree type, const frange &lhs, @@ -2313,7 +2334,12 @@ public: zero_to_inf_range (lb, ub, signbit_known); r.set (type, lb, ub); } - return float_binary_op_range_finish (ret, r, type, lhs); + // If lhs must be finite (can't be +-INF nor NAN), then op1 must be + // finite too - +-INF / anything is either +-INF or NAN (NAN if op2 is + // +-INF or NAN). + if (!real_isinf (&lhs_lb) && !real_isinf (&lhs_ub) && !lhs.maybe_isnan ()) + frange_drop_infs (r, type); + return float_binary_op_range_finish (ret, r, type, lhs, RDIV_EXPR); } virtual bool op2_range (frange &r, tree type, const frange &lhs, @@ -2341,7 +2367,11 @@ public: zero_to_inf_range (lb, ub, signbit_known); r.set (type, lb, ub); } - return float_binary_op_range_finish (ret, r, type, lhs); + // If lhs can't be zero nor NAN, then op2 must be finite - anything / +-INF + // is either +-0 or NAN (NAN if op1 is +-INF or NAN). + if (!contains_zero_p (lhs_lb, lhs_ub) && !lhs.maybe_isnan ()) + frange_drop_infs (r, type); + return float_binary_op_range_finish (ret, r, type, lhs, RDIV_EXPR); } private: void rv_fold (REAL_VALUE_TYPE &lb, REAL_VALUE_TYPE &ub, bool &maybe_nan, Jakub --opU2QKMeSaS7YWCy Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="pr107972.c" double foo (double a, double b) { if (!__builtin_isfinite (a)) return 42.0; if (!__builtin_isfinite (b)) return 42.0; double res = a + b; if (!__builtin_isfinite (res)) __builtin_unreachable (); return res; } double bar (double a, double b) { if (!__builtin_isfinite (a)) return 42.0; if (!__builtin_isfinite (b)) return 42.0; double res = a - b; if (!__builtin_isfinite (res)) __builtin_unreachable (); return res; } double baz (double a, double b) { if (!__builtin_isfinite (a)) return 42.0; if (!__builtin_isfinite (b)) return 42.0; double res = a * b; if (!__builtin_isfinite (res)) __builtin_unreachable (); return res; } double qux (double a, double b) { if (!__builtin_isfinite (a)) return 42.0; double res = a / b; if (!__builtin_isfinite (res)) __builtin_unreachable (); return res; } double quux (double a, double b) { if (!__builtin_isfinite (b)) return 42.0; double res = a / b; if (__builtin_isnan (res) || res == 0.0) __builtin_unreachable (); return res; } --opU2QKMeSaS7YWCy Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="pr107972-2.c" double foo (double a, double b) { if (!__builtin_isfinite (a)) return 42.0; if (!__builtin_isfinite (b)) return 42.0; double res = a + b; __attribute__((assume (__builtin_isfinite (res)))); return res; } double bar (double a, double b) { if (!__builtin_isfinite (a)) return 42.0; if (!__builtin_isfinite (b)) return 42.0; double res = a - b; __attribute__((assume (__builtin_isfinite (res)))); return res; } double baz (double a, double b) { if (!__builtin_isfinite (a)) return 42.0; if (!__builtin_isfinite (b)) return 42.0; double res = a * b; __attribute__((assume (__builtin_isfinite (res)))); return res; } double qux (double a, double b) { if (!__builtin_isfinite (a)) return 42.0; double res = a / b; __attribute__((assume (__builtin_isfinite (res)))); return res; } double quux (double a, double b) { if (!__builtin_isfinite (b)) return 42.0; double res = a / b; __attribute__((assume (!__builtin_isnan (res) && res != 0.0))); return res; } --opU2QKMeSaS7YWCy--