diff mbox series

[04/12] RISC-V: GAS: Add basic shared test utilities

Message ID	6a020edd0e114a003edbaafe1088a040e9fa07e7.1667651354.git.research_trasio@irq.a4lg.com
State	Accepted
Headers	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; DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 16DEB3858431 To: Tsukasa OI <research_trasio@irq.a4lg.com>, Nelson Chu <nelson@rivosinc.com>, Kito Cheng <kito.cheng@sifive.com>, Palmer Dabbelt <palmer@dabbelt.com> Subject: [PATCH 04/12] RISC-V: GAS: Add basic shared test utilities Date: Sat, 5 Nov 2022 12:29:10 +0000 Message-Id: <6a020edd0e114a003edbaafe1088a040e9fa07e7.1667651354.git.research_trasio@irq.a4lg.com> In-Reply-To: <cover.1667651354.git.research_trasio@irq.a4lg.com> References: <cover.1667651354.git.research_trasio@irq.a4lg.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list From: Tsukasa OI via Binutils <binutils@sourceware.org> Reply-To: Tsukasa OI <research_trasio@irq.a4lg.com> Cc: binutils@sourceware.org Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" <binutils-bounces+ouuuleilei=gmail.com@sourceware.org> X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
Series	RISC-V: Test refinements (Batch 1) \| [00/12] RISC-V: Test refinements (Batch 1) [01/12] RISC-V: Remove unnecessary empty matching file [02/12] RISC-V: Tidy disassembler corner case tests [03/12] RISC-V: Tidying related to 'Zfinx' disassembler test [04/12] RISC-V: GAS: Add basic shared test utilities [05/12] RISC-V: Redefine "nop" test [06/12] RISC-V: Reorganize/enhance {sign, zero}-extension instructions [07/12] RISC-V: Combine complex extension error handling tests [08/12] RISC-V: Refine/enhance 'M'/'Zmmul' extension tests [09/12] RISC-V: Combine/enhance 'Zicbo[mz]' extension tests [10/12] RISC-V: Enhance 'Zicbop' testcases [11/12] RISC-V: Reorganize/enhance 'Zb' extension tests [12/12] RISC-V: Combine/enhance 'Zk'/'Zbk*' extension tests

Checks

Context	Check	Description
snail/binutils-gdb-check	success	Github commit url

Commit Message

Tsukasa OI Nov. 5, 2022, 12:29 p.m. UTC

  This commit adds basic shared test utilities intended for future
extension tests.

gas/ChangeLog:

	* testsuite/gas/riscv/testutils.inc: New test utilities.
---
 gas/testsuite/gas/riscv/testutils.inc | 113 ++++++++++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 gas/testsuite/gas/riscv/testutils.inc

Comments

Nelson Chu Nov. 29, 2022, 7:53 a.m. UTC | #1

I disagree with this change.  This make testcase too complicated.
Besides, I also don't prefer to add something only used for future
purposes.  Just add the stuff when we really need it.

Nelson

