[llvm-branch-commits] [llvm-branch] r208828 - Merging r207990:

[Tom Stellard]

Author: tstellar
Date: Wed May 14 19:15:24 2014
New Revision: 208828

URL: http://llvm.org/viewvc/llvm-project?rev=208828&view=rev
Log:
Merging r207990:

------------------------------------------------------------------------
r207990 | marek.olsak | 2014-05-05 15:30:54 -0400 (Mon, 05 May 2014) | 6 lines

R600/SI: allow 5 more input SGPRs to a shader

Our OpenGL driver needs 22 SGPRs (16 user SGPRs + 6 streamout non-user SGPRs).

Signed-off-by: Marek Olšák <marek.olsak at amd.com>

------------------------------------------------------------------------

Modified:
    llvm/branches/release_34/lib/Target/R600/AMDGPUCallingConv.td

Modified: llvm/branches/release_34/lib/Target/R600/AMDGPUCallingConv.td
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/lib/Target/R600/AMDGPUCallingConv.td?rev=208828&r1=208827&r2=208828&view=diff
==============================================================================
--- llvm/branches/release_34/lib/Target/R600/AMDGPUCallingConv.td (original)
+++ llvm/branches/release_34/lib/Target/R600/AMDGPUCallingConv.td Wed May 14 19:15:24 2014
@@ -20,7 +20,7 @@ def CC_SI : CallingConv<[
   CCIfInReg<CCIfType<[f32, i32] , CCAssignToReg<[
     SGPR0, SGPR1, SGPR2, SGPR3, SGPR4, SGPR5, SGPR6, SGPR7,
     SGPR8, SGPR9, SGPR10, SGPR11, SGPR12, SGPR13, SGPR14, SGPR15,
-    SGPR16
+    SGPR16, SGPR17, SGPR18, SGPR19, SGPR20, SGPR21
   ]>>>,
 
   CCIfInReg<CCIfType<[i64] , CCAssignToRegWithShadow<