From patchwork Thu Sep 22 19:05:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew MacLeod X-Patchwork-Id: 57932 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3CF26385AC22 for ; Thu, 22 Sep 2022 19:05:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3CF26385AC22 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1663873558; bh=Fr82gZ7Ayxx+pjyLoPlRoiCZJGRKeEn55dtAep4DGzc=; h=Date:Subject:To:References:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=UZJntzcAKiPtaSmcz51k1ErfD8ZAaxsjKDX9R5jjGV56Mq7lj+WzwE0du+sfnGLxA MeNr4BS0UWzP2a2YPlghVL2AghdOn6D1tSyxwTbShZNoCOnXlM5CoewRgy1xCvnl2z r7seulaPeGLtdvB1k34EgjYAFn2zA0s1u71QUL6E= 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 E59E13857BA2 for ; Thu, 22 Sep 2022 19:05:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E59E13857BA2 Received: from mail-io1-f69.google.com (mail-io1-f69.google.com [209.85.166.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-649-XWwJetiSMV23fOGeas0iDg-1; Thu, 22 Sep 2022 15:05:22 -0400 X-MC-Unique: XWwJetiSMV23fOGeas0iDg-1 Received: by mail-io1-f69.google.com with SMTP id n16-20020a6b5910000000b006a3570db9a5so5303637iob.23 for ; Thu, 22 Sep 2022 12:05:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:references:cc:to:from:content-language:subject :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date; bh=TwWGnmr01OJs6tPHGIjyk+CEI85LhO8bRskaSrMugd4=; b=BD2emNms+Efh3WgFINEcsMLWd7mYC5ynn9BeTij4OA1StcddR5MlJpo+WcArQXQU7b daavPzcpSJ1gkZSmruCj3u79ed5KefR+bMYbLxq/ib2DunEBJyhJVwPoZfXY8gGn30Cy PoZVgNQ2ylah0SRdbPEtl1Od9oLDKNulKIfTzFA+lPcsm6h3Dur0UXZD2cfo+Q/dHvQr RK233/6rPEoeLUk6yYEFfaLKzdKxhvgmWCopTek5PmfA6DP7Shl1lx46Gr4lGCmRjc/Q ftdZw7eEswc2NKzbhh+owd4QlINv1IgP4p6+UboDY9eWndgtA6NdWNtyinXxWdREAPkf PIlQ== X-Gm-Message-State: ACrzQf0gaYFIo6sZ4QIqZcb2bCB0XN9CZoqB+UihFpBFHHPurBXIrBEx tgTJNmiJ9XsrvVA1tmI3K3RNC/mcBADZ6ur/1GZdnpl6UV7wAbIbJ9rU6IFPqHtp4qlCyVBhNzu KSFgwxPhzakGeranrTbCzFHKhocXf6zb6EBx3XRko6AJdodvTuGjHOkxwZxdU82q4/CqEQw== X-Received: by 2002:a05:6e02:1886:b0:2eb:438a:c64c with SMTP id o6-20020a056e02188600b002eb438ac64cmr2424344ilu.282.1663873521469; Thu, 22 Sep 2022 12:05:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6A6WUaORQ80Ye5daju0un/bYQj7P/VbyMn8YfYG8s4ahKAQaqptDrxRVI1vzd0kXTImXxBzQ== X-Received: by 2002:a05:6e02:1886:b0:2eb:438a:c64c with SMTP id o6-20020a056e02188600b002eb438ac64cmr2424336ilu.282.1663873521184; Thu, 22 Sep 2022 12:05:21 -0700 (PDT) Received: from ?IPV6:2607:fea8:a263:f600::3dbe? ([2607:fea8:a263:f600::3dbe]) by smtp.gmail.com with ESMTPSA id n25-20020a02a199000000b0035ad8408d40sm2528487jah.108.2022.09.22.12.05.20 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 22 Sep 2022 12:05:20 -0700 (PDT) Message-ID: Date: Thu, 22 Sep 2022 15:05:19 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.2.1 Subject: [PATCH 11/17] Convert CFN_CLZ builtins to range-ops. To: gcc-patches References: <571782f9-72e6-5c30-da55-b8d62d3a153e@redhat.com> In-Reply-To: <571782f9-72e6-5c30-da55-b8d62d3a153e@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-Spam-Status: No, score=-12.7 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_LOW, 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: Andrew MacLeod via Gcc-patches From: Andrew MacLeod Reply-To: Andrew MacLeod Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Bootstrapped on x86_64-pc-linux-gnu with no regressions.  Pushed. Andrew From ae1669a98656cca594fcd2fef6bd2cd7308a361f Mon Sep 17 00:00:00 2001 From: Andrew MacLeod Date: Tue, 20 Sep 2022 18:12:25 -0400 Subject: [PATCH 11/17] Convert CFN_CLZ builtins to range-ops. * gimple-range-fold.cc (range_of_builtin_int_call): Remove case for CFN_CLZ. * gimple-range-op.cc (class cfn_clz): New. (gimple_range_op_handler::maybe_builtin_call): Set arguments. --- gcc/gimple-range-fold.cc | 61 ----------------------------- gcc/gimple-range-op.cc | 84 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 61 deletions(-) diff --git a/gcc/gimple-range-fold.cc b/gcc/gimple-range-fold.cc index ca531037e13..63eaa90be96 100644 --- a/gcc/gimple-range-fold.cc +++ b/gcc/gimple-range-fold.cc @@ -926,67 +926,6 @@ fold_using_range::range_of_builtin_int_call (irange &r, gcall *call, r.set (build_zero_cst (type), build_one_cst (type)); return true; - CASE_CFN_CLZ: - // __builtin_c[lt]z* return [0, prec-1], except when the - // argument is 0, but that is undefined behavior. - // - // For __builtin_c[lt]z* consider argument of 0 always undefined - // behavior, for internal fns depending on C?Z_DEFINED_VALUE_AT_ZERO. - arg = gimple_call_arg (call, 0); - prec = TYPE_PRECISION (TREE_TYPE (arg)); - mini = 0; - maxi = prec - 1; - mode = SCALAR_INT_TYPE_MODE (TREE_TYPE (arg)); - if (gimple_call_internal_p (call)) - { - if (optab_handler (clz_optab, mode) != CODE_FOR_nothing - && CLZ_DEFINED_VALUE_AT_ZERO (mode, zerov) == 2) - { - // Only handle the single common value. - if (zerov == prec) - maxi = prec; - else - // Magic value to give up, unless we can prove arg is non-zero. - mini = -2; - } - } - - src.get_operand (r, arg); - // From clz of minimum we can compute result maximum. - if (!r.undefined_p ()) - { - // From clz of minimum we can compute result maximum. - if (wi::gt_p (r.lower_bound (), 0, TYPE_SIGN (r.type ()))) - { - maxi = prec - 1 - wi::floor_log2 (r.lower_bound ()); - if (mini == -2) - mini = 0; - } - else if (!range_includes_zero_p (&r)) - { - mini = 0; - maxi = prec - 1; - } - if (mini == -2) - break; - // From clz of maximum we can compute result minimum. - wide_int max = r.upper_bound (); - int newmini = prec - 1 - wi::floor_log2 (max); - if (max == 0) - { - // If CLZ_DEFINED_VALUE_AT_ZERO is 2 with VALUE of prec, - // return [prec, prec], otherwise ignore the range. - if (maxi == prec) - mini = prec; - } - else - mini = newmini; - } - if (mini == -2) - break; - r.set (build_int_cst (type, mini), build_int_cst (type, maxi)); - return true; - CASE_CFN_CTZ: // __builtin_ctz* return [0, prec-1], except for when the // argument is 0, but that is undefined behavior. diff --git a/gcc/gimple-range-op.cc b/gcc/gimple-range-op.cc index 84837f8ee43..caba49309f9 100644 --- a/gcc/gimple-range-op.cc +++ b/gcc/gimple-range-op.cc @@ -414,6 +414,81 @@ public: } } op_cfn_popcount; +// Implement range operator for CFN_BUILT_IN_CLZ +class cfn_clz : public range_operator +{ +public: + cfn_clz (bool internal) { m_gimple_call_internal_p = internal; } + using range_operator::fold_range; + virtual bool fold_range (irange &r, tree type, const irange &lh, + const irange &, relation_kind) const; +private: + bool m_gimple_call_internal_p; +} op_cfn_clz (false), op_cfn_clz_internal (true); + +bool +cfn_clz::fold_range (irange &r, tree type, const irange &lh, + const irange &, relation_kind) const +{ + // __builtin_c[lt]z* return [0, prec-1], except when the + // argument is 0, but that is undefined behavior. + // + // For __builtin_c[lt]z* consider argument of 0 always undefined + // behavior, for internal fns depending on C?Z_DEFINED_ALUE_AT_ZERO. + if (lh.undefined_p ()) + return false; + int prec = TYPE_PRECISION (lh.type ()); + int mini = 0; + int maxi = prec - 1; + int zerov = 0; + scalar_int_mode mode = SCALAR_INT_TYPE_MODE (lh.type ()); + if (m_gimple_call_internal_p) + { + if (optab_handler (clz_optab, mode) != CODE_FOR_nothing + && CLZ_DEFINED_VALUE_AT_ZERO (mode, zerov) == 2) + { + // Only handle the single common value. + if (zerov == prec) + maxi = prec; + else + // Magic value to give up, unless we can prove arg is non-zero. + mini = -2; + } + } + + // From clz of minimum we can compute result maximum. + if (wi::gt_p (lh.lower_bound (), 0, TYPE_SIGN (lh.type ()))) + { + maxi = prec - 1 - wi::floor_log2 (lh.lower_bound ()); + if (mini == -2) + mini = 0; + } + else if (!range_includes_zero_p (&lh)) + { + mini = 0; + maxi = prec - 1; + } + if (mini == -2) + return false; + // From clz of maximum we can compute result minimum. + wide_int max = lh.upper_bound (); + int newmini = prec - 1 - wi::floor_log2 (max); + if (max == 0) + { + // If CLZ_DEFINED_VALUE_AT_ZERO is 2 with VALUE of prec, + // return [prec, prec], otherwise ignore the range. + if (maxi == prec) + mini = prec; + } + else + mini = newmini; + + if (mini == -2) + return false; + r.set (build_int_cst (type, mini), build_int_cst (type, maxi)); + return true; +} + // Set up a gimple_range_op_handler for any built in function which can be // supported via range-ops. @@ -469,6 +544,15 @@ gimple_range_op_handler::maybe_builtin_call () m_valid = true; break; + CASE_CFN_CLZ: + m_op1 = gimple_call_arg (call, 0); + m_valid = true; + if (gimple_call_internal_p (call)) + m_int = &op_cfn_clz_internal; + else + m_int = &op_cfn_clz; + break; + default: break; } -- 2.37.3