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 ESMTP id E4D5F3857C53 for ; Thu, 22 Jul 2021 15:29:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E4D5F3857C53 Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-3-enP3fEsuOKSArsxpYHTXrA-1; Thu, 22 Jul 2021 11:29:04 -0400 X-MC-Unique: enP3fEsuOKSArsxpYHTXrA-1 Received: by mail-lf1-f69.google.com with SMTP id x203-20020a19c7d40000b029039ae2a616baso1348134lff.9 for ; Thu, 22 Jul 2021 08:29:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=v7tMuwQFb+gDI0aGlNZMysSq1mmBL3X/vDSms1xlFHM=; b=BHJVjYw5nQkpDPDO7ovnSwog5yjyOfYwpQeC2pw4Hq2hkbIUEjvcdJKDyllm18i9rY PQj7kOeTvKgqV497f5cbxG8olbKGXR44jIVvBfbfwnbx7FIpFPensER6OF/mRkMJfx9z MDgAKkmb1W75f5aMsFYW5LmVjd+G3k9yP/vC8CG/n0e42F/UUnicjJ8SoP6SY84qQFqE Wc5ZUEIacWyGWQOMs82vUocqWt0PkjP2Wvu7ikFyBu3A5LPvDPfqSBE0DoAh63ub5Wqs sf5UYsXWtV6UrY0KtUKBllp8olzlsqRiaOe566LJTdtfY+PAR9juwMlt28ilrth+rdst T7bw== X-Gm-Message-State: AOAM530ZOw8DijRMQXR200iSuYtR1vyzKcx0gCdVg9uAR2q7ffZ4INFz 8iPNwQ+uPZQThEGbIchAnr90HVkW37aQGK9mcaqLnSBOZoyxrQqGft5epiHSUF/q6DiB71fB++w Xzi0HjrWI7f/niMuGMSE/yiILIKhEGgKQyQ== X-Received: by 2002:a2e:9d43:: with SMTP id y3mr401761ljj.85.1626967742397; Thu, 22 Jul 2021 08:29:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+pNcU5MIUUb+TedJRELYtX4rH7qyF1hSehOSRXSfmHscmK2C3r9RfbGE0t8TDoXVkvrmxtzz0RewO1mQsE2s= X-Received: by 2002:a2e:9d43:: with SMTP id y3mr401752ljj.85.1626967742220; Thu, 22 Jul 2021 08:29:02 -0700 (PDT) MIME-Version: 1.0 References: <20210715122054.2002001-1-aldyh@redhat.com> In-Reply-To: From: Aldy Hernandez Date: Thu, 22 Jul 2021 17:28:51 +0200 Message-ID: Subject: Re: [PUSHED] Abstract out non_null adjustments in ranger. To: GCC patches , Andrew MacLeod X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="00000000000056389f05c7b7f2c4" X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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-List-Received-Date: Thu, 22 Jul 2021 15:29:09 -0000 --00000000000056389f05c7b7f2c4 Content-Type: text/plain; charset="UTF-8" Well, arbitrarily allowing everything caused some -Wnonnull regressions. I've changed the check to !r.zero_p() && !r.nonzero_p(), as the only reasonable ranges for pointers besides varying/undefined are zero and non-zero. Attached is the final version of the patch I have pushed. Tested on x86-64 Linux. On Wed, Jul 21, 2021 at 5:29 PM Aldy Hernandez wrote: > > As I mentioned when I pushed the patch in this thread, I have run into > cases where a pointer has a non-varying range, but it includes 0. The > varying check causes no further refinements to be done. The previous > cases I had seen were in follow-up threader work, so I was delaying > pushing this until then. But I'm now going through VRP cases that > evrp is missing, and this is one of the main culprits. > > I will push this once tests are done. If for some reason, varying > restrictions are needed, we can always adjust the callers to > adjust_range. > > Aldy > > On Thu, Jul 15, 2021 at 2:21 PM Aldy Hernandez wrote: > > > > There are 4 exact copies of the non-null range adjusting code in the > > ranger. This patch abstracts the functionality into a separate method. > > > > As a follow-up I would like to remove the varying_p check, since I have > > seen incoming ranges such as [0, 0xff....ef] which are not varying, but > > are not-null. Removing the varying restriction catches those. > > > > Tested on x86-64 Linux. > > > > Pushed to trunk. > > > > p.s. Andrew, what are your thoughts on removing the varying_p() check as > > a follow-up? > > > > gcc/ChangeLog: > > > > * gimple-range-cache.cc (non_null_ref::adjust_range): New. > > (ranger_cache::range_of_def): Call adjust_range. > > (ranger_cache::entry_range): Same. > > * gimple-range-cache.h (non_null_ref::adjust_range): New. > > * gimple-range.cc (gimple_ranger::range_of_expr): Call > > adjust_range. > > (gimple_ranger::range_on_entry): Same. > > --- > > gcc/gimple-range-cache.cc | 35 ++++++++++++++++++++++++++--------- > > gcc/gimple-range-cache.h | 2 ++ > > gcc/gimple-range.cc | 8 ++------ > > 3 files changed, 30 insertions(+), 15 deletions(-) > > > > diff --git a/gcc/gimple-range-cache.cc b/gcc/gimple-range-cache.cc > > index 98ecdbbd68e..23597ade802 100644 > > --- a/gcc/gimple-range-cache.cc > > +++ b/gcc/gimple-range-cache.cc > > @@ -81,6 +81,29 @@ non_null_ref::non_null_deref_p (tree name, basic_block bb, bool search_dom) > > return false; > > } > > > > +// If NAME has a non-null dereference in block BB, adjust R with the > > +// non-zero information from non_null_deref_p, and return TRUE. If > > +// SEARCH_DOM is true, non_null_deref_p should search the dominator tree. > > + > > +bool > > +non_null_ref::adjust_range (irange &r, tree name, basic_block bb, > > + bool search_dom) > > +{ > > + // Check if pointers have any non-null dereferences. Non-call > > + // exceptions mean we could throw in the middle of the block, so just > > + // punt for now on those. > > + if (!cfun->can_throw_non_call_exceptions > > + && r.varying_p () > > + && non_null_deref_p (name, bb, search_dom)) > > + { > > + int_range<2> nz; > > + nz.set_nonzero (TREE_TYPE (name)); > > + r.intersect (nz); > > + return true; > > + } > > + return false; > > +} > > + > > // Allocate an populate the bitmap for NAME. An ON bit for a block > > // index indicates there is a non-null reference in that block. In > > // order to populate the bitmap, a quick run of all the immediate uses > > @@ -857,9 +880,8 @@ ranger_cache::range_of_def (irange &r, tree name, basic_block bb) > > r = gimple_range_global (name); > > } > > > > - if (bb && r.varying_p () && m_non_null.non_null_deref_p (name, bb, false) && > > - !cfun->can_throw_non_call_exceptions) > > - r = range_nonzero (TREE_TYPE (name)); > > + if (bb) > > + m_non_null.adjust_range (r, name, bb, false); > > } > > > > // Get the range of NAME as it occurs on entry to block BB. > > @@ -878,12 +900,7 @@ ranger_cache::entry_range (irange &r, tree name, basic_block bb) > > if (!m_on_entry.get_bb_range (r, name, bb)) > > range_of_def (r, name); > > > > - // Check if pointers have any non-null dereferences. Non-call > > - // exceptions mean we could throw in the middle of the block, so just > > - // punt for now on those. > > - if (r.varying_p () && m_non_null.non_null_deref_p (name, bb, false) && > > - !cfun->can_throw_non_call_exceptions) > > - r = range_nonzero (TREE_TYPE (name)); > > + m_non_null.adjust_range (r, name, bb, false); > > } > > > > // Get the range of NAME as it occurs on exit from block BB. > > diff --git a/gcc/gimple-range-cache.h b/gcc/gimple-range-cache.h > > index ecf63dc01b3..f842e9c092a 100644 > > --- a/gcc/gimple-range-cache.h > > +++ b/gcc/gimple-range-cache.h > > @@ -34,6 +34,8 @@ public: > > non_null_ref (); > > ~non_null_ref (); > > bool non_null_deref_p (tree name, basic_block bb, bool search_dom = true); > > + bool adjust_range (irange &r, tree name, basic_block bb, > > + bool search_dom = true); > > private: > > vec m_nn; > > void process_name (tree name); > > diff --git a/gcc/gimple-range.cc b/gcc/gimple-range.cc > > index 1851339c528..b210787d0b7 100644 > > --- a/gcc/gimple-range.cc > > +++ b/gcc/gimple-range.cc > > @@ -69,9 +69,7 @@ gimple_ranger::range_of_expr (irange &r, tree expr, gimple *stmt) > > if (def_stmt && gimple_bb (def_stmt) == bb) > > { > > range_of_stmt (r, def_stmt, expr); > > - if (!cfun->can_throw_non_call_exceptions && r.varying_p () && > > - m_cache.m_non_null.non_null_deref_p (expr, bb)) > > - r = range_nonzero (TREE_TYPE (expr)); > > + m_cache.m_non_null.adjust_range (r, expr, bb, true); > > } > > else > > // Otherwise OP comes from outside this block, use range on entry. > > @@ -95,9 +93,7 @@ gimple_ranger::range_on_entry (irange &r, basic_block bb, tree name) > > if (m_cache.block_range (entry_range, bb, name)) > > r.intersect (entry_range); > > > > - if (!cfun->can_throw_non_call_exceptions && r.varying_p () && > > - m_cache.m_non_null.non_null_deref_p (name, bb)) > > - r = range_nonzero (TREE_TYPE (name)); > > + m_cache.m_non_null.adjust_range (r, name, bb, true); > > } > > > > // Calculate the range for NAME at the end of block BB and return it in R. > > -- > > 2.31.1 > > --00000000000056389f05c7b7f2c4 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Allow-non-null-adjustments-for-pointers-even-when-th.patch" Content-Disposition: attachment; filename="0001-Allow-non-null-adjustments-for-pointers-even-when-th.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_krf2kdnt0 RnJvbSBhOTVlOTE3YzQ4ZTYyMjA5MzgzYjVmODEwOTdhZjc1ZjkzYTdhMWM1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGR5IEhlcm5hbmRleiA8YWxkeWhAcmVkaGF0LmNvbT4KRGF0 ZTogVGh1LCAyMiBKdWwgMjAyMSAxNjowMzo1MyArMDIwMApTdWJqZWN0OiBbUEFUQ0hdIEFsbG93 IG5vbi1udWxsIGFkanVzdG1lbnRzIGZvciBwb2ludGVycyBldmVuIHdoZW4gdGhlcmUgaXMgYQog a25vd24gcmFuZ2UuCgpGaXggbm9uX251bGxfcmVmOjphZGp1c3RfcmFuZ2Ugc28gaXQgYWx3YXlz IGFkanVzdCByYW5nZXMsIG5vdCBqdXN0CnZhcnlpbmcgcmFuZ2VzLiAgVGhpcyB3aWxsIGFsbG93 IHBvaW50ZXJzIHRoYXQgaGF2ZSBhIHJhbmdlLCBidXQgYXJlIG5vdApuZWNlc3NhcmlseSBub24t bnVsbCwgdG8gYmUgYWRqdXN0ZWQuCgpnY2MvQ2hhbmdlTG9nOgoKCSogZ2ltcGxlLXJhbmdlLWNh Y2hlLmNjIChub25fbnVsbF9yZWY6OmFkanVzdF9yYW5nZSk6IFJlcGxhY2UKCXZhcnlpbmdfcCBj aGVjayBmb3IgbnVsbC9ub24tbnVsbCBjaGVjay4KLS0tCiBnY2MvZ2ltcGxlLXJhbmdlLWNhY2hl LmNjIHwgMTcgKysrKysrKysrKystLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMSBpbnNlcnRpb25z KCspLCA2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2djYy9naW1wbGUtcmFuZ2UtY2FjaGUu Y2MgYi9nY2MvZ2ltcGxlLXJhbmdlLWNhY2hlLmNjCmluZGV4IDIzNTk3YWRlODAyLi4yNjVhNjRi YWNjYSAxMDA2NDQKLS0tIGEvZ2NjL2dpbXBsZS1yYW5nZS1jYWNoZS5jYworKysgYi9nY2MvZ2lt cGxlLXJhbmdlLWNhY2hlLmNjCkBAIC04OSwxMiArODksMTcgQEAgYm9vbAogbm9uX251bGxfcmVm OjphZGp1c3RfcmFuZ2UgKGlyYW5nZSAmciwgdHJlZSBuYW1lLCBiYXNpY19ibG9jayBiYiwKIAkJ CSAgICBib29sIHNlYXJjaF9kb20pCiB7Ci0gIC8vIENoZWNrIGlmIHBvaW50ZXJzIGhhdmUgYW55 IG5vbi1udWxsIGRlcmVmZXJlbmNlcy4gIE5vbi1jYWxsCi0gIC8vIGV4Y2VwdGlvbnMgbWVhbiB3 ZSBjb3VsZCB0aHJvdyBpbiB0aGUgbWlkZGxlIG9mIHRoZSBibG9jaywgc28ganVzdAotICAvLyBw dW50IGZvciBub3cgb24gdGhvc2UuCi0gIGlmICghY2Z1bi0+Y2FuX3Rocm93X25vbl9jYWxsX2V4 Y2VwdGlvbnMKLSAgICAgICYmIHIudmFyeWluZ19wICgpCi0gICAgICAmJiBub25fbnVsbF9kZXJl Zl9wIChuYW1lLCBiYiwgc2VhcmNoX2RvbSkpCisgIC8vIE5vbi1jYWxsIGV4Y2VwdGlvbnMgbWVh biB3ZSBjb3VsZCB0aHJvdyBpbiB0aGUgbWlkZGxlIG9mIHRoZQorICAvLyBibG9jaywgc28ganVz dCBwdW50IG9uIHRob3NlIGZvciBub3cuCisgIGlmIChjZnVuLT5jYW5fdGhyb3dfbm9uX2NhbGxf ZXhjZXB0aW9ucykKKyAgICByZXR1cm4gZmFsc2U7CisKKyAgLy8gV2Ugb25seSBjYXJlIGFib3V0 IHRoZSBudWxsIC8gbm9uLW51bGwgcHJvcGVydHkgb2YgcG9pbnRlcnMuCisgIGlmICghUE9JTlRF Ul9UWVBFX1AgKFRSRUVfVFlQRSAobmFtZSkpIHx8IHIuemVyb19wICgpIHx8IHIubm9uemVyb19w ICgpKQorICAgIHJldHVybiBmYWxzZTsKKworICAvLyBDaGVjayBpZiBwb2ludGVycyBoYXZlIGFu eSBub24tbnVsbCBkZXJlZmVyZW5jZXMuCisgIGlmIChub25fbnVsbF9kZXJlZl9wIChuYW1lLCBi Yiwgc2VhcmNoX2RvbSkpCiAgICAgewogICAgICAgaW50X3JhbmdlPDI+IG56OwogICAgICAgbnou c2V0X25vbnplcm8gKFRSRUVfVFlQRSAobmFtZSkpOwotLSAKMi4zMS4xCgo= --00000000000056389f05c7b7f2c4--