Patchwork [ARM] ICE when building kernel raid6 neon code

login
register
mail settings
Submitter Zhenqiang Chen
Date Jan. 16, 2014, 5:44 a.m.
Message ID <CACgzC7A6grN1rdAo=9KL+8UWOLvTVZ4Xc-9HQmFuyTkQGG3Pjw@mail.gmail.com>
Download mbox | patch
Permalink /patch/311565/
State New
Headers show

Comments

Zhenqiang Chen - Jan. 16, 2014, 5:44 a.m.
Thanks for comments.

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59837

The patch with a test case is attached.

ChangeLog:
2014-01-16  Zhenqiang Chen  <zhenqiang.chen@linaro.org>

    PR target/59837
    * config/arm/arm.c (arm_emit_vfp_multi_reg_pop): Do not add
    REG_CFA_ADJUST_CFA NOTE if shrink-wrap is not enabled.

testsuite/ChangeLog:
2014-01-16  Zhenqiang Chen  <zhenqiang.chen@linaro.org>

    * gcc.target/arm/pr59837.c: New testcase.

On 15 January 2014 19:56, Ramana Radhakrishnan
<Ramana.Radhakrishnan@arm.com> wrote:
> Please also create a bugzilla entry for this and use the pr number here.
>
> Ramana
>
>
> Sent from Samsung Mobile
>
>
>
> -------- Original message --------
> From: Zhenqiang Chen <zhenqiang.chen@linaro.org>
> Date:
> To: gcc-patches@gcc.gnu.org
> Cc: Richard Earnshaw <Richard.Earnshaw@arm.com>,Ramana Radhakrishnan
> <Ramana.Radhakrishnan@arm.com>
> Subject: [PATCH, ARM] ICE when building kernel raid6 neon code
>
>
> Hi,
>
> The patch fixes ICE when building kernel raid6 neon code.
>
> lib/raid6/neon4.c: In function 'raid6_
>
> neon4_gen_syndrome_real':
> lib/raid6/neon4.c:113:1: internal compiler error: in
> dwarf2out_frame_debug_adjust_cfa, at dwarf2cfi.c:1090
>  }
>
> https://bugs.launchpad.net/gcc-linaro/+bug/1268893
>
> Root cause:
> When expanding epilogue, REG_CFA_ADJUST_CFA NOTE is added to handle
> dwarf info issue for shrink-wrap. But for TARGET_APCS_FRAME,
> shrink-wrap is disabled. And not all dwarf info in
> arm_expand_epilogue_apcs_frame are correctly updated.
> arm_emit_vfp_multi_reg_pop is called by both
> arm_expand_epilogue_apcs_frame and arm_expand_epilogue. So we should
> not add the NOTE in arm_emit_vfp_multi_reg_pop if shrink-wrap is not
> enabled.
>
> Boot strap and no make check regression on ARM Chromebook.
>
> OK for trunk?
>
> Thanks!
> -Zhenqiang
>
> ChangeLog:
> 2014-01-15  Zhenqiang Chen  <zhenqiang.chen@linaro.org>
>
>         * config/arm/arm.c (arm_emit_vfp_multi_reg_pop): Do not add
>         REG_CFA_ADJUST_CFA NOTE if shrink-wrap is not enabled.
>
> diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
> index 18196b3..1ccb796 100644
> --- a/gcc/config/arm/arm.c
> +++ b/gcc/config/arm/arm.c
> @@ -19890,8 +19890,12 @@ arm_emit_vfp_multi_reg_pop (int first_reg,
> int num_regs, rtx base_reg)
>    par = emit_insn (par);
>    REG_NOTES (par) = dwarf;
>
> -  arm_add_cfa_adjust_cfa_note (par, 2 * UNITS_PER_WORD * num_regs,
> -                              base_reg, base_reg);
> +  /* REG_CFA_ADJUST_CFA NOTE is added to handle dwarf info issue when
> +     shrink-wrap is enabled.  So when shrink-wrap is not enabled, we should
> +     not add the note.  */
> +  if (flag_shrink_wrap)
> +    arm_add_cfa_adjust_cfa_note (par, 2 * UNITS_PER_WORD * num_regs,
> +                                base_reg, base_reg);
>  }
>
>  /* Generate and emit a pattern that will be recognized as LDRD
> pattern.  If even
>
>
> -- IMPORTANT NOTICE: The contents of this email and any attachments are
> confidential and may also be privileged. If you are not the intended
> recipient, please notify the sender immediately and do not disclose the
> contents to any other person, use it for any purpose, or store or copy the
> information in any medium. Thank you.
>
> ARM Limited, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ,
> Registered in England & Wales, Company No: 2557590
> ARM Holdings plc, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ,
> Registered in England & Wales, Company No: 2548782
Ramana Radhakrishnan - Jan. 27, 2014, 5:07 p.m.
On Thu, Jan 16, 2014 at 5:44 AM, Zhenqiang Chen
<zhenqiang.chen@linaro.org> wrote:
> Thanks for comments.
>
> http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59837
>
> The patch with a test case is attached.


> +/* { dg-options " -Os -fno-omit-frame-pointer -mapcs -mabi=aapcs-linux -marm  -mfloat-abi=softfp  -g " } */

