From b60c29e6658c8620f1116ce5a38a6eb823af64e6 Mon Sep 17 00:00:00 2001
From: xiezhiheng <xiezhiheng@huawei.com>
Date: Thu, 7 Mar 2024 10:22:39 +0800
Subject: [PATCH 152/157] [SME] Adapt some testsuites

gcc.target/aarch64/sme/aarch64-sme-acle-asm.exp:
  GCC 12.3.0 do not support -std=c23 and -std=gnu23

gcc.target/aarch64/sme/streaming_mode_2.c:
  It's a warning in GCC 12.3.0

gcc.dg/c2x-attr-syntax-6.c:
gcc.dg/c2x-attr-syntax-7.c:
  GCC 12.3.0 do not support C2x (...) function prototypes and
  C2x noreturn attribute

gcc.target/aarch64/sme/za_state_4.c:
  Seems need a ldp/stp optimization, not a functionality issue
---
 gcc/testsuite/gcc.dg/c2x-attr-syntax-6.c             |  2 --
 gcc/testsuite/gcc.dg/c2x-attr-syntax-7.c             |  2 --
 .../gcc.target/aarch64/sme/aarch64-sme-acle-asm.exp  |  2 --
 .../gcc.target/aarch64/sme/streaming_mode_2.c        | 12 ++++++------
 gcc/testsuite/gcc.target/aarch64/sme/za_state_4.c    |  1 +
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/gcc/testsuite/gcc.dg/c2x-attr-syntax-6.c b/gcc/testsuite/gcc.dg/c2x-attr-syntax-6.c
index 9e5f65ce4..2385b25fe 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-syntax-6.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-syntax-6.c
@@ -15,13 +15,11 @@ typedef int [[__extension__ gnu FOO vector_size (4)]] g5;
 typedef int [[__extension__ gnu BAR BAR vector_size (4)]] g6;
 typedef int [[__extension__ gnu :/**/: vector_size (4)]] g7;
 typedef int [[__extension__ gnu JOIN(:,:) vector_size (4)]] g8;
-typedef int [[__extension__ gnu :: vector_size (sizeof (void (*)(...)))]] g10;
 typedef int [[__extension__]] g11;
 typedef int [[__extension__,]] g12;
 typedef int [[__extension__, ,,,, ,, ,]] g13;
 [[__extension__ deprecated]] int g14 ();
 [[__extension__ nodiscard]] int g15 ();
-[[__extension__ noreturn]] void g16 ();
 
 int
 cases (int x)
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-syntax-7.c b/gcc/testsuite/gcc.dg/c2x-attr-syntax-7.c
index 702f733b1..5bbdba665 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-syntax-7.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-syntax-7.c
@@ -15,13 +15,11 @@ typedef int [[__extension__ gnu FOO vector_size (4)]] g5;
 typedef int [[__extension__ gnu BAR BAR vector_size (4)]] g6;
 typedef int [[__extension__ gnu :/**/: vector_size (4)]] g7;
 typedef int [[__extension__ gnu JOIN(:,:) vector_size (4)]] g8;
-typedef int [[__extension__ gnu :: vector_size (sizeof (void (*)(...)))]] g10;
 typedef int [[__extension__]] g11;
 typedef int [[__extension__,]] g12;
 typedef int [[__extension__, ,,,, ,, ,]] g13;
 [[__extension__ deprecated]] int g14 ();
 [[__extension__ nodiscard]] int g15 ();
-[[__extension__ noreturn]] void g16 ();
 
 int
 cases (int x)
diff --git a/gcc/testsuite/gcc.target/aarch64/sme/aarch64-sme-acle-asm.exp b/gcc/testsuite/gcc.target/aarch64/sme/aarch64-sme-acle-asm.exp
index e2d002f26..a0a4fe4f7 100644
--- a/gcc/testsuite/gcc.target/aarch64/sme/aarch64-sme-acle-asm.exp
+++ b/gcc/testsuite/gcc.target/aarch64/sme/aarch64-sme-acle-asm.exp
@@ -52,9 +52,7 @@ set-torture-options {
     "-std=c90 -O0 -g"
     "-std=c99 -Og -g"
     "-std=c11 -Os -g"
-    "-std=c23 -O2 -fno-schedule-insns -fno-schedule-insns2 -DCHECK_ASM --save-temps"
     "-std=gnu90 -O3 -g"
-    "-std=gnu23 -Ofast -g"
 } {
     "-DTEST_FULL"
     "-DTEST_OVERLOADS"
diff --git a/gcc/testsuite/gcc.target/aarch64/sme/streaming_mode_2.c b/gcc/testsuite/gcc.target/aarch64/sme/streaming_mode_2.c
index e8be0f821..1e328c817 100644
--- a/gcc/testsuite/gcc.target/aarch64/sme/streaming_mode_2.c
+++ b/gcc/testsuite/gcc.target/aarch64/sme/streaming_mode_2.c
@@ -12,14 +12,14 @@ void
 f ()
 {
   sc_fn_ptr = sc_fn;
-  sc_fn_ptr = s_fn; // { dg-error "incompatible pointer type" }
-  sc_fn_ptr = ns_fn; // { dg-error "incompatible pointer type" }
+  sc_fn_ptr = s_fn; // { dg-warning "incompatible pointer type" }
+  sc_fn_ptr = ns_fn; // { dg-warning "incompatible pointer type" }
 
-  s_fn_ptr = sc_fn; // { dg-error "incompatible pointer type" }
+  s_fn_ptr = sc_fn; // { dg-warning "incompatible pointer type" }
   s_fn_ptr = s_fn;
-  s_fn_ptr = ns_fn; // { dg-error "incompatible pointer type" }
+  s_fn_ptr = ns_fn; // { dg-warning "incompatible pointer type" }
 
-  ns_fn_ptr = sc_fn; // { dg-error "incompatible pointer type" }
-  ns_fn_ptr = s_fn; // { dg-error "incompatible pointer type" }
+  ns_fn_ptr = sc_fn; // { dg-warning "incompatible pointer type" }
+  ns_fn_ptr = s_fn; // { dg-warning "incompatible pointer type" }
   ns_fn_ptr = ns_fn;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/sme/za_state_4.c b/gcc/testsuite/gcc.target/aarch64/sme/za_state_4.c
index cec0abf0e..a764a7c89 100644
--- a/gcc/testsuite/gcc.target/aarch64/sme/za_state_4.c
+++ b/gcc/testsuite/gcc.target/aarch64/sme/za_state_4.c
@@ -105,6 +105,7 @@ __arm_new("za") void test5()
 **	mul	(x[0-9]+), \1, \1
 **	sub	sp, sp, \2
 **	mov	(x[0-9]+), sp
+**	add	[^\n]+
 **	stp	\3, \1, \[x29, #?16\]
 **	add	(x[0-9]+), x29, #?16
 **	msr	tpidr2_el0, \4
-- 
2.33.0