From patchwork Tue Dec 19 05:30:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Xu X-Patchwork-Id: 180759 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp1728924dyi; Mon, 18 Dec 2023 21:31:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IG+5gucmVVkYazfW8RsjxuQh2YXxJves5C6DaHRnRt7FQpSC/WVM3yz88UzXdX6E7VUZ/jt X-Received: by 2002:ac8:5bc1:0:b0:425:4043:50d3 with SMTP id b1-20020ac85bc1000000b00425404350d3mr27022519qtb.98.1702963890432; Mon, 18 Dec 2023 21:31:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702963890; cv=pass; d=google.com; s=arc-20160816; b=Kgcxor775fgcS2cXSXHXIo1FCyEiHgv8FZSq5tPd4Zf4AT8/imgpHvuKsXnVZrhtic zVXNHitGOkHc/drbQO+NlZk9yaa5xvJ3jSwUaZ0J4YKmqoCmPn81KbcPAvxE2uN41nJ3 bRFVTfRVewWPus51SbJYBTZV8rDX8LUQ6EljO6kACPYZ3vMSjNK8mY67/feLbjndvtZA cfKh3Al1/s0fE+Wj5x80yCrB0dB+cEBZyvG6yieXCYrvvRMSZfG0l895gT/udgcdvvPk vXx8kUuudiurFGrijtss7QKiqUV9tzd/zvHTciHckbb52C0yXYDfDGoRvFlITJPUBUsi ovjg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:message-id:date:subject:cc:to :from:arc-filter:dmarc-filter:delivered-to; bh=DhY3GxnJtAAPGE6yeRN2D3QiZPJCoxC5L8IM4ze5XFE=; fh=Qb/t3bub0qUevN32JfR0ksI5uuULifWToHOJuO7VEBY=; b=VDaxYPy+V0fxNBUl1ZiefzPCYmnvp+IJYSNFfh6OsSm4L+EtwujDGloTFTOZLK92m6 tcwHrjNz7sFZl/PzAKjp/ezQgJFfGlWyLI0FRYUyTGMi+Hqbnm5jLRVA+cxhWirlh1ah DUcGIvm0KghNT5Ug+GCC9fndhcwG7BjKRjjcyt4aSW8WJc/VVDPY1Ej8xgwFc94tq2m9 b5McICcz4ge9lj1iSXQUh7XG9go3GqMh5eo2epWAaQhIdnOXOlmRYj4qubgqUg4gjs2i flpncoE7I2Pk2RxRRN51yaHioI0dWs1d62J8RgmdoEJ8qSH5jSpEgKkRSERDp9Byhlrp +cSA== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id w4-20020a05622a134400b00425a179c878si25888408qtk.384.2023.12.18.21.31.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 21:31:30 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2BB323857BBD for ; Tue, 19 Dec 2023 05:31:30 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from zg8tmja2lje4os4yms4ymjma.icoremail.net (zg8tmja2lje4os4yms4ymjma.icoremail.net [206.189.21.223]) by sourceware.org (Postfix) with ESMTP id 86D2A3858C5F for ; Tue, 19 Dec 2023 05:31:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 86D2A3858C5F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=eswincomputing.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=eswincomputing.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 86D2A3858C5F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=206.189.21.223 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702963867; cv=none; b=QlQ4eSFrBXLR3d9BKHWTUk7QHeFo321xdA5C3w0mmkVgcmsBB0JRiXiyYROf6fU8g8G2j+zas9RH0hdHxVrSvO7ueTQvHLIyXMmCn0ndDMxHAl7NKK1epfEQdmsKjbr7Cpl49BBVwys5e/g9nCw5T4DXZjbFypq0wSBmeC1xRto= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702963867; c=relaxed/simple; bh=t7C0bWqlgl9g5MWv9IqXiu8bRm+AbGLM29IJY0Px0/Q=; h=From:To:Subject:Date:Message-Id; b=klBJVKYs+S4ZVD0FoPm5+oEoawJmUruMVPF/2iQxPtKbJMCzO1Ux6ZNRuLXvdNg+hs0WwOvfBNeQJuXPAVY9F41JDH5kreRoUvLVvDrbpfUx1M6SmmKLk1AmRWqBsZ1HL4UZ6KnDwCBr4E8SMMxdINPk+uQaWtXajJx9iapU6Co= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from host014-ubuntu-1804.lxd (unknown [10.12.130.31]) by app2 (Coremail) with SMTP id TQJkCgAnttQ+KoFlmyICAA--.23878S4; Tue, 19 Dec 2023 13:29:35 +0800 (CST) From: Li Xu To: gcc-patches@gcc.gnu.org Cc: kito.cheng@gmail.com, palmer@dabbelt.com, juzhe.zhong@rivai.ai, xuli Subject: [PATCH] testsuite: Fix dump checks under different riscv-sim for RVV. Date: Tue, 19 Dec 2023 05:30:00 +0000 Message-Id: <20231219053000.2741-1-xuli1@eswincomputing.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: TQJkCgAnttQ+KoFlmyICAA--.23878S4 X-Coremail-Antispam: 1UD129KBjvJXoWxCF4fAF1DGFyDGF1xGw45KFg_yoWrXw13pa yjyw4jyFy7JFZ7K3ZY9F1UJryYga1kWryku3sxCryUAF4Fka4xX392g3Z7Jw15Xa1UZry3 KFsxCw1fZwsYqr7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkI14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4U JVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gc CE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E 2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJV W8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lc2xSY4AK6svPMxAI w28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr 4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxG rwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8Jw CI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2 z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUbXdbUUUUUU== X-CM-SenderInfo: 50xoxi46hv4xpqfrz1xxwl0woofrz/ X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785687064584174936 X-GMAIL-MSGID: 1785687064584174936 From: xuli gcc/testsuite/ChangeLog: * gcc.target/riscv/rvv/base/cpymem-1.c: Fix checks under medany. * gcc.target/riscv/rvv/base/cpymem-strategy-3.c: Fix checks. * gcc.target/riscv/rvv/base/cpymem-strategy-4.c: Ditto. --- .../gcc.target/riscv/rvv/base/cpymem-1.c | 23 +++++++++++++++++-- .../riscv/rvv/base/cpymem-strategy-3.c | 3 ++- .../riscv/rvv/base/cpymem-strategy-4.c | 3 ++- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/cpymem-1.c b/gcc/testsuite/gcc.target/riscv/rvv/base/cpymem-1.c index ccde7575051..9efe258c99a 100644 --- a/gcc/testsuite/gcc.target/riscv/rvv/base/cpymem-1.c +++ b/gcc/testsuite/gcc.target/riscv/rvv/base/cpymem-1.c @@ -85,15 +85,34 @@ void f2 (__INT32_TYPE__* a, __INT32_TYPE__* b, int l) */ /* -** f3: { target { any-opts "-mcmodel=medany" } } +** f3: { target { { any-opts "-mcmodel=medany" } && { no-opts "-march=rv64gcv_zvl512b" "-march=rv64gcv_zvl256b" "-march=rv64gcv_zvl1024b" "--param=riscv-autovec-lmul=dynamic" "--param=riscv-autovec-lmul=m8" "--param=riscv-autovec-lmul=m4" "--param=riscv-autovec-preference=fixed-vlmax" } } } +** lla\s+[ta][0-7],a_a ** lla\s+[ta][0-7],a_b -** vsetivli\s+zero,16,e32,m4,ta,ma +** vsetivli\s+zero,16,e32,m8,ta,ma +** vle32.v\s+v\d+,0\([ta][0-7]\) +** vse32\.v\s+v\d+,0\([ta][0-7]\) +** ret +*/ + +/* +** f3: { target { { any-opts "-mcmodel=medany" } && { no-opts "-march=rv64gcv_zvl512b" "-march=rv64gcv_zvl256b" "-march=rv64gcv" "-march=rv64gc_zve64d" "-march=rv64gc_zve32f" } } } +** lla\s+[ta][0-7],a_b +** vsetivli\s+zero,16,e32,m(f2|1|4),ta,ma ** vle32.v\s+v\d+,0\([ta][0-7]\) ** lla\s+[ta][0-7],a_a ** vse32\.v\s+v\d+,0\([ta][0-7]\) ** ret */ +/* +** f3: { target { { any-opts "-mcmodel=medany --param=riscv-autovec-preference=fixed-vlmax" } && { no-opts "-march=rv64gcv_zvl1024b" } } } +** lla\s+[ta][0-7],a_a +** lla\s+[ta][0-7],a_b +** vl(1|2|4)re32\.v\s+v\d+,0\([ta][0-7]\) +** vs(1|2|4)r\.v\s+v\d+,0\([ta][0-7]\) +** ret +*/ + extern struct { __INT32_TYPE__ a[16]; } a_a, a_b; void f3 () diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/cpymem-strategy-3.c b/gcc/testsuite/gcc.target/riscv/rvv/base/cpymem-strategy-3.c index 83e5a837730..1e11ac0759f 100644 --- a/gcc/testsuite/gcc.target/riscv/rvv/base/cpymem-strategy-3.c +++ b/gcc/testsuite/gcc.target/riscv/rvv/base/cpymem-strategy-3.c @@ -3,4 +3,5 @@ #include "cpymem-strategy.h" -/* { dg-final { scan-assembler-times {v[ls]+e[0-9]+\.v\tv[0-9]+\,0\([a-z0-9]+\)} 4 } } */ +/* { dg-final { scan-assembler-times {v[ls]+e[0-9]+\.v\tv[0-9]+\,0\([a-z0-9]+\)} 4 { target { no-opts "--param=riscv-autovec-preference=fixed-vlmax" } } } } */ +/* { dg-final { scan-assembler-times {v[ls]+e[0-9]+\.v\tv[0-9]+\,0\([a-z0-9]+\)} 2 { target { any-opts "--param=riscv-autovec-preference=fixed-vlmax" } } } } */ diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/cpymem-strategy-4.c b/gcc/testsuite/gcc.target/riscv/rvv/base/cpymem-strategy-4.c index 800549c8556..6bbcb54dec1 100644 --- a/gcc/testsuite/gcc.target/riscv/rvv/base/cpymem-strategy-4.c +++ b/gcc/testsuite/gcc.target/riscv/rvv/base/cpymem-strategy-4.c @@ -3,4 +3,5 @@ #include "cpymem-strategy.h" -/* { dg-final { scan-assembler-times {v[ls]+e[0-9]+\.v\tv[0-9]+\,0\([a-z0-9]+\)} 4 } } */ +/* { dg-final { scan-assembler-times {v[ls]+e[0-9]+\.v\tv[0-9]+\,0\([a-z0-9]+\)} 4 { target { no-opts "--param=riscv-autovec-preference=fixed-vlmax" } } } } */ +/* { dg-final { scan-assembler-times {v[ls]+e[0-9]+\.v\tv[0-9]+\,0\([a-z0-9]+\)} 2 { target { any-opts "--param=riscv-autovec-preference=fixed-vlmax" } } } } */