Can you instead do ?

{ dg-options "-Os -fno-omit-frame-pointer -mapcs" }
{ dg-add-options arm_neon }

I don't like this as it as it stands because the test relies on the
compiler being configured for neon by default.


regards
Ramana


>
> ChangeLog:
> 2014-01-16  Zhenqiang Chen  <zhenqiang.chen@linaro.org>
>
>     PR target/59837
>     * config/arm/arm.c (arm_emit_vfp_multi_reg_pop): Do not add
>     REG_CFA_ADJUST_CFA NOTE if shrink-wrap is not enabled.
>
> testsuite/ChangeLog:
> 2014-01-16  Zhenqiang Chen  <zhenqiang.chen@linaro.org>
>
>     * gcc.target/arm/pr59837.c: New testcase.
>
> On 15 January 2014 19:56, Ramana Radhakrishnan
> <Ramana.Radhakrishnan@arm.com> wrote:
>> Please also create a bugzilla entry for this and use the pr number here.
>>
>> Ramana
>>
>>
>> Sent from Samsung Mobile
>>
>>
>>
>> -------- Original message --------
>> From: Zhenqiang Chen <zhenqiang.chen@linaro.org>
>> Date:
>> To: gcc-patches@gcc.gnu.org
>> Cc: Richard Earnshaw <Richard.Earnshaw@arm.com>,Ramana Radhakrishnan
>> <Ramana.Radhakrishnan@arm.com>
>> Subject: [PATCH, ARM] ICE when building kernel raid6 neon code
>>
>>
>> Hi,
>>
>> The patch fixes ICE when building kernel raid6 neon code.
>>
>> lib/raid6/neon4.c: In function 'raid6_
>>
>> neon4_gen_syndrome_real':
>> lib/raid6/neon4.c:113:1: internal compiler error: in
>> dwarf2out_frame_debug_adjust_cfa, at dwarf2cfi.c:1090
>>  }
>>
>> https://bugs.launchpad.net/gcc-linaro/+bug/1268893
>>
>> Root cause:
>> When expanding epilogue, REG_CFA_ADJUST_CFA NOTE is added to handle
>> dwarf info issue for shrink-wrap. But for TARGET_APCS_FRAME,
>> shrink-wrap is disabled. And not all dwarf info in
>> arm_expand_epilogue_apcs_frame are correctly updated.
>> arm_emit_vfp_multi_reg_pop is called by both
>> arm_expand_epilogue_apcs_frame and arm_expand_epilogue. So we should
>> not add the NOTE in arm_emit_vfp_multi_reg_pop if shrink-wrap is not
>> enabled.
>>
>> Boot strap and no make check regression on ARM Chromebook.
>>
>> OK for trunk?
>>
>> Thanks!
>> -Zhenqiang
>>
>> ChangeLog:
>> 2014-01-15  Zhenqiang Chen  <zhenqiang.chen@linaro.org>
>>
>>         * config/arm/arm.c (arm_emit_vfp_multi_reg_pop): Do not add
>>         REG_CFA_ADJUST_CFA NOTE if shrink-wrap is not enabled.
>>
>> diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
>> index 18196b3..1ccb796 100644
>> --- a/gcc/config/arm/arm.c
>> +++ b/gcc/config/arm/arm.c
>> @@ -19890,8 +19890,12 @@ arm_emit_vfp_multi_reg_pop (int first_reg,
>> int num_regs, rtx base_reg)
>>    par = emit_insn (par);
>>    REG_NOTES (par) = dwarf;
>>
>> -  arm_add_cfa_adjust_cfa_note (par, 2 * UNITS_PER_WORD * num_regs,
>> -                              base_reg, base_reg);
>> +  /* REG_CFA_ADJUST_CFA NOTE is added to handle dwarf info issue when
>> +     shrink-wrap is enabled.  So when shrink-wrap is not enabled, we should
>> +     not add the note.  */
>> +  if (flag_shrink_wrap)
>> +    arm_add_cfa_adjust_cfa_note (par, 2 * UNITS_PER_WORD * num_regs,
>> +                                base_reg, base_reg);
>>  }
>>
>>  /* Generate and emit a pattern that will be recognized as LDRD
>> pattern.  If even
>>
>>
>> -- IMPORTANT NOTICE: The contents of this email and any attachments are
>> confidential and may also be privileged. If you are not the intended
>> recipient, please notify the sender immediately and do not disclose the
>> contents to any other person, use it for any purpose, or store or copy the
>> information in any medium. Thank you.
>>
>> ARM Limited, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ,
>> Registered in England & Wales, Company No: 2557590
>> ARM Holdings plc, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ,
>> Registered in England & Wales, Company No: 2548782

Patch

diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 18196b3..1ccb796 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -19890,8 +19890,12 @@  arm_emit_vfp_multi_reg_pop (int first_reg, int num_regs, rtx base_reg)
   par = emit_insn (par);
   REG_NOTES (par) = dwarf;
 
-  arm_add_cfa_adjust_cfa_note (par, 2 * UNITS_PER_WORD * num_regs,
-			       base_reg, base_reg);
+  /* REG_CFA_ADJUST_CFA NOTE is added to handle dwarf info issue when
+     shrink-wrap is enabled.  So when shrink-wrap is not enabled, we should
+     not add the note.  */
+  if (flag_shrink_wrap)
+    arm_add_cfa_adjust_cfa_note (par, 2 * UNITS_PER_WORD * num_regs,
+				 base_reg, base_reg);
 }
 
 /* Generate and emit a pattern that will be recognized as LDRD pattern.  If even
diff --git a/gcc/testsuite/gcc.target/arm/pr59837.c b/gcc/testsuite/gcc.target/arm/pr59837.c
new file mode 100644
index 0000000..9057f64
--- /dev/null
+++ b/gcc/testsuite/gcc.target/arm/pr59837.c
@@ -0,0 +1,79 @@ 
+/* { dg-do compile { target arm_neon } } */
+/* { dg-options " -Os -fno-omit-frame-pointer -mapcs -mabi=aapcs-linux -marm  -mfloat-abi=softfp  -g " } */
+
+#include <arm_neon.h>
+
+typedef uint8x16_t unative_t;
+static inline unative_t SHLBYTE(unative_t v)
+{
+ return vshlq_n_u8(v, 1);
+}
+
+static inline unative_t MASK(unative_t v)
+{
+ const uint8x16_t temp = ((unative_t){0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0});
+ return (unative_t)vcltq_s8((int8x16_t)v, (int8x16_t)temp);
+}
+
+void raid6_neon4_gen_syndrome_real(int disks, unsigned long bytes, void **ptrs)
+{
+ uint8_t **dptr = (uint8_t **)ptrs;
+ uint8_t *p, *q;
+ int d, z, z0;
+
+ register unative_t wd0, wq0, wp0, w10, w20;
+ register unative_t wd1, wq1, wp1, w11, w21;
+ register unative_t wd2, wq2, wp2, w12, w22;
+ register unative_t wd3, wq3, wp3, w13, w23;
+ const unative_t x1d = ((unative_t){0x1d,0x1d,0x1d,0x1d, 0x1d,0x1d,0x1d,0x1d, 0x1d,0x1d,0x1d,0x1d, 0x1d,0x1d,0x1d,0x1d});
+
+ z0 = disks - 3;
+ p = dptr[z0+1];
+ q = dptr[z0+2];
+
+ for ( d = 0 ; d < bytes ; d += sizeof(unative_t)*4 ) {
+  wq0 = wp0 = vld1q_u8(&dptr[z0][d+0*sizeof(unative_t)]);
+  wq1 = wp1 = vld1q_u8(&dptr[z0][d+1*sizeof(unative_t)]);
+  wq2 = wp2 = vld1q_u8(&dptr[z0][d+2*sizeof(unative_t)]);
+  wq3 = wp3 = vld1q_u8(&dptr[z0][d+3*sizeof(unative_t)]);
+  for ( z = z0-1 ; z >= 0 ; z-- ) {
+   wd0 = vld1q_u8(&dptr[z][d+0*sizeof(unative_t)]);
+   wd1 = vld1q_u8(&dptr[z][d+1*sizeof(unative_t)]);
+   wd2 = vld1q_u8(&dptr[z][d+2*sizeof(unative_t)]);
+   wd3 = vld1q_u8(&dptr[z][d+3*sizeof(unative_t)]);
+   wp0 = veorq_u8(wp0, wd0);
+   wp1 = veorq_u8(wp1, wd1);
+   wp2 = veorq_u8(wp2, wd2);
+   wp3 = veorq_u8(wp3, wd3);
+   w20 = MASK(wq0);
+   w21 = MASK(wq1);
+   w22 = MASK(wq2);
+   w23 = MASK(wq3);
+   w10 = SHLBYTE(wq0);
+   w11 = SHLBYTE(wq1);
+   w12 = SHLBYTE(wq2);
+   w13 = SHLBYTE(wq3);
+
+   w20 = vandq_u8(w20, x1d);
+   w21 = vandq_u8(w21, x1d);
+   w22 = vandq_u8(w22, x1d);
+   w23 = vandq_u8(w23, x1d);
+   w10 = veorq_u8(w10, w20);
+   w11 = veorq_u8(w11, w21);
+   w12 = veorq_u8(w12, w22);
+   w13 = veorq_u8(w13, w23);
+   wq0 = veorq_u8(w10, wd0);
+   wq1 = veorq_u8(w11, wd1);
+   wq2 = veorq_u8(w12, wd2);
+   wq3 = veorq_u8(w13, wd3);
+  }
+  vst1q_u8(&p[d+sizeof(unative_t)*0], wp0);
+  vst1q_u8(&p[d+sizeof(unative_t)*1], wp1);
+  vst1q_u8(&p[d+sizeof(unative_t)*2], wp2);
+  vst1q_u8(&p[d+sizeof(unative_t)*3], wp3);
+  vst1q_u8(&q[d+sizeof(unative_t)*0], wq0);
+  vst1q_u8(&q[d+sizeof(unative_t)*1], wq1);
+  vst1q_u8(&q[d+sizeof(unative_t)*2], wq2);
+  vst1q_u8(&q[d+sizeof(unative_t)*3], wq3);
+ }
+}