Skip to contentSkip to conversation

sim/testsuite/or1k: Add test case for l.adrp instruction

PATCH Superseded Stafford Horne 2 participants 6 messages Jun 10, 2019 – Jun 12, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v3 10/11 sim/testsuite/or1k: Add test case for l.adrp instruction

This is a simple test to ensure that the l.adrp instruction can be assembled and simulated correctly.

sim/testsuite/sim/or1k/ChangeLog:

yyyy-mm-dd Stafford Horne <[email protected]>

* adrp.S: New file.
---
Changes since v2:
- new patch

 sim/testsuite/sim/or1k/adrp.S | 73 +++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 sim/testsuite/sim/or1k/adrp.S
sim/testsuite/sim/or1k/adrp.S new file +73 -0
new file mode 100644
index 0000000000..ba384ccc84
@@ -0,0 +1,73 @@
+/* Tests the load page address instruction.
+
+   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(0x00002064);\n
+# output: report(0x00012138);\n
+# output: report(0x00002000);\n
+# output: report(0x00012000);\n
+# output: report(0x00002000);\n
+# output: report(0x00014000);\n
+# output: report(0x00000000);\n
+# output: exit(0)\n
+
+#include "or1k-asm-test-helpers.h"
+
+	STANDARD_TEST_ENVIRONMENT
+
+	.section .data
+	.org 0x10000
+	.align 4
+	.type   pi, @object
+	.size   pi, 4
+pi:
+	.float	3.14159
+
+	.section .text
+start_tests:
+	PUSH LINK_REGISTER_R9
+
+	/* Print out the PC.  To compare with that loaded by l.adrp.  */
+	l.jal	capture_pc
+	 l.nop
+capture_pc:
+	REPORT_REG_TO_CONSOLE r9
+
+	/* Print out our data address to compared with l.adrp offset.  */
+	l.movhi	r11, ha(pi)
+	l.addi	r11, r11, lo(pi)
+	REPORT_REG_TO_CONSOLE r11
+
+	/* Test l.adrp with symbols, loads page of symbol to register.  */
+	l.adrp	r4, start_tests
+	REPORT_REG_TO_CONSOLE r4
+
+	l.adrp	r4, pi
+	REPORT_REG_TO_CONSOLE r4
+
+	/* Test l.adrp with immediate, immediate is the page offset.  */
+	l.adrp	r4, 0x0
+	REPORT_REG_TO_CONSOLE r4
+
+	l.adrp	r4, 0x12000
+	REPORT_REG_TO_CONSOLE r4
+
+	l.adrp	r4, -0x2000
+	REPORT_REG_TO_CONSOLE r4
+
+	POP LINK_REGISTER_R9
+	RETURN_TO_LINK_REGISTER_R9
Signature · 1 line
2.21.0
#1 lore raw

PATCH v3 11/11 sim/testsuite/or1k: Add tests for unordered compares

Add tests for 32-bit and 64-bit unordered compare instructions.

sim/testsuite/sim/or1k/ChangeLog:

yyyy-mm-dd Stafford Horne <[email protected]>

* 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
sim/testsuite/sim/or1k/fpu-unordered.S new file +97 -0
new file mode 100644
index 0000000000..bf229878bb
@@ -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
sim/testsuite/sim/or1k/fpu64a32-unordered.S new file +100 -0

100 lines not on this page · raw message

Signature · 1 line
2.21.0
#2 lore raw

PATCH v3 11/11 sim/testsuite/or1k: Add tests for unordered compares

Quoted 8 lines · Stafford Horne

Add tests for 32-bit and 64-bit unordered compare instructions.

sim/testsuite/sim/or1k/ChangeLog:

yyyy-mm-dd Stafford Horne <[email protected]>

* fpu-unordered.S: New file.
* fpu64a32-unordered.S: New file.

This is fine with the nits below fixed.

Thanks,
Andrew

Quoted 16 lines

---
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
sim/testsuite/sim/or1k/fpu-unordered.S new file +0 -0
new file mode 100644
index 0000000000..bf229878bb

sim/testsuite/sim/or1k/fpu-unordered.S line 3

Quoted 3 lines
sim/testsuite/sim/or1k/fpu-unordered.S new file +3 -0
@@ -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.

Quoted 100 lines
sim/testsuite/sim/or1k/fpu-unordered.S new file +94 -0
+
+   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
sim/testsuite/sim/or1k/fpu64a32-unordered.S new file +0 -0
new file mode 100644
index 0000000000..31c9ee4a33

sim/testsuite/sim/or1k/fpu64a32-unordered.S line 3

Quoted 3 lines
sim/testsuite/sim/or1k/fpu64a32-unordered.S new file +3 -0
@@ -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.

