From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by sourceware.org (Postfix) with ESMTPS id E53C93858C62 for ; Thu, 9 Feb 2023 19:19:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E53C93858C62 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pj1-x1033.google.com with SMTP id v6-20020a17090ad58600b00229eec90a7fso6964326pju.0 for ; Thu, 09 Feb 2023 11:19:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=w1gqqvW6eaDfvr1zbTc7M+mprn3w7qtoEF1QJnZZmMc=; b=Nw9Q6kYkEMh9NbyMbvjSw2gpOClQZ5Lje9FQVh89IpRa/x//eR5HNwwVH7FBqINIHQ Q4NmB7bS73etfiFMiFpAUD8A9edreLErnzdAY+ciUggwCYIDFw82DlqSQopef+CSu1+/ cAoGPXUnIDmB09VLnsJejtC0ik0AjYUMVUFvMkaAwXcLNuKaQLwfUoIU8ZnjpUTuezT3 7GDI0YD7oz5aKfEFHM6nov5E0sdV9fM1LfB/3sS+ncrBoEcHNWLYHsy3l0Nwzk9oqhhT ERx7NYj+Qq7fUetAIbTRrkRbpQJh7jZsJcZd0rO6IHwes0ZbsNWNPmgUjTzGp/yss6Id FG+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=w1gqqvW6eaDfvr1zbTc7M+mprn3w7qtoEF1QJnZZmMc=; b=SIMnxa4li0dIDU0MKOx02c7uZhMjRI+R6WsW4cN9c3HKoMh6YZ8uELg8XLLAmRLQoy QdtyvF/+83+xUUd5vwAqBpfw5Ce7/JeyPIWVPyVBe4L80Vm15JGR9vc/w+VMYSUUiX4g ei/WYDKYt8MmhrFWuh+7p8umH0hMl+Mlr2DhZ12ZQm8dhTPKozV+rShwfDHiCViwMOcB zMGWVC/47B7d+ViAVgyoUtPPHHn2eVHWEmp4QWzSqIoJGIDmshxuJ82cjydd5QL7tlyW HETZzRjqBWctVlZc/JqAIOJLWmbV/gkhcVRdECWGrE8QppOsJSNXwW0UBGDnov0jtmZ2 rl1Q== X-Gm-Message-State: AO0yUKW6ZKSdDQxvc/28D1jyF8SAzKQTKjdnUoNrmkVjJR4OkNilvodn UBGlWtSmERL7WAhVTUXfSbYLYtGw47e2LHT12YM= X-Google-Smtp-Source: AK7set+BII4r+cs0q0g8qNKkdqBwrB8G4nz8IRpO+nNkRc6B9qXiOcThkd+3qGrdIUY7uf4kmXEEBqc9YmMPKfDQOic= X-Received: by 2002:a17:902:8693:b0:198:f73f:9d52 with SMTP id g19-20020a170902869300b00198f73f9d52mr3274120plo.34.1675970360721; Thu, 09 Feb 2023 11:19:20 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Andrew Pinski Date: Thu, 9 Feb 2023 11:19:08 -0800 Message-ID: Subject: Re: [PATCH] testsuite: adjust patterns in RISC-V tests to skip unwind table directives To: Palmer Dabbelt Cc: gcc-patches@gcc.gnu.org, Kito Cheng , Andrew Waterman , Jim Wilson Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Thu, Feb 9, 2023 at 11:10 AM Palmer Dabbelt wrote: > > On Thu, 09 Feb 2023 01:48:25 PST (-0800), gcc-patches@gcc.gnu.org wrote: > > PR target/108723 > > * gcc.target/riscv/shorten-memrefs-1.c: Adjust patterns to skip > > over cfi directives. > > * gcc.target/riscv/shorten-memrefs-2.c: Likewise. > > * gcc.target/riscv/shorten-memrefs-3.c: Likewise. > > * gcc.target/riscv/shorten-memrefs-4.c: Likewise. > > * gcc.target/riscv/shorten-memrefs-5.c: Likewise. > > * gcc.target/riscv/shorten-memrefs-6.c: Likewise. > > * gcc.target/riscv/shorten-memrefs-8.c: Likewise. > > --- > > gcc/testsuite/gcc.target/riscv/shorten-memrefs-1.c | 4 ++-- > > gcc/testsuite/gcc.target/riscv/shorten-memrefs-2.c | 8 ++++---- > > gcc/testsuite/gcc.target/riscv/shorten-memrefs-3.c | 2 +- > > gcc/testsuite/gcc.target/riscv/shorten-memrefs-4.c | 4 ++-- > > gcc/testsuite/gcc.target/riscv/shorten-memrefs-5.c | 8 ++++---- > > gcc/testsuite/gcc.target/riscv/shorten-memrefs-6.c | 2 +- > > gcc/testsuite/gcc.target/riscv/shorten-memrefs-8.c | 4 ++-- > > 7 files changed, 16 insertions(+), 16 deletions(-) > > It kind of smells like there's some better way to write these test > cases, but the label->instruction matching was already there. I'm fine > just taking the fix for now so > > Reviewed-by: Palmer Dabbelt > Acked-by: Palmer Dabbelt > > but if anyone has ideas on how to make the tests less fragile I'm all > ears. > > I didn't actually run the tests and I'm pretty bad at doing regexes in > my head, though. If you ran them and can commit that's good with me, > but LMK if you want me to. Maybe you could use check-function-bodies for these files? check-function-bodies does remove cfi and other .line directives too when doing the scanning. Thanks, Andrew Pinski > > Thanks! > > > > > diff --git a/gcc/testsuite/gcc.target/riscv/shorten-memrefs-1.c b/gcc/testsuite/gcc.target/riscv/shorten-memrefs-1.c > > index f0222f46eff..cce7c80f6c1 100644 > > --- a/gcc/testsuite/gcc.target/riscv/shorten-memrefs-1.c > > +++ b/gcc/testsuite/gcc.target/riscv/shorten-memrefs-1.c > > @@ -23,5 +23,5 @@ store2z (long long *array) > > array[203] = 0; > > } > > > > -/* { dg-final { scan-assembler-not "store1z:\n\taddi" } } */ > > -/* { dg-final { scan-assembler-not "store2z:\n\taddi" } } */ > > +/* { dg-final { scan-assembler-not "store1z:\n(\t?\\.\[^\n\]*\n)\taddi" } } */ > > +/* { dg-final { scan-assembler-not "store2z:\n(\t?\\.\[^\n\]*\n)\taddi" } } */ > > diff --git a/gcc/testsuite/gcc.target/riscv/shorten-memrefs-2.c b/gcc/testsuite/gcc.target/riscv/shorten-memrefs-2.c > > index ec39104fd88..a9ddb797d06 100644 > > --- a/gcc/testsuite/gcc.target/riscv/shorten-memrefs-2.c > > +++ b/gcc/testsuite/gcc.target/riscv/shorten-memrefs-2.c > > @@ -44,9 +44,9 @@ load2r (long long *array) > > return a; > > } > > > > -/* { dg-final { scan-assembler "store1a:\n\taddi" } } */ > > +/* { dg-final { scan-assembler "store1a:\n(\t?\\.\[^\n\]*\n)*\taddi" } } */ > > /* The sd insns in store2a are not rewritten because shorten_memrefs currently > > only optimizes lw and sw. > > -/* { dg-final { scan-assembler "store2a:\n\taddi" { xfail riscv*-*-* } } } */ > > -/* { dg-final { scan-assembler "load1r:\n\taddi" } } */ > > -/* { dg-final { scan-assembler "load2r:\n\taddi" } } */ > > +/* { dg-final { scan-assembler "store2a:\n(\t?\\.\[^\n\]*\n)*\taddi" { xfail riscv*-*-* } } } */ > > +/* { dg-final { scan-assembler "load1r:\n(\t?\\.\[^\n\]*\n)*\taddi" } } */ > > +/* { dg-final { scan-assembler "load2r:\n(\t?\\.\[^\n\]*\n)*\taddi" } } */ > > diff --git a/gcc/testsuite/gcc.target/riscv/shorten-memrefs-3.c b/gcc/testsuite/gcc.target/riscv/shorten-memrefs-3.c > > index 50316284832..3d561124b81 100644 > > --- a/gcc/testsuite/gcc.target/riscv/shorten-memrefs-3.c > > +++ b/gcc/testsuite/gcc.target/riscv/shorten-memrefs-3.c > > @@ -36,5 +36,5 @@ load2a (long long a0, long long a1, long long a2, long long a3, long long a4, > > return sub2 (a0, a1, a2, a3, a4, 0, a); > > } > > > > -/* { dg-final { scan-assembler-not "load1a:\n\taddi" { xfail riscv*-*-* } } } */ > > +/* { dg-final { scan-assembler-not "load1a:\n(\t?\\.\[^\n\]*\n)*\taddi" { xfail riscv*-*-* } } } */ > > /* { dg-final { scan-assembler-not "load2a:\n.*addi\[ \t\]*\[at\]\[0-9\],\[at\]\[0-9\],\[0-9\]*" { xfail riscv*-*-* } } } */ > > diff --git a/gcc/testsuite/gcc.target/riscv/shorten-memrefs-4.c b/gcc/testsuite/gcc.target/riscv/shorten-memrefs-4.c > > index d985512e2b3..26decf085fb 100644 > > --- a/gcc/testsuite/gcc.target/riscv/shorten-memrefs-4.c > > +++ b/gcc/testsuite/gcc.target/riscv/shorten-memrefs-4.c > > @@ -23,5 +23,5 @@ store2z (long long *array) > > array[203] = 0; > > } > > > > -/* { dg-final { scan-assembler-not "store1z:\n\taddi" } } */ > > -/* { dg-final { scan-assembler-not "store2z:\n\taddi" } } */ > > +/* { dg-final { scan-assembler-not "store1z:\n(\t?\\.\[^\n\]*\n)\taddi" } } */ > > +/* { dg-final { scan-assembler-not "store2z:\n(\t?\\.\[^\n\]*\n)\taddi" } } */ > > diff --git a/gcc/testsuite/gcc.target/riscv/shorten-memrefs-5.c b/gcc/testsuite/gcc.target/riscv/shorten-memrefs-5.c > > index 9217922c10d..11e858ed6da 100644 > > --- a/gcc/testsuite/gcc.target/riscv/shorten-memrefs-5.c > > +++ b/gcc/testsuite/gcc.target/riscv/shorten-memrefs-5.c > > @@ -44,11 +44,11 @@ load2r (long long *array) > > return a; > > } > > > > -/* { dg-final { scan-assembler "store1a:\n\taddi" } } */ > > +/* { dg-final { scan-assembler "store1a:\n(\t?\\.\[^\n\]*\n)*\taddi" } } */ > > /* The sd insns in store2a are not rewritten because shorten_memrefs currently > > only optimizes lw and sw. > > -/* { dg-final { scan-assembler "store2a:\n\taddi" { xfail riscv*-*-* } } } */ > > -/* { dg-final { scan-assembler "load1r:\n\taddi" } } */ > > +/* { dg-final { scan-assembler "store2a:\n(\t?\\.\[^\n\]*\n)*\taddi" { xfail riscv*-*-* } } } */ > > +/* { dg-final { scan-assembler "load1r:\n(\t?\\.\[^\n\]*\n)*\taddi" } } */ > > /* The ld insns in load2r are not rewritten because shorten_memrefs currently > > only optimizes lw and sw. > > -/* { dg-final { scan-assembler "load2r:\n\taddi" { xfail riscv*-*-* } } } */ > > +/* { dg-final { scan-assembler "load2r:\n(\t?\\.\[^\n\]*\n)*\taddi" { xfail riscv*-*-* } } } */ > > diff --git a/gcc/testsuite/gcc.target/riscv/shorten-memrefs-6.c b/gcc/testsuite/gcc.target/riscv/shorten-memrefs-6.c > > index c36af6d6a5d..b6539b76aaf 100644 > > --- a/gcc/testsuite/gcc.target/riscv/shorten-memrefs-6.c > > +++ b/gcc/testsuite/gcc.target/riscv/shorten-memrefs-6.c > > @@ -36,5 +36,5 @@ load2a (long long a0, long long a1, long long a2, long long a3, long long a4, > > return sub2 (a0, a1, a2, a3, a4, 0, a); > > } > > > > -/* { dg-final { scan-assembler-not "load1a:\n\taddi" { xfail riscv*-*-* } } } */ > > +/* { dg-final { scan-assembler-not "load1a:\n(\t?\\.\[^\n\]*\n)*\taddi" { xfail riscv*-*-* } } } */ > > /* { dg-final { scan-assembler-not "load2a:\n.*addi\[ \t\]*\[at\]\[0-9\],\[at\]\[0-9\],\[0-9\]*" } } */ > > diff --git a/gcc/testsuite/gcc.target/riscv/shorten-memrefs-8.c b/gcc/testsuite/gcc.target/riscv/shorten-memrefs-8.c > > index 6dfc015cf3a..3ff6956b33e 100644 > > --- a/gcc/testsuite/gcc.target/riscv/shorten-memrefs-8.c > > +++ b/gcc/testsuite/gcc.target/riscv/shorten-memrefs-8.c > > @@ -23,6 +23,6 @@ load (char *p) > > return a; > > } > > > > -/* { dg-final { scan-assembler "store:\n\taddi\ta\[0-7\],a\[0-7\],1" } } */ > > -/* { dg-final { scan-assembler "load:\n\taddi\ta\[0-7\],a\[0-7\],1" } } */ > > +/* { dg-final { scan-assembler "store:\n(\t?\\.\[^\n\]*\n)*\taddi\ta\[0-7\],a\[0-7\],1" } } */ > > +/* { dg-final { scan-assembler "load:\n(\t?\\.\[^\n\]*\n)*\taddi\ta\[0-7\],a\[0-7\],1" } } */