From 9b2fc7a77e7740de13f0f773d192080565669721 Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Thu, 10 Dec 2015 14:27:54 -0500
Subject: [PATCH] P4 to Git Change 1219652 by asalmanp@asalmanp-opencl-stg on
 2015/12/10 14:20:26

	SWDEV-82296 - [CQE OCL][2.0][HWSC][16.10]SDK Sample "AtomicCounters" 32/64bit failed with HWSC driver

	Disabling the cl_ext_atomic_counters_32 extension since there is no support for this extension on HSAIL and HWS.

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/9221/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#265 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#538 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#338 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsasettings.cpp#11 edit
---
 rocclr/runtime/device/device.hpp          | 2 --
 rocclr/runtime/device/gpu/gpudevice.cpp   | 4 ----
 rocclr/runtime/device/gpu/gpusettings.cpp | 1 -
 3 files changed, 7 deletions(-)

diff --git a/rocclr/runtime/device/device.hpp b/rocclr/runtime/device/device.hpp
index b468719b41..45ef0bfabe 100644
--- a/rocclr/runtime/device/device.hpp
+++ b/rocclr/runtime/device/device.hpp
@@ -89,7 +89,6 @@ enum OclExtensions {
     ClKhrGlSharing,
     ClKhrGLDepthImages,
     ClExtDeviceFission,
-    ClExtAtomicCounters32,
     ClAmdDeviceAttributeQuery,
     ClAmdVec3,
     ClAmdPrintf,
@@ -133,7 +132,6 @@ OclExtensionsString[] = {
     "cl_khr_gl_sharing ",
     "cl_khr_gl_depth_images ",
     "cl_ext_device_fission ",
-    "cl_ext_atomic_counters_32 ",
     "cl_amd_device_attribute_query ",
     "cl_amd_vec3 ",
     "cl_amd_printf ",
diff --git a/rocclr/runtime/device/gpu/gpudevice.cpp b/rocclr/runtime/device/gpu/gpudevice.cpp
index 1caa33381c..18267c54a4 100644
--- a/rocclr/runtime/device/gpu/gpudevice.cpp
+++ b/rocclr/runtime/device/gpu/gpudevice.cpp
@@ -486,10 +486,6 @@ void NullDevice::fillDeviceInfo(
 
     info_.extensions_   = getExtensionString();
 
-    if (settings().checkExtension(ClExtAtomicCounters32)) {
-        info_.maxAtomicCounters_    = MaxAtomicCounters;
-    }
-
     info_.deviceTopology_.pcie.type = CL_DEVICE_TOPOLOGY_TYPE_PCIE_AMD;
     info_.deviceTopology_.pcie.bus = (calAttr.pciTopologyInformation&(0xFF<<8))>>8;
     info_.deviceTopology_.pcie.device = (calAttr.pciTopologyInformation&(0x1F<<3))>>3;
diff --git a/rocclr/runtime/device/gpu/gpusettings.cpp b/rocclr/runtime/device/gpu/gpusettings.cpp
index 6eeafa488f..61fd850c9a 100644
--- a/rocclr/runtime/device/gpu/gpusettings.cpp
+++ b/rocclr/runtime/device/gpu/gpusettings.cpp
@@ -347,7 +347,6 @@ Settings::create(
     enableExtension(ClKhr3DImageWrites);
     enableExtension(ClAmdVec3);
     enableExtension(ClAmdPrintf);
-    enableExtension(ClExtAtomicCounters32);
     // Enable some platform extensions
     enableExtension(ClAmdDeviceAttributeQuery);
     enableExtension(ClKhrSpir);