[CM] Aligns object reuse policy in creating CmQueue in Cmrtlib and UMD.

CreateQueue() and CreateQueueEx() will create one and only one render queue, but multiple compute queue as required.

Change-Id: Iac58a858bf78747890e03c34e9eb4f0f5ffe5ccc

Author: shengcon

cmrtlib/agnostic/hardware/cm_device.cpp

@@ -321,40 +321,12 @@ CM_RT_API int32_t CmDevice_RT::DestroyTask( CmTask*& task)
 //!     CM_OUT_OF_HOST_MEMORY if out of system memory;
 //!     CM_FAILURE otherwise;
 //!
-CM_RT_API int32_t CmDevice_RT::CreateQueue( CmQueue* & queue )
+CM_RT_API int32_t CmDevice_RT::CreateQueue(CmQueue* &queue)
 {
     INSERT_PROFILER_RECORD();
 
-    // For legacy CreateQueue API, we will only return the same queue
-    m_criticalSectionQueue.Acquire();
-    for (auto iter = m_queue.begin(); iter != m_queue.end(); iter++)
-    {
-        CM_QUEUE_TYPE queueType = (*iter)->GetQueueOption().QueueType;
-        if (queueType == CM_QUEUE_TYPE_RENDER)
-        {
-            queue = (*iter);
-            m_criticalSectionQueue.Release();
-            return CM_SUCCESS;
-        }
-    }
-
-    CmQueue_RT *queueRT = nullptr;
-    int32_t result = CmQueue_RT::Create(this, queueRT);
-    if (result != CM_SUCCESS)
-    {
-        CmAssert(0);
-        CmDebugMessage(("Failed to create queue!"));
-        m_criticalSectionQueue.Release();
-        return result;
-    }
-
-    m_queue.push_back(queueRT);
-    m_criticalSectionQueue.Release();
-
-    if (queueRT != nullptr)
-    {
-        queue = static_cast< CmQueue* >(queueRT);
-    }
+    CM_QUEUE_CREATE_OPTION option = CM_DEFAULT_QUEUE_CREATE_OPTION;
+    int32_t result = CreateQueueEx(queue, option);
 
 #if USE_EXTENSION_CODE
     GTPIN_MAKER_FUNCTION(CmrtCodeMarkerForGTPin_CreateQueue(this, queue));
@@ -363,28 +335,40 @@ CM_RT_API int32_t CmDevice_RT::CreateQueue( CmQueue* & queue )
     return result;
 }
 
-CM_RT_API int32_t CmDevice_RT::CreateQueueEx(CmQueue *&queue, CM_QUEUE_CREATE_OPTION queueCreateOption)
+CM_RT_API int32_t
+CmDevice_RT::CreateQueueEx(CmQueue* &queue,
+                           CM_QUEUE_CREATE_OPTION queueCreateOption)
 {
     INSERT_PROFILER_RECORD();
-
     m_criticalSectionQueue.Acquire();
+
     CmQueue_RT *queueRT = nullptr;
+    if (CM_QUEUE_TYPE_RENDER == queueCreateOption.QueueType)
+    {
+        for (auto iter = m_queue.begin(); iter != m_queue.end(); ++iter)
+        {
+            CM_QUEUE_TYPE queueType = (*iter)->GetQueueOption().QueueType;
+            if (queueType == CM_QUEUE_TYPE_RENDER)
+            {
+                queue = (*iter);
+                m_criticalSectionQueue.Release();
+                return CM_SUCCESS;
+            }
+        }
+    }
+
     int32_t result = CmQueue_RT::Create(this, queueRT, queueCreateOption);
-    if (result != CM_SUCCESS)
+    if (CM_SUCCESS != result || nullptr == queueRT)
     {
         CmAssert(0);
         CmDebugMessage(("Failed to create queue!"));
         m_criticalSectionQueue.Release();
         return result;
     }
-
     m_queue.push_back(queueRT);
+    queue = queueRT;
     m_criticalSectionQueue.Release();
 
-    if (queueRT != nullptr)
-    {
-        queue = static_cast< CmQueue* >(queueRT);
-    }
     return result;
 }
 

cmrtlib/agnostic/hardware/cm_queue.cpp

@@ -112,26 +112,6 @@ struct CM_ENQUEUE_VEBOX_PARAM
     int32_t returnValue;  // [out] return value
 };
 
