[Patch][gas][arm] Fix testcase on arm-*pe* targets

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[Patch][gas][arm] Fix testcase on arm-*pe* targets

Matthew Malcomson-2
The PE target can insert NOP's for padding to 4 byte alignment.
This was causing a testcase failure, this commit fixes the testcase.

This commit also escapes some full-stops in the testcase regexp.

Ok for trunk?
Regtested with cross-build for target arm-none-elf and arm-wince-pe.

n.b. I don't have commit rights.

gas/ChangeLog:

2018-11-06  Matthew Malcomson  <[hidden email]>

        * testsuite/gas/arm/neon-cond-bad_t2.d: Fix testcase for PE
        target.



###############     Attachment also inlined for ease of reply    ###############


diff --git a/gas/testsuite/gas/arm/neon-cond-bad_t2.d b/gas/testsuite/gas/arm/neon-cond-bad_t2.d
index abff08431e1618718b8885da4e8465dc0732b459..47717ba4775ded7fc67e4aae269a801fd2888d81 100644
--- a/gas/testsuite/gas/arm/neon-cond-bad_t2.d
+++ b/gas/testsuite/gas/arm/neon-cond-bad_t2.d
@@ -31,8 +31,8 @@ Disassembly of section \.text:
 0[0-9a-f]+ <[^>]+> ef21 0d02 vsubeq\.f32 d0, d1, d2
 0[0-9a-f]+ <[^>]+> ef22 0d44 vsubeq\.f32 q0, q1, q2
 0[0-9a-f]+ <[^>]+> bf04       itt eq
-0[0-9a-f]+ <[^>]+> ffb6 1602 vcvteq.f16.f32 d1, q1
-0[0-9a-f]+ <[^>]+> ffb6 2701 vcvteq.f32.f16 q1, d1
+0[0-9a-f]+ <[^>]+> ffb6 1602 vcvteq\.f16\.f32 d1, q1
+0[0-9a-f]+ <[^>]+> ffb6 2701 vcvteq\.f32\.f16 q1, d1
 0[0-9a-f]+ <[^>]+> bf04       itt eq
 0[0-9a-f]+ <[^>]+> ffb9 0701 vabseq\.f32 d0, d1
 0[0-9a-f]+ <[^>]+> ffb9 0742 vabseq\.f32 q0, q1
@@ -56,3 +56,5 @@ Disassembly of section \.text:
 0[0-9a-f]+ <[^>]+> eea0 1b10 vdupeq\.32 q0, r1
 0[0-9a-f]+ <[^>]+> ffb4 0c01 vdupeq\.32 d0, d1\[0\]
 0[0-9a-f]+ <[^>]+> ffbc 0c41 vdupeq\.32 q0, d1\[1\]
+# PE targets can insert an extra NOP for padding -- avoid that breaking tests.
+#pass


