Patchwork [v3,11/11] sim/testsuite/or1k: Add tests for unordered compares

login
register
mail settings
Submitter Stafford Horne
Date June 10, 2019, 8:49 p.m.
Message ID <20190610204940.3846-2-shorne@gmail.com>
Download mbox | patch
Permalink /patch/33073/
State New
Headers show

Comments

Stafford Horne - June 10, 2019, 8:49 p.m.
Add tests for 32-bit and 64-bit unordered compare instructions.

sim/testsuite/sim/or1k/ChangeLog:

yyyy-mm-dd  Stafford Horne  <shorne@gmail.com>

	* fpu-unordered.S: New file.
	* fpu64a32-unordered.S: New file.
---
Changes since v2:
 - new patch

 sim/testsuite/sim/or1k/fpu-unordered.S      |  97 +++++++++++++++++++
 sim/testsuite/sim/or1k/fpu64a32-unordered.S | 100 ++++++++++++++++++++
 2 files changed, 197 insertions(+)
 create mode 100644 sim/testsuite/sim/or1k/fpu-unordered.S
 create mode 100644 sim/testsuite/sim/or1k/fpu64a32-unordered.S
Andrew Burgess - June 11, 2019, 9:49 p.m.
* Stafford Horne <shorne@gmail.com> [2019-06-11 05:49:40 +0900]:

> Add tests for 32-bit and 64-bit unordered compare instructions.
> 
> sim/testsuite/sim/or1k/ChangeLog:
> 
> yyyy-mm-dd  Stafford Horne  <shorne@gmail.com>
> 
> 	* fpu-unordered.S: New file.
> 	* fpu64a32-unordered.S: New file.

This is fine with the nits below fixed.

Thanks,
Andrew