-int32_t CmQueue_RT::Create(CmDevice_RT *device, CmQueue_RT *&queue)
-{
-    int32_t result = CM_SUCCESS;
-    queue = new(std::nothrow) CmQueue_RT(device, CM_DEFAULT_QUEUE_CREATE_OPTION);
-    if (queue)
-    {
-        result = queue->Initialize();
-        if (result != CM_SUCCESS)
-        {
-            CmQueue_RT::Destroy(queue);
-        }
-    }
-    else
-    {
-        CmAssert(0);
-        result = CM_OUT_OF_HOST_MEMORY;
-    }
-    return result;
-}
-
 int32_t CmQueue_RT::Create(CmDevice_RT *device, CmQueue_RT *&queue, CM_QUEUE_CREATE_OPTION queueCreateOption)
 {
     int32_t result = CM_SUCCESS;

cmrtlib/agnostic/hardware/cm_queue.h

@@ -71,8 +71,9 @@ typedef struct _CM_ENQUEUE_GPUCOPY_PARAM
 class CmQueue_RT : public CmQueue
 {
 public:
-    static int32_t Create(CmDevice_RT *device, CmQueue_RT *&queue);
-    static int32_t Create(CmDevice_RT *device, CmQueue_RT *&queue, CM_QUEUE_CREATE_OPTION queueCreateOption);
+    static int32_t Create(CmDevice_RT *device,
+                          CmQueue_RT* &queue,
+                          CM_QUEUE_CREATE_OPTION queueCreateOption);
     static int32_t Destroy(CmQueue_RT *&queue);
 
     CM_RT_API int32_t Enqueue(CmTask *task,

media_driver/agnostic/common/cm/cm_device_rt.cpp

@@ -1731,15 +1731,13 @@ CM_RT_API int32_t CmDeviceRT::DestroyKernel(CmKernel*& kernel)
     return CM_SUCCESS;
 }
 
-CM_RT_API int32_t CmDeviceRT::CreateQueue(CmQueue* & queue)
+CM_RT_API int32_t CmDeviceRT::CreateQueue(CmQueue* &queue)
 {
     INSERT_API_CALL_LOG();
 
-    CmQueue *tmpQueue = nullptr;
-
-    // For legacy CreateQueue API, we will only return the same queue
+    CM_QUEUE_CREATE_OPTION queueCreateOption = CM_DEFAULT_QUEUE_CREATE_OPTION;
     m_criticalSectionQueue.Acquire();
-    for (auto iter = m_queue.begin(); iter != m_queue.end(); iter++)
+    for (auto iter = m_queue.begin(); iter != m_queue.end(); ++iter)
     {
         CM_QUEUE_TYPE queueType = (*iter)->GetQueueOption().QueueType;
         if (queueType == CM_QUEUE_TYPE_RENDER)
@@ -1751,8 +1749,6 @@ CM_RT_API int32_t CmDeviceRT::CreateQueue(CmQueue* & queue)
     }
     m_criticalSectionQueue.Release();
 
-    CM_QUEUE_CREATE_OPTION queueCreateOption = {};
-
     // Check queue type redirect is needed.
     PCM_CONTEXT_DATA cmData = (PCM_CONTEXT_DATA)GetAccelData();
     CM_CHK_NULL_RETURN_CMERROR(cmData);
@@ -1770,51 +1766,44 @@ CM_RT_API int32_t CmDeviceRT::CreateQueue(CmQueue* & queue)
 #if (_DEBUG || _RELEASE_INTERNAL)
     // Check queue type override for debugging is needed.
     MOS_USER_FEATURE_VALUE_DATA UserFeatureData = {0};
-    if( MOS_UserFeature_ReadValue_ID( nullptr,
+    if (MOS_UserFeature_ReadValue_ID(
+            nullptr,
             __MEDIA_USER_FEATURE_VALUE_MDF_DEFAULT_CM_QUEUE_TYPE_ID,
             &UserFeatureData) == MOS_STATUS_SUCCESS )
     {
         if (UserFeatureData.u32Data == CM_QUEUE_TYPE_RENDER
-         || UserFeatureData.u32Data == CM_QUEUE_TYPE_COMPUTE)
+            || UserFeatureData.u32Data == CM_QUEUE_TYPE_COMPUTE)
         {
-            queueCreateOption.QueueType = (CM_QUEUE_TYPE)UserFeatureData.u32Data;
+            queueCreateOption.QueueType
+                    = (CM_QUEUE_TYPE)UserFeatureData.u32Data;
         }
     }
 #endif
 
-    int32_t result = CreateQueueEx(tmpQueue, queueCreateOption);
-
-    if (result != CM_SUCCESS)
-    {
-        CM_ASSERTMESSAGE("Failed to create the queue.");
-        return result;
-    }
-
-    queue = tmpQueue;
-    return CM_SUCCESS;
+    return CreateQueueEx(queue, queueCreateOption);
 }
 
 CM_RT_API int32_t
-CmDeviceRT::CreateQueueEx(CmQueue* & queue,
+CmDeviceRT::CreateQueueEx(CmQueue* &queue,
                           CM_QUEUE_CREATE_OPTION queueCreateOption)
 {
     INSERT_API_CALL_LOG();
-
     m_criticalSectionQueue.Acquire();
-    CmQueueRT *queueRT = nullptr;
 
-    for (auto iter = m_queue.begin(); iter != m_queue.end(); iter++)
+    CmQueueRT *queueRT = nullptr;
+    if (CM_QUEUE_TYPE_RENDER == queueCreateOption.QueueType)
     {
-        CM_QUEUE_TYPE queueType = (*iter)->GetQueueOption().QueueType;
-        unsigned int gpuContext = (*iter)->GetQueueOption().GPUContext;
-
-        if (queueType == CM_QUEUE_TYPE_RENDER
-            && queueType == queueCreateOption.QueueType
-            && gpuContext == queueCreateOption.GPUContext)
+        for (auto iter = m_queue.begin(); iter != m_queue.end(); ++iter)
         {
-            queue = (*iter);
-            m_criticalSectionQueue.Release();
-            return CM_SUCCESS;
+            CM_QUEUE_TYPE queueType = (*iter)->GetQueueOption().QueueType;
+            unsigned int gpuContext = (*iter)->GetQueueOption().GPUContext;
+            if (queueType == CM_QUEUE_TYPE_RENDER
+                && gpuContext == queueCreateOption.GPUContext)
+            {
+                queue = (*iter);
+                m_criticalSectionQueue.Release();
+                return CM_SUCCESS;
+            }
         }
     }
 
@@ -1825,7 +1814,6 @@ CmDeviceRT::CreateQueueEx(CmQueue* & queue,
         m_criticalSectionQueue.Release();
         return result;
     }
-
     m_queue.push_back(queueRT);
     queue = queueRT;
     m_criticalSectionQueue.Release();