[llvm-branch-commits] [llvm-branch] r235549 - Merging r228374:

[Tom Stellard]

Author: tstellar
Date: Wed Apr 22 16:13:10 2015
New Revision: 235549

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

------------------------------------------------------------------------
r228374 | michel.daenzer | 2015-02-05 21:51:29 -0500 (Thu, 05 Feb 2015) | 4 lines

R600/SI: Amend a test to ensure WQM is enabled for LDS in pixel shaders

Reviewed-by: Tom Stellard <tom at stellard.net>

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

Modified:
    llvm/branches/release_36/test/CodeGen/R600/si-sgpr-spill.ll

Modified: llvm/branches/release_36/test/CodeGen/R600/si-sgpr-spill.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_36/test/CodeGen/R600/si-sgpr-spill.ll?rev=235549&r1=235548&r2=235549&view=diff
==============================================================================
--- llvm/branches/release_36/test/CodeGen/R600/si-sgpr-spill.ll (original)
+++ llvm/branches/release_36/test/CodeGen/R600/si-sgpr-spill.ll Wed Apr 22 16:13:10 2015
@@ -5,6 +5,7 @@
 ; SGPRs.
 
 ; CHECK-LABEL: {{^}}main:
+; CHECK: s_wqm
 ; Writing to M0 from an SMRD instruction will hang the GPU.
 ; CHECK-NOT: s_buffer_load_dword m0
 ; CHECK: s_endpgm