testcase-fix.patch (1K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [Patch][gas][arm] Fix testcase on arm-*pe* targets

Richard Earnshaw (lists)
On 06/11/2018 16:52, Matthew Malcomson wrote:

> The PE target can insert NOP's for padding to 4 byte alignment.
> This was causing a testcase failure, this commit fixes the testcase.
>
> This commit also escapes some full-stops in the testcase regexp.
>
> Ok for trunk?
> Regtested with cross-build for target arm-none-elf and arm-wince-pe.
>
> n.b. I don't have commit rights.
>
> gas/ChangeLog:
>
> 2018-11-06  Matthew Malcomson  <[hidden email]>
>
> * testsuite/gas/arm/neon-cond-bad_t2.d: Fix testcase for PE
> target.
>
Pushed.

R.

>
>
> ###############     Attachment also inlined for ease of reply    ###############
>
>
> diff --git a/gas/testsuite/gas/arm/neon-cond-bad_t2.d b/gas/testsuite/gas/arm/neon-cond-bad_t2.d
> index abff08431e1618718b8885da4e8465dc0732b459..47717ba4775ded7fc67e4aae269a801fd2888d81 100644
> --- a/gas/testsuite/gas/arm/neon-cond-bad_t2.d
> +++ b/gas/testsuite/gas/arm/neon-cond-bad_t2.d
> @@ -31,8 +31,8 @@ Disassembly of section \.text:
>  0[0-9a-f]+ <[^>]+> ef21 0d02 vsubeq\.f32 d0, d1, d2
>  0[0-9a-f]+ <[^>]+> ef22 0d44 vsubeq\.f32 q0, q1, q2
>  0[0-9a-f]+ <[^>]+> bf04       itt eq
> -0[0-9a-f]+ <[^>]+> ffb6 1602 vcvteq.f16.f32 d1, q1
> -0[0-9a-f]+ <[^>]+> ffb6 2701 vcvteq.f32.f16 q1, d1
> +0[0-9a-f]+ <[^>]+> ffb6 1602 vcvteq\.f16\.f32 d1, q1
> +0[0-9a-f]+ <[^>]+> ffb6 2701 vcvteq\.f32\.f16 q1, d1
>  0[0-9a-f]+ <[^>]+> bf04       itt eq
>  0[0-9a-f]+ <[^>]+> ffb9 0701 vabseq\.f32 d0, d1
>  0[0-9a-f]+ <[^>]+> ffb9 0742 vabseq\.f32 q0, q1
> @@ -56,3 +56,5 @@ Disassembly of section \.text:
>  0[0-9a-f]+ <[^>]+> eea0 1b10 vdupeq\.32 q0, r1
>  0[0-9a-f]+ <[^>]+> ffb4 0c01 vdupeq\.32 d0, d1\[0\]
>  0[0-9a-f]+ <[^>]+> ffbc 0c41 vdupeq\.32 q0, d1\[1\]
> +# PE targets can insert an extra NOP for padding -- avoid that breaking tests.
> +#pass
>
>
> testcase-fix.patch
>
> diff --git a/gas/testsuite/gas/arm/neon-cond-bad_t2.d b/gas/testsuite/gas/arm/neon-cond-bad_t2.d
> index abff08431e1618718b8885da4e8465dc0732b459..47717ba4775ded7fc67e4aae269a801fd2888d81 100644
> --- a/gas/testsuite/gas/arm/neon-cond-bad_t2.d
> +++ b/gas/testsuite/gas/arm/neon-cond-bad_t2.d
> @@ -31,8 +31,8 @@ Disassembly of section \.text:
>  0[0-9a-f]+ <[^>]+> ef21 0d02 vsubeq\.f32 d0, d1, d2
>  0[0-9a-f]+ <[^>]+> ef22 0d44 vsubeq\.f32 q0, q1, q2
>  0[0-9a-f]+ <[^>]+> bf04       itt eq
> -0[0-9a-f]+ <[^>]+> ffb6 1602 vcvteq.f16.f32 d1, q1
> -0[0-9a-f]+ <[^>]+> ffb6 2701 vcvteq.f32.f16 q1, d1
> +0[0-9a-f]+ <[^>]+> ffb6 1602 vcvteq\.f16\.f32 d1, q1
> +0[0-9a-f]+ <[^>]+> ffb6 2701 vcvteq\.f32\.f16 q1, d1
>  0[0-9a-f]+ <[^>]+> bf04       itt eq
>  0[0-9a-f]+ <[^>]+> ffb9 0701 vabseq\.f32 d0, d1
>  0[0-9a-f]+ <[^>]+> ffb9 0742 vabseq\.f32 q0, q1
> @@ -56,3 +56,5 @@ Disassembly of section \.text:
>  0[0-9a-f]+ <[^>]+> eea0 1b10 vdupeq\.32 q0, r1
>  0[0-9a-f]+ <[^>]+> ffb4 0c01 vdupeq\.32 d0, d1\[0\]
>  0[0-9a-f]+ <[^>]+> ffbc 0c41 vdupeq\.32 q0, d1\[1\]
> +# PE targets can insert an extra NOP for padding -- avoid that breaking tests.
> +#pass
>