testsuite: Sanitize pacbti test cases for Cortex-M

Some of the test cases were scanning for "bti", but it would,
incorrectly, match the ".arch_extenssion pacbti".

gcc/testsuite/ChangeLog:

	* gcc.target/arm/bti-1.c: Check for asm instructions starting
	with a tab.
	* gcc.target/arm/bti-2.c: Likewise.
	* gcc.target/arm/pac-1.c: Likewise.
	* gcc.target/arm/pac-2.c: Likewise.
	* gcc.target/arm/pac-3.c: Likewise.
	* gcc.target/arm/pac-4.c: Likewise.
	* gcc.target/arm/pac-6.c: Likewise.
	* gcc.target/arm/pac-7.c: Likewise.
	* gcc.target/arm/pac-8.c: Likewise.
	* gcc.target/arm/pac-9.c: Likewise.
	* gcc.target/arm/pac-10.c: Likewise.
	* gcc.target/arm/pac-11.c: Likewise.
	* gcc.target/arm/pac-15.c: Likewise.
	* gcc.target/arm/pac-sibcall.c: Likewise.

Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>
Co-authored-by: Yvan ROUX <yvan.roux@foss.st.com>
(cherry picked from commit 6ad29a858bac7cf9e765925cf5f6945e20f085be)

diff --git a/gcc/testsuite/gcc.target/arm/bti-1.c b/gcc/testsuite/gcc.target/arm/bti-1.c
index 79dd8010d2dab4dc07b1eed0cbe514f239eeacfe..54a733d9f20a11e4c510fa8c920afc7da61d8652 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/bti-1.c
+++ b/gcc/testsuite/gcc.target/arm/bti-1.c
@@ -9,4 +9,4 @@ main (void)
   return 0;
 }
 
-/* { dg-final { scan-assembler "bti" } } */
+/* { dg-final { scan-assembler "\tbti" } } */

diff --git a/gcc/testsuite/gcc.target/arm/bti-2.c b/gcc/testsuite/gcc.target/arm/bti-2.c
index 33910563849a4f1355f441e1a258cae5f826d54d..645ad36942411e13a633cb48c23485ffa96a7545 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/bti-2.c
+++ b/gcc/testsuite/gcc.target/arm/bti-2.c
@@ -55,4 +55,4 @@ lab2:
   return 2;
 }
 
-/* { dg-final { scan-assembler-times "bti" 15 } } */
+/* { dg-final { scan-assembler-times "\tbti" 14 } } */

diff --git a/gcc/testsuite/gcc.target/arm/pac-1.c b/gcc/testsuite/gcc.target/arm/pac-1.c
index 9b26f62b65f77f19d58450f2911a3ff326fc9937..e0eea0858e0384988ce93a07a1bf6dcbe7312ecc 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/pac-1.c
+++ b/gcc/testsuite/gcc.target/arm/pac-1.c
@@ -6,6 +6,6 @@
 
 #include "pac.h"
 
-/* { dg-final { scan-assembler-times "pac\tip, lr, sp" 2 } } */
-/* { dg-final { scan-assembler-times "aut\tip, lr, sp" 2 } } */
+/* { dg-final { scan-assembler-times "\tpac\tip, lr, sp" 2 } } */
+/* { dg-final { scan-assembler-times "\taut\tip, lr, sp" 2 } } */
 /* { dg-final { scan-assembler-not "\tbti" } } */

diff --git a/gcc/testsuite/gcc.target/arm/pac-10.c b/gcc/testsuite/gcc.target/arm/pac-10.c
index a794195e8f6eb0bfa3a8fe94e787ee7e57abdbe2..6da8434aeaf0476d1b4d939772b80e84dfbacec0 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/pac-10.c
+++ b/gcc/testsuite/gcc.target/arm/pac-10.c
@@ -5,6 +5,6 @@
 
 #include "pac.h"
 
-/* { dg-final { scan-assembler "pac\tip, lr, sp" } } */
-/* { dg-final { scan-assembler "aut\tip, lr, sp" } } */
+/* { dg-final { scan-assembler "\tpac\tip, lr, sp" } } */
+/* { dg-final { scan-assembler "\taut\tip, lr, sp" } } */
 /* { dg-final { scan-assembler-not "\tbti" } } */

