From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi1-x236.google.com (mail-oi1-x236.google.com [IPv6:2607:f8b0:4864:20::236]) by sourceware.org (Postfix) with ESMTPS id C76113858D1E for ; Tue, 29 Nov 2022 08:51:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C76113858D1E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivosinc.com Received: by mail-oi1-x236.google.com with SMTP id q186so14421500oia.9 for ; Tue, 29 Nov 2022 00:51:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=5G6yyYyM8N5OLxJ0ZHMn6M+KJP4XbyuucOtbiVuCoYM=; b=JM87X3INH0j0TGTTqtBuPXegS25EEEs7W5u+RgI+D+fqBQjKZ8dL6VQbwlwiK6Uchm /Q5QvkNmdvJctJCs3bUaeFF3JqEWjLbGXLa6a1CiWcpYUTmY1ksYwEQPXOzlvwWbBKtI QBoSke7gBQAWO2YZXx6ZJTWENO9LlYrL95Z2epnWo8Zf5tV40z9lL9YmV87iFz5Rr2QA H3b0n4BvTcXpPDJdk054eozsp0WQdBgEx1E4oJIKVZVG4jkTkq6cwFnO9zlANQ9Kro66 JxuReBe+d35lipJl1kX0kcpNVGr3Fvpsb2EiP9pBmka8bKMqtcFOJrNj4biAlNdnC7zd ocfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5G6yyYyM8N5OLxJ0ZHMn6M+KJP4XbyuucOtbiVuCoYM=; b=m7BjoSHR0hSB6rYqXOTeq3ZXosLX7gVLj1J88vqeWc1N56lbk0KvGUYBXvj9roDkyN sE4rJGjbnaibTM+sE7QzN00jPXU73LN2EYtkdvVN2NYbZUdNnFoS3GKF5pUvYuTWujUA Tcb4XmtMMyuIsH7vD9rTAJhQUuMyYt0iQh9cOhlFr551uvbaBSSQKZLOe8BplWRB+sKe cg87nvSatx9nlqU4t1CYjEGG+3hFiTq5tIdzf2sPPbAqF9ZNrA40pdGzdOQ7q52E7vli IY5AOHhxO7hyJWT2bC2MubJwXhQxscaxo75Hp2iV5KTGl9wwxt37F+7RPS0fbnaCsxUV rUew== X-Gm-Message-State: ANoB5pnFQuPXbDd4KKc5mqYfFpNhHK/Uyrnufilc3TFPyxFS4CRVzJeF lNTetpTnjGJvUvj2rqBXEv5XBZcbyFlRMNV7vAA/Dwh/TDcehw== X-Google-Smtp-Source: AA0mqf5iXhTPPB53nZOuS2iaGgbPqbI+lwShnWwVsxjuO0wwfapBq7gu/+rKN2qtaHTOJnIR3q4yqBf7LmSxtTGP7oM= X-Received: by 2002:a54:4694:0:b0:35a:83c1:ce7 with SMTP id k20-20020a544694000000b0035a83c10ce7mr16132823oic.107.1669711875196; Tue, 29 Nov 2022 00:51:15 -0800 (PST) MIME-Version: 1.0 References: <9c47e59868a64b13e5a7bb487e3619d4f1497d78.1667651354.git.research_trasio@irq.a4lg.com> In-Reply-To: <9c47e59868a64b13e5a7bb487e3619d4f1497d78.1667651354.git.research_trasio@irq.a4lg.com> From: Nelson Chu Date: Tue, 29 Nov 2022 16:51:04 +0800 Message-ID: Subject: Re: [PATCH 10/12] RISC-V: Enhance 'Zicbop' testcases To: Tsukasa OI Cc: Kito Cheng , Palmer Dabbelt , binutils@sourceware.org Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,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 List-Id: On Sat, Nov 5, 2022 at 8:31 PM Tsukasa OI wrote: > > 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. I suggest moving the zicbop into zicbom-zicboz test case, and don't care the no-arch test cases for now. Nelson > 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 This is only one extension needed to add, so don't need the mapping symbols. > -- > 2.37.2 >