diff mbox

[2/4] vldN_lane error message enhancements (D registers)

Message ID 1418138874-13285-3-git-send-email-charles.baylis@linaro.org
State New
Headers show

Commit Message

Charles Baylis Dec. 9, 2014, 3:27 p.m. UTC 
From: Charles Baylis <charles.baylis@linaro.org>

gcc/ChangeLog

<DATE>  Charles Baylis  <charles.baylis@linaro.org>

        * config/aarch64/arm_neon.h (__LD2_LANE_FUNC): Add explicit lane
	bounds check.
        (__LD3_LANE_FUNC): Likewise.
        (__LD4_LANE_FUNC): Likewise

gcc/testsuite/ChangeLog:

<DATE>  Charles Baylis  <charles.baylis@linaro.org>

        * gcc.target/aarch64/simd/vld4_lane.c: New test.

Change-Id: Ia95fbed34b50cf710ea9032ff3428a5f1432e0aa
---
 gcc/config/aarch64/arm_neon.h                     |  6 ++++++
 gcc/testsuite/gcc.target/aarch64/simd/vld4_lane.c | 15 +++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 gcc/testsuite/gcc.target/aarch64/simd/vld4_lane.c

Comments

Christophe Lyon Dec. 10, 2014, 9:23 a.m. UTC | #1 
On 9 December 2014 at 16:27,  <charles.baylis@linaro.org> wrote:
> From: Charles Baylis <charles.baylis@linaro.org>
>
> gcc/ChangeLog
>
> <DATE>  Charles Baylis  <charles.baylis@linaro.org>
>
>         * config/aarch64/arm_neon.h (__LD2_LANE_FUNC): Add explicit lane
>         bounds check.
>         (__LD3_LANE_FUNC): Likewise.
>         (__LD4_LANE_FUNC): Likewise
>
> gcc/testsuite/ChangeLog:
>
> <DATE>  Charles Baylis  <charles.baylis@linaro.org>
>
>         * gcc.target/aarch64/simd/vld4_lane.c: New test.
>
> Change-Id: Ia95fbed34b50cf710ea9032ff3428a5f1432e0aa
> ---
>  gcc/config/aarch64/arm_neon.h                     |  6 ++++++
>  gcc/testsuite/gcc.target/aarch64/simd/vld4_lane.c | 15 +++++++++++++++
>  2 files changed, 21 insertions(+)
>  create mode 100644 gcc/testsuite/gcc.target/aarch64/simd/vld4_lane.c
>
> diff --git a/gcc/config/aarch64/arm_neon.h b/gcc/config/aarch64/arm_neon.h
> index 8cff719..22df564 100644
> --- a/gcc/config/aarch64/arm_neon.h
> +++ b/gcc/config/aarch64/arm_neon.h
> @@ -17901,6 +17901,8 @@ vld2_lane_##funcsuffix (const ptrtype * __ptr, intype __b, const int __c)  \
>    __o = __builtin_aarch64_set_qregoi##mode (__o,                          \
>                                            (signedtype) __temp.val[1],     \
>                                            1);                             \
> +  __builtin_aarch64_im_lane_boundsi (__c,                                 \
> +                                    sizeof (vectype) / sizeof (*__ptr));  \

Shouldn't the arguments be reversed? (I'm looking at
__AARCH64_LANE_CHECK: the lane index is the 2nd parameter)

