From 1b1dfddf2c8a0ea1a9cda295107f3c2680b38d9b Mon Sep 17 00:00:00 2001 From: Kyrylo Tkachov Date: Fri, 14 Sep 2018 16:05:42 +0000 Subject: [PATCH] [AArch64][committed] Fix gcc.target/aarch64/combine_bfi_1.c This test started failing because some of the functions in the combine dump that it scans uses a different pattern to match the same instruction: insv_regsi rather than aarch64_bfi. The code generation is still the same. The patch changes the scan to look for the actual instruction we want in the assembly. This fixes the test. Committing to trunk as obvious. * gcc.target/aarch64/combine_bfi_1.c: Scan for bfi instruction rather than pattern name in combine dump. From-SVN: r264323 --- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.target/aarch64/combine_bfi_1.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index fcec319f3a0..b065b402749 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-09-14 Kyrylo Tkachov + + * gcc.target/aarch64/combine_bfi_1.c: Scan for bfi instruction + rather than pattern name in combine dump. + 2018-09-14 Sam Tebbs PR target/85628 diff --git a/gcc/testsuite/gcc.target/aarch64/combine_bfi_1.c b/gcc/testsuite/gcc.target/aarch64/combine_bfi_1.c index 9cc3bdb3ddf..cee42ccafcc 100644 --- a/gcc/testsuite/gcc.target/aarch64/combine_bfi_1.c +++ b/gcc/testsuite/gcc.target/aarch64/combine_bfi_1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-rtl-combine" } */ +/* { dg-options "-O2" } */ int f1 (int x, int y) @@ -31,4 +31,4 @@ f5 (long long x, long long y) return (x & ~0xffffffffull) | (y & 0xffffffff); } -/* { dg-final { scan-rtl-dump-times "\\*aarch64_bfi" 5 "combine" } } */ +/* { dg-final { scan-assembler-times {\tbfi\t} 5 } } */ -- 2.30.2