From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6159 invoked by alias); 31 May 2012 23:02:54 -0000 Received: (qmail 6039 invoked by uid 22791); 31 May 2012 23:02:52 -0000 X-SWARE-Spam-Status: No, hits=-2.8 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,KHOP_RCVD_TRUST,RCVD_IN_DNSWL_LOW,RCVD_IN_HOSTKARMA_YE,TW_GR,TW_XX,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail-vb0-f73.google.com (HELO mail-vb0-f73.google.com) (209.85.212.73) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 31 May 2012 23:02:37 +0000 Received: by vbbfd1 with SMTP id fd1so171159vbb.2 for ; Thu, 31 May 2012 16:02:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=to:subject:message-id:date:from:x-gm-message-state; bh=HEjTVcRtdIOKxiSn/H0IqhhUx/gJjFtMoq2PAM1QPh4=; b=cLsyryznPaYArAdMf/trOypTANJrlwLPBHKv3kPN19VktNnkR+dqYMlF5KFNSuRC5Q 9Bp1QNY0HdqGlf2u+6al4qpWxDlYWDyHOCak18oisKu3sFYw09R2IDFaSR7pS+ECIFex SEj84Yj91u85u8ni1v9ejnn3GnsXrGNXWCXW6hrjhTGFEBr35zVvg6KR+WWfgsdgsZmQ BzLovlcMETYCNlZmFbN3AFHnWbb2Vgtk0ZUeTGqffwsAC//UEs009n3FucGm3wlCWaWp 5sHElrI+D+UEN4mq2Y3g77Yxqwb2hI6ufVUOPQsWfJIT84l3RW8F9VA3eNEaCb/wSP/d PglQ== Received: by 10.236.161.98 with SMTP id v62mr844824yhk.4.1338505356913; Thu, 31 May 2012 16:02:36 -0700 (PDT) Received: by 10.236.161.98 with SMTP id v62mr844820yhk.4.1338505356870; Thu, 31 May 2012 16:02:36 -0700 (PDT) Received: from wpzn3.hot.corp.google.com (216-239-44-65.google.com [216.239.44.65]) by gmr-mx.google.com with ESMTPS id w40si34113anp.3.2012.05.31.16.02.36 (version=TLSv1/SSLv3 cipher=AES128-SHA); Thu, 31 May 2012 16:02:36 -0700 (PDT) Received: from atree.mtv.corp.google.com (atree.mtv.corp.google.com [172.18.110.18]) by wpzn3.hot.corp.google.com (Postfix) with ESMTP id 9E98410004D; Thu, 31 May 2012 16:02:36 -0700 (PDT) Received: by atree.mtv.corp.google.com (Postfix, from userid 51281) id 2BE4E20D7D; Thu, 31 May 2012 16:02:35 -0700 (PDT) To: reply@codereview.appspotmail.com,dnovillo@google.com,gcc-patches@gcc.gnu.org Subject: [google/gcc-4_6] Backport r171031 from upstream to fix ICE on PowerPC64 (issue6255070) Message-Id: <20120531230236.2BE4E20D7D@atree.mtv.corp.google.com> Date: Thu, 31 May 2012 23:02:00 -0000 From: dougkwan@google.com (Doug Kwan) X-Gm-Message-State: ALoCoQlvdvqt5l9QPc4m1oHR97cOpQEiyR+25jSsIKAFC/JRvxjfXdSWie13pvZ2CXJr49iMnEvEaOBXK3LFgdgsxfbN+MhrnLbn07HLSK6GkIRD4ye03IkdeGER/63zAk6lsZCyhBOPeHHZLPYdzOWsMS1rgd6dqQ== X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2012-05/txt/msg02133.txt.bz2 Hi Diego, This is a backport of this patch to fix an ICE on PowerPC64. http://gcc.gnu.org/ml/gcc-patches/2011-03/msg00829.html -Doug 2012-05-31 Doug Kwan Backport r171031 from upstream trunk in gcc/. 2011-03-16 Alan Modra 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. * contrib/testsuite-management/powerpc64-grtev2-linux-gnu.xfail: Remove expected failures because now the bug is fixed by the above. Index: contrib/testsuite-management/powerpc64-grtev2-linux-gnu.xfail =================================================================== --- contrib/testsuite-management/powerpc64-grtev2-linux-gnu.xfail (revision 188083) +++ contrib/testsuite-management/powerpc64-grtev2-linux-gnu.xfail (working copy) @@ -69,8 +69,6 @@ FAIL: gcc.target/powerpc/pr47755-2.c execution tes # *** gfortran: XPASS: gfortran.dg/nint_2.f90 -O0 execution test -FAIL: gfortran.dg/vect/pr45714-b.f -O (internal compiler error) -FAIL: gfortran.dg/vect/pr45714-b.f -O (test for excess errors) FAIL: gfortran.dg/vect/fast-math-pr38968.f90 execution test # *** g++: Index: gcc/config/rs6000/predicates.md =================================================================== --- gcc/config/rs6000/predicates.md (revision 188083) +++ gcc/config/rs6000/predicates.md (working copy) @@ -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") Index: gcc/config/rs6000/rs6000.c =================================================================== --- gcc/config/rs6000/rs6000.c (revision 188083) +++ gcc/config/rs6000/rs6000.c (working copy) @@ -6703,6 +6703,14 @@ rs6000_legitimize_reload_address (rtx x, enum mach { 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 Index: gcc/config/rs6000/vsx.md =================================================================== --- gcc/config/rs6000/vsx.md (revision 188083) +++ gcc/config/rs6000/vsx.md (working copy) @@ -1076,7 +1076,7 @@ (define_insn "vsx_splat_" [(set (match_operand:VSX_D 0 "vsx_register_operand" "=wd,wd,wd,?wa,?wa,?wa") (vec_duplicate:VSX_D - (match_operand: 1 "input_operand" "ws,f,Z,wa,wa,Z")))] + (match_operand: 1 "splat_input_operand" "ws,f,Z,wa,wa,Z")))] "VECTOR_MEM_VSX_P (mode)" "@ xxpermdi %x0,%x1,%x1,0 -- This patch is available for review at http://codereview.appspot.com/6255070