>    __o =        __builtin_aarch64_ld2_lane##mode (                                 \
>           (__builtin_aarch64_simd_##ptrmode *) __ptr, __o, __c);           \
>    __b.val[0] = (vectype) __builtin_aarch64_get_dregoidi (__o, 0);         \
> @@ -17991,6 +17993,8 @@ vld3_lane_##funcsuffix (const ptrtype * __ptr, intype __b, const int __c)  \
>    __o = __builtin_aarch64_set_qregci##mode (__o,                          \
>                                            (signedtype) __temp.val[2],     \
>                                            2);                             \
> +  __builtin_aarch64_im_lane_boundsi (__c,                                 \
> +                                    sizeof (vectype) / sizeof (*__ptr));  \
>    __o =        __builtin_aarch64_ld3_lane##mode (                                 \
>           (__builtin_aarch64_simd_##ptrmode *) __ptr, __o, __c);           \
>    __b.val[0] = (vectype) __builtin_aarch64_get_dregcidi (__o, 0);         \
> @@ -18089,6 +18093,8 @@ vld4_lane_##funcsuffix (const ptrtype * __ptr, intype __b, const int __c)  \
>    __o = __builtin_aarch64_set_qregxi##mode (__o,                          \
>                                            (signedtype) __temp.val[3],     \
>                                            3);                             \
> +  __builtin_aarch64_im_lane_boundsi (__c,                                 \
> +                                    sizeof (vectype) / sizeof (*__ptr));  \
>    __o =        __builtin_aarch64_ld4_lane##mode (                                 \
>           (__builtin_aarch64_simd_##ptrmode *) __ptr, __o, __c);           \
>    __b.val[0] = (vectype) __builtin_aarch64_get_dregxidi (__o, 0);         \
> diff --git a/gcc/testsuite/gcc.target/aarch64/simd/vld4_lane.c b/gcc/testsuite/gcc.target/aarch64/simd/vld4_lane.c
> new file mode 100644
> index 0000000..d14e6c1
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/aarch64/simd/vld4_lane.c
> @@ -0,0 +1,15 @@
> +/* Test error message when passing an invalid value as a lane index.  */
> +
> +/* { dg-do compile } */
> +
> +#include <arm_neon.h>
> +
> +int8x8x4_t
> +f_vld4_lane (int8_t * p, int8x8x4_t v)
> +{
> +  int8x8x4_t res;
> +  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
> +  res = vld4_lane_s8 (p, v, 8);
> +  return res;
> +}
> +
> --
> 1.9.1
>
Alan Lawrence Dec. 10, 2014, 10:26 a.m. UTC | #2 
Hmmm. Yes I think I may have switched that in the patch introducing 
__AARCH64_LANE_CHECK, and it was correct at time of Charles' writing. However, 
maybe we could (now) use __AARCH64_LANE_CHECK directly? (Referencing one of the 
component vectors in the blahLxMxN_t struct?)

--Alan

Christophe Lyon wrote:
> On 9 December 2014 at 16:27,  <charles.baylis@linaro.org> wrote:
>> From: Charles Baylis <charles.baylis@linaro.org>
>>
>> gcc/ChangeLog
>>
>> <DATE>  Charles Baylis  <charles.baylis@linaro.org>
>>
>>         * config/aarch64/arm_neon.h (__LD2_LANE_FUNC): Add explicit lane
>>         bounds check.
>>         (__LD3_LANE_FUNC): Likewise.
>>         (__LD4_LANE_FUNC): Likewise
>>
>> gcc/testsuite/ChangeLog:
>>
>> <DATE>  Charles Baylis  <charles.baylis@linaro.org>
>>
>>         * gcc.target/aarch64/simd/vld4_lane.c: New test.
>>
>> Change-Id: Ia95fbed34b50cf710ea9032ff3428a5f1432e0aa
>> ---
>>  gcc/config/aarch64/arm_neon.h                     |  6 ++++++
>>  gcc/testsuite/gcc.target/aarch64/simd/vld4_lane.c | 15 +++++++++++++++
>>  2 files changed, 21 insertions(+)
>>  create mode 100644 gcc/testsuite/gcc.target/aarch64/simd/vld4_lane.c
>>
>> diff --git a/gcc/config/aarch64/arm_neon.h b/gcc/config/aarch64/arm_neon.h
>> index 8cff719..22df564 100644
>> --- a/gcc/config/aarch64/arm_neon.h
>> +++ b/gcc/config/aarch64/arm_neon.h
>> @@ -17901,6 +17901,8 @@ vld2_lane_##funcsuffix (const ptrtype * __ptr, intype __b, const int __c)  \
>>    __o = __builtin_aarch64_set_qregoi##mode (__o,                          \
>>                                            (signedtype) __temp.val[1],     \
>>                                            1);                             \
>> +  __builtin_aarch64_im_lane_boundsi (__c,                                 \
>> +                                    sizeof (vectype) / sizeof (*__ptr));  \
> 
> Shouldn't the arguments be reversed? (I'm looking at
> __AARCH64_LANE_CHECK: the lane index is the 2nd parameter)
> 
>>    __o =        __builtin_aarch64_ld2_lane##mode (                                 \
>>           (__builtin_aarch64_simd_##ptrmode *) __ptr, __o, __c);           \
>>    __b.val[0] = (vectype) __builtin_aarch64_get_dregoidi (__o, 0);         \
>> @@ -17991,6 +17993,8 @@ vld3_lane_##funcsuffix (const ptrtype * __ptr, intype __b, const int __c)  \
>>    __o = __builtin_aarch64_set_qregci##mode (__o,                          \
>>                                            (signedtype) __temp.val[2],     \
>>                                            2);                             \
>> +  __builtin_aarch64_im_lane_boundsi (__c,                                 \
>> +                                    sizeof (vectype) / sizeof (*__ptr));  \
>>    __o =        __builtin_aarch64_ld3_lane##mode (                                 \
>>           (__builtin_aarch64_simd_##ptrmode *) __ptr, __o, __c);           \
>>    __b.val[0] = (vectype) __builtin_aarch64_get_dregcidi (__o, 0);         \
>> @@ -18089,6 +18093,8 @@ vld4_lane_##funcsuffix (const ptrtype * __ptr, intype __b, const int __c)  \
>>    __o = __builtin_aarch64_set_qregxi##mode (__o,                          \
>>                                            (signedtype) __temp.val[3],     \
>>                                            3);                             \
>> +  __builtin_aarch64_im_lane_boundsi (__c,                                 \
>> +                                    sizeof (vectype) / sizeof (*__ptr));  \
>>    __o =        __builtin_aarch64_ld4_lane##mode (                                 \
>>           (__builtin_aarch64_simd_##ptrmode *) __ptr, __o, __c);           \
>>    __b.val[0] = (vectype) __builtin_aarch64_get_dregxidi (__o, 0);         \
>> diff --git a/gcc/testsuite/gcc.target/aarch64/simd/vld4_lane.c b/gcc/testsuite/gcc.target/aarch64/simd/vld4_lane.c
>> new file mode 100644
>> index 0000000..d14e6c1
>> --- /dev/null
>> +++ b/gcc/testsuite/gcc.target/aarch64/simd/vld4_lane.c
>> @@ -0,0 +1,15 @@
>> +/* Test error message when passing an invalid value as a lane index.  */
>> +
>> +/* { dg-do compile } */
>> +
>> +#include <arm_neon.h>
>> +
>> +int8x8x4_t
>> +f_vld4_lane (int8_t * p, int8x8x4_t v)
>> +{
>> +  int8x8x4_t res;
>> +  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
>> +  res = vld4_lane_s8 (p, v, 8);
>> +  return res;
>> +}
>> +
>> --
>> 1.9.1
>>
>
diff mbox

Patch

diff --git a/gcc/config/aarch64/arm_neon.h b/gcc/config/aarch64/arm_neon.h
index 8cff719..22df564 100644
--- a/gcc/config/aarch64/arm_neon.h
+++ b/gcc/config/aarch64/arm_neon.h
@@ -17901,6 +17901,8 @@  vld2_lane_##funcsuffix (const ptrtype * __ptr, intype __b, const int __c)  \
   __o = __builtin_aarch64_set_qregoi##mode (__o,			   \
 					   (signedtype) __temp.val[1],	   \
 					   1);				   \
