From 9ef13bd018fc5c6e2dc57aa36d378919c8aeded1 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Wed, 16 Mar 2011 16:56:29 +1030
Subject: [PATCH] re PR target/45844 (FAIL: gfortran.dg/vect/pr45714-b.f -O
(internal compiler error))
PR target/45844
* config/rs6000/rs6000.c (rs6000_legitimize_reload_address): Don't
create invalid offset address for vsx splat insn.
* config/rs6000/predicates.md (splat_input_operand): New.
* config/rs6000/vsx.md (vsx_splat_*): Use it.
From-SVN: r171031
---
gcc/ChangeLog | 8 ++++++++
gcc/config/rs6000/predicates.md | 19 ++++++++++++++++++-
gcc/config/rs6000/rs6000.c | 8 ++++++++
gcc/config/rs6000/vsx.md | 2 +-
4 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 493629e2af9b..876262325702 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2011-03-16 Alan Modra <amodra@gmail.com>
+
+ PR target/45844
+ * config/rs6000/rs6000.c (rs6000_legitimize_reload_address): Don't
+ create invalid offset address for vsx splat insn.
+ * config/rs6000/predicates.md (splat_input_operand): New.
+ * config/rs6000/vsx.md (vsx_splat_*): Use it.
+
2011-03-15 Xinliang David Li <davidxl@google.com>
PR c/47837
diff --git a/gcc/config/rs6000/predicates.md b/gcc/config/rs6000/predicates.md
index 90947452b65c..046f8bca83b4 100644
--- a/gcc/config/rs6000/predicates.md
+++ b/gcc/config/rs6000/predicates.md
@@ -1,5 +1,5 @@
;; Predicate definitions for POWER and PowerPC.
-;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
;; Free Software Foundation, Inc.
;;
;; This file is part of GCC.
@@ -871,6 +871,23 @@
return 0;
})
+;; Return 1 if this operand is a valid input for a vsx_splat insn.
+(define_predicate "splat_input_operand"
+ (match_code "label_ref,symbol_ref,const,high,reg,subreg,mem,
+ const_double,const_vector,const_int,plus")
+{
+ if (MEM_P (op))
+ {
+ if (mode == DFmode)
+ mode = V2DFmode;
+ else if (mode == DImode)
+ mode = V2DImode;
+ else
+ gcc_unreachable ();
+ }
+ return input_operand (op, mode);
+})
+
;; Return true if OP is an invalid SUBREG operation on the e500.
(define_predicate "rs6000_nonimmediate_operand"
(match_code "reg,subreg,mem")
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 0ff174519d3b..0714c8fc3998 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -6676,6 +6676,14 @@ rs6000_legitimize_reload_address (rtx x, enum machine_mode mode,
{
bool reg_offset_p = reg_offset_addressing_ok_p (mode);
+ /* Nasty hack for vsx_splat_V2DF/V2DI load from mem, which takes a
+ DFmode/DImode MEM. */
+ if (reg_offset_p
+ && opnum == 1
+ && ((mode == DFmode && recog_data.operand_mode[0] == V2DFmode)
+ || (mode == DImode && recog_data.operand_mode[0] == V2DImode)))
+ reg_offset_p = false;
+
/* We must recognize output that we have already generated ourselves. */
if (GET_CODE (x) == PLUS
&& GET_CODE (XEXP (x, 0)) == PLUS
diff --git a/gcc/config/rs6000/vsx.md b/gcc/config/rs6000/vsx.md
index 3f6da4c0b404..a5b5a5374cb7 100644
--- a/gcc/config/rs6000/vsx.md
+++ b/gcc/config/rs6000/vsx.md
@@ -1076,7 +1076,7 @@
(define_insn "vsx_splat_<mode>"
[(set (match_operand:VSX_D 0 "vsx_register_operand" "=wd,wd,wd,?wa,?wa,?wa")
(vec_duplicate:VSX_D
- (match_operand:<VS_scalar> 1 "input_operand" "ws,f,Z,wa,wa,Z")))]
+ (match_operand:<VS_scalar> 1 "splat_input_operand" "ws,f,Z,wa,wa,Z")))]
"VECTOR_MEM_VSX_P (<MODE>mode)"
"@
xxpermdi %x0,%x1,%x1,0
--
GitLab