From 663cb0cdb0957716f93c98bedc6c81729898a181 Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Fri, 30 Sep 2016 02:07:13 -0400
Subject: [PATCH] P4 to Git Change 1320976 by lmoriche@lmoriche_opencl_dev on
 2016/09/30 02:00:09

	SWDEV-103751 - [ROCm CQE][OCLonLC][QR][G] WF 2.0 conf test "Subgroups" fails
	- Enable cl_khr_subgroups for the ROCm device.
	- Fill in info_.wavefrontWidth_ from hsa_get_agent_info

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#21 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocsettings.cpp#4 edit


[ROCm/clr commit: a6d5fb60eb6651b412eb9c3f04d0775ad8a270fe]
---
 projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp   | 7 +++++++
 projects/clr/rocclr/runtime/device/rocm/rocsettings.cpp | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp b/projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp
index c9af9fa9e0..4a9b9cb649 100644
--- a/projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp
+++ b/projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp
@@ -970,6 +970,13 @@ Device::populateOCLDeviceConstants()
         }
     }
 
+    if (HSA_STATUS_SUCCESS !=
+        hsa_agent_get_info(_bkendDevice,
+                           HSA_AGENT_INFO_WAVEFRONT_SIZE,
+                           &info_.wavefrontWidth_)) {
+        return false;
+    }
+
     return true;
 }
 
diff --git a/projects/clr/rocclr/runtime/device/rocm/rocsettings.cpp b/projects/clr/rocclr/runtime/device/rocm/rocsettings.cpp
index c9a1bbc819..9ab97d0603 100644
--- a/projects/clr/rocclr/runtime/device/rocm/rocsettings.cpp
+++ b/projects/clr/rocclr/runtime/device/rocm/rocsettings.cpp
@@ -80,6 +80,8 @@ Settings::create(bool doublePrecision)
         // Also enable AMD double precision extension?
         enableExtension(ClAmdFp64);
     }
+    
+    enableExtension(ClKhrSubGroups);
 
     enableExtension(ClKhrDepthImages);
     supportDepthsRGB_ = true;