+  __builtin_aarch64_im_lane_boundsi (__c,				   \
+				     sizeof (vectype) / sizeof (*__ptr));  \
   __o =	__builtin_aarch64_ld2_lane##mode (				   \
 	  (__builtin_aarch64_simd_##ptrmode *) __ptr, __o, __c);	   \
   __b.val[0] = (vectype) __builtin_aarch64_get_dregoidi (__o, 0);	   \
@@ -17991,6 +17993,8 @@  vld3_lane_##funcsuffix (const ptrtype * __ptr, intype __b, const int __c)  \
   __o = __builtin_aarch64_set_qregci##mode (__o,			   \
 					   (signedtype) __temp.val[2],	   \
 					   2);				   \
+  __builtin_aarch64_im_lane_boundsi (__c,				   \
+				     sizeof (vectype) / sizeof (*__ptr));  \
   __o =	__builtin_aarch64_ld3_lane##mode (				   \
 	  (__builtin_aarch64_simd_##ptrmode *) __ptr, __o, __c);	   \
   __b.val[0] = (vectype) __builtin_aarch64_get_dregcidi (__o, 0);	   \
@@ -18089,6 +18093,8 @@  vld4_lane_##funcsuffix (const ptrtype * __ptr, intype __b, const int __c)  \
   __o = __builtin_aarch64_set_qregxi##mode (__o,			   \
 					   (signedtype) __temp.val[3],	   \
 					   3);				   \
+  __builtin_aarch64_im_lane_boundsi (__c,				   \
+				     sizeof (vectype) / sizeof (*__ptr));  \
   __o =	__builtin_aarch64_ld4_lane##mode (				   \
 	  (__builtin_aarch64_simd_##ptrmode *) __ptr, __o, __c);	   \
   __b.val[0] = (vectype) __builtin_aarch64_get_dregxidi (__o, 0);	   \
diff --git a/gcc/testsuite/gcc.target/aarch64/simd/vld4_lane.c b/gcc/testsuite/gcc.target/aarch64/simd/vld4_lane.c
new file mode 100644
index 0000000..d14e6c1
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/simd/vld4_lane.c
@@ -0,0 +1,15 @@ 
+/* Test error message when passing an invalid value as a lane index.  */
+
+/* { dg-do compile } */
+
+#include <arm_neon.h>
+
+int8x8x4_t
+f_vld4_lane (int8_t * p, int8x8x4_t v)
+{
+  int8x8x4_t res;
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
+  res = vld4_lane_s8 (p, v, 8);
+  return res;
+}
+