From patchwork Fri Apr 10 11:06:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyrylo Tkachov X-Patchwork-Id: 460046 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id DFBD414028E for ; Fri, 10 Apr 2015 21:06:44 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass reason="1024-bit key; unprotected key" header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=sVfZkI+2; dkim-adsp=none (unprotected policy); dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; q=dns; s=default; b=MnYhmQi4Lvar8W6cK ansYFoQyVVRKnV+8LUDLvmbARUPRjXj0jOST4gFL289q7A7caNX2KW2VASlsWlR8 5gOQjU2MtQzXVyPqUMHvYy54Loh2JBY0pNF6VsVgZYrDAfCUiXit2bJfqJKsT0ub PqutKx6pT2SZdL3bwo9/wX7ZS8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; s=default; bh=Mmopm19JP1aUkRk1cWdm5r7 sVuI=; b=sVfZkI+2pbVptfZIbGtafa3bCHagiOCZjd9Qo52m7PxjOrwz92sbM3R qdeEEkmVRoWfxTXjfepU71Uk3Aw0YTpZTNxxgdMLB4Tq/K+3zKXrSIsO9P+uiK6U tXHvgfFoo+06AL8/LxYw0Gb5G+1/85LSQU3Jv7l5FvOumrc9kuME= Received: (qmail 58753 invoked by alias); 10 Apr 2015 11:06:36 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 58743 invoked by uid 89); 10 Apr 2015 11:06:35 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, SPF_PASS autolearn=ham version=3.3.2 X-HELO: eu-smtp-delivery-143.mimecast.com Received: from eu-smtp-delivery-143.mimecast.com (HELO eu-smtp-delivery-143.mimecast.com) (146.101.78.143) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 10 Apr 2015 11:06:34 +0000 Received: from cam-owa2.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.140]) by uk-mta-27.uk.mimecast.lan; Fri, 10 Apr 2015 12:06:31 +0100 Received: from [10.2.207.50] ([10.1.2.79]) by cam-owa2.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 10 Apr 2015 12:06:31 +0100 Message-ID: <5527AEB7.9000206@arm.com> Date: Fri, 10 Apr 2015 12:06:31 +0100 From: Kyrill Tkachov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Jakub Jelinek CC: GCC Patches , Ramana Radhakrishnan , Richard Earnshaw Subject: Re: [PATCH][ARM] PR 65694: Properly sign-extend large numbers before passing to GEN_INT in arm_canonicalize_comparison References: <55278AC7.9070807@arm.com> <20150410085720.GS19273@tucnak.redhat.com> In-Reply-To: <20150410085720.GS19273@tucnak.redhat.com> X-MC-Unique: FbbAc_M6QTm5RVTHZT7Lhw-1 X-IsSubscribed: yes Hi Jakub, On 10/04/15 09:57, Jakub Jelinek wrote: > On Fri, Apr 10, 2015 at 09:33:11AM +0100, Kyrill Tkachov wrote: >> 2015-04-09 Kyrylo Tkachov >> > Missing > PR target/65694 > line here. Fixed. > >> * config/arm/arm.c (arm_canonicalize_comparison): Use ARM_SIGN_EXTEND >> when creating +1 values for SImode and trunc_int_for_mode for similar >> DImode operations. >> >> 2015-04-09 Kyrylo Tkachov >> > Ditto. Fixed. > >> * g++.dg/torture/pr65694.C: New test. >> diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c >> index 369cb67..5342b33 100644 >> --- a/gcc/config/arm/arm.c >> +++ b/gcc/config/arm/arm.c >> @@ -4984,7 +4984,7 @@ arm_canonicalize_comparison (int *code, rtx *op0, rtx *op1, >> if (i != maxval >> && arm_const_double_by_immediates (GEN_INT (i + 1))) >> { >> - *op1 = GEN_INT (i + 1); >> + *op1 = GEN_INT (trunc_int_for_mode (i + 1, DImode)); >> *code = *code == GT ? GE : LT; >> return; >> } >> @@ -4994,7 +4994,7 @@ arm_canonicalize_comparison (int *code, rtx *op0, rtx *op1, >> if (i != ~((unsigned HOST_WIDE_INT) 0) >> && arm_const_double_by_immediates (GEN_INT (i + 1))) >> { >> - *op1 = GEN_INT (i + 1); >> + *op1 = GEN_INT (trunc_int_for_mode (i + 1, DImode)); > The above two aren't strictly necessary, HOST_WIDE_INT is always 64-bit, so > is DImode, and GEN_INT takes HOST_WIDE_INT. Yeah, those aren't strictly necessary, it's the SImode code that was causing the ICE. > You haven't changed it in the GEN_INT (i + 1) calls passed to > arm_const_double_by_immediates anyway. > I'd think you can leave those changes to cleanup in stage1 if desirable. > >> @@ -5047,7 +5047,7 @@ arm_canonicalize_comparison (int *code, rtx *op0, rtx *op1, >> if (i != maxval >> && (const_ok_for_arm (i + 1) || const_ok_for_arm (-(i + 1)))) >> { >> - *op1 = GEN_INT (i + 1); >> + *op1 = GEN_INT (ARM_SIGN_EXTEND (i + 1)); >> *code = *code == GT ? GE : LT; >> return; >> } >> @@ -5069,7 +5069,7 @@ arm_canonicalize_comparison (int *code, rtx *op0, rtx *op1, >> if (i != ~((unsigned HOST_WIDE_INT) 0) >> && (const_ok_for_arm (i + 1) || const_ok_for_arm (-(i + 1)))) >> { >> - *op1 = GEN_INT (i + 1); >> + *op1 = GEN_INT (ARM_SIGN_EXTEND (i + 1)); >> *code = *code == GTU ? GEU : LTU; >> return; >> } > This looks ok to me, but I'll defer the final word to ARM maintainers. > That said, the ARM_SIGN_EXTEND macro could very well use some cleanup too > now that HOST_WIDE_INT is always 64-bit and one can e.g. use > HOST_WIDE_INT_{U,}C macros to build large constants. But I'd think that's stage 1 material anyway. Also, trunc_int_for_mode SImode would have worked here, I suspect. Attached is updated patch without the DImode stuff and ChangeLog. Thanks, Kyrill 2015-04-09 Kyrylo Tkachov PR target/65694 * config/arm/arm.c (arm_canonicalize_comparison): Use ARM_SIGN_EXTEND when creating +1 values for SImode. 2015-04-09 Kyrylo Tkachov PR target/65694 * g++.dg/torture/pr65694.C: New test. commit 656485123eb7dbcdd03889603cf5ed7c43f7d553 Author: Kyrylo Tkachov Date: Wed Apr 8 17:08:17 2015 +0100 [ARM] PR target/65694: Use ARM_SIGN_EXTEND in arm_canonicalize_comparison diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 10edeb4..77b9917 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -5047,7 +5047,7 @@ arm_canonicalize_comparison (int *code, rtx *op0, rtx *op1, if (i != maxval && (const_ok_for_arm (i + 1) || const_ok_for_arm (-(i + 1)))) { - *op1 = GEN_INT (i + 1); + *op1 = GEN_INT (ARM_SIGN_EXTEND (i + 1)); *code = *code == GT ? GE : LT; return; } @@ -5069,7 +5069,7 @@ arm_canonicalize_comparison (int *code, rtx *op0, rtx *op1, if (i != ~((unsigned HOST_WIDE_INT) 0) && (const_ok_for_arm (i + 1) || const_ok_for_arm (-(i + 1)))) { - *op1 = GEN_INT (i + 1); + *op1 = GEN_INT (ARM_SIGN_EXTEND (i + 1)); *code = *code == GTU ? GEU : LTU; return; } diff --git a/gcc/testsuite/g++.dg/torture/pr65694.C b/gcc/testsuite/g++.dg/torture/pr65694.C new file mode 100644 index 0000000..55e009a --- /dev/null +++ b/gcc/testsuite/g++.dg/torture/pr65694.C @@ -0,0 +1,144 @@ +/* { dg-do compile } */ +/* { dg-options "-Wno-sign-compare -Wno-return-type -Wno-overflow" } */ +/* { dg-additional-options "-mthumb" { target arm_thumb2_ok } } */ + +struct A { + enum { __value }; +}; +template struct B { _T1 first; }; +template struct C { + typedef typename _Iterator::iterator_type iterator_type; + static iterator_type _S_base(_Iterator p1) { return p1.base(); } +}; +template +typename _RandomAccessIterator::difference_type +__distance(_RandomAccessIterator p1, _RandomAccessIterator p2, int) { + return p2 - p1; +} + +template +typename _InputIterator::difference_type distance(_InputIterator p1, + _InputIterator p2) { + return __distance(p1, p2, 0); +} + +template class D { + _Iterator _M_current; + +public: + typedef _Iterator iterator_type; + typedef int difference_type; + _Iterator base() { return _M_current; } +}; + +template +typename D<_Iterator, _Container>::difference_type +operator-(D<_Iterator, _Container> p1, D<_Iterator, _Container> p2) { + return p1.base() - p2.base(); +} + +struct F { + static unsigned short *__copy_m(unsigned short *p1, unsigned short *p2, + unsigned short *p3) { + int a = p2 - p1; + if (a) + __builtin_memmove(p3, p1, a); + return p3 + a; + } +}; +class G { +public: + void allocate(int p1) { + if (p1 > max_size()) + operator new(sizeof(short)); + } + unsigned max_size() { return -1 / sizeof(short); } +}; + +template class L : public G {}; + +struct H { + static unsigned short *allocate(int p1) { + L d; + d.allocate(p1); + } +}; +struct I { + template + static _ForwardIterator __uninit_copy(_InputIterator p1, _InputIterator p2, + _ForwardIterator p3) { + return copy(p1, p2, p3); + } +}; +struct J { + typedef unsigned short *pointer; + struct K { + unsigned short *_M_start; + unsigned short *_M_finish; + }; + J(); + J(int p1, int) { _M_create_storage(p1); } + K _M_impl; + pointer _M_allocate(unsigned p1) { p1 ? H::allocate(p1) : pointer(); } + void _M_create_storage(int p1) { _M_allocate(p1); } +}; + +C, 1>::iterator_type +__miter_base(D p1) { + return C, 1>::_S_base(p1); +} + +template +_OI __copy_move_a(_II p1, _II p2, _OI p3) { + return F::__copy_m(p1, p2, p3); +} + +template +_OI __copy_move_a2(_II p1, _II p2, _OI p3) { + return __copy_move_a<_IsMove>(p1, p2, p3); +} + +template _OI copy(_II p1, _II p2, _OI p3) { + C, 1>::iterator_type b, c = __miter_base(p1); + b = __miter_base(p2); + return __copy_move_a2(c, b, p3); +} + +template +_ForwardIterator uninitialized_copy(_InputIterator p1, _InputIterator p2, + _ForwardIterator p3) { + return I::__uninit_copy(p1, p2, p3); +} + +template +_ForwardIterator __uninitialized_copy_a(_InputIterator p1, _InputIterator p2, + _ForwardIterator p3, L<_Tp>) { + return uninitialized_copy(p1, p2, p3); +} + +class M : J { + J _Base; + +public: + M(); + M(int p1, int p2 = int()) : _Base(p1, p2) {} + M(D p1, D p2) { + _M_initialize_dispatch(p1, p2, int()); + } + D begin(); + D end(); + int size() { return _M_impl._M_finish - _M_impl._M_start; } + void _M_initialize_dispatch(D p1, + D p2, int) { + L e; + int f = distance(p1, p2); + _M_impl._M_start = _M_allocate(f); + _M_impl._M_finish = __uninitialized_copy_a(p1, p2, _M_impl._M_start, e); + } +}; + +B g, h; +void twoMeans() { + M i(g.first.begin(), h.first.end()); + M(i.size()); +}