Quoted 100 lines
sim/testsuite/sim/or1k/fpu64a32-unordered.S new file +97 -0
+
+   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
Signature · 1 line
2.21.0
#3 lore raw

PATCH v3 11/11 sim/testsuite/or1k: Add tests for unordered compares

Quoted 4 lines · Andrew Burgess
Quoted 2 lines · Stafford Horne

Add tests for 32-bit and 64-bit unordered compare instructions.

Quoted 8 lines
Quoted 6 lines

sim/testsuite/sim/or1k/ChangeLog:

yyyy-mm-dd Stafford Horne <[email protected]>

* 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

#4 lore raw

PATCH v3 10/11 sim/testsuite/or1k: Add test case for l.adrp instruction

In reply to Stafford Horne
Quoted 8 lines · Stafford Horne

This is a simple test to ensure that the l.adrp instruction can be assembled and simulated correctly.

sim/testsuite/sim/or1k/ChangeLog:

yyyy-mm-dd Stafford Horne <[email protected]>

* adrp.S: New file.

This is fine with one nit below.

Thanks,
Andrew

Quoted 14 lines

---
Changes since v2:
- new patch

 sim/testsuite/sim/or1k/adrp.S | 73 +++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 sim/testsuite/sim/or1k/adrp.S
sim/testsuite/sim/or1k/adrp.S new file +0 -0
new file mode 100644
index 0000000000..ba384ccc84

sim/testsuite/sim/or1k/adrp.S line 3

Quoted 3 lines
sim/testsuite/sim/or1k/adrp.S new file +3 -0
@@ -0,0 +1,73 @@
+/* Tests the load page address instruction.
+
+   Copyright (C) 2017-2019 Free Software Foundation, Inc.

This date range should just be '2019'.

Quoted 73 lines
sim/testsuite/sim/or1k/adrp.S new file +70 -0
+
+   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(0x00002064);\n
+# output: report(0x00012138);\n
+# output: report(0x00002000);\n
+# output: report(0x00012000);\n
+# output: report(0x00002000);\n
+# output: report(0x00014000);\n
+# output: report(0x00000000);\n
+# output: exit(0)\n
+
+#include "or1k-asm-test-helpers.h"
+
+	STANDARD_TEST_ENVIRONMENT
+
+	.section .data
+	.org 0x10000
+	.align 4
+	.type   pi, @object
+	.size   pi, 4
+pi:
+	.float	3.14159
+
+	.section .text
+start_tests:
+	PUSH LINK_REGISTER_R9
+
+	/* Print out the PC.  To compare with that loaded by l.adrp.  */
+	l.jal	capture_pc
+	 l.nop
+capture_pc:
+	REPORT_REG_TO_CONSOLE r9
+
+	/* Print out our data address to compared with l.adrp offset.  */
+	l.movhi	r11, ha(pi)
+	l.addi	r11, r11, lo(pi)
+	REPORT_REG_TO_CONSOLE r11
+
+	/* Test l.adrp with symbols, loads page of symbol to register.  */
+	l.adrp	r4, start_tests
+	REPORT_REG_TO_CONSOLE r4
+
+	l.adrp	r4, pi
+	REPORT_REG_TO_CONSOLE r4
+
+	/* Test l.adrp with immediate, immediate is the page offset.  */
+	l.adrp	r4, 0x0
+	REPORT_REG_TO_CONSOLE r4
+
+	l.adrp	r4, 0x12000
+	REPORT_REG_TO_CONSOLE r4
+
+	l.adrp	r4, -0x2000
+	REPORT_REG_TO_CONSOLE r4
+
+	POP LINK_REGISTER_R9
+	RETURN_TO_LINK_REGISTER_R9
Signature · 1 line
2.21.0
#5 lore raw

PATCH v3 10/11 sim/testsuite/or1k: Add test case for l.adrp instruction

Quoted 25 lines · Andrew Burgess
Quoted 8 lines · Stafford Horne

This is a simple test to ensure that the l.adrp instruction can be assembled and simulated correctly.

sim/testsuite/sim/or1k/ChangeLog:

yyyy-mm-dd Stafford Horne <[email protected]>

* adrp.S: New file.

This is fine with one nit below.

Thanks,
Andrew

Quoted 8 lines

---
Changes since v2:
- new patch

 sim/testsuite/sim/or1k/adrp.S | 73 +++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 sim/testsuite/sim/or1k/adrp.S
Quoted 11 lines

sim/testsuite/sim/or1k/adrp.S line 3

Quoted 9 lines
sim/testsuite/sim/or1k/adrp.S new file +3 -0
new file mode 100644
index 0000000000..ba384ccc84
@@ -0,0 +1,73 @@
+/* Tests the load page address instruction.
+
+   Copyright (C) 2017-2019 Free Software Foundation, Inc.

This date range should just be '2019'.

Oh, of course, bad copy from me.

-Stafford