From patchwork Mon Jul 4 18:45:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aldy Hernandez X-Patchwork-Id: 55707 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 C9B8538582A2 for ; Mon, 4 Jul 2022 18:46:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C9B8538582A2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1656960368; bh=3m0B0ODrTviLAANx5JXcU12R4KrDVAkB7cLNNR9DbmQ=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=nxs9FrgLHqqUqI9c09T1Y3ddU7cex9Uq/1yrZ1SkNxmiNI558cC3mtvfCqwR5wg4P y29dnK1ngzD/aLErteNAh6JJO4L0qVDJHZtJebGHWQ/eqOTS263IxA4TVSCRm04SJE 8M1aPvVBhbKn9LkmjsGPhTYYaHwbQNVb+LZUYtT0= 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 5F42E38582A2 for ; Mon, 4 Jul 2022 18:45:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5F42E38582A2 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-282-PmmvIswYNFWxGedC2VrJUQ-1; Mon, 04 Jul 2022 14:45:38 -0400 X-MC-Unique: PmmvIswYNFWxGedC2VrJUQ-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 D209081D9CA for ; Mon, 4 Jul 2022 18:45:37 +0000 (UTC) Received: from abulafia.quesejoda.com (unknown [10.39.193.61]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8141E9D7F; Mon, 4 Jul 2022 18:45:37 +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 264IjZ3v580037 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 4 Jul 2022 20:45:35 +0200 Received: (from aldyh@localhost) by abulafia.quesejoda.com (8.17.1/8.17.1/Submit) id 264IjZUk580036; Mon, 4 Jul 2022 20:45:35 +0200 To: GCC patches Subject: [COMMITTED] Misc conversions to vrange. Date: Mon, 4 Jul 2022 20:45:30 +0200 Message-Id: <20220704184530.580018-1-aldyh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.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_NONE, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" The following converts a handful of places that were irange centric. Tested on x86-64 Linux. gcc/ChangeLog: * gimple-range-fold.cc (fold_using_range::range_of_ssa_name_with_loop_info): Restrict the call to SCEV for irange supported types. (fold_using_range::range_of_builtin_int_call): Convert to vrange. * gimple-range.cc (gimple_ranger::prefill_stmt_dependencies): Same. * tree-ssa-dom.cc (cprop_operand): Same. --- gcc/gimple-range-fold.cc | 32 ++++++++++++++++++-------------- gcc/gimple-range.cc | 11 ++++++++--- gcc/tree-ssa-dom.cc | 2 +- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/gcc/gimple-range-fold.cc b/gcc/gimple-range-fold.cc index 0f815b50b9a..6f907df5bf5 100644 --- a/gcc/gimple-range-fold.cc +++ b/gcc/gimple-range-fold.cc @@ -1006,19 +1006,21 @@ fold_using_range::range_of_builtin_int_call (irange &r, gcall *call, switch (func) { case CFN_BUILT_IN_CONSTANT_P: - arg = gimple_call_arg (call, 0); - if (src.get_operand (r, arg) && r.singleton_p ()) - { - r.set (build_one_cst (type), build_one_cst (type)); - return true; - } - if (cfun->after_inlining) - { - r.set_zero (type); - // r.equiv_clear (); - return true; - } - break; + { + arg = gimple_call_arg (call, 0); + Value_Range tmp (TREE_TYPE (arg)); + if (src.get_operand (tmp, arg) && tmp.singleton_p ()) + { + r.set (build_one_cst (type), build_one_cst (type)); + return true; + } + if (cfun->after_inlining) + { + r.set_zero (type); + return true; + } + break; + } case CFN_BUILT_IN_TOUPPER: { @@ -1335,7 +1337,9 @@ fold_using_range::range_of_ssa_name_with_loop_info (irange &r, tree name, { gcc_checking_assert (TREE_CODE (name) == SSA_NAME); tree min, max, type = TREE_TYPE (name); - if (bounds_of_var_in_loop (&min, &max, src.query (), l, phi, name)) + // FIXME: Remove the supports_p() once all this can handle floats, etc. + if (irange::supports_p (type) + && bounds_of_var_in_loop (&min, &max, src.query (), l, phi, name)) { if (TREE_CODE (min) != INTEGER_CST) { diff --git a/gcc/gimple-range.cc b/gcc/gimple-range.cc index f3a46555f91..3a9f0b07e79 100644 --- a/gcc/gimple-range.cc +++ b/gcc/gimple-range.cc @@ -422,12 +422,17 @@ gimple_ranger::prefill_stmt_dependencies (tree ssa) { gcc_checking_assert (range_op_handler (stmt)); tree op = gimple_range_operand2 (stmt); - Value_Range r (TREE_TYPE (name)); if (op) - prefill_name (r, op); + { + Value_Range r (TREE_TYPE (op)); + prefill_name (r, op); + } op = gimple_range_operand1 (stmt); if (op) - prefill_name (r, op); + { + Value_Range r (TREE_TYPE (op)); + prefill_name (r, op); + } } } if (idx) diff --git a/gcc/tree-ssa-dom.cc b/gcc/tree-ssa-dom.cc index 9b6520fd2dd..2bc2c3db7d7 100644 --- a/gcc/tree-ssa-dom.cc +++ b/gcc/tree-ssa-dom.cc @@ -1837,7 +1837,7 @@ cprop_operand (gimple *stmt, use_operand_p op_p, range_query *query) val = SSA_NAME_VALUE (op); if (!val) { - int_range<2> r; + Value_Range r (TREE_TYPE (op)); tree single; if (query->range_of_expr (r, op, stmt) && r.singleton_p (&single)) val = single;