P4 to Git Change 1117979 by jatang@jatang-opencl-hsa-stg1 on 2015/02/03 10:05:21

EPR #412821 - Add CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD to cl_amd_device_attribute_query.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_device.cpp#56 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h#8 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h#15 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#239 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#493 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#105 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.h#43 edit

rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp

@@ -308,6 +308,8 @@ CALGSLDevice::open(uint32 gpuIndex, bool enableHighPerformanceState, bool report
         return false;
     }
 
+    m_adp->queryAvailableEngines(&m_nEngines, m_engines);
+
     if (m_PerformLazyDeviceInit)
     {
         // close the adaptor
@@ -1405,14 +1407,6 @@ CALGSLDevice::resCopy(gslMemObject srcRes, gslMemObject dstRes, uint32 flags) co
     }
 }
 
-void
-CALGSLDevice::queryDeviceEngines(uint32 *nEngines, gslEngineDescriptor *engines)
-{
-    PerformFullInitialization();
-
-    m_adp->queryAvailableEngines(nEngines, engines);
-}
-
 #define CPDMA_THRESHOLD 131072
 
 CopyType

rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.h

@@ -115,7 +115,6 @@ public:
 
     void             PerformAdapterInitialization() const;
     void             PerformFullInitialization() const;
-    void             queryDeviceEngines(uint32* nEngines, gslEngineDescriptor* engines);
 
     CopyType         GetCopyType(gslMemObject srcMem, gslMemObject destMem, size_t* srcOffset,
                                      size_t* destOffset, bool allowDMA, uint32 flags, uint64& surfaceSize,
@@ -160,6 +159,9 @@ protected:
         channelSwizzleMode a : 8;  ///< Alpha channel of texture
     } channelSwizzle;
 
+    uint                m_nEngines;
+    gslEngineDescriptor m_engines[GSL_ENGINEID_MAX];
+
 private:
     gsl::gsAdaptor*  m_adp;
     gsl::gsCtx*      m_cs;