> ---
> Changes since v2:
>  - new patch
> 
>  sim/testsuite/sim/or1k/fpu-unordered.S      |  97 +++++++++++++++++++
>  sim/testsuite/sim/or1k/fpu64a32-unordered.S | 100 ++++++++++++++++++++
>  2 files changed, 197 insertions(+)
>  create mode 100644 sim/testsuite/sim/or1k/fpu-unordered.S
>  create mode 100644 sim/testsuite/sim/or1k/fpu64a32-unordered.S
> 
> diff --git a/sim/testsuite/sim/or1k/fpu-unordered.S b/sim/testsuite/sim/or1k/fpu-unordered.S
> new file mode 100644
> index 0000000000..bf229878bb
> --- /dev/null
> +++ b/sim/testsuite/sim/or1k/fpu-unordered.S
> @@ -0,0 +1,97 @@
> +/* Tests some basic unordered fpu compare instructions.
> +
> +   Copyright (C) 2017-2019 Free Software Foundation, Inc.

Date range should be '2019' only.


> +
> +   This program is free software; you can redistribute it and/or modify
> +   it under the terms of the GNU General Public License as published by
> +   the Free Software Foundation; either version 3 of the License, or
> +   (at your option) any later version.
> +
> +   This program is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +   GNU General Public License for more details.
> +
> +   You should have received a copy of the GNU General Public License
> +   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
> +
> +# mach: or1k
> +# output: report(0x40490fd0);\n
> +# output: report(0x402df84d);\n
> +# output: report(0x7fc00000);\n
> +# output: \n
> +# output: report(0x00000001);\n
> +# output: \n
> +# output: report(0x00000000);\n
> +# output: \n
> +# output: report(0x00000001);\n
> +# output: \n
> +# output: report(0x00000001);\n
> +# output: \n
> +# output: exit(0)\n
> +
> +#include "or1k-asm-test-helpers.h"
> +
> +	STANDARD_TEST_ENVIRONMENT
> +
> +	.section .data
> +	.align 4
> +	.type   pi, @object
> +	.size   pi, 4
> +anchor:
> +pi:
> +	.float  3.14159
> +
> +	.type   e, @object
> +	.size   e, 4
> +e:
> +	.float  2.71828
> +
> +	.section .text
> +start_tests:
> +	PUSH LINK_REGISTER_R9
> +
> +	/* Test unordered float comparisons.  Setting up:
> +	 *  r11      pointer to data
> +	 *  r12  pi  as float
> +	 *  r13  e   as float
> +	 *  r16  nan as float
> +	 */
> +	l.ori	r11, r0, ha(anchor)
> +	l.addi	r11, r11, lo(anchor)
> +	l.lwz	r12, 0(r11)
> +
> +	l.lwz	r13, 4(r11)
> +
> +	/* Make a NaN.  */
> +	lf.sub.s r16, r13, r13
> +	lf.div.s r16, r16, r16
> +
> +	/* Output to ensure we loaded it correctly.  */
> +	REPORT_REG_TO_CONSOLE r12
> +	REPORT_REG_TO_CONSOLE r13
> +	REPORT_REG_TO_CONSOLE r16
> +	PRINT_NEWLINE_TO_CONSOLE
> +
> +	lf.sfuge.s r12, r13
> +	MOVE_FROM_SPR r2, SPR_SR
> +	REPORT_BIT_TO_CONSOLE r2, SPR_SR_F
> +	PRINT_NEWLINE_TO_CONSOLE
> +
> +	lf.sfun.s r12, r13
> +	MOVE_FROM_SPR r2, SPR_SR
> +	REPORT_BIT_TO_CONSOLE r2, SPR_SR_F
> +	PRINT_NEWLINE_TO_CONSOLE
> +
> +	lf.sfun.s r12, r16
> +	MOVE_FROM_SPR r2, SPR_SR
> +	REPORT_BIT_TO_CONSOLE r2, SPR_SR_F
> +	PRINT_NEWLINE_TO_CONSOLE
> +
> +	lf.sfueq.s r12, r12
> +	MOVE_FROM_SPR r2, SPR_SR
> +	REPORT_BIT_TO_CONSOLE r2, SPR_SR_F
> +	PRINT_NEWLINE_TO_CONSOLE
> +
> +	POP LINK_REGISTER_R9
> +	RETURN_TO_LINK_REGISTER_R9
> diff --git a/sim/testsuite/sim/or1k/fpu64a32-unordered.S b/sim/testsuite/sim/or1k/fpu64a32-unordered.S
> new file mode 100644
> index 0000000000..31c9ee4a33
> --- /dev/null
> +++ b/sim/testsuite/sim/or1k/fpu64a32-unordered.S
> @@ -0,0 +1,100 @@
> +/* Tests some basic unordered fpu compare instructions.
> +
> +   Copyright (C) 2017-2019 Free Software Foundation, Inc.

Date range should be '2019' only.

> +
> +   This program is free software; you can redistribute it and/or modify
> +   it under the terms of the GNU General Public License as published by
> +   the Free Software Foundation; either version 3 of the License, or
> +   (at your option) any later version.
> +
> +   This program is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +   GNU General Public License for more details.
> +
> +   You should have received a copy of the GNU General Public License
> +   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
> +
> +# mach: or1k
> +# output: report(0x400921f9);\n
> +# output: report(0xf01b866e);\n
> +# output: report(0x4005bf09);\n
> +# output: report(0x95aaf790);\n
> +# output: report(0x7ff80000);\n
> +# output: report(0x00000000);\n
> +# output: \n
> +# output: report(0x00000001);\n
> +# output: \n
> +# output: report(0x00000000);\n
> +# output: \n
> +# output: report(0x00000001);\n
> +# output: \n
> +# output: exit(0)\n
> +
> +#include "or1k-asm-test-helpers.h"
> +
> +	STANDARD_TEST_ENVIRONMENT
> +
> +	.section .data
> +	.align 4
> +	.type   pi, @object
> +	.size   pi, 8
> +anchor:
> +pi:
> +	.double  3.14159
> +
> +	.type   e, @object
> +	.size   e, 8
> +e:
> +	.double  2.71828
> +
> +	.section .text
> +start_tests:
> +	PUSH LINK_REGISTER_R9
> +
> +	/* Test unordered double comparisons.  Setting up:
> +	 *  r11      pointer to data
> +	 *  r12,r13  pi  as double
> +	 *  r14,r15  e   as double
> +	 *  r16,r17  nan as double
> +	 */
> +	l.ori	r11, r0, ha(anchor)
> +	l.addi	r11, r11, lo(anchor)
> +	l.lwz	r12, 0(r11)
> +	l.lwz	r13, 4(r11)
> +
> +	l.lwz	r14, 8(r11)
> +	l.lwz	r15, 12(r11)
> +
> +	/* Make a NaN.  */
> +	lf.sub.d r16,r18, r12,r13, r12,r13
> +	lf.div.d r16,r18, r16,r18, r16,r18
> +
> +	/* Output to ensure we loaded it correctly.  */
> +	REPORT_REG_TO_CONSOLE r12
> +	REPORT_REG_TO_CONSOLE r13
> +
> +	REPORT_REG_TO_CONSOLE r14
> +	REPORT_REG_TO_CONSOLE r15
> +
> +	REPORT_REG_TO_CONSOLE r16
> +	REPORT_REG_TO_CONSOLE r18
> +	PRINT_NEWLINE_TO_CONSOLE
> +
> +	lf.sfuge.d r12,r13, r14,r15
> +	MOVE_FROM_SPR r2, SPR_SR
> +	REPORT_BIT_TO_CONSOLE r2, SPR_SR_F
> +	PRINT_NEWLINE_TO_CONSOLE
> +
> +	lf.sfun.d r12,r13, r14,r15
> +	MOVE_FROM_SPR r2, SPR_SR
> +	REPORT_BIT_TO_CONSOLE r2, SPR_SR_F
> +	PRINT_NEWLINE_TO_CONSOLE
> +
> +	lf.sfun.d r12,r13, r16,r18
> +	MOVE_FROM_SPR r2, SPR_SR
> +	REPORT_BIT_TO_CONSOLE r2, SPR_SR_F
> +	PRINT_NEWLINE_TO_CONSOLE
> +
> +	POP LINK_REGISTER_R9
> +	RETURN_TO_LINK_REGISTER_R9
> -- 
> 2.21.0
>
Stafford Horne - June 12, 2019, 1:11 p.m.
On Tue, Jun 11, 2019 at 10:49:12PM +0100, Andrew Burgess wrote:
> * Stafford Horne <shorne@gmail.com> [2019-06-11 05:49:40 +0900]:
> 
> > Add tests for 32-bit and 64-bit unordered compare instructions.
> > 
> > sim/testsuite/sim/or1k/ChangeLog:
> > 
> > yyyy-mm-dd  Stafford Horne  <shorne@gmail.com>
> > 
> > 	* fpu-unordered.S: New file.
> > 	* fpu64a32-unordered.S: New file.
> 
> This is fine with the nits below fixed.

