From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id C75EB3AA8CB2; Tue, 20 Apr 2021 23:31:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C75EB3AA8CB2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc r9-9411] aarch64: Fix up *aarch64_bfxilsi_uxtw [PR98853] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/releases/gcc-9 X-Git-Oldrev: e3dc765eb4556b78fe52d32be9858f2805b4488d X-Git-Newrev: bde3846fb90f51b75685c9b6d677015daaec5f69 Message-Id: <20210420233139.C75EB3AA8CB2@sourceware.org> Date: Tue, 20 Apr 2021 23:31:39 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 23:31:39 -0000 https://gcc.gnu.org/g:bde3846fb90f51b75685c9b6d677015daaec5f69 commit r9-9411-gbde3846fb90f51b75685c9b6d677015daaec5f69 Author: Jakub Jelinek Date: Wed Jan 27 20:35:21 2021 +0100 aarch64: Fix up *aarch64_bfxilsi_uxtw [PR98853] The https://gcc.gnu.org/legacy-ml/gcc-patches/2018-07/msg01895.html patch that introduced this pattern claimed: Would generate: combine_balanced_int: bfxil w0, w1, 0, 16 uxtw x0, w0 ret But with this patch generates: combine_balanced_int: bfxil w0, w1, 0, 16 ret and it is indeed what it should generate, but it doesn't do that, it emits bfxil x0, x1, 0, 16 instead which doesn't zero extend from 32 to 64 bits, but preserves the bits from the destination register. 2021-01-27 Jakub Jelinek PR target/98853 * config/aarch64/aarch64.md (*aarch64_bfxilsi_uxtw): Use %w0, %w1 and %2 instead of %0, %1 and %2. * gcc.c-torture/execute/pr98853-1.c: New test. * gcc.c-torture/execute/pr98853-2.c: New test. (cherry picked from commit 2a2c1e22c2501457608f12d5ab560caaca59c425) Diff: --- gcc/config/aarch64/aarch64.md | 4 ++-- gcc/testsuite/gcc.c-torture/execute/pr98853-1.c | 21 +++++++++++++++++++++ gcc/testsuite/gcc.c-torture/execute/pr98853-2.c | 19 +++++++++++++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md index 78288abfd92..324b2dd64e1 100644 --- a/gcc/config/aarch64/aarch64.md +++ b/gcc/config/aarch64/aarch64.md @@ -5767,10 +5767,10 @@ { case 0: operands[3] = GEN_INT (ctz_hwi (~INTVAL (operands[3]))); - return "bfxil\\t%0, %1, 0, %3"; + return "bfxil\\t%w0, %w1, 0, %3"; case 1: operands[3] = GEN_INT (ctz_hwi (~INTVAL (operands[4]))); - return "bfxil\\t%0, %2, 0, %3"; + return "bfxil\\t%w0, %w2, 0, %3"; default: gcc_unreachable (); } diff --git a/gcc/testsuite/gcc.c-torture/execute/pr98853-1.c b/gcc/testsuite/gcc.c-torture/execute/pr98853-1.c new file mode 100644 index 00000000000..b5a37869fa8 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/pr98853-1.c @@ -0,0 +1,21 @@ +/* PR target/98853 */ + +#if __SIZEOF_INT__ == 4 && __SIZEOF_LONG_LONG__ == 8 && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ +__attribute__((__noipa__)) unsigned long long +foo (unsigned x, unsigned long long y, unsigned long long z) +{ + __builtin_memcpy (2 + (char *) &x, 2 + (char *) &y, 2); + return x + z; +} +#endif + +int +main () +{ +#if __SIZEOF_INT__ == 4 && __SIZEOF_LONG_LONG__ == 8 && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ + if (foo (0x44444444U, 0x1111111111111111ULL, 0x2222222222222222ULL) + != 0x2222222233336666ULL) + __builtin_abort (); +#endif + return 0; +} diff --git a/gcc/testsuite/gcc.c-torture/execute/pr98853-2.c b/gcc/testsuite/gcc.c-torture/execute/pr98853-2.c new file mode 100644 index 00000000000..2a3b0f2e9ba --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/pr98853-2.c @@ -0,0 +1,19 @@ +/* PR target/98853 */ + +#if __SIZEOF_INT__ == 4 && __SIZEOF_LONG_LONG__ == 8 +__attribute__((noipa)) unsigned long long +foo (unsigned long long x, unsigned int y) +{ + return ((unsigned) x & 0xfffe0000U) | (y & 0x1ffff); +} +#endif + +int +main () +{ +#if __SIZEOF_INT__ == 4 && __SIZEOF_LONG_LONG__ == 8 + if (foo (0xdeadbeefcaf2babeULL, 0xdeaffeedU) != 0x00000000caf3feedULL) + __builtin_abort (); +#endif + return 0; +}