diff --git a/gcc/testsuite/gcc.target/arm/pac-11.c b/gcc/testsuite/gcc.target/arm/pac-11.c
index 37ffc93b41b3a2e30f1faa3c56eed8a8ff167a9e..0bb727c2c800182ad7a47e01aa6f78ef4d6ae427 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/pac-11.c
+++ b/gcc/testsuite/gcc.target/arm/pac-11.c
@@ -5,6 +5,6 @@
 
 #include "pac.h"
 
-/* { dg-final { scan-assembler-times "pacbti\tip, lr, sp" 2 } } */
-/* { dg-final { scan-assembler-times "aut\tip, lr, sp" 2 } } */
+/* { dg-final { scan-assembler-times "\tpacbti\tip, lr, sp" 2 } } */
+/* { dg-final { scan-assembler-times "\taut\tip, lr, sp" 2 } } */
 /* { dg-final { scan-assembler-not "\tbti" } } */

diff --git a/gcc/testsuite/gcc.target/arm/pac-15.c b/gcc/testsuite/gcc.target/arm/pac-15.c
index e1054902955686a78536933580a603d5713794ef..979941492d3bb3e1d4c91b5c682e062213281177 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/pac-15.c
+++ b/gcc/testsuite/gcc.target/arm/pac-15.c
@@ -24,7 +24,7 @@ int main (void)
 }
 
 /* { dg-final { scan-assembler-times "\.pacspval" 1 } } */
-/* { dg-final { scan-assembler-times "pac      ip, lr, sp" 3 } } */
+/* { dg-final { scan-assembler-times "\tpac\tip, lr, sp" 3 } } */
 /* { dg-final { scan-assembler-times "\.cfi_register 143, 12" 3 } } */
 /* { dg-final { scan-assembler-times "\.save {r7, ra_auth_code, lr}" 2 } } */
 /* { dg-final { scan-assembler-times "\.cfi_offset 143, -8" 2 } } */

diff --git a/gcc/testsuite/gcc.target/arm/pac-2.c b/gcc/testsuite/gcc.target/arm/pac-2.c
index 945ce9385929e27acf018114ea595f9d4f14eecb..5eb1062043c593596e20be85c454c0564137318e 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/pac-2.c
+++ b/gcc/testsuite/gcc.target/arm/pac-2.c
@@ -6,6 +6,6 @@
 
 #include "pac.h"
 
-/* { dg-final { scan-assembler "pac\tip, lr, sp" } } */
-/* { dg-final { scan-assembler "aut\tip, lr, sp" } } */
+/* { dg-final { scan-assembler "\tpac\tip, lr, sp" } } */
+/* { dg-final { scan-assembler "\taut\tip, lr, sp" } } */
 /* { dg-final { scan-assembler-not "\tbti" } } */

diff --git a/gcc/testsuite/gcc.target/arm/pac-3.c b/gcc/testsuite/gcc.target/arm/pac-3.c
index 47e290a5840dcacb17612745fabedaff7c5e8f8a..50453dd8ec40641b62e5bae5b8da3c3c7e578302 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/pac-3.c
+++ b/gcc/testsuite/gcc.target/arm/pac-3.c
@@ -6,6 +6,6 @@
 
 #include "pac.h"
 
-/* { dg-final { scan-assembler-times "pacbti\tip, lr, sp" 2 } } */
-/* { dg-final { scan-assembler-times "aut\tip, lr, sp" 2 } } */
+/* { dg-final { scan-assembler-times "\tpacbti\tip, lr, sp" 2 } } */
+/* { dg-final { scan-assembler-times "\taut\tip, lr, sp" 2 } } */
 /* { dg-final { scan-assembler-not "\tbti" } } */

diff --git a/gcc/testsuite/gcc.target/arm/pac-4.c b/gcc/testsuite/gcc.target/arm/pac-4.c
index cf915cdba505a10b226d312205c38dde76677999..81907079d77f799f5a32186daaf766d1d4da5548 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/pac-4.c
+++ b/gcc/testsuite/gcc.target/arm/pac-4.c
@@ -5,6 +5,6 @@
 
 #include "pac.h"
 
-/* { dg-final { scan-assembler-not "\tbti\t" } } */
+/* { dg-final { scan-assembler-not "\tbti" } } */
 /* { dg-final { scan-assembler-not "\tpac\t" } } */
 /* { dg-final { scan-assembler-not "\tpacbti\t" } } */

