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


[ROCm/clr commit: 8eb38c986f]

projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp

@@ -787,6 +787,7 @@ void Device::fillDeviceInfo(
         info_.localMemSizePerCU_    = hwInfo()->localMemSizePerCU_;
         info_.localMemBanks_        = hwInfo()->localMemBanks_;
         info_.gfxipVersion_         = hwInfo()->gfxipVersion_;
+        info_.numAsyncQueues_       = engines().numComputeRings();
         info_.threadTraceEnable_    = settings().threadTraceEnable_;
     }
 }
@@ -820,6 +821,8 @@ Device::create(CALuint ordinal, CALuint numOfDevices)
         return false;
     }
 
+    engines_.create(m_nEngines, m_engines, settings().numComputeRings_);
+
     amd::Context::Info  info = {0};
     std::vector<amd::Device*> devices;
     devices.push_back(this);
@@ -975,10 +978,8 @@ Device::initializeHeapResources()
     amd::ScopedLock k(lockAsyncOpsForInitHeap_);
     if (!heapInitComplete_) {
         heapInitComplete_ = true;
-        uint nEngines;
-        gslEngineDescriptor engines[GSL_ENGINEID_MAX];
-        queryDeviceEngines(&nEngines, engines);
-        engines_.create(nEngines, engines, settings().numComputeRings_);
+
+        PerformFullInitialization();
 
         uint numComputeRings = engines_.numComputeRings();
         scratch_.resize((settings().useSingleScratch_) ? 1 : (numComputeRings ? numComputeRings : 1));