[gcc(refs/users/dfaust/heads/gcc-13-bpf)] bpf: testsuite: fix unresolved test in memset-1.c

[David Faust via Gcc-cvs]

https://gcc.gnu.org/g:64e6da250a07c19d302ec8648824cb42b608cf62

commit 64e6da250a07c19d302ec8648824cb42b608cf62
Author: David Faust <david.fa...@oracle.com>
Date:   Thu Mar 7 09:23:38 2024 -0800

    bpf: testsuite: fix unresolved test in memset-1.c
    
    The test was trying to do too much by both checking for an error, and
    checking the resulting assembly. Of course, due to the error no asm was
    produced, so the scan-asm went unresolved. Split it into two separate
    tests to fix the issue.
    
    gcc/testsuite/
    
            * gcc.target/bpf/memset-1.c: Move error test case to...
            * gcc.target/bpf/memset-2.c: ... here. New test.
    
    (cherry picked from commit 10c609191c4462133d6a4ea10a739167204f2cd3)

Diff:
---
 gcc/testsuite/gcc.target/bpf/memset-1.c |  8 --------
 gcc/testsuite/gcc.target/bpf/memset-2.c | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/gcc/testsuite/gcc.target/bpf/memset-1.c 
b/gcc/testsuite/gcc.target/bpf/memset-1.c
index 9e9f8eff028..7c4768c6e73 100644
--- a/gcc/testsuite/gcc.target/bpf/memset-1.c
+++ b/gcc/testsuite/gcc.target/bpf/memset-1.c
@@ -28,12 +28,4 @@ set_large (struct context *ctx)
   __builtin_memset (dest, 0xfe, 130);
 }
 
-void
-set_variable (struct context *ctx)
-{
-  void *data = (void *)(long)ctx->data;
-  char *dest = data;
-  __builtin_memset (dest, 0xbc, ctx->data_meta); /* { dg-error "could not 
inline call" } */
-}
-
 /* { dg-final { scan-assembler-times "call" 0 } } */
diff --git a/gcc/testsuite/gcc.target/bpf/memset-2.c 
b/gcc/testsuite/gcc.target/bpf/memset-2.c
new file mode 100644
index 00000000000..0602a1a277c
--- /dev/null
+++ b/gcc/testsuite/gcc.target/bpf/memset-2.c
@@ -0,0 +1,22 @@
+/* Test that we error if memset cannot be expanded inline.  */
+
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+struct context {
+ unsigned int data;
+ unsigned int data_end;
+ unsigned int data_meta;
+ unsigned int ingress;
+ unsigned int queue_index;
+ unsigned int egress;
+};
+
+
+void
+set_variable (struct context *ctx)
+{
+  void *data = (void *)(long)ctx->data;
+  char *dest = data;
+  __builtin_memset (dest, 0xbc, ctx->data_meta); /* { dg-error "could not 
inline call" } */
+}