From patchwork Thu Sep 22 19:05:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew MacLeod X-Patchwork-Id: 57933 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 5ADE8385AC2E for ; Thu, 22 Sep 2022 19:05:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5ADE8385AC2E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1663873548; bh=LsOZp2JtsO6VBUMkx8tPJpe4IHJUHdVy3gCb02yPxWc=; 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=MwctuRlkPU3eWvb0H9/FnCGU9sx7BBIlolz05queEgoa4epCScASCH6WzxJ8nhVjN QBl/Ku69CU1qnalxoxxKy4CWFspMtNtNGD9xIXgd0rUMbWf5rHECBz5DMY46uclBdI MdN1DeMFRom1bZW55w7Uqk6E62tV36i8qLJDfR0s= 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.133.124]) by sourceware.org (Postfix) with ESMTPS id 4B32F3858400 for ; Thu, 22 Sep 2022 19:05:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4B32F3858400 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-156-oJUbHKoJP7mHptMBUcKa1Q-1; Thu, 22 Sep 2022 15:05:17 -0400 X-MC-Unique: oJUbHKoJP7mHptMBUcKa1Q-1 Received: by mail-io1-f69.google.com with SMTP id y1-20020a056602200100b006893cd97da9so5261457iod.1 for ; Thu, 22 Sep 2022 12:05:16 -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=lQfDA1FuIxrlziwO84HaRm6i3hzLIXRRS5CP07BQ+fs=; b=KFhPAKY+MQvc+ay5LkLkRpPNR76YXRaX+WdQW5mT46PGkAUtZZLxlJIvgqClRq3nHu UCfK78MvjxOUsIt6VpuIpeaFewquGYzRKIZ4zswIMuIpogSKVxusIi936nVvP5gzkSIy YgP4LrEGZHrbVqyi+BmmCzo3hPD6t/8YkXCl2SUJcJ+Vy/DjrV+TpbZxk+fUynTj46x1 bVT/U4ld7kENmu8kuiLL79kAD6WlGeoqgavu7pxmpFVaTTPMrBLEDxauJuWcpaen4gQW BPWPA87TvkJEdVyqSd9LW2R6Msc1y94djO5sBKXDdRFfTMjRajHf5i9l3mPNzo82mXU9 srcg== X-Gm-Message-State: ACrzQf0Kws4RI8r1VRnMbspAr+YTHVnDF9oQQ5+3ubI8j5yoWsmuhU4X jmmH+r9/s7OWQdS5dpIUTfRgtV1AlFMyBOs1goJcxhqrNsCsBIRwf6JgsdayGWSkTeQ+lvBcuvs ozLFD2a7ImNoQNJrKka3O95XcJBwTblVF3Q69+veBE4iazThwih2xBLe24GQnTEQhu6Xtrw== X-Received: by 2002:a6b:c349:0:b0:689:d9f6:adf0 with SMTP id t70-20020a6bc349000000b00689d9f6adf0mr2230899iof.21.1663873515952; Thu, 22 Sep 2022 12:05:15 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4rPf02vskaJitPdudKyeRDFjYTkxSkbwcMBvXNfkuFQI4q9/iYJg9mhgkRrPaS1hhR8z/b0Q== X-Received: by 2002:a6b:c349:0:b0:689:d9f6:adf0 with SMTP id t70-20020a6bc349000000b00689d9f6adf0mr2230884iof.21.1663873515621; Thu, 22 Sep 2022 12:05:15 -0700 (PDT) Received: from ?IPV6:2607:fea8:a263:f600::3dbe? ([2607:fea8:a263:f600::3dbe]) by smtp.gmail.com with ESMTPSA id g17-20020a05663810f100b00349fb9b1abesm2532044jae.106.2022.09.22.12.05.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 22 Sep 2022 12:05:14 -0700 (PDT) Message-ID: Date: Thu, 22 Sep 2022 15:05:13 -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 10/17] Convert CFN_BUILT_FFS and CFN_POPCOUNT 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 5f730c650184d4c8bfad513a9e0e593f87a5bf0c Mon Sep 17 00:00:00 2001 From: Andrew MacLeod Date: Tue, 20 Sep 2022 18:07:14 -0400 Subject: [PATCH 10/17] Convert CFN_BUILT_FFS and CFN_POPCOUNT to range-ops. * gimple-range-fold.cc (range_of_builtin_int_call): Remove case for CFN_FFS and CFN_POPCOUNT. * gimple-range-op.cc (class cfn_pocount): New. (gimple_range_op_handler::maybe_builtin_call): Set arguments. --- gcc/gimple-range-fold.cc | 22 ---------------------- gcc/gimple-range-op.cc | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 22 deletions(-) diff --git a/gcc/gimple-range-fold.cc b/gcc/gimple-range-fold.cc index af1f83f7409..ca531037e13 100644 --- a/gcc/gimple-range-fold.cc +++ b/gcc/gimple-range-fold.cc @@ -922,28 +922,6 @@ fold_using_range::range_of_builtin_int_call (irange &r, gcall *call, switch (func) { - CASE_CFN_FFS: - CASE_CFN_POPCOUNT: - // __builtin_ffs* and __builtin_popcount* return [0, prec]. - arg = gimple_call_arg (call, 0); - prec = TYPE_PRECISION (TREE_TYPE (arg)); - mini = 0; - maxi = prec; - src.get_operand (r, arg); - // If arg is non-zero, then ffs or popcount are non-zero. - if (!range_includes_zero_p (&r)) - mini = 1; - // If some high bits are known to be zero, decrease the maximum. - if (!r.undefined_p ()) - { - if (TYPE_SIGN (r.type ()) == SIGNED) - range_cast (r, unsigned_type_for (r.type ())); - wide_int max = r.upper_bound (); - maxi = wi::floor_log2 (max) + 1; - } - r.set (build_int_cst (type, mini), build_int_cst (type, maxi)); - return true; - CASE_CFN_PARITY: r.set (build_zero_cst (type), build_one_cst (type)); return true; diff --git a/gcc/gimple-range-op.cc b/gcc/gimple-range-op.cc index 45384d990ae..84837f8ee43 100644 --- a/gcc/gimple-range-op.cc +++ b/gcc/gimple-range-op.cc @@ -387,6 +387,33 @@ cfn_toupper_tolower::fold_range (irange &r, tree type, const irange &lh, return true; } +// Implement range operator for CFN_BUILT_IN_FFS and CFN_BUILT_IN_POPCOUNT. +class cfn_popcount : public range_operator +{ +public: + using range_operator::fold_range; + virtual bool fold_range (irange &r, tree type, const irange &lh, + const irange &, relation_kind) const + { + if (lh.undefined_p ()) + return false; + // __builtin_ffs* and __builtin_popcount* return [0, prec]. + int prec = TYPE_PRECISION (lh.type ()); + // If arg is non-zero, then ffs or popcount are non-zero. + int mini = range_includes_zero_p (&lh) ? 0 : 1; + int maxi = prec; + + // If some high bits are known to be zero, decrease the maximum. + int_range_max tmp = lh; + if (TYPE_SIGN (tmp.type ()) == SIGNED) + range_cast (tmp, unsigned_type_for (tmp.type ())); + wide_int max = tmp.upper_bound (); + maxi = wi::floor_log2 (max) + 1; + r.set (build_int_cst (type, mini), build_int_cst (type, maxi)); + return true; + } +} op_cfn_popcount; + // Set up a gimple_range_op_handler for any built in function which can be // supported via range-ops. @@ -435,6 +462,13 @@ gimple_range_op_handler::maybe_builtin_call () } break; + CASE_CFN_FFS: + CASE_CFN_POPCOUNT: + m_op1 = gimple_call_arg (call, 0); + m_int = &op_cfn_popcount; + m_valid = true; + break; + default: break; } -- 2.37.3