[2/3] RISC-V: testsuite: Make cmo tests LTO safe
Checks
Context |
Check |
Description |
rivoscibot/toolchain-ci-rivos-apply-patch |
success
|
Patch applied
|
rivoscibot/toolchain-ci-rivos-lint |
success
|
Lint passed
|
rivoscibot/toolchain-ci-rivos-build--newlib-rv64gc-lp64d-multilib |
success
|
Build passed
|
rivoscibot/toolchain-ci-rivos-build--linux-rv32gc_zba_zbb_zbc_zbs-ilp32d-non-multilib |
success
|
Build passed
|
rivoscibot/toolchain-ci-rivos-build--linux-rv64gc_zba_zbb_zbc_zbs-lp64d-non-multilib |
success
|
Build passed
|
rivoscibot/toolchain-ci-rivos-build--newlib-rv64gcv-lp64d-multilib |
success
|
Build passed
|
rivoscibot/toolchain-ci-rivos-build--linux-rv64gcv-lp64d-multilib |
success
|
Build passed
|
rivoscibot/toolchain-ci-rivos-test |
success
|
Testing passed
|
Commit Message
Let's add '\t' to the instruction match pattern to avoid false positive
matches when compiling with -flto.
gcc/testsuite/ChangeLog:
* gcc.target/riscv/cmo-zicbom-1.c: Add \t to test pattern.
* gcc.target/riscv/cmo-zicbom-2.c: Likewise.
* gcc.target/riscv/cmo-zicbop-1.c: Likewise.
* gcc.target/riscv/cmo-zicbop-2.c: Likewise.
* gcc.target/riscv/cmo-zicboz-1.c: Likewise.
* gcc.target/riscv/cmo-zicboz-2.c: Likewise.
Signed-off-by: Christoph Müllner <christoph.muellner@vrull.eu>
---
gcc/testsuite/gcc.target/riscv/cmo-zicbom-1.c | 6 +++---
gcc/testsuite/gcc.target/riscv/cmo-zicbom-2.c | 6 +++---
gcc/testsuite/gcc.target/riscv/cmo-zicbop-1.c | 6 +++---
gcc/testsuite/gcc.target/riscv/cmo-zicbop-2.c | 6 +++---
gcc/testsuite/gcc.target/riscv/cmo-zicboz-1.c | 2 +-
gcc/testsuite/gcc.target/riscv/cmo-zicboz-2.c | 2 +-
6 files changed, 14 insertions(+), 14 deletions(-)
Comments
On 5/7/24 11:38 PM, Christoph Müllner wrote:
> Let's add '\t' to the instruction match pattern to avoid false positive
> matches when compiling with -flto.
>
> gcc/testsuite/ChangeLog:
>
> * gcc.target/riscv/cmo-zicbom-1.c: Add \t to test pattern.
> * gcc.target/riscv/cmo-zicbom-2.c: Likewise.
> * gcc.target/riscv/cmo-zicbop-1.c: Likewise.
> * gcc.target/riscv/cmo-zicbop-2.c: Likewise.
> * gcc.target/riscv/cmo-zicboz-1.c: Likewise.
> * gcc.target/riscv/cmo-zicboz-2.c: Likewise.
OK
jeff
@@ -24,6 +24,6 @@ void foo3()
__builtin_riscv_zicbom_cbo_inval((void*)0x111);
}
-/* { dg-final { scan-assembler-times "cbo.clean" 3 } } */
-/* { dg-final { scan-assembler-times "cbo.flush" 3 } } */
-/* { dg-final { scan-assembler-times "cbo.inval" 3 } } */
+/* { dg-final { scan-assembler-times "cbo.clean\t" 3 } } */
+/* { dg-final { scan-assembler-times "cbo.flush\t" 3 } } */
+/* { dg-final { scan-assembler-times "cbo.inval\t" 3 } } */
@@ -24,6 +24,6 @@ void foo3()
__builtin_riscv_zicbom_cbo_inval((void*)0x111);
}
-/* { dg-final { scan-assembler-times "cbo.clean" 3 } } */
-/* { dg-final { scan-assembler-times "cbo.flush" 3 } } */
-/* { dg-final { scan-assembler-times "cbo.inval" 3 } } */
+/* { dg-final { scan-assembler-times "cbo.clean\t" 3 } } */
+/* { dg-final { scan-assembler-times "cbo.flush\t" 3 } } */
+/* { dg-final { scan-assembler-times "cbo.inval\t" 3 } } */
@@ -18,6 +18,6 @@ int foo1()
return __builtin_riscv_zicbop_cbo_prefetchi(1);
}
-/* { dg-final { scan-assembler-times "prefetch.i" 1 } } */
-/* { dg-final { scan-assembler-times "prefetch.r" 4 } } */
-/* { dg-final { scan-assembler-times "prefetch.w" 4 } } */
+/* { dg-final { scan-assembler-times "prefetch.i\t" 1 } } */
+/* { dg-final { scan-assembler-times "prefetch.r\t" 4 } } */
+/* { dg-final { scan-assembler-times "prefetch.w\t" 4 } } */
@@ -18,6 +18,6 @@ int foo1()
return __builtin_riscv_zicbop_cbo_prefetchi(1);
}
-/* { dg-final { scan-assembler-times "prefetch.i" 1 } } */
-/* { dg-final { scan-assembler-times "prefetch.r" 4 } } */
-/* { dg-final { scan-assembler-times "prefetch.w" 4 } } */
+/* { dg-final { scan-assembler-times "prefetch.i\t" 1 } } */
+/* { dg-final { scan-assembler-times "prefetch.r\t" 4 } } */
+/* { dg-final { scan-assembler-times "prefetch.w\t" 4 } } */
@@ -10,4 +10,4 @@ void foo1()
__builtin_riscv_zicboz_cbo_zero((void*)0x121);
}
-/* { dg-final { scan-assembler-times "cbo.zero" 3 } } */
+/* { dg-final { scan-assembler-times "cbo.zero\t" 3 } } */
@@ -10,4 +10,4 @@ void foo1()
__builtin_riscv_zicboz_cbo_zero((void*)0x121);
}
-/* { dg-final { scan-assembler-times "cbo.zero" 3 } } */
+/* { dg-final { scan-assembler-times "cbo.zero\t" 3 } } */