From owner-svn-src-all@FreeBSD.ORG  Wed Dec 25 20:58:03 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 86517591;
 Wed, 25 Dec 2013 20:58:03 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 59A8E125E;
 Wed, 25 Dec 2013 20:58:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBPKw3PB005208;
 Wed, 25 Dec 2013 20:58:03 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBPKw3De005207;
 Wed, 25 Dec 2013 20:58:03 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201312252058.rBPKw3De005207@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 25 Dec 2013 20:58:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r259888 - head/contrib/llvm/lib/Target/X86
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Dec 2013 20:58:03 -0000

Author: dim
Date: Wed Dec 25 20:58:02 2013
New Revision: 259888
URL: http://svnweb.freebsd.org/changeset/base/259888

Log:
  Pull in r183971 from upstream llvm trunk:
  
    X86: cvtpi2ps is just an SSE instruction with MMX operands. It has no AVX
    equivalent.
  
    Give it the right register format so we can also emit it when AVX is enabled.
  
  This should fix a "Cannot select: intrinsic %llvm.x86.sse.cvtpi2ps" fatal error
  in clang while building the gnuradio port for amd64.
  
  Reported by:	db
  MFC after:	3 days

Modified:
  head/contrib/llvm/lib/Target/X86/X86InstrMMX.td

Modified: head/contrib/llvm/lib/Target/X86/X86InstrMMX.td
==============================================================================
--- head/contrib/llvm/lib/Target/X86/X86InstrMMX.td	Wed Dec 25 20:26:49 2013	(r259887)
+++ head/contrib/llvm/lib/Target/X86/X86InstrMMX.td	Wed Dec 25 20:58:02 2013	(r259888)
@@ -189,13 +189,14 @@ multiclass sse12_cvt_pint<bits<8> opc, R
 multiclass sse12_cvt_pint_3addr<bits<8> opc, RegisterClass SrcRC,
                     RegisterClass DstRC, Intrinsic Int, X86MemOperand x86memop,
                     PatFrag ld_frag, string asm, Domain d> {
-  def irr : PI<opc, MRMSrcReg, (outs DstRC:$dst),(ins DstRC:$src1, SrcRC:$src2),
-              asm, [(set DstRC:$dst, (Int DstRC:$src1, SrcRC:$src2))], 
-              NoItinerary, d>;
-  def irm : PI<opc, MRMSrcMem, (outs DstRC:$dst),
-                   (ins DstRC:$src1, x86memop:$src2), asm,
-              [(set DstRC:$dst, (Int DstRC:$src1, (ld_frag addr:$src2)))], 
-              NoItinerary, d>;
+  def irr : MMXPI<opc, MRMSrcReg, (outs DstRC:$dst),
+                  (ins DstRC:$src1, SrcRC:$src2), asm,
+                  [(set DstRC:$dst, (Int DstRC:$src1, SrcRC:$src2))],
+                  NoItinerary, d>;
+  def irm : MMXPI<opc, MRMSrcMem, (outs DstRC:$dst),
+                  (ins DstRC:$src1, x86memop:$src2), asm,
+                  [(set DstRC:$dst, (Int DstRC:$src1, (ld_frag addr:$src2)))],
+                  NoItinerary, d>;
 }
 
 //===----------------------------------------------------------------------===//