From patchwork Sat Nov 5 12:29:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 15970 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp967992wru; Sat, 5 Nov 2022 05:37:44 -0700 (PDT) X-Google-Smtp-Source: AMsMyM713Z7sgyaEwBnP5YtNTvAonrdBVXYfVEtlgl39OL6LgBBkHOSAYIAyfMp48Ks29iS51HuN X-Received: by 2002:a05:6402:1a48:b0:461:900a:7f0d with SMTP id bf8-20020a0564021a4800b00461900a7f0dmr40318817edb.125.1667651864182; Sat, 05 Nov 2022 05:37:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667651864; cv=none; d=google.com; s=arc-20160816; b=eiH6eHc7kBsRchURUybBvCzsy+/F/fRpF7ZD4qGhMS1pnBAyf0yc4dZqbQpSB8AH6B uioh6lYkTNXZnqvU2B1SNJbYOSUrxaEMUvBV9ujOQ6vqMW79RUK9JsiXj5AMEp0UKrEw BXh1mgd4TiDlS70HoE22QNdP+DuGG0yj6bOpW6JFf9B+2iEFtAzWvUZqQu/vGqJx+qgp zSt0itu4uqz2cVZKrmwi+KHV1X9OsBHiBq9J+M34/oRQZ8Q2NGPcNmZhUR7LNNpoc/Uw 3Mo03EBVJ0Xhx0kYw9fynXCxpEPOOecM/vu4vSB4UDHH3xD68cRCPJOFb6jJoemQhsgf oc1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=UVoDPk63cS6tYA2C6tzs/RiRrPF/vQo5EcaO7mnJc4E=; b=XMpstrL/UoB4F5zwn29XwBi9uCoJYnDBZ7Ap0YrwYrSMbvjHgSx4JKS+OKPmqISFWb ww6gdRAMee04OeLzxos+s027Kmbeo+I81vOYhoZpM/2acBIIW1CqM1L3UTq6G/vjbtM1 NhkI+L7ypBwW0SlJyu9OG164Wvh5c1f93UsX1ZQB3DKfAsYHkPDNJ3l/a29D5P8FoLm/ /ggpeKMjx7tQGtGKPIt4EItwGWqL04b/Akya7d3g3iFjM4cNA1QKWcyl3WxexlmeQnEM M0Xz4fqp4C8SSdcWYP8fOhsKlVnc9z0w/A9MTAJnrpCKSvMdvFVfp0rMMrz8LyEBX0lv JDdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=ZnI9RmZz; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id hs7-20020a1709073e8700b0073d9ea386d4si1842748ejc.983.2022.11.05.05.37.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 05:37:44 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.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; dkim=pass header.i=@sourceware.org header.s=default header.b=ZnI9RmZz; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DEA18385E00D for ; Sat, 5 Nov 2022 12:35:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DEA18385E00D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667651728; bh=UVoDPk63cS6tYA2C6tzs/RiRrPF/vQo5EcaO7mnJc4E=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=ZnI9RmZzTyCqAw78xsBXEzvgna1JHiryRtAahFsDLADgkoyHmyeQ6353oF/Si6VZV A3Cnse7yuOlUPTdbu2SA+upANcx9YS1l6zodTqexPRZup3G5C8e2OIQ3nFTzN1YpoQ qALQ/rfeP5U41+78Cr2fwcDIXp8/PBC78Dkva8QY= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-sender-0.a4lg.com (mail-sender.a4lg.com [153.120.152.154]) by sourceware.org (Postfix) with ESMTPS id 228573858439 for ; Sat, 5 Nov 2022 12:30:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 228573858439 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 7946530008A; Sat, 5 Nov 2022 12:30:47 +0000 (UTC) To: Tsukasa OI , Nelson Chu , Kito Cheng , Palmer Dabbelt Subject: [PATCH 08/12] RISC-V: Refine/enhance 'M'/'Zmmul' extension tests Date: Sat, 5 Nov 2022 12:29:14 +0000 Message-Id: <9378b9505e3e230e0a690c56e67d253e2a0f5864.1667651354.git.research_trasio@irq.a4lg.com> In-Reply-To: References: Mime-Version: 1.0 X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, 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 X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tsukasa OI via Binutils From: Tsukasa OI Reply-To: Tsukasa OI Cc: binutils@sourceware.org Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748659721240912183?= X-GMAIL-MSGID: =?utf-8?q?1748659721240912183?= This commit refines tests for 'M' and 'Zmmul' extensions and adds "no required extension" testcases based on new test utilities. gas/ChangeLog: * testsuite/gas/riscv/m-ext.s: Refine using new testing utils. * testsuite/gas/riscv/m-ext-32.d: Refine. * testsuite/gas/riscv/m-ext-32-noarch.d: New test. * testsuite/gas/riscv/m-ext-32-noarch.l: Likewise. * testsuite/gas/riscv/m-ext-32-noarch-m.d: New test ased on m-ext-fail-zmmul-32.d but refine. * testsuite/gas/riscv/m-ext-32-noarch-m.l: New test ased on m-ext-fail-zmmul-32.l. * testsuite/gas/riscv/m-ext-64.d: Refine. * testsuite/gas/riscv/m-ext-64-noarch.d: New test ased on m-ext-fail-noarch-64.d but refine. * testsuite/gas/riscv/m-ext-64-noarch.l: New test ased on m-ext-fail-noarch-64.l. * testsuite/gas/riscv/m-ext-64-noarch-m.d: New test ased on m-ext-fail-zmmul-64.d but refine. * testsuite/gas/riscv/m-ext-64-noarch-m.l: New test ased on m-ext-fail-zmmul-64.l. * testsuite/gas/riscv/m-ext-fail-xlen-32.d: Removed. * testsuite/gas/riscv/m-ext-fail-xlen-32.l: Removed. * testsuite/gas/riscv/m-ext-fail-zmmul-32.d: Removed. * testsuite/gas/riscv/m-ext-fail-zmmul-64.d: Removed. * testsuite/gas/riscv/m-ext-fail-noarch-64.d: Removed. * testsuite/gas/riscv/zmmul-32.d: Removed as duplicate. * testsuite/gas/riscv/zmmul-64.d: Removed as duplicate. --- gas/testsuite/gas/riscv/m-ext-32-noarch-m.d | 4 ++++ ...-ext-fail-zmmul-32.l => m-ext-32-noarch-m.l} | 0 gas/testsuite/gas/riscv/m-ext-32-noarch.d | 4 ++++ gas/testsuite/gas/riscv/m-ext-32-noarch.l | 14 ++++++++++++++ gas/testsuite/gas/riscv/m-ext-32.d | 2 +- gas/testsuite/gas/riscv/m-ext-64-noarch-m.d | 4 ++++ ...-ext-fail-zmmul-64.l => m-ext-64-noarch-m.l} | 0 gas/testsuite/gas/riscv/m-ext-64-noarch.d | 4 ++++ ...m-ext-fail-noarch-64.l => m-ext-64-noarch.l} | 0 gas/testsuite/gas/riscv/m-ext-64.d | 2 +- gas/testsuite/gas/riscv/m-ext-fail-noarch-64.d | 4 ---- gas/testsuite/gas/riscv/m-ext-fail-xlen-32.d | 4 ---- gas/testsuite/gas/riscv/m-ext-fail-xlen-32.l | 6 ------ gas/testsuite/gas/riscv/m-ext-fail-zmmul-32.d | 4 ---- gas/testsuite/gas/riscv/m-ext-fail-zmmul-64.d | 4 ---- gas/testsuite/gas/riscv/m-ext.s | 17 +++++++++++------ gas/testsuite/gas/riscv/zmmul-32.d | 14 -------------- gas/testsuite/gas/riscv/zmmul-64.d | 15 --------------- 18 files changed, 43 insertions(+), 59 deletions(-) create mode 100644 gas/testsuite/gas/riscv/m-ext-32-noarch-m.d rename gas/testsuite/gas/riscv/{m-ext-fail-zmmul-32.l => m-ext-32-noarch-m.l} (100%) create mode 100644 gas/testsuite/gas/riscv/m-ext-32-noarch.d create mode 100644 gas/testsuite/gas/riscv/m-ext-32-noarch.l create mode 100644 gas/testsuite/gas/riscv/m-ext-64-noarch-m.d rename gas/testsuite/gas/riscv/{m-ext-fail-zmmul-64.l => m-ext-64-noarch-m.l} (100%) create mode 100644 gas/testsuite/gas/riscv/m-ext-64-noarch.d rename gas/testsuite/gas/riscv/{m-ext-fail-noarch-64.l => m-ext-64-noarch.l} (100%) delete mode 100644 gas/testsuite/gas/riscv/m-ext-fail-noarch-64.d delete mode 100644 gas/testsuite/gas/riscv/m-ext-fail-xlen-32.d delete mode 100644 gas/testsuite/gas/riscv/m-ext-fail-xlen-32.l delete mode 100644 gas/testsuite/gas/riscv/m-ext-fail-zmmul-32.d delete mode 100644 gas/testsuite/gas/riscv/m-ext-fail-zmmul-64.d delete mode 100644 gas/testsuite/gas/riscv/zmmul-32.d delete mode 100644 gas/testsuite/gas/riscv/zmmul-64.d diff --git a/gas/testsuite/gas/riscv/m-ext-32-noarch-m.d b/gas/testsuite/gas/riscv/m-ext-32-noarch-m.d new file mode 100644 index 00000000000..1d05564125f --- /dev/null +++ b/gas/testsuite/gas/riscv/m-ext-32-noarch-m.d @@ -0,0 +1,4 @@ +#as: -march=rv32i_zmmul -I$srcdir/$subdir -defsym XLEN=32 -defsym NOARCH_ARCH=1 +#source: m-ext.s +#objdump: -d +#error_output: m-ext-32-noarch-m.l diff --git a/gas/testsuite/gas/riscv/m-ext-fail-zmmul-32.l b/gas/testsuite/gas/riscv/m-ext-32-noarch-m.l similarity index 100% rename from gas/testsuite/gas/riscv/m-ext-fail-zmmul-32.l rename to gas/testsuite/gas/riscv/m-ext-32-noarch-m.l diff --git a/gas/testsuite/gas/riscv/m-ext-32-noarch.d b/gas/testsuite/gas/riscv/m-ext-32-noarch.d new file mode 100644 index 00000000000..a708d429ac7 --- /dev/null +++ b/gas/testsuite/gas/riscv/m-ext-32-noarch.d @@ -0,0 +1,4 @@ +#as: -march=rv32i -I$srcdir/$subdir -defsym XLEN=32 -defsym NOARCH=1 +#source: m-ext.s +#objdump: -d +#error_output: m-ext-32-noarch.l diff --git a/gas/testsuite/gas/riscv/m-ext-32-noarch.l b/gas/testsuite/gas/riscv/m-ext-32-noarch.l new file mode 100644 index 00000000000..f9179f45bb4 --- /dev/null +++ b/gas/testsuite/gas/riscv/m-ext-32-noarch.l @@ -0,0 +1,14 @@ +.*Assembler messages: +.*: Error: unrecognized opcode `mul a0,a1,a2', extension `m' or `zmmul' required +.*: Error: unrecognized opcode `mulh a0,a1,a2', extension `m' or `zmmul' required +.*: Error: unrecognized opcode `mulhsu a0,a1,a2', extension `m' or `zmmul' required +.*: Error: unrecognized opcode `mulhu a0,a1,a2', extension `m' or `zmmul' required +.*: Error: unrecognized opcode `div a0,a1,a2', extension `m' required +.*: Error: unrecognized opcode `divu a0,a1,a2', extension `m' required +.*: Error: unrecognized opcode `rem a0,a1,a2', extension `m' required +.*: Error: unrecognized opcode `remu a0,a1,a2', extension `m' required +.*: Error: unrecognized opcode `mulw a0,a1,a2' +.*: Error: unrecognized opcode `divw a0,a1,a2' +.*: Error: unrecognized opcode `divuw a0,a1,a2' +.*: Error: unrecognized opcode `remw a0,a1,a2' +.*: Error: unrecognized opcode `remuw a0,a1,a2' diff --git a/gas/testsuite/gas/riscv/m-ext-32.d b/gas/testsuite/gas/riscv/m-ext-32.d index fe2ef9af54b..02be2ef9569 100644 --- a/gas/testsuite/gas/riscv/m-ext-32.d +++ b/gas/testsuite/gas/riscv/m-ext-32.d @@ -1,4 +1,4 @@ -#as: -march=rv32im +#as: -march=rv32i -I$srcdir/$subdir -defsym XLEN=32 #source: m-ext.s #objdump: -d diff --git a/gas/testsuite/gas/riscv/m-ext-64-noarch-m.d b/gas/testsuite/gas/riscv/m-ext-64-noarch-m.d new file mode 100644 index 00000000000..d74fbd0b682 --- /dev/null +++ b/gas/testsuite/gas/riscv/m-ext-64-noarch-m.d @@ -0,0 +1,4 @@ +#as: -march=rv64i_zmmul -I$srcdir/$subdir -defsym XLEN=64 -defsym NOARCH_ARCH=1 +#source: m-ext.s +#objdump: -d +#error_output: m-ext-64-noarch-m.l diff --git a/gas/testsuite/gas/riscv/m-ext-fail-zmmul-64.l b/gas/testsuite/gas/riscv/m-ext-64-noarch-m.l similarity index 100% rename from gas/testsuite/gas/riscv/m-ext-fail-zmmul-64.l rename to gas/testsuite/gas/riscv/m-ext-64-noarch-m.l diff --git a/gas/testsuite/gas/riscv/m-ext-64-noarch.d b/gas/testsuite/gas/riscv/m-ext-64-noarch.d new file mode 100644 index 00000000000..2d7031e5a35 --- /dev/null +++ b/gas/testsuite/gas/riscv/m-ext-64-noarch.d @@ -0,0 +1,4 @@ +#as: -march=rv64i -I$srcdir/$subdir -defsym XLEN=64 -defsym NOARCH=1 +#source: m-ext.s +#objdump: -d +#error_output: m-ext-64-noarch.l diff --git a/gas/testsuite/gas/riscv/m-ext-fail-noarch-64.l b/gas/testsuite/gas/riscv/m-ext-64-noarch.l similarity index 100% rename from gas/testsuite/gas/riscv/m-ext-fail-noarch-64.l rename to gas/testsuite/gas/riscv/m-ext-64-noarch.l diff --git a/gas/testsuite/gas/riscv/m-ext-64.d b/gas/testsuite/gas/riscv/m-ext-64.d index 05099b14e9e..ad086829ae5 100644 --- a/gas/testsuite/gas/riscv/m-ext-64.d +++ b/gas/testsuite/gas/riscv/m-ext-64.d @@ -1,4 +1,4 @@ -#as: -march=rv64im -defsym rv64=1 +#as: -march=rv64i -I$srcdir/$subdir -defsym XLEN=64 #source: m-ext.s #objdump: -d diff --git a/gas/testsuite/gas/riscv/m-ext-fail-noarch-64.d b/gas/testsuite/gas/riscv/m-ext-fail-noarch-64.d deleted file mode 100644 index 3c4fc9a0a50..00000000000 --- a/gas/testsuite/gas/riscv/m-ext-fail-noarch-64.d +++ /dev/null @@ -1,4 +0,0 @@ -#as: -march=rv64i -defsym rv64=1 -#source: m-ext.s -#objdump: -d -#error_output: m-ext-fail-noarch-64.l diff --git a/gas/testsuite/gas/riscv/m-ext-fail-xlen-32.d b/gas/testsuite/gas/riscv/m-ext-fail-xlen-32.d deleted file mode 100644 index 54f8b8225dc..00000000000 --- a/gas/testsuite/gas/riscv/m-ext-fail-xlen-32.d +++ /dev/null @@ -1,4 +0,0 @@ -#as: -march=rv32im -defsym rv64=1 -#source: m-ext.s -#objdump: -d -#error_output: m-ext-fail-xlen-32.l diff --git a/gas/testsuite/gas/riscv/m-ext-fail-xlen-32.l b/gas/testsuite/gas/riscv/m-ext-fail-xlen-32.l deleted file mode 100644 index d65ca4980e6..00000000000 --- a/gas/testsuite/gas/riscv/m-ext-fail-xlen-32.l +++ /dev/null @@ -1,6 +0,0 @@ -.*Assembler messages: -.*: Error: unrecognized opcode `mulw a0,a1,a2' -.*: Error: unrecognized opcode `divw a0,a1,a2' -.*: Error: unrecognized opcode `divuw a0,a1,a2' -.*: Error: unrecognized opcode `remw a0,a1,a2' -.*: Error: unrecognized opcode `remuw a0,a1,a2' diff --git a/gas/testsuite/gas/riscv/m-ext-fail-zmmul-32.d b/gas/testsuite/gas/riscv/m-ext-fail-zmmul-32.d deleted file mode 100644 index c164fa96f8f..00000000000 --- a/gas/testsuite/gas/riscv/m-ext-fail-zmmul-32.d +++ /dev/null @@ -1,4 +0,0 @@ -#as: -march=rv32i_zmmul -#source: m-ext.s -#objdump: -d -#error_output: m-ext-fail-zmmul-32.l diff --git a/gas/testsuite/gas/riscv/m-ext-fail-zmmul-64.d b/gas/testsuite/gas/riscv/m-ext-fail-zmmul-64.d deleted file mode 100644 index f736d9c66c6..00000000000 --- a/gas/testsuite/gas/riscv/m-ext-fail-zmmul-64.d +++ /dev/null @@ -1,4 +0,0 @@ -#as: -march=rv64i_zmmul -defsym rv64=1 -#source: m-ext.s -#objdump: -d -#error_output: m-ext-fail-zmmul-64.l diff --git a/gas/testsuite/gas/riscv/m-ext.s b/gas/testsuite/gas/riscv/m-ext.s index 68baf2ab9c0..8d599f20aef 100644 --- a/gas/testsuite/gas/riscv/m-ext.s +++ b/gas/testsuite/gas/riscv/m-ext.s @@ -1,21 +1,26 @@ +.include "testutils.inc" + target: + SET_ARCH_START +zmmul mul a0, a1, a2 mulh a0, a1, a2 mulhsu a0, a1, a2 mulhu a0, a1, a2 -.ifndef zmmul + SET_ARCH_START +m div a0, a1, a2 divu a0, a1, a2 rem a0, a1, a2 remu a0, a1, a2 -.endif - -.ifdef rv64 + SET_ARCH_END + SET_ARCH_END +.if XLEN_GE_64 + SET_ARCH_START +zmmul mulw a0, a1, a2 -.ifndef zmmul + SET_ARCH_START +m divw a0, a1, a2 divuw a0, a1, a2 remw a0, a1, a2 remuw a0, a1, a2 -.endif + SET_ARCH_END + SET_ARCH_END .endif diff --git a/gas/testsuite/gas/riscv/zmmul-32.d b/gas/testsuite/gas/riscv/zmmul-32.d deleted file mode 100644 index c9cf56ab33f..00000000000 --- a/gas/testsuite/gas/riscv/zmmul-32.d +++ /dev/null @@ -1,14 +0,0 @@ -#as: -march=rv32im -defsym zmmul=1 -#source: m-ext.s -#objdump: -d - -.*:[ ]+file format .* - - -Disassembly of section .text: - -0+000 : -[ ]+[0-9a-f]+:[ ]+02c58533[ ]+mul[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+02c59533[ ]+mulh[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+02c5a533[ ]+mulhsu[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+02c5b533[ ]+mulhu[ ]+a0,a1,a2 diff --git a/gas/testsuite/gas/riscv/zmmul-64.d b/gas/testsuite/gas/riscv/zmmul-64.d deleted file mode 100644 index 67ef3604755..00000000000 --- a/gas/testsuite/gas/riscv/zmmul-64.d +++ /dev/null @@ -1,15 +0,0 @@ -#as: -march=rv64im -defsym zmmul=1 -defsym rv64=1 -#source: m-ext.s -#objdump: -d - -.*:[ ]+file format .* - - -Disassembly of section .text: - -0+000 : -[ ]+[0-9a-f]+:[ ]+02c58533[ ]+mul[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+02c59533[ ]+mulh[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+02c5a533[ ]+mulhsu[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+02c5b533[ ]+mulhu[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+02c5853b[ ]+mulw[ ]+a0,a1,a2