commit 7aad8fd8f45e07d72e50792aec18c2b476bdd96e
author Matt Arsenault <Matthew.Arsenault@amd.com> Tue Jan 24 22:02:15 2017 +0000
committer Matt Arsenault <Matthew.Arsenault@amd.com> Tue Jan 24 22:02:15 2017 +0000
tree c4944a9d92eed6e454c369d9723cad854da9498b
parent e4c1dd2c08586649ebb3ae1e51ad98f0efabaf68

Enable FeatureFlatForGlobal on Volcanic Islands

This switches to the workaround that HSA defaults to
for the mesa path.

This should be applied to the 4.0 branch.

Patch by Vedran Miletić <vedran@miletic.net>

llvm-svn: 292982

llvm/test/CodeGen/AMDGPU/sminmax.ll

diff --git a/llvm/test/CodeGen/AMDGPU/sminmax.ll b/llvm/test/CodeGen/AMDGPU/sminmax.ll
index 8346520..ce5d924 100644
--- a/llvm/test/CodeGen/AMDGPU/sminmax.ll
+++ b/llvm/test/CodeGen/AMDGPU/sminmax.ll
@@ -181,8 +181,8 @@
 }
 
 ; FUNC-LABEL: {{^}}v_min_max_i32:
-; GCN: buffer_load_dword [[VAL0:v[0-9]+]]
-; GCN: buffer_load_dword [[VAL1:v[0-9]+]]
+; GCN: {{buffer|flat}}_load_dword [[VAL0:v[0-9]+]]
+; GCN: {{buffer|flat}}_load_dword [[VAL1:v[0-9]+]]
 
 ; GCN-DAG: v_min_i32_e32 v{{[0-9]+}}, [[VAL1]], [[VAL0]]
 ; GCN-DAG: v_max_i32_e32 v{{[0-9]+}}, [[VAL1]], [[VAL0]]