From patchwork Tue Jan 30 01:19:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "juzhe.zhong@rivai.ai" X-Patchwork-Id: 193766 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp933546dyb; Mon, 29 Jan 2024 17:20:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IHANlgZE8I2MvuCRHTAtFRlbjKwwQ4qU+9y3Aa8SPbTx1MY4WhzOLqTGlPiCWGq+gOPjoMq X-Received: by 2002:ac8:5c4a:0:b0:42a:b586:ea36 with SMTP id j10-20020ac85c4a000000b0042ab586ea36mr400987qtj.59.1706577607214; Mon, 29 Jan 2024 17:20:07 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706577607; cv=pass; d=google.com; s=arc-20160816; b=ZO0r+WLwJ+2RqNl+hZ+47P2ts9N3YfAJOaVkIf/ZLpukSpiZhyB4ssCByxanSCpi/A EM5G4fweXnpQQryc+mwgiJVqx5Uw1ZPETwXsIFPFUEM2FgartClgH3FVZJBfs1xL1byp gPZXBUtpSm8G/dVH5dKvES7nWQeakCECbFBnN0biq552d9IiUkKvKDoOTExagklny54d z+L7LYgIVejfqWu8/Si6Wo2qxgeKZjE0KeONnVY/iAMDWoJfDRYRu1YkG9cy00wloxFJ /iAzy/Mk9tPfQgvidQVKMKUjgFDhziNek+iCJz9AJxZgNfj/IJDyCvOfqweYcqy9Do70 mczQ== 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:feedback-id :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:arc-filter:dmarc-filter:delivered-to; bh=pRc396XYyt1qatzHd1gwsSO3dapFzN22yKDC4m6JKEo=; fh=idvV5TQ1gmHAoU8u1GUGfjilVySOK+BR5TeZLoSouN8=; b=xwKPXUM68hag+Yz8BOIqG2wLNSKO2HYtxA6HzqIndued4Lr61Fc0BjjqZzOwifyYWS Q1Cn+AE0eGBjn7isvZD+avhFEZR1n7ROInjQRqNxNULn3Txkp66laKXxnPyAHCPFL2j0 /1IjQp1nwKuqogv/tIpA+bPdK6ezsyg/FWvzgi4GUK5CTGYJUJFLhDrELhcoxiIw72Mw zOwgxiQkBuvMcxp8qSluRnGz+k9HSpIb/8AYO2x/fgMDAIvm24EKGYJUAaVRUKSVrbst PSnj3G87uOmmlYEYaEs3z6T1pX33IvGH0jLOeoqMqeeUFjt0v3+dz/tg45Y+CGPeztz2 M8jg== 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 g20-20020ac87d14000000b0042ab4f91b64si546521qtb.15.2024.01.29.17.20.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 17:20:07 -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 E737D385840F for ; Tue, 30 Jan 2024 01:20:06 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtpbg154.qq.com (smtpbg154.qq.com [15.184.224.54]) by sourceware.org (Postfix) with ESMTPS id 9CA753858CDA for ; Tue, 30 Jan 2024 01:19:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9CA753858CDA Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivai.ai Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivai.ai ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9CA753858CDA Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=15.184.224.54 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706577560; cv=none; b=GBF4qRzVo2zPUhdnqgDJVQylTh8NK/PJfeGtZoF+2rapjVrD0e0wpy3Y/QeqNS+h2SMK1+f5PMt5oZLgmhU3fDfvEhCq/uQYftLrUuCzchnvodwuToeSTGcNwPSPmdEgRaxuEEGKRemqN9IuTeNvRhWBuwTnJQ1v67m3TIsKCTE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706577560; c=relaxed/simple; bh=xT+KRjpv438r0MX0ZrESp4VBk5pVw1hMHwC1+gwl+P8=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=bXp1tAaDBd1zotzd6t0avAIwjYrklSO7r2zDeNpBlWv2vCKL32LVRzUpqJS6Etkgchr5ZPx9lTKktRjnCm2TTlvoKbFl5yzSwUk5o+Ghb9kN92nu/MpYrR9a3XvRZTBreag41JyEmaYRlkGUamEZ7dQDt2PeWODVXf1g0tcHRpQ= ARC-Authentication-Results: i=1; server2.sourceware.org X-QQ-mid: bizesmtp73t1706577550tm67rrbc X-QQ-Originating-IP: FgH46Jbl36MOV9WVkgcsv6g6iYcWZLaIEdFaTN6Xuz8= Received: from server1.localdomain ( [58.60.1.8]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 30 Jan 2024 09:19:09 +0800 (CST) X-QQ-SSF: 01400000000000G0V000000A0000000 X-QQ-FEAT: zT6n3Y95oi3MAGu3Vd0ncZ+u2EVL+g5hh2pKyaTDw3f8aB0i9zEmGVb4j2bqW X/3T/BaejFBQmbMEWgmi8Ada9BXUHPuw9y34dkFOnovHCgnStpuMELj+dtHyrwsgWDey88l VlU3ouF3pRAsR/3UNtn/o68uk8JOobTkSqRbilps91+QxfFb9x26FdIh1PnhGq0DIa8B/m0 oyZENNVulDSRRzRKPvwDcMeaJUf6zsADDtfgeIaGbU0/RhKu87lktz7N7q1NdGa64orRtf8 phy6S7eVPmm+fay363hUnlXKE/QXLkBXpVfFQsYXX+crvwqSXar2hsah1BCFXYnkNkpfO4f e+mwQubo87un6wjZFgvs2gQYJ50rKFd/lvUmLJhtzblp21cWnQ= X-QQ-GoodBg: 2 X-BIZMAIL-ID: 14424325597759095137 From: Juzhe-Zhong To: gcc-patches@gcc.gnu.org Cc: Juzhe-Zhong Subject: [Committed] RISC-V: Fix regression Date: Tue, 30 Jan 2024 09:19:06 +0800 Message-Id: <20240130011906.19660-1-juzhe.zhong@rivai.ai> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:rivai.ai:qybglogicsvrgz:qybglogicsvrgz7a-one-0 X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, 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: 1789476321317103009 X-GMAIL-MSGID: 1789476321317103009 Due to recent middle-end loop vectorizer changes, these tests have regression and the changes are reasonable. Adapt test to fix the regression. gcc/testsuite/ChangeLog: * gcc.target/riscv/rvv/autovec/binop/shift-rv32gcv.c: Adapt test. * gcc.target/riscv/rvv/autovec/binop/shift-rv64gcv.c: Ditto. * gcc.target/riscv/rvv/autovec/vls/mod-1.c: Ditto. * gcc.target/riscv/rvv/autovec/vls/shift-1.c: Ditto. * gcc.target/riscv/rvv/autovec/vls/shift-2.c: Ditto. --- .../gcc.target/riscv/rvv/autovec/binop/shift-rv32gcv.c | 2 +- .../gcc.target/riscv/rvv/autovec/binop/shift-rv64gcv.c | 2 +- gcc/testsuite/gcc.target/riscv/rvv/autovec/vls/mod-1.c | 2 +- gcc/testsuite/gcc.target/riscv/rvv/autovec/vls/shift-1.c | 2 +- gcc/testsuite/gcc.target/riscv/rvv/autovec/vls/shift-2.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/shift-rv32gcv.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/shift-rv32gcv.c index befa4b85e8f..d5348855aa0 100644 --- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/shift-rv32gcv.c +++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/shift-rv32gcv.c @@ -4,5 +4,5 @@ #include "shift-template.h" /* { dg-final { scan-assembler-times {\tvsll\.vv} 8 } } */ -/* { dg-final { scan-assembler-times {\tvsrl\.vv} 4 } } */ +/* { dg-final { scan-assembler-times {\tvsrl\.vv} 2 } } */ /* { dg-final { scan-assembler-times {\tvsra\.vv} 4 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/shift-rv64gcv.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/shift-rv64gcv.c index 976b29fa356..a533dc79bc0 100644 --- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/shift-rv64gcv.c +++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/binop/shift-rv64gcv.c @@ -4,5 +4,5 @@ #include "shift-template.h" /* { dg-final { scan-assembler-times {\tvsll\.vv} 8 } } */ -/* { dg-final { scan-assembler-times {\tvsrl\.vv} 4 } } */ +/* { dg-final { scan-assembler-times {\tvsrl\.vv} 2 } } */ /* { dg-final { scan-assembler-times {\tvsra\.vv} 4 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls/mod-1.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls/mod-1.c index 57bbf8fbc68..17d2784b90d 100644 --- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls/mod-1.c +++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls/mod-1.c @@ -53,5 +53,5 @@ DEF_OP_VV (mod, 128, int64_t, %) DEF_OP_VV (mod, 256, int64_t, %) DEF_OP_VV (mod, 512, int64_t, %) -/* { dg-final { scan-assembler-times {vremu?\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 42 } } */ +/* { dg-final { scan-assembler-times {vremu?\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 47 } } */ /* { dg-final { scan-assembler-not {csrr} } } */ diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls/shift-1.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls/shift-1.c index cb5a1dbc9ff..ee8da2573c7 100644 --- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls/shift-1.c +++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls/shift-1.c @@ -53,5 +53,5 @@ DEF_OP_VV (shift, 128, int64_t, >>) DEF_OP_VV (shift, 256, int64_t, >>) DEF_OP_VV (shift, 512, int64_t, >>) -/* { dg-final { scan-assembler-times {vsra\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 42 } } */ +/* { dg-final { scan-assembler-times {vsra\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 35 } } */ /* { dg-final { scan-assembler-not {csrr} } } */ diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls/shift-2.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls/shift-2.c index e626a52c2d8..ebd5575f267 100644 --- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls/shift-2.c +++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls/shift-2.c @@ -53,5 +53,5 @@ DEF_OP_VV (shift, 128, uint64_t, >>) DEF_OP_VV (shift, 256, uint64_t, >>) DEF_OP_VV (shift, 512, uint64_t, >>) -/* { dg-final { scan-assembler-times {vsrl\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 42 } } */ +/* { dg-final { scan-assembler-times {vsrl\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 19 } } */ /* { dg-final { scan-assembler-not {csrr} } } */