Sure, I will fix them.  Please note there are other patches for the sim that
have been updated (mostly regens from the binutils updates).

Also, this all depends on a cgen patch as well that is pending review.  So I
will wait to commit until cgen is reviewed.

-Stafford

Patch

diff --git a/sim/testsuite/sim/or1k/fpu-unordered.S b/sim/testsuite/sim/or1k/fpu-unordered.S
new file mode 100644
index 0000000000..bf229878bb
--- /dev/null
+++ b/sim/testsuite/sim/or1k/fpu-unordered.S
@@ -0,0 +1,97 @@ 
+/* Tests some basic unordered fpu compare instructions.
+
+   Copyright (C) 2017-2019 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+# mach: or1k
+# output: report(0x40490fd0);\n
+# output: report(0x402df84d);\n
+# output: report(0x7fc00000);\n
+# output: \n
+# output: report(0x00000001);\n
+# output: \n
+# output: report(0x00000000);\n
+# output: \n
+# output: report(0x00000001);\n
+# output: \n
+# output: report(0x00000001);\n
+# output: \n
+# output: exit(0)\n
+
+#include "or1k-asm-test-helpers.h"
+
+	STANDARD_TEST_ENVIRONMENT
+
+	.section .data
+	.align 4
+	.type   pi, @object
+	.size   pi, 4
+anchor:
+pi:
+	.float  3.14159
+
+	.type   e, @object
+	.size   e, 4
+e:
+	.float  2.71828
+
+	.section .text
+start_tests:
+	PUSH LINK_REGISTER_R9
+
+	/* Test unordered float comparisons.  Setting up:
+	 *  r11      pointer to data
+	 *  r12  pi  as float
+	 *  r13  e   as float
+	 *  r16  nan as float
+	 */
+	l.ori	r11, r0, ha(anchor)
+	l.addi	r11, r11, lo(anchor)
+	l.lwz	r12, 0(r11)
+
+	l.lwz	r13, 4(r11)
+
+	/* Make a NaN.  */
+	lf.sub.s r16, r13, r13
+	lf.div.s r16, r16, r16
+
+	/* Output to ensure we loaded it correctly.  */
+	REPORT_REG_TO_CONSOLE r12
+	REPORT_REG_TO_CONSOLE r13
+	REPORT_REG_TO_CONSOLE r16
+	PRINT_NEWLINE_TO_CONSOLE
+
+	lf.sfuge.s r12, r13
+	MOVE_FROM_SPR r2, SPR_SR
+	REPORT_BIT_TO_CONSOLE r2, SPR_SR_F
+	PRINT_NEWLINE_TO_CONSOLE
+
+	lf.sfun.s r12, r13
+	MOVE_FROM_SPR r2, SPR_SR
+	REPORT_BIT_TO_CONSOLE r2, SPR_SR_F
+	PRINT_NEWLINE_TO_CONSOLE
+
+	lf.sfun.s r12, r16
+	MOVE_FROM_SPR r2, SPR_SR
+	REPORT_BIT_TO_CONSOLE r2, SPR_SR_F
+	PRINT_NEWLINE_TO_CONSOLE
+
+	lf.sfueq.s r12, r12
+	MOVE_FROM_SPR r2, SPR_SR
+	REPORT_BIT_TO_CONSOLE r2, SPR_SR_F
+	PRINT_NEWLINE_TO_CONSOLE
+
+	POP LINK_REGISTER_R9
+	RETURN_TO_LINK_REGISTER_R9
diff --git a/sim/testsuite/sim/or1k/fpu64a32-unordered.S b/sim/testsuite/sim/or1k/fpu64a32-unordered.S
new file mode 100644
index 0000000000..31c9ee4a33
--- /dev/null
+++ b/sim/testsuite/sim/or1k/fpu64a32-unordered.S
@@ -0,0 +1,100 @@ 
+/* Tests some basic unordered fpu compare instructions.
+
+   Copyright (C) 2017-2019 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+# mach: or1k
+# output: report(0x400921f9);\n
+# output: report(0xf01b866e);\n
+# output: report(0x4005bf09);\n
+# output: report(0x95aaf790);\n
+# output: report(0x7ff80000);\n
+# output: report(0x00000000);\n
+# output: \n
+# output: report(0x00000001);\n
+# output: \n
+# output: report(0x00000000);\n
+# output: \n
+# output: report(0x00000001);\n
+# output: \n
+# output: exit(0)\n
+
+#include "or1k-asm-test-helpers.h"
+
+	STANDARD_TEST_ENVIRONMENT
+
+	.section .data
+	.align 4
+	.type   pi, @object
+	.size   pi, 8
+anchor:
+pi:
+	.double  3.14159
+
+	.type   e, @object
+	.size   e, 8
+e:
+	.double  2.71828
+
+	.section .text
+start_tests:
+	PUSH LINK_REGISTER_R9
+
+	/* Test unordered double comparisons.  Setting up:
+	 *  r11      pointer to data
+	 *  r12,r13  pi  as double
+	 *  r14,r15  e   as double
+	 *  r16,r17  nan as double
+	 */
+	l.ori	r11, r0, ha(anchor)
+	l.addi	r11, r11, lo(anchor)
+	l.lwz	r12, 0(r11)
+	l.lwz	r13, 4(r11)
+
+	l.lwz	r14, 8(r11)
+	l.lwz	r15, 12(r11)
+
+	/* Make a NaN.  */
+	lf.sub.d r16,r18, r12,r13, r12,r13
+	lf.div.d r16,r18, r16,r18, r16,r18
+
+	/* Output to ensure we loaded it correctly.  */
+	REPORT_REG_TO_CONSOLE r12
+	REPORT_REG_TO_CONSOLE r13
+
+	REPORT_REG_TO_CONSOLE r14
+	REPORT_REG_TO_CONSOLE r15
+
+	REPORT_REG_TO_CONSOLE r16
+	REPORT_REG_TO_CONSOLE r18
+	PRINT_NEWLINE_TO_CONSOLE
+
+	lf.sfuge.d r12,r13, r14,r15
+	MOVE_FROM_SPR r2, SPR_SR
+	REPORT_BIT_TO_CONSOLE r2, SPR_SR_F
+	PRINT_NEWLINE_TO_CONSOLE
+
+	lf.sfun.d r12,r13, r14,r15
+	MOVE_FROM_SPR r2, SPR_SR
+	REPORT_BIT_TO_CONSOLE r2, SPR_SR_F
+	PRINT_NEWLINE_TO_CONSOLE
+
+	lf.sfun.d r12,r13, r16,r18
+	MOVE_FROM_SPR r2, SPR_SR
+	REPORT_BIT_TO_CONSOLE r2, SPR_SR_F
+	PRINT_NEWLINE_TO_CONSOLE
+
+	POP LINK_REGISTER_R9
+	RETURN_TO_LINK_REGISTER_R9