On Sat, Nov 5, 2022 at 8:30 PM Tsukasa OI <research_trasio@irq.a4lg.com> wrote:
>
> This commit adds basic shared test utilities intended for future
> extension tests.
>
> gas/ChangeLog:
>
>         * testsuite/gas/riscv/testutils.inc: New test utilities.
> ---
>  gas/testsuite/gas/riscv/testutils.inc | 113 ++++++++++++++++++++++++++
>  1 file changed, 113 insertions(+)
>  create mode 100644 gas/testsuite/gas/riscv/testutils.inc
>
> diff --git a/gas/testsuite/gas/riscv/testutils.inc b/gas/testsuite/gas/riscv/testutils.inc
> new file mode 100644
> index 00000000000..009484eefed
> --- /dev/null
> +++ b/gas/testsuite/gas/riscv/testutils.inc
> @@ -0,0 +1,113 @@
> +# Set NOARCH symbols.
> +.ifndef        NOARCH
> +.set   NOARCH, 0
> +.endif
> +.ifndef        NOARCH_ARCH
> +.set   NOARCH_ARCH, 0
> +.endif
> +.ifndef        NOARCH_XLEN
> +.set   NOARCH_XLEN, 0
> +.endif
> +.if    NOARCH
> +.set   NOARCH_ARCH, 1
> +.set   NOARCH_XLEN, 1
> +.endif
> +
> +# Update XLEN constraint symbols.
> +# For intentional error handling tests, .if SYM ... .endif block should be
> +# used to test those varibales.
> +.macro UPDATE_XLEN
> +       .if     NOARCH_XLEN
> +               # When NOARCH_XLEN is set,
> +               # set those variables to "invalid" 1 to generate errors.
> +               .set    XLEN_EQ_32, 1
> +               .set    XLEN_EQ_64, 1
> +               .set    XLEN_GE_64, 1
> +       .else
> +               # Set symbol values depending on the XLEN.
> +               .ifdef  XLEN
> +                       .ifeq   XLEN-32
> +                       .set    XLEN_EQ_32, 1
> +                       .else
> +                       .set    XLEN_EQ_32, 0
> +                       .endif
> +                       .ifeq   XLEN-64
> +                       .set    XLEN_EQ_64, 1
> +                       .else
> +                       .set    XLEN_EQ_64, 0
> +                       .endif
> +                       .ifge   XLEN-64
> +                       .set    XLEN_GE_64, 1
> +                       .else
> +                       .set    XLEN_GE_64, 0
> +                       .endif
> +               .else
> +                       .set    XLEN_EQ_32, 0
> +                       .set    XLEN_EQ_64, 0
> +                       .set    XLEN_GE_64, 0
> +               .endif
> +       .endif
> +.endm
> +UPDATE_XLEN
> +
> +# Set the base architecture.
> +.macro SET_BASE_FORCE xlen, basearch=i
> +       .option arch, rv\xlen\basearch
> +       .set    XLEN, \xlen
> +       UPDATE_XLEN
> +.endm
> +
> +# Set the base architecture unless the symbol NOARCH_ARCH is set.
> +.macro SET_BASE xlen, basearch=i
> +       .if     !NOARCH_ARCH
> +       SET_BASE_FORCE  \xlen, \basearch
> +       .endif
> +.endm
> +
> +# Begin base architecture block.
> +.macro SET_BASE_START_FORCE xlen, basearch=i
> +       .option         push
> +       SET_BASE_FORCE  \xlen, \basearch
> +.endm
> +
> +# Begin base architecture block.
> +# Don't change the architecture if NOARCH_ARCH is set.
> +.macro SET_BASE_START xlen, basearch=i
> +       .option         push
> +       SET_BASE        \xlen, \basearch
> +.endm
> +
> +# End base architecture block.
> +.macro SET_BASE_END
> +       .option pop
> +.endm
> +
> +# Set the architecture.
> +.macro SET_ARCH_FORCE arch
> +       .option arch, \arch
> +.endm
> +
> +# Set the architecture unless the symbol NOARCH_ARCH is set.
> +.macro SET_ARCH arch
> +       .ifeq   NOARCH_ARCH-0
> +       SET_ARCH_FORCE  \arch
> +       .endif
> +.endm
> +
> +# Begin architecture block.
> +.macro SET_ARCH_START_FORCE arch
> +       .option         push
> +       SET_ARCH_FORCE  \arch
> +.endm
> +
> +# Begin architecture block.
> +# Don't change the architecture if NOARCH_ARCH is set.
> +.macro SET_ARCH_START arch
> +       .option         push
> +       SET_ARCH        \arch
> +.endm
> +
> +# End architecture block.
> +.macro SET_ARCH_END
> +       .option pop
> +.endm
> --
> 2.37.2
>

diff mbox series

