From patchwork Tue Dec 19 01:44:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Xu X-Patchwork-Id: 180709 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp1655738dyi; Mon, 18 Dec 2023 17:46:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IEuEAUbn261zquRkX8bYEdWZzqQ5BrzqLsgRU/VWGHYd3y7fr0NGuHSkxjjieV+k+BG42fT X-Received: by 2002:a05:622a:24a:b0:425:a86b:5fee with SMTP id c10-20020a05622a024a00b00425a86b5feemr22342713qtx.43.1702950391177; Mon, 18 Dec 2023 17:46:31 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702950391; cv=pass; d=google.com; s=arc-20160816; b=gWh6v7krCSFkZrbgNT3kykbkMzGGvTvzOZhTzNZC1qVG/9qRiG8ha62KKj2/qxlkfT oEKO8XWJj7kCK7xOb6y9UdK7UjNcqw2Pk7QI8HxL2IbTxtmba4c3JmXP9A1w6obufZcz GulsWeph84eNUehidCWgVskpzGTgUb9MAJsAT667mpDHh7Uv3a0no/mPJAV3VZIZJN2t ItqngqFNESzeDxWZ1SbJQujr8etXMOkrpLBytqpdXPymS3VOFepnBXLbj4a5R+qIqpgB 2GArM0gk4hDcKgPhrHq3oU8buqfhnRPxd064mXy5zwbInHMNDCVY+swPwlaRtaRwyVme gOvA== 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=Rzlq3xC+tTbIKkPznl2uWjPUnLlTZI2m1Xwyk9Fq78o=; fh=Qb/t3bub0qUevN32JfR0ksI5uuULifWToHOJuO7VEBY=; b=bBp9YZo7/eRinvlblq+4haEojHC82H9Z7pjy1D2nWDdNNwOoDRMFVcPLay++BC+W3s nt+pIn9P5D9q+1PwSU53HKN++YW3YYMLT5bPulbKTdWUCEuJsOg2cM8guBGaUaqlTO/z AeVSTs1rCov9eSCI7G7qaG8iXkrshm8omuw86KTgx2biefaQuohW9envTb0QpU7pFq2D qCVt1vTXTGYz5aUtvxFttV3PlbTxJNFFlBR70GbZjpLE0gbQijBhBRHsax0eVJDhuIte Gw4N2XQ1kWVxCzFj5IoMdg2S/ELY9ElGviUAh7IA4GDAPsQHiurq4NnV8cz97FoVEQ/W xN/Q== 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 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id o6-20020ac87c46000000b0042395200e6fsi26941025qtv.415.2023.12.18.17.46.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 17:46:31 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; 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 2620:52:3:1:0:246e:9693:128c 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 CF3FA3858298 for ; Tue, 19 Dec 2023 01:46:30 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from azure-sdnproxy.icoremail.net (azure-sdnproxy.icoremail.net [52.237.72.81]) by sourceware.org (Postfix) with ESMTP id 360813858417 for ; Tue, 19 Dec 2023 01:45:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 360813858417 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 360813858417 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=52.237.72.81 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702950366; cv=none; b=Z36whgk6DCY0j2Y1sHBUunYPTzKJkEkBQLAj52z1+MgZbJtG1SBq9HBUlwUxjyb3W8hTxfSJ73PIHak/kXzZrNoNFuJBly3+ARaw7fmZ2XZooa5IxxsJZAwskmkKc8V5oZYwdyV7nN6HUOylZxQtK9LSHsCmeTuo3KskedqVVUA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702950366; c=relaxed/simple; bh=S7xqjKsIIPJ7qv7+g7NQetBdwVH2oCDhq3ukAmas2to=; h=From:To:Subject:Date:Message-Id; b=Sp88pMv1cvuhw5ihnRWDgeX/QK+SBfga3egVuDUTkb0PYn+HSLYSvBsT6ARM+jGBX2p77kDUFi0cD0HGWk6MzZ8G57qp58Aczdhw4PjOnLVKirWlBYmII9Kr4KQsDyT4e63yy878DDB3i7g4K1Z38zsuIDPESzxoYBjmt5FWLwg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from host014-ubuntu-1804.lxd (unknown [10.12.130.31]) by app1 (Coremail) with SMTP id TAJkCgAHk_1_9YBl9B0CAA--.21337S4; Tue, 19 Dec 2023 09:44:32 +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 cpymem-2.c dump checks under different riscv-sim for RVV. Date: Tue, 19 Dec 2023 01:44:55 +0000 Message-Id: <20231219014455.33713-1-xuli1@eswincomputing.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: TAJkCgAHk_1_9YBl9B0CAA--.21337S4 X-Coremail-Antispam: 1UD129KBjvJXoWxZrWfXF1rGr13XFW8uw4UJwb_yoW5Cr1xpF y3Cr48tFy7GrWkJ3Zagr15Wr129a1rXr1q93sruFyUZa1F9ryvqFZFgwn7WFy5Xa1fur1F krWUCw15Za90vFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkI14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4U JVWxJr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I8E87Iv6xkF7I0E14v26r xl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj 6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr 0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxkIecxEwVCm-wCF 04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r 18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vI r41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr 1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvE x4A2jsIEc7CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7VUbXdbUUUUUU== X-CM-SenderInfo: 50xoxi46hv4xpqfrz1xxwl0woofrz/ X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, 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: 1785672909400316456 X-GMAIL-MSGID: 1785672909400316456 From: xuli gcc/testsuite/ChangeLog: * gcc.target/riscv/rvv/base/cpymem-2.c: Fix checks. --- .../gcc.target/riscv/rvv/base/cpymem-2.c | 44 ++++++++++++++----- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/cpymem-2.c b/gcc/testsuite/gcc.target/riscv/rvv/base/cpymem-2.c index 7b706b6ef52..f1914a36161 100644 --- a/gcc/testsuite/gcc.target/riscv/rvv/base/cpymem-2.c +++ b/gcc/testsuite/gcc.target/riscv/rvv/base/cpymem-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-additional-options "-O1" } */ +/* { dg-additional-options "-O1 -fno-schedule-insns -fno-schedule-insns2" } */ /* { dg-add-options riscv_v } */ /* { dg-final { check-function-bodies "**" "" } } */ @@ -8,23 +8,38 @@ typedef struct { char c[32]; } c32; typedef struct { short s; char c[30]; } s16; /* A short struct copy can use vsetivli. -** f1: -** vsetivli\s+zero,16,e8,m1,ta,ma +** f1: { target { no-opts "--param=riscv-autovec-preference=fixed-vlmax" } } +** vsetivli\s+zero,16,e8,m(1|f8|f2|f4),ta,ma ** vle8.v\s+v1,0\(a1\) ** vse8.v\s+v1,0\(a0\) ** ret */ + +/* +** f1: { target { { any-opts "--param=riscv-autovec-preference=fixed-vlmax" } && { no-opts "-march=rv64gcv_zvl1024b" "-march=rv64gcv_zvl256b" "-march=rv64gcv_zvl512b --param=riscv-autovec-lmul=dynamic" } } } +** vl1re8.v\s+v1,0\(a1\) +** vs1r.v\s+v1,0\(a0\) +** ret +*/ + void f1 (c16 *a, c16* b) { *a = *b; } /* A longer one needs li. -** f2: +** f2: { target { no-opts "--param=riscv-autovec-preference=fixed-vlmax" } } ** li\s+[ta][0-7],32 -** vsetvli\s+zero,[ta][0-7],e8,m2,ta,ma -** vle8.v\s+v2,0\(a1\) -** vse8.v\s+v2,0\(a0\) +** vsetvli\s+zero,[ta][0-7],e8,m(f4|f2|1|2|8),ta,ma +** vle8.v\s+v(1|2|8),0\(a1\) +** vse8.v\s+v(1|2|8),0\(a0\) +** ret +*/ + +/* +** f2: { target { { any-opts "--param=riscv-autovec-preference=fixed-vlmax" } && { no-opts "-march=rv64gcv_zvl1024b" "-march=rv64gcv_zvl256b" "-march=rv64gcv_zvl512b --param=riscv-autovec-lmul=dynamic" } } } +** vl2re8.v\s+v2,0\(a1\) +** vs2r.v\s+v2,0\(a0\) ** ret */ void f2 (c32 *a, c32* b) @@ -34,10 +49,17 @@ void f2 (c32 *a, c32* b) /* A 32 byte struct is still short enough for vsetivli if we can use an element width larger than 8. -** f3: -** vsetivli\s+zero,16,e16,m2,ta,ma -** vle16.v\s+v2,0\(a1\) -** vse16.v\s+v2,0\(a0\) +** f3: { target { no-opts "--param=riscv-autovec-preference=fixed-vlmax" } } +** vsetivli\s+zero,16,e16,m(f2|f4|1|2|8),ta,ma +** vle16.v\s+v(1|2|8),0\(a1\) +** vse16.v\s+v(1|2|8),0\(a0\) +** ret +*/ + +/* +** f3: { target { { any-opts "--param=riscv-autovec-preference=fixed-vlmax" } && { no-opts "-march=rv64gcv_zvl1024b" "-march=rv64gcv_zvl256b" "-march=rv64gcv_zvl512b --param=riscv-autovec-lmul=dynamic" } } } +** vl2re16.v\s+v2,0\(a1\) +** vs2r.v\s+v2,0\(a0\) ** ret */ void f3 (s16 *a, s16* b)