From patchwork Tue Nov 30 14:33:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew MacLeod X-Patchwork-Id: 48291 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 426E93857C6B for ; Tue, 30 Nov 2021 14:34:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 426E93857C6B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1638282894; bh=54h+um9qHJvbG20qerKt2FQmlrtY8fCzJTv7ABjBkzk=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=PZFE8jfiKroqeHNJWpfUssQ090XRSRSX5wEyOV0Yr9tfwTNqdPrnwlq0BItqtop56 rHCc7uUfdxU9k2liUSuKtm7tbqUvqZ39rLhOXm9cEfLX24u8SOLAUiURbHzpm50k+W SBLzQrbZlL8uz8Nx18E9Wqyj2dee/AYrfNdIMzgo= 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 21B5D385BF9B for ; Tue, 30 Nov 2021 14:34:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 21B5D385BF9B Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-61-0JeSCVZ2NbiXqAGrmNTsXw-1; Tue, 30 Nov 2021 09:33:19 -0500 X-MC-Unique: 0JeSCVZ2NbiXqAGrmNTsXw-1 Received: by mail-qv1-f71.google.com with SMTP id fw10-20020a056214238a00b003c05d328ad2so29506585qvb.2 for ; Tue, 30 Nov 2021 06:33:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent :content-language:to:cc:from:subject; bh=G0aqGLD+4zoZv8hoJmDw2/82o8khBz3cY99DxCnnT2c=; b=jrMHMke0aYDlGlhLqm55+nmriwAz3Ud4UIzs9eTNuEXuG3sliEh2rcyrTm224guW8B BPur5m8KIMOy7TjnYLr/Qpz+T0L2do2tqbpUICvRt3X0Zz5kbOxb4AakV7HnEX1jcfvT DIlPKNoA3HcG1APCz4V1wx4gUXgTRUhP24b+RkFxy+ycW8+9XMevIQs7ysDcQ2y2LCAI n/cPO/tvl6GRjri/A12+62Wvh7i7Pm98J+9xkhAg8TEfW/tmGCDc0sU6Btw8VeztpZB9 8RmDwpiULtvEDjo/78JcmAEqZ20fUlbQHto4xd2b6f0JW5OwhISOpOU9SjrDYgYXY0ly 9lkg== X-Gm-Message-State: AOAM530Sq3HVqPBTgbpy8LmPg98RSA9ZgKh8gX94M5wdlItnyYztCLKk ZqVkxFKkdZYid9ywdUQPUQgV2zOEIq9YDHolwUff/yjF0TqKB8SMWfiZPAZ5zcTkVJ/pNYOo51j PuGWwoY6vPQl/TQiGm1R5+5hiJYQHV7zhxey2+Sup/cmlfkzjZqO/2onRNSX5EkBFZTJy0w== X-Received: by 2002:a05:6214:21ae:: with SMTP id t14mr50172360qvc.66.1638282798164; Tue, 30 Nov 2021 06:33:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJzCP5IQ1V7Ja4UrlJSvUyCbuYv/QF1gFaf8ZT5lJM897CFeG2TxTE4snMQuIuY8S6NvtPfSxw== X-Received: by 2002:a05:6214:21ae:: with SMTP id t14mr50172243qvc.66.1638282797138; Tue, 30 Nov 2021 06:33:17 -0800 (PST) Received: from [192.168.0.102] ([104.219.122.97]) by smtp.gmail.com with ESMTPSA id u11sm9678934qko.33.2021.11.30.06.33.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 30 Nov 2021 06:33:16 -0800 (PST) Message-ID: Date: Tue, 30 Nov 2021 09:33:14 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.3.2 To: gcc-patches Subject: [PATCH] tree-optimization/103464 - Also pre-process PHIs in range-of-stmt. X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-CA X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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" When I flatten the call stack for range_of_stmt in PR 103231 ( https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103231 ), I mention that I was only flattening it for chains of statements with range handlers. If it turned out that PHI chaining was also a problem, we could also do PHIs. The cost to do phis is quite nominal, and resolve this testcase...  so we might as well do PHIs as well. Bootstrapped on x86_64-pc-linux-gnu with no regressions.  OK? Andrew commit 99b0f5f03a04fd342461a67287d81250f86f0586 Author: Andrew MacLeod Date: Mon Nov 29 12:00:26 2021 -0500 Also pre-process PHIs in range-of-stmt. PR tree-optimization/103464 * gimple-range.cc (gimple_ranger::prefill_name): Process phis also. (gimple_ranger::prefill_stmt_dependencies): Ditto. diff --git a/gcc/gimple-range.cc b/gcc/gimple-range.cc index 178a470a419..c8431a7180b 100644 --- a/gcc/gimple-range.cc +++ b/gcc/gimple-range.cc @@ -333,7 +333,7 @@ gimple_ranger::prefill_name (irange &r, tree name) if (!gimple_range_ssa_p (name)) return; gimple *stmt = SSA_NAME_DEF_STMT (name); - if (!gimple_range_handler (stmt)) + if (!gimple_range_handler (stmt) && !is_a (stmt)) return; bool current; @@ -356,8 +356,8 @@ gimple_ranger::prefill_stmt_dependencies (tree ssa) gimple *stmt = SSA_NAME_DEF_STMT (ssa); gcc_checking_assert (stmt && gimple_bb (stmt)); - // Only pre-process range-ops. - if (!gimple_range_handler (stmt)) + // Only pre-process range-ops and phis. + if (!gimple_range_handler (stmt) && !is_a (stmt)) return; // Mark where on the stack we are starting. @@ -401,13 +401,22 @@ gimple_ranger::prefill_stmt_dependencies (tree ssa) print_gimple_stmt (dump_file, stmt, 0, TDF_SLIM); } - gcc_checking_assert (gimple_range_handler (stmt)); - tree op = gimple_range_operand2 (stmt); - if (op) - prefill_name (r, op); - op = gimple_range_operand1 (stmt); - if (op) - prefill_name (r, op); + gphi *phi = dyn_cast (stmt); + if (phi) + { + for (unsigned x = 0; x < gimple_phi_num_args (phi); x++) + prefill_name (r, gimple_phi_arg_def (phi, x)); + } + else + { + gcc_checking_assert (gimple_range_handler (stmt)); + tree op = gimple_range_operand2 (stmt); + if (op) + prefill_name (r, op); + op = gimple_range_operand1 (stmt); + if (op) + prefill_name (r, op); + } } if (idx) tracer.trailer (idx, "ROS ", false, ssa, r);