Patch

diff --git a/gas/testsuite/gas/riscv/testutils.inc b/gas/testsuite/gas/riscv/testutils.inc
new file mode 100644
index 00000000000..009484eefed
--- /dev/null
+++ b/gas/testsuite/gas/riscv/testutils.inc
@@ -0,0 +1,113 @@ 
+# Set NOARCH symbols.
+.ifndef	NOARCH
+.set	NOARCH, 0
+.endif
+.ifndef	NOARCH_ARCH
+.set	NOARCH_ARCH, 0
+.endif
+.ifndef	NOARCH_XLEN
+.set	NOARCH_XLEN, 0
+.endif
+.if	NOARCH
+.set	NOARCH_ARCH, 1
+.set	NOARCH_XLEN, 1
+.endif
+
+# Update XLEN constraint symbols.
+# For intentional error handling tests, .if SYM ... .endif block should be
+# used to test those varibales.
+.macro	UPDATE_XLEN
+	.if	NOARCH_XLEN
+		# When NOARCH_XLEN is set,
+		# set those variables to "invalid" 1 to generate errors.
+		.set	XLEN_EQ_32, 1
+		.set	XLEN_EQ_64, 1
+		.set	XLEN_GE_64, 1
+	.else
+		# Set symbol values depending on the XLEN.
+		.ifdef	XLEN
+			.ifeq	XLEN-32
+			.set	XLEN_EQ_32, 1
+			.else
+			.set	XLEN_EQ_32, 0
+			.endif
+			.ifeq	XLEN-64
+			.set	XLEN_EQ_64, 1
+			.else
+			.set	XLEN_EQ_64, 0
+			.endif
+			.ifge	XLEN-64
+			.set	XLEN_GE_64, 1
+			.else
+			.set	XLEN_GE_64, 0
+			.endif
+		.else
+			.set	XLEN_EQ_32, 0
+			.set	XLEN_EQ_64, 0
+			.set	XLEN_GE_64, 0
+		.endif
+	.endif
+.endm
+UPDATE_XLEN
+
+# Set the base architecture.
+.macro	SET_BASE_FORCE xlen, basearch=i
+	.option	arch, rv\xlen\basearch
+	.set	XLEN, \xlen
+	UPDATE_XLEN
+.endm
+
+# Set the base architecture unless the symbol NOARCH_ARCH is set.
+.macro	SET_BASE xlen, basearch=i
+	.if	!NOARCH_ARCH
+	SET_BASE_FORCE	\xlen, \basearch
+	.endif
+.endm
+
+# Begin base architecture block.
+.macro	SET_BASE_START_FORCE xlen, basearch=i
+	.option		push
+	SET_BASE_FORCE	\xlen, \basearch
+.endm
+
+# Begin base architecture block.
+# Don't change the architecture if NOARCH_ARCH is set.
+.macro	SET_BASE_START xlen, basearch=i
+	.option		push
+	SET_BASE	\xlen, \basearch
+.endm
+
+# End base architecture block.
+.macro	SET_BASE_END
+	.option	pop
+.endm
+
+# Set the architecture.
+.macro	SET_ARCH_FORCE arch
+	.option	arch, \arch
+.endm
+
+# Set the architecture unless the symbol NOARCH_ARCH is set.
+.macro	SET_ARCH arch
+	.ifeq	NOARCH_ARCH-0
+	SET_ARCH_FORCE	\arch
+	.endif
+.endm
+
+# Begin architecture block.
+.macro	SET_ARCH_START_FORCE arch
+	.option		push
+	SET_ARCH_FORCE	\arch
+.endm
+
+# Begin architecture block.
+# Don't change the architecture if NOARCH_ARCH is set.
+.macro	SET_ARCH_START arch
+	.option		push
+	SET_ARCH	\arch
+.endm
+
+# End architecture block.
+.macro	SET_ARCH_END
+	.option	pop
+.endm