From patchwork Sat Nov 5 12:29:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 15965 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp966223wru; Sat, 5 Nov 2022 05:33:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7oxBqnzyh63WIyWF2dXQkV5AD2y5lmfApmgsAlftTH2gay07fjIGQ/vOaplmemORWmsPdR X-Received: by 2002:a17:906:a2d0:b0:781:aff3:c68d with SMTP id by16-20020a170906a2d000b00781aff3c68dmr475692ejb.36.1667651597299; Sat, 05 Nov 2022 05:33:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667651597; cv=none; d=google.com; s=arc-20160816; b=rBKn25IvY6PQXeYp6pTLUcWx9S5R/F3P2k+t7daW38cD7wv/74Lenejktn60CspB9G YNJMnCTDqHh3TitYW/uTxZmcN5c6tDZ6G5KFGNDE3T+I6ySdZAiYRWCw6Dj+0aSY7K06 999yAIngDykLCE72/OPzEGBkp5cKxviUz19CQXLKKrdZKx34r7PkQRQ94Czp4eSEboha 7TZi7jaqek8dlt9u2is/mb0T9VMNYvNQ2GiOoPgcs1ENxwM3FN+MiVl35rMtxPMR6qs6 xHXo7xoWh16J6qGglgjzPsZ+zI6macyMLLfcQ16VE85URTQUAk4TVwwNfulPlsGiAFz5 6S9Q== 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=7zgZC8gq5FyVbWmbFuqCQNTw5cGpGI7EthZB7EG2b2o=; b=RHwei4M/h+VCuCK3HkkL6rQuPhlW2CSpEDXwCMg91ZfZ2yymcsuj+ZyS735iPQLRbF TrDDVerzPznr2jDz1SgA7QVDDZAm2l5fTw9//q3StzoQqrAf7gjmGefAKmlftbdZPJN2 1yb4Oyqwd/gk7wXF8AZIASqqYYoU/1DFw1jYGyidSJOab5sSCnq8o9MadhdTXIlBL3e5 huziLkr+j/iy3y18pEVDtF9rdZbwT73VYVOom5WL2jvok5PgwL1j5XUHVT+Xab9ldw5E nRVaJX+9o+/AJ+4tD5GV8ibRf70g54IUzNCjGgNeo2Qwgcnpy7J8vYVeXZK+eqr7r87O 1ACA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=y6HmOVd7; 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 a26-20020aa7d75a000000b0045bccc84cebsi2361977eds.71.2022.11.05.05.33.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 05:33:17 -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=y6HmOVd7; 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 33CFD385781D for ; Sat, 5 Nov 2022 12:32:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 33CFD385781D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667651558; bh=7zgZC8gq5FyVbWmbFuqCQNTw5cGpGI7EthZB7EG2b2o=; 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=y6HmOVd7Ezt7WyvSs7yvKy8E9pKCMjHbv4JomudTWpn7AYSsvxYPK1w7sDsvMr3q6 mfgPPyXu6/u8/c8Kw/Rb4QPrUouQB7yO4Eyxa7U214VAoAOphZpb9iLsXsAV4y10Jx z2zTlrzkNft4kCdXwG/VJ8raJc/hxx0Ci1U4El3s= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-sender-0.a4lg.com (mail-sender-0.a4lg.com [IPv6:2401:2500:203:30b:4000:6bfe:4757:0]) by sourceware.org (Postfix) with ESMTPS id 29BB33858280 for ; Sat, 5 Nov 2022 12:31:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 29BB33858280 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 794BE300089; Sat, 5 Nov 2022 12:31:08 +0000 (UTC) To: Tsukasa OI , Nelson Chu , Kito Cheng , Palmer Dabbelt Subject: [PATCH 10/12] RISC-V: Enhance 'Zicbop' testcases Date: Sat, 5 Nov 2022 12:29:16 +0000 Message-Id: <9c47e59868a64b13e5a7bb487e3619d4f1497d78.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?1748659441086614829?= X-GMAIL-MSGID: =?utf-8?q?1748659441086614829?= This commit makes some tidying and enhancements to 'Zicbop' testcases. It adds "no required extension" testcases based on new test utilities. It adds the hint of the failure reason to the file names. gas/ChangeLog: * testsuite/gas/riscv/zicbop.s: Enhanced to test offset zero. * testsuite/gas/riscv/zicbop.d: Likewise. Minimize extension requirements and objdump options. * testsuite/gas/riscv/zicbop-noarch.s: New test for architecture failure. * testsuite/gas/riscv/zicbop-noarch.d: Likewise. * testsuite/gas/riscv/zicbop-noarch.l: Likewise. * testsuite/gas/riscv/zicbop-fail-offset.s: Move from zicbop-fail.s. * testsuite/gas/riscv/zicbop-fail-offset.d: Likewise. Minimize extension requirements. * testsuite/gas/riscv/zicbop-fail-offset.l: Likewise. * testsuite/gas/riscv/zicbop-fail.s: Removed. * testsuite/gas/riscv/zicbop-fail.d: Removed. * testsuite/gas/riscv/zicbop-fail.l: Removed. --- gas/testsuite/gas/riscv/zicbop-fail-offset.d | 2 ++ .../gas/riscv/{zicbop-fail.l => zicbop-fail-offset.l} | 0 .../gas/riscv/{zicbop-fail.s => zicbop-fail-offset.s} | 0 gas/testsuite/gas/riscv/zicbop-fail.d | 3 --- gas/testsuite/gas/riscv/zicbop-noarch.d | 4 ++++ gas/testsuite/gas/riscv/zicbop-noarch.l | 7 +++++++ gas/testsuite/gas/riscv/zicbop.d | 8 +++++--- gas/testsuite/gas/riscv/zicbop.s | 7 +++++++ 8 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 gas/testsuite/gas/riscv/zicbop-fail-offset.d rename gas/testsuite/gas/riscv/{zicbop-fail.l => zicbop-fail-offset.l} (100%) rename gas/testsuite/gas/riscv/{zicbop-fail.s => zicbop-fail-offset.s} (100%) delete mode 100644 gas/testsuite/gas/riscv/zicbop-fail.d create mode 100644 gas/testsuite/gas/riscv/zicbop-noarch.d create mode 100644 gas/testsuite/gas/riscv/zicbop-noarch.l diff --git a/gas/testsuite/gas/riscv/zicbop-fail-offset.d b/gas/testsuite/gas/riscv/zicbop-fail-offset.d new file mode 100644 index 00000000000..4680f6eef0d --- /dev/null +++ b/gas/testsuite/gas/riscv/zicbop-fail-offset.d @@ -0,0 +1,2 @@ +#as: -march=rv32i_zicbop +#error_output: zicbop-fail-offset.l diff --git a/gas/testsuite/gas/riscv/zicbop-fail.l b/gas/testsuite/gas/riscv/zicbop-fail-offset.l similarity index 100% rename from gas/testsuite/gas/riscv/zicbop-fail.l rename to gas/testsuite/gas/riscv/zicbop-fail-offset.l diff --git a/gas/testsuite/gas/riscv/zicbop-fail.s b/gas/testsuite/gas/riscv/zicbop-fail-offset.s similarity index 100% rename from gas/testsuite/gas/riscv/zicbop-fail.s rename to gas/testsuite/gas/riscv/zicbop-fail-offset.s diff --git a/gas/testsuite/gas/riscv/zicbop-fail.d b/gas/testsuite/gas/riscv/zicbop-fail.d deleted file mode 100644 index d734c7d4d15..00000000000 --- a/gas/testsuite/gas/riscv/zicbop-fail.d +++ /dev/null @@ -1,3 +0,0 @@ -#as: -march=rv64g_zicbop -#source: zicbop-fail.s -#error_output: zicbop-fail.l diff --git a/gas/testsuite/gas/riscv/zicbop-noarch.d b/gas/testsuite/gas/riscv/zicbop-noarch.d new file mode 100644 index 00000000000..2f51eb9b8d1 --- /dev/null +++ b/gas/testsuite/gas/riscv/zicbop-noarch.d @@ -0,0 +1,4 @@ +#as: -march=rv32i -I$srcdir/$subdir -defsym NOARCH=1 +#source: zicbop.s +#objdump: -d +#error_output: zicbop-noarch.l diff --git a/gas/testsuite/gas/riscv/zicbop-noarch.l b/gas/testsuite/gas/riscv/zicbop-noarch.l new file mode 100644 index 00000000000..742fedd9009 --- /dev/null +++ b/gas/testsuite/gas/riscv/zicbop-noarch.l @@ -0,0 +1,7 @@ +.*: Assembler messages: +.*: Error: unrecognized opcode `prefetch\.i \(x1\)', extension `zicbop' required +.*: Error: unrecognized opcode `prefetch\.i 0x20\(x1\)', extension `zicbop' required +.*: Error: unrecognized opcode `prefetch\.r \(x16\)', extension `zicbop' required +.*: Error: unrecognized opcode `prefetch\.r -2048\(x16\)', extension `zicbop' required +.*: Error: unrecognized opcode `prefetch\.w \(x31\)', extension `zicbop' required +.*: Error: unrecognized opcode `prefetch\.w \+0x7e0\(x31\)', extension `zicbop' required diff --git a/gas/testsuite/gas/riscv/zicbop.d b/gas/testsuite/gas/riscv/zicbop.d index 056a8a501ff..b19ead39cd6 100644 --- a/gas/testsuite/gas/riscv/zicbop.d +++ b/gas/testsuite/gas/riscv/zicbop.d @@ -1,12 +1,14 @@ -#as: -march=rv64g_zicbop -#source: zicbop.s -#objdump: -dr +#as: -march=rv32i -I$srcdir/$subdir +#objdump: -d .*:[ ]+file format .* Disassembly of section .text: 0+000 : +[ ]+[0-9a-f]+:[ ]+0000e013[ ]+prefetch\.i[ ]+0\(ra\) [ ]+[0-9a-f]+:[ ]+0200e013[ ]+prefetch\.i[ ]+32\(ra\) +[ ]+[0-9a-f]+:[ ]+00186013[ ]+prefetch\.r[ ]+0\(a6\) [ ]+[0-9a-f]+:[ ]+80186013[ ]+prefetch\.r[ ]+-2048\(a6\) +[ ]+[0-9a-f]+:[ ]+003fe013[ ]+prefetch\.w[ ]+0\(t6\) [ ]+[0-9a-f]+:[ ]+7e3fe013[ ]+prefetch\.w[ ]+2016\(t6\) diff --git a/gas/testsuite/gas/riscv/zicbop.s b/gas/testsuite/gas/riscv/zicbop.s index ffe2014be6f..698bb5d0d8e 100644 --- a/gas/testsuite/gas/riscv/zicbop.s +++ b/gas/testsuite/gas/riscv/zicbop.s @@ -1,4 +1,11 @@ +.include "testutils.inc" + target: + SET_ARCH_START +zicbop + prefetch.i (x1) prefetch.i 0x20(x1) + prefetch.r (x16) prefetch.r -2048(x16) + prefetch.w (x31) prefetch.w +0x7e0(x31) + SET_ARCH_END