diff --git a/gcc/testsuite/gcc.target/arm/pac-6.c b/gcc/testsuite/gcc.target/arm/pac-6.c
index c5329f0ef48b4ed0d200ebb042db6643d3fc27be..a8e3067f825a91dfd0ef1841e76d6f10da927020 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/pac-6.c
+++ b/gcc/testsuite/gcc.target/arm/pac-6.c
@@ -13,6 +13,6 @@ int bar()
   return 0;
 }
 
-/* { dg-final { scan-assembler "pac\tip, lr, sp" } } */
-/* { dg-final { scan-assembler "aut\tip, lr, sp" } } */
-/* { dg-final { scan-assembler-not "bti" } } */
+/* { dg-final { scan-assembler "\tpac\tip, lr, sp" } } */
+/* { dg-final { scan-assembler "\taut\tip, lr, sp" } } */
+/* { dg-final { scan-assembler-not "\tbti" } } */

diff --git a/gcc/testsuite/gcc.target/arm/pac-7.c b/gcc/testsuite/gcc.target/arm/pac-7.c
index cdaebca5cfa923032bad88420ea6fc3c43f9d6f9..6b4ad1450ce546a13a248278178e8efe3f49ac7d 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/pac-7.c
+++ b/gcc/testsuite/gcc.target/arm/pac-7.c
@@ -27,6 +27,6 @@ main (void)
   return 0;
 }
 
-/* { dg-final { scan-assembler-times "pac\tip, lr, sp" 3 } } */
-/* { dg-final { scan-assembler-times "aut\tip, lr, sp" 3 } } */
+/* { dg-final { scan-assembler-times "\tpac\tip, lr, sp" 3 } } */
+/* { dg-final { scan-assembler-times "\taut\tip, lr, sp" 3 } } */
 /* { dg-final { scan-assembler-not "\tbti" } } */

diff --git a/gcc/testsuite/gcc.target/arm/pac-8.c b/gcc/testsuite/gcc.target/arm/pac-8.c
index 3f37dcfa5c8af60ea722fbafa31f24711fe6b415..84208bfda4f8212941193c30536903be372ed658 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/pac-8.c
+++ b/gcc/testsuite/gcc.target/arm/pac-8.c
@@ -29,6 +29,6 @@ int main()
   return 0;
 }
 
-/* { dg-final { scan-assembler-times "pac\tip, lr, sp" 2 } } */
-/* { dg-final { scan-assembler-times "aut\tip, lr, sp" 2 } } */
+/* { dg-final { scan-assembler-times "\tpac\tip, lr, sp" 2 } } */
+/* { dg-final { scan-assembler-times "\taut\tip, lr, sp" 2 } } */
 /* { dg-final { scan-assembler-not "\tbti" } } */

diff --git a/gcc/testsuite/gcc.target/arm/pac-9.c b/gcc/testsuite/gcc.target/arm/pac-9.c
index ee2fad290b595dd683e3f17319b46336e7767719..588b7ffb8d20d4294fea2e76ab50598475cb47a3 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/pac-9.c
+++ b/gcc/testsuite/gcc.target/arm/pac-9.c
@@ -5,7 +5,7 @@
 
 #include "pac.h"
 
-/* { dg-final { scan-assembler-times "pac\tip, lr, sp" 2 } } */
-/* { dg-final { scan-assembler-times "aut\tip, lr, sp" 2 } } */
+/* { dg-final { scan-assembler-times "\tpac\tip, lr, sp" 2 } } */
+/* { dg-final { scan-assembler-times "\taut\tip, lr, sp" 2 } } */
 /* { dg-final { scan-assembler-not "\tbti" } } */
 

diff --git a/gcc/testsuite/gcc.target/arm/pac-sibcall.c b/gcc/testsuite/gcc.target/arm/pac-sibcall.c
index e15bd2f478d1c9aae5870dd572e5fe043fd4df1f..205099d177eff72f871820a50bb31edca96048bd 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/pac-sibcall.c
+++ b/gcc/testsuite/gcc.target/arm/pac-sibcall.c
@@ -11,4 +11,4 @@ void fail(void (*f)(int, int, int, int))
   f(1, 2, 3, 4);
 }
 
-/* { dg-final { scan-assembler-not "bx\tip\t@ indirect register sibling call" } } */
+/* { dg-final { scan-assembler-not "\tbx\tip\t@ indirect register sibling call" } } */