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 ESMTPS id AE2033858D1E for ; Mon, 24 Apr 2023 17:17:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AE2033858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682356678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=UeMl9camxdcSJn3jbAs5ELiIA1HCGnB9wyXgqzTNisg=; b=cBeZVx97rVugQ79oS3AqrHGY9stB+KLpNAn5qcv6+XNz5CgAOzOIweXQ3rWOYAq95UVQYe 40gSeXW5r4WwvLa1GBFVr51tZI01yQah3K0D1VfN3VB/4K+v+1YtKy53sqlLUsGIf1su9Y nNgAOyy4no9/82gHGGkk/wqt5rMc4pc= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-491-e6Wc7DA_MXC5Nr253XUJZw-1; Mon, 24 Apr 2023 13:17:56 -0400 X-MC-Unique: e6Wc7DA_MXC5Nr253XUJZw-1 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-2f831f6e175so2519051f8f.2 for ; Mon, 24 Apr 2023 10:17:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682356675; x=1684948675; h=in-reply-to:from:content-language:references:cc:to:subject :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=YQvOgc9+JUg3OL6xqc82GH/q435wF3Fl/KQ3uM29IDc=; b=LYY2xqGztenGJ7nS3rxzdQxWtqnA2ny99z32DtbzO4p84mOTAPVf/prt/P8IwopO+h cpH43wHKso59MgyUCuF43rd38Yrkr1+L0dAEZ1ejZnlu2t75vm10WQ1q8HVjzvFcy8q9 c8cO/zMuOTEECaAerHX0fWHz07f284nfCmpxhI3ad1UYDeBJt72o1wGSz+PCspeZcSzp iZseQO69ZCLk0brPhFLChYDfrhPuqgVr07LmbN1c0e2XbPyE1YwykqB0fHmP2k8tXlS0 RXVvz7d3itGEiEBzyxZCLeHQJnrzldTITJ/KI9zrgYRDO/4rY3oBEPXSgg1hsi3G/qon Dbrw== X-Gm-Message-State: AAQBX9e+aOtplU0s404Lqxyr1CaFP4oCGkCuRFWeRymLGZXZqN+1MgfD 8i2WKgeexI0/WfrWVuUQaM6WOh/SkpH/EY3ELYW74f1VxSKxlg+m0jkSs4JXhwMsG2ASNKg3VXD FTepgZ9MhbrknF7C537AJuMyK4A== X-Received: by 2002:a5d:6b46:0:b0:2db:11f3:f7ee with SMTP id x6-20020a5d6b46000000b002db11f3f7eemr9736948wrw.63.1682356675247; Mon, 24 Apr 2023 10:17:55 -0700 (PDT) X-Google-Smtp-Source: AKy350bkRLGKQEYmetcNRoNwrC6JyOHjBi9dJHn4L4yZ3pl6kEMsO2gqWBd2DNjFltiCH5+GVOgj6w== X-Received: by 2002:a5d:6b46:0:b0:2db:11f3:f7ee with SMTP id x6-20020a5d6b46000000b002db11f3f7eemr9736935wrw.63.1682356674919; Mon, 24 Apr 2023 10:17:54 -0700 (PDT) Received: from [192.168.1.201] ([139.47.42.170]) by smtp.gmail.com with ESMTPSA id m18-20020adffa12000000b003047297a5e8sm4575431wrr.54.2023.04.24.10.17.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Apr 2023 10:17:54 -0700 (PDT) Message-ID: <79959ae1-8958-28be-6258-2594d4cbac5b@redhat.com> Date: Mon, 24 Apr 2023 19:17:53 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: [PATCH] Pass correct type to irange::contains_p() in ipa-cp.cc. To: Richard Biener Cc: GCC patches , Andrew MacLeod References: <20230424074332.141890-1-aldyh@redhat.com> <9db305b9-62fb-1b07-656a-13d029a7f730@redhat.com> From: Aldy Hernandez In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="------------NVcQxLOQqMZUc5dCQVhQpdAa" Content-Language: en-US X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_BARRACUDACENTRAL,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,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 List-Id: This is a multi-part message in MIME format. --------------NVcQxLOQqMZUc5dCQVhQpdAa Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 4/24/23 14:35, Richard Biener wrote: > On Mon, Apr 24, 2023 at 2:32 PM Aldy Hernandez wrote: >> >> >> >> On 4/24/23 14:10, Richard Biener wrote: >>> On Mon, Apr 24, 2023 at 1:51 PM Aldy Hernandez wrote: >>>> >>>> >>>> >>>> On 4/24/23 10:30, Richard Biener wrote: >>>>> On Mon, Apr 24, 2023 at 9:44 AM Aldy Hernandez via Gcc-patches >>>>> wrote: >>>>>> >>>>>> There is a call to contains_p() in ipa-cp.cc which passes incompatible >>>>>> types. This currently works because deep in the call chain, the legacy >>>>>> code uses tree_int_cst_lt which performs the operation with >>>>>> widest_int. With the upcoming removal of legacy, contains_p() will be >>>>>> stricter. >>>>>> >>>>>> OK pending tests? >>>>>> >>>>>> gcc/ChangeLog: >>>>>> >>>>>> * ipa-cp.cc (ipa_range_contains_p): New. >>>>>> (decide_whether_version_node): Use it. >>>>>> --- >>>>>> gcc/ipa-cp.cc | 16 +++++++++++++++- >>>>>> 1 file changed, 15 insertions(+), 1 deletion(-) >>>>>> >>>>>> diff --git a/gcc/ipa-cp.cc b/gcc/ipa-cp.cc >>>>>> index b3e0f62e400..c8013563796 100644 >>>>>> --- a/gcc/ipa-cp.cc >>>>>> +++ b/gcc/ipa-cp.cc >>>>>> @@ -6180,6 +6180,19 @@ decide_about_value (struct cgraph_node *node, int index, HOST_WIDE_INT offset, >>>>>> return true; >>>>>> } >>>>>> >>>>>> +/* Like irange::contains_p(), but convert VAL to the range of R if >>>>>> + necessary. */ >>>>>> + >>>>>> +static inline bool >>>>>> +ipa_range_contains_p (const irange &r, tree val) >>>>>> +{ >>>>>> + if (r.undefined_p ()) >>>>>> + return false; >>>>>> + >>>>>> + val = fold_convert (r.type (), val); >>>>> >>>>> I think that's wrong, it might truncate 'val'. I think we'd want >>>>> >>>>> if (r.undefined_p () || !int_fits_type_p (val, r.type ())) >>>>> return false; >>>> >>>> This won't work for pointers. Is there a suitable version that handles >>>> pointers as well? >>> >>> Where does it not work? And when do you get pointer values/types >>> where they mismatch sufficiently (how?) to make ranger unhappy? >>> >> >> It's not ranger that's unhappy, this is just irange::contains_p(). >> >> IPA works on both integers and pointers, and pointers don't have >> TYPE_MIN/MAX_VALUE defined, so we ICE in int_fits_type_p: >> >> type_low_bound = TYPE_MIN_VALUE (type); >> type_high_bound = TYPE_MAX_VALUE (type); > > Ah. The code handles NULL TYPE_MIN/MAX_VALUE just fine so > I wonder if it works to change the above to > > type_low_bound = INTEGRAL_TYPE_P (type) ? TYPE_MIN_VALUE (type) : NULL_TREE; > ... > > alternatively you could use wi::fits_to_tree_p (wi::to_wide (val), > type) from the IPA code. That works. How's this? Tested on x86-64 Linux. p.s. Once we convert the API to wide_int's (upcoming patches), I can move this logic into irange::contains_p (tree) virtual instead of ipa_range_contains_p. We'll also have an irange::contains_p (const wide_int &) which we can upgrade to a widest_int overload if need be. --------------NVcQxLOQqMZUc5dCQVhQpdAa Content-Type: text/x-patch; charset=UTF-8; name="0001-Pass-correct-type-to-irange-contains_p-in-ipa-cp.cc.patch" Content-Disposition: attachment; filename*0="0001-Pass-correct-type-to-irange-contains_p-in-ipa-cp.cc.pat"; filename*1="ch" Content-Transfer-Encoding: base64 RnJvbSA5NDc3OTJlZWZjYjgzMTY4MThkMTA1ZmNiMzhiNjlhNzZiYjkzZTg2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGR5IEhlcm5hbmRleiA8YWxkeWhAcmVkaGF0LmNvbT4KRGF0 ZTogTW9uLCAyMSBOb3YgMjAyMiAyMzoxODo0MyArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIFBhc3Mg Y29ycmVjdCB0eXBlIHRvIGlyYW5nZTo6Y29udGFpbnNfcCgpIGluIGlwYS1jcC5jYy4KClRoZXJl IGlzIGEgY2FsbCB0byBjb250YWluc19wKCkgaW4gaXBhLWNwLmNjIHdoaWNoIHBhc3NlcyBpbmNv bXBhdGlibGUKdHlwZXMuICBUaGlzIGN1cnJlbnRseSB3b3JrcyBiZWNhdXNlIGRlZXAgaW4gdGhl IGNhbGwgY2hhaW4sIHRoZSBsZWdhY3kKY29kZSB1c2VzIHRyZWVfaW50X2NzdF9sdCB3aGljaCBw ZXJmb3JtcyB0aGUgb3BlcmF0aW9uIHdpdGgKd2lkZXN0X2ludC4gIFdpdGggdGhlIHVwY29taW5n IHJlbW92YWwgb2YgbGVnYWN5LCBjb250YWluc19wKCkgd2lsbCBiZQpzdHJpY3Rlci4KCmdjYy9D aGFuZ2VMb2c6CgoJKiBpcGEtY3AuY2MgKGlwYV9yYW5nZV9jb250YWluc19wKTogTmV3LgoJKGRl Y2lkZV93aGV0aGVyX3ZlcnNpb25fbm9kZSk6IFVzZSBpdC4KLS0tCiBnY2MvaXBhLWNwLmNjIHwg MjAgKysrKysrKysrKysrKysrKysrKy0KIDEgZmlsZSBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCsp LCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZ2NjL2lwYS1jcC5jYyBiL2djYy9pcGEtY3Au Y2MKaW5kZXggYjNlMGY2MmU0MDAuLjY1YzQ5NTU4YjU4IDEwMDY0NAotLS0gYS9nY2MvaXBhLWNw LmNjCisrKyBiL2djYy9pcGEtY3AuY2MKQEAgLTYxODAsNiArNjE4MCwyMyBAQCBkZWNpZGVfYWJv dXRfdmFsdWUgKHN0cnVjdCBjZ3JhcGhfbm9kZSAqbm9kZSwgaW50IGluZGV4LCBIT1NUX1dJREVf SU5UIG9mZnNldCwKICAgcmV0dXJuIHRydWU7CiB9CiAKKy8qIExpa2UgaXJhbmdlOjpjb250YWlu c19wKCksIGJ1dCBjb252ZXJ0IFZBTCB0byB0aGUgcmFuZ2Ugb2YgUiBpZgorICAgbmVjZXNzYXJ5 LiAgKi8KKworc3RhdGljIGlubGluZSBib29sCitpcGFfcmFuZ2VfY29udGFpbnNfcCAoY29uc3Qg aXJhbmdlICZyLCB0cmVlIHZhbCkKK3sKKyAgaWYgKHIudW5kZWZpbmVkX3AgKCkpCisgICAgcmV0 dXJuIGZhbHNlOworCisgIHRyZWUgdHlwZSA9IHIudHlwZSAoKTsKKyAgaWYgKCF3aTo6Zml0c190 b190cmVlX3AgKHdpOjp0b193aWRlICh2YWwpLCB0eXBlKSkKKyAgICByZXR1cm4gZmFsc2U7CisK KyAgdmFsID0gZm9sZF9jb252ZXJ0ICh0eXBlLCB2YWwpOworICByZXR1cm4gci5jb250YWluc19w ICh2YWwpOworfQorCiAvKiBEZWNpZGUgd2hldGhlciBhbmQgd2hhdCBzcGVjaWFsaXplZCBjbG9u ZXMgb2YgTk9ERSBzaG91bGQgYmUgY3JlYXRlZC4gICovCiAKIHN0YXRpYyBib29sCkBAIC02MjIx LDcgKzYyMzgsOCBAQCBkZWNpZGVfd2hldGhlcl92ZXJzaW9uX25vZGUgKHN0cnVjdCBjZ3JhcGhf bm9kZSAqbm9kZSkKIAkJIHN1cHBvcnRzIHRoaXMgb25seSBmb3IgaW50ZWdlcnMgbm93LiAgKi8K IAkgICAgICBpZiAoVFJFRV9DT0RFICh2YWwtPnZhbHVlKSA9PSBJTlRFR0VSX0NTVAogCQkgICYm ICFwbGF0cy0+bV92YWx1ZV9yYW5nZS5ib3R0b21fcCAoKQotCQkgICYmICFwbGF0cy0+bV92YWx1 ZV9yYW5nZS5tX3ZyLmNvbnRhaW5zX3AgKHZhbC0+dmFsdWUpKQorCQkgICYmICFpcGFfcmFuZ2Vf Y29udGFpbnNfcCAocGxhdHMtPm1fdmFsdWVfcmFuZ2UubV92ciwKKwkJCQkJICAgIHZhbC0+dmFs dWUpKQogCQl7CiAJCSAgLyogVGhpcyBjYW4gaGFwcGVuIGFsc28gaWYgYSBjb25zdGFudCBwcmVz ZW50IGluIHRoZSBzb3VyY2UKIAkJICAgICBjb2RlIGZhbGxzIG91dHNpZGUgb2YgdGhlIHJhbmdl IG9mIHBhcmFtZXRlcidzIHR5cGUsIHNvIHdlCi0tIAoyLjQwLjAKCg== --------------NVcQxLOQqMZUc5dCQVhQpdAa--