diff mbox

[ia64,PR,target/52731] internal compiler error: in ia64_st_address_bypass_p, at config/ia64/ia64.c:9357

Message ID 20131120153720.GA18804@msticlxl57.ims.intel.com
State New
Headers show

Commit Message

Kirill Yukhin Nov. 20, 2013, 3:37 p.m. UTC
Hello,
Patch in the bottom fixes PR52731.

The essense of the problem is that `ia64_single_set'
allows double set as exception for `prologue_allocate_stack'
and `epilogue_deallocate_stack'.

Although it does not apply this exception for predicated 
version of the patterns. I introduce explicit predicated
versions of the insns and use their codes in the routine.

Test passes w/ patch applied and fails when not.
Bootstrap pass (for all languages).

ChangeLog entry:
2013-11-20  Kirill Yukhin  <kirill.yukhin@intel.com>

	* config/ia64/ia64.md (prologue_allocate_stack): Block auto-
	generation of predicated version.
	(epilogue_deallocate_stack): Ditto.
	(prologue_allocate_stack_pr): Add explicit predicated version.
	(epilogue_deallocate_stack_pr): Ditto.

testsuite/ChangeLog entry:
2013-11-20  Kirill Yukhin  <kirill.yukhin@intel.com>

	* gcc.target/ia64/pr52731.c: New. 

Is it ok for trunk?

--
Thanks, K

 gcc/config/ia64/ia64.c                  |    2 +
 gcc/config/ia64/ia64.md                 |   41 +++++++++++++++++++++++++++++-
 gcc/testsuite/gcc.target/ia64/pr52731.c |   19 ++++++++++++++
 3 files changed, 60 insertions(+), 2 deletions(-)

Comments

Kirill Yukhin Nov. 29, 2013, 12:01 p.m. UTC | #1
Hello,
On 20 Nov 18:37, Kirill Yukhin wrote:
> Hello,
> Patch in the bottom fixes PR52731.
> Is it ok for trunk?
Ping?

--
Thanks, K
Steve Ellcey Dec. 3, 2013, 7:22 p.m. UTC | #2
On Fri, 2013-11-29 at 15:01 +0300, Kirill Yukhin wrote:
> Hello,
> On 20 Nov 18:37, Kirill Yukhin wrote:
> > Hello,
> > Patch in the bottom fixes PR52731.
> > Is it ok for trunk?
> Ping?
> 
> --
> Thanks, K

OK.

Steve Ellcey
sellcey@mips.com
diff mbox

Patch

diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
index 4fde7aa..6ce7154 100644
--- a/gcc/config/ia64/ia64.c
+++ b/gcc/config/ia64/ia64.c
@@ -7146,7 +7146,9 @@  ia64_single_set (rtx insn)
   switch (recog_memoized (insn))
     {
     case CODE_FOR_prologue_allocate_stack:
+    case CODE_FOR_prologue_allocate_stack_pr:
     case CODE_FOR_epilogue_deallocate_stack:
+    case CODE_FOR_epilogue_deallocate_stack_pr:
       ret = XVECEXP (x, 0, 0);
       break;
 
diff --git a/gcc/config/ia64/ia64.md b/gcc/config/ia64/ia64.md
index 4d9d4e0..bc4e8cb 100644
--- a/gcc/config/ia64/ia64.md
+++ b/gcc/config/ia64/ia64.md
@@ -4652,6 +4652,8 @@ 
 
 ;; This prevents the scheduler from moving the SP decrement past FP-relative
 ;; stack accesses.  This is the same as adddi3 plus the extra set.
+;; Explicit predicated version of insn needed to check by CODE_FOR_
+;; in ia64_single_set, where despite of 2 sets this define_insn should be OK.
 
 (define_insn "prologue_allocate_stack"
   [(set (match_operand:DI 0 "register_operand" "=r,r,r")
@@ -4664,10 +4666,31 @@ 
    add %0 = %1, %2
    adds %0 = %2, %1
    addl %0 = %2, %1"
-  [(set_attr "itanium_class" "ialu")])
+  [(set_attr "itanium_class" "ialu")
+   (set_attr "predicable" "no")])
+
+(define_insn "prologue_allocate_stack_pr"
+  [(cond_exec (match_operator 0 ("predicate_operator")
+		 [(match_operand:BI 1 ("register_operand") ("c,c,c"))
+		  (const_int 0)])
+	      (parallel
+	         [(set (match_operand:DI 2 "register_operand" "=r,r,r")
+		       (plus:DI (match_operand:DI 3 "register_operand" "%r,r,a")
+				(match_operand:DI 4 "gr_reg_or_22bit_operand" "r,I,J")))
+		  (set (match_operand:DI 5 "register_operand" "+r,r,r")
+		       (match_dup 5))]))]
+  ""
+  "@
+   (%J0) add %2 = %3, %4
+   (%J0) adds %2 = %3, %4
+   (%J0) addl %2 = %3, %4"
+  [(set_attr "itanium_class" "ialu")
+   (set_attr "predicable" "no")])
 
 ;; This prevents the scheduler from moving the SP restore past FP-relative
 ;; stack accesses.  This is similar to movdi plus the extra set.
+;; Explicit predicated version of insn needed to check by CODE_FOR_
+;; in ia64_single_set, where despite of 2 sets this define_insn should be OK.
 
 (define_insn "epilogue_deallocate_stack"
   [(set (match_operand:DI 0 "register_operand" "=r")
@@ -4675,7 +4698,21 @@ 
    (set (match_dup 1) (match_dup 1))]
   ""
   "mov %0 = %1"
-  [(set_attr "itanium_class" "ialu")])
+  [(set_attr "itanium_class" "ialu")
+   (set_attr "predicable" "no")])
+
+(define_insn "epilogue_deallocate_stack_pr"
+  [(cond_exec (match_operator 0 ("predicate_operator")
+		 [(match_operand:BI 1 ("register_operand") ("c"))
+		  (const_int 0)])
+	      (parallel
+	         [(set (match_operand:DI 2 "register_operand" "=r")
+		       (match_operand:DI 3 "register_operand" "+r"))
+		  (set (match_dup 3) (match_dup 3))]))]
+  ""
+  "(%J0) mov %2 = %3"
+  [(set_attr "itanium_class" "ialu")
+   (set_attr "predicable" "no")])
 
 ;; As USE insns aren't meaningful after reload, this is used instead
 ;; to prevent deleting instructions setting registers for EH handling
diff --git a/gcc/testsuite/gcc.target/ia64/pr52731.c b/gcc/testsuite/gcc.target/ia64/pr52731.c
new file mode 100644
index 0000000..50ef1d7
--- /dev/null
+++ b/gcc/testsuite/gcc.target/ia64/pr52731.c
@@ -0,0 +1,19 @@ 
+/* { dg-do compile { target ia64-*-* } } */
+/* { dg-options "-O2" } */
+
+char* area;
+long int area_size;
+char* base;
+
+void fun(unsigned long int addr)
+{
+  unsigned long int size32 = (addr + 4096 - 1) & ~(4096 - 1);
+  unsigned long int size = size32 * sizeof(unsigned int);
+
+  if (size > 0) {
+    size = (size + 1) & ~(1);
+  }
+
+  area_size = size;
+  area = base + size;
+}