Re: [Qemu-devel] [PATCH for-3.0] target/arm: Fix LD1W and LDFF1W (scalar plus vector)

2018-07-12 Thread Peter Maydell
On 11 July 2018 at 11:39, Richard Henderson
 wrote:
> 'I' was being double-incremented; correctly within the inner loop
> and incorrectly within the outer loop.
>
> Signed-off-by: Richard Henderson 
> ---
>
> Fixes a SIGSEGV within one of these generated helpers,
> exposed by an armclang vectorized code sample.
>


Applied to target-arm.next, thanks.

-- PMM



Re: [Qemu-devel] [PATCH for-3.0] target/arm: Fix LD1W and LDFF1W (scalar plus vector)

2018-07-12 Thread Alex Bennée


Richard Henderson  writes:

> 'I' was being double-incremented; correctly within the inner loop
> and incorrectly within the outer loop.
>
> Signed-off-by: Richard Henderson 

Reviewed-by: Alex Bennée 
Tested-by: Alex Bennée 

> ---
>
> Fixes a SIGSEGV within one of these generated helpers,
> exposed by an armclang vectorized code sample.
>
>
> r~
>
> ---
>  target/arm/sve_helper.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c
> index cec0d3ee54..ddc592ff79 100644
> --- a/target/arm/sve_helper.c
> +++ b/target/arm/sve_helper.c
> @@ -4855,7 +4855,7 @@ void HELPER(NAME)(CPUARMState *env, void *vd, void *vg, 
> void *vm,   \
>  intptr_t i, oprsz = simd_oprsz(desc);   \
>  unsigned scale = simd_data(desc);   \
>  uintptr_t ra = GETPC(); \
> -for (i = 0; i < oprsz; i++) {   \
> +for (i = 0; i < oprsz; ) {  \
>  uint16_t pg = *(uint16_t *)(vg + H1_2(i >> 3)); \
>  do {\
>  TYPEM m = 0;\
> @@ -4936,7 +4936,7 @@ void HELPER(NAME)(CPUARMState *env, void *vd, void *vg, 
> void *vm,   \
>  uintptr_t ra = GETPC(); \
>  bool first = true;  \
>  mmap_lock();\
> -for (i = 0; i < oprsz; i++) {   \
> +for (i = 0; i < oprsz; ) {  \
>  uint16_t pg = *(uint16_t *)(vg + H1_2(i >> 3)); \
>  do {\
>  TYPEM m = 0;\


--
Alex Bennée



Re: [Qemu-devel] [PATCH for-3.0] target/arm: Fix LD1W and LDFF1W (scalar plus vector)

2018-07-11 Thread Richard Henderson
On 07/11/2018 04:04 AM, Laurent Desnogues wrote:
> Hello,
> 
> On Wed, Jul 11, 2018 at 12:39 PM, Richard Henderson
>  wrote:
>> 'I' was being double-incremented; correctly within the inner loop
>> and incorrectly within the outer loop.
>>
>> Signed-off-by: Richard Henderson 
> 
> I didn't try to apply the patch but line numbers look wrong.
> 
> I guess this should apply to DO_LD1_ZPZ_S and DO_LDFF1_ZPZ macros, in
> which case you get my review:

The patch was pulled out of the middle of a branch,
so the line numbers might be off.  I probably should
have cherry-picked it to master before posting...


r~



Re: [Qemu-devel] [PATCH for-3.0] target/arm: Fix LD1W and LDFF1W (scalar plus vector)

2018-07-11 Thread Laurent Desnogues
Hello,

On Wed, Jul 11, 2018 at 12:39 PM, Richard Henderson
 wrote:
> 'I' was being double-incremented; correctly within the inner loop
> and incorrectly within the outer loop.
>
> Signed-off-by: Richard Henderson 

I didn't try to apply the patch but line numbers look wrong.

I guess this should apply to DO_LD1_ZPZ_S and DO_LDFF1_ZPZ macros, in
which case you get my review:

Reviewed-by: Laurent Desnogues 

Thanks,

Laurent

> ---
>
> Fixes a SIGSEGV within one of these generated helpers,
> exposed by an armclang vectorized code sample.
>
>
> r~
>
> ---
>  target/arm/sve_helper.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c
> index cec0d3ee54..ddc592ff79 100644
> --- a/target/arm/sve_helper.c
> +++ b/target/arm/sve_helper.c
> @@ -4855,7 +4855,7 @@ void HELPER(NAME)(CPUARMState *env, void *vd, void *vg, 
> void *vm,   \
>  intptr_t i, oprsz = simd_oprsz(desc);   \
>  unsigned scale = simd_data(desc);   \
>  uintptr_t ra = GETPC(); \
> -for (i = 0; i < oprsz; i++) {   \
> +for (i = 0; i < oprsz; ) {  \
>  uint16_t pg = *(uint16_t *)(vg + H1_2(i >> 3)); \
>  do {\
>  TYPEM m = 0;\
> @@ -4936,7 +4936,7 @@ void HELPER(NAME)(CPUARMState *env, void *vd, void *vg, 
> void *vm,   \
>  uintptr_t ra = GETPC(); \
>  bool first = true;  \
>  mmap_lock();\
> -for (i = 0; i < oprsz; i++) {   \
> +for (i = 0; i < oprsz; ) {  \
>  uint16_t pg = *(uint16_t *)(vg + H1_2(i >> 3)); \
>  do {\
>  TYPEM m = 0;\
> --
> 2.17.1
>
>



[Qemu-devel] [PATCH for-3.0] target/arm: Fix LD1W and LDFF1W (scalar plus vector)

2018-07-11 Thread Richard Henderson
'I' was being double-incremented; correctly within the inner loop
and incorrectly within the outer loop.

Signed-off-by: Richard Henderson 
---

Fixes a SIGSEGV within one of these generated helpers,
exposed by an armclang vectorized code sample.


r~

---
 target/arm/sve_helper.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c
index cec0d3ee54..ddc592ff79 100644
--- a/target/arm/sve_helper.c
+++ b/target/arm/sve_helper.c
@@ -4855,7 +4855,7 @@ void HELPER(NAME)(CPUARMState *env, void *vd, void *vg, 
void *vm,   \
 intptr_t i, oprsz = simd_oprsz(desc);   \
 unsigned scale = simd_data(desc);   \
 uintptr_t ra = GETPC(); \
-for (i = 0; i < oprsz; i++) {   \
+for (i = 0; i < oprsz; ) {  \
 uint16_t pg = *(uint16_t *)(vg + H1_2(i >> 3)); \
 do {\
 TYPEM m = 0;\
@@ -4936,7 +4936,7 @@ void HELPER(NAME)(CPUARMState *env, void *vd, void *vg, 
void *vm,   \
 uintptr_t ra = GETPC(); \
 bool first = true;  \
 mmap_lock();\
-for (i = 0; i < oprsz; i++) {   \
+for (i = 0; i < oprsz; ) {  \
 uint16_t pg = *(uint16_t *)(vg + H1_2(i >> 3)); \
 do {\
 TYPEM m = 0;\
-- 
2.17.1