From: Jeff Law <jeffreyalaw@gmail.com>
To: Ilya Leoshkevich <iii@linux.ibm.com>,
Andreas Krebbel <krebbel@gcc.gnu.org>
Cc: Joern Rennecke <joern.rennecke@embecosm.com>, gcc-patches@gcc.gnu.org
Subject: Re: [PATCH] IBM Z: Remove match_scratch workaround
Date: Tue, 1 Jun 2021 23:18:02 -0600 [thread overview]
Message-ID: <4a3e7804-58cf-c2f4-11fa-73012a9b5f7d@gmail.com> (raw)
In-Reply-To: <20210602022158.3147550-1-iii@linux.ibm.com>
On 6/1/2021 8:21 PM, Ilya Leoshkevich via Gcc-patches wrote:
> Bootstrapped and regtested on s390x-redhat-linux. Ok for master?
>
>
>
> Since commit dd1ef00c45ba ("Fix bug in the define_subst handling that
> made match_scratch unusable for multi-alternative patterns.") the
> workaround for that bug in *ashrdi3_31<setcc><cconly> is not only no
> longer necessary, but actually breaks the build.
>
> Get rid of it by using only one alternative in (match_scratch). It
> will be replicated as many times as needed in order to match the
> pattern with which (define_subst) is used.
>
> gcc/ChangeLog:
>
> * config/s390/s390.md(*ashrdi3_31<setcc><cconly>): Use a single
> constraint.
> * config/s390/subst.md(cconly_subst): Use a single constraint
> in (match_scratch).
>
> gcc/testsuite/ChangeLog:
>
> * gcc.target/s390/ashr.c: New test.
Presumably this fixes:
../../../gcc/gcc/config/s390/s390.md:9335:1: alternative number mismatch: operand 0 has 4, operand 1 has 2
../../../gcc/gcc/config/s390/s390.md:9335:1: alternative number mismatch: operand 0 has 4, operand 2 has 2
../../../gcc/gcc/config/s390/s390.md:9335:1: wrong number of alternatives in the output template
../../../gcc/gcc/config/s390/s390.md:9349:1: alternative number mismatch: operand 0 has 4, operand 1 has 2
../../../gcc/gcc/config/s390/s390.md:9349:1: alternative number mismatch: operand 0 has 4, operand 2 has 2
../../../gcc/gcc/config/s390/s390.md:9349:1: wrong number of alternatives in the output template
../../../gcc/gcc/config/s390/s390.md:9349:1: alternative number mismatch: operand 0 has 4, operand 1 has 2
../../../gcc/gcc/config/s390/s390.md:9349:1: alternative number mismatch: operand 0 has 4, operand 2 has 2
../../../gcc/gcc/config/s390/s390.md:9349:1: wrong number of alternatives in the output template
The tester has been tripping over that for about a week.
I'll let the s390 maintainers chime in on the correctness of the change.
Jeff
next prev parent reply other threads:[~2021-06-02 5:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-02 2:21 Ilya Leoshkevich
2021-06-02 5:18 ` Jeff Law [this message]
2021-06-02 6:56 ` Andreas Krebbel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4a3e7804-58cf-c2f4-11fa-73012a9b5f7d@gmail.com \
--to=jeffreyalaw@gmail.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=iii@linux.ibm.com \
--cc=joern.rennecke@embecosm.com \
--cc=krebbel@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).