Skip to content

Commit

Permalink
[Media Common][VP] gpucontexthandle use map not vector
Browse files Browse the repository at this point in the history 
gpucontexthandle use map not vectorfor perf
  • Loading branch information
@haichund1 @intel-mediadev
haichund1 authored and intel-mediadev committed Aug 15, 2024
1 parent bf4ff61 commit 82d2524
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 40 deletions.
66 changes: 36 additions & 30 deletions media_softlet/agnostic/common/os/mos_gpucontextmgr_next.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ MOS_STATUS GpuContextMgrNext::Initialize()
MOS_OS_CHK_NULL_RETURN(m_gpuContextArrayMutex);

MosUtilities::MosLockMutex(m_gpuContextArrayMutex);
m_gpuContextArray.clear();
m_gpuContextMap.clear();
MosUtilities::MosUnlockMutex(m_gpuContextArrayMutex);

m_initialized = true;
Expand Down Expand Up @@ -106,7 +106,7 @@ void GpuContextMgrNext::CleanUp()
DestroyAllGpuContexts();

MosUtilities::MosLockMutex(m_gpuContextArrayMutex);
m_gpuContextArray.clear();
m_gpuContextMap.clear();
MosUtilities::MosUnlockMutex(m_gpuContextArrayMutex);

m_initialized = false;
Expand Down Expand Up @@ -159,37 +159,37 @@ GpuContextNext *GpuContextMgrNext::CreateGpuContext(
MosUtilities::MosLockMutex(m_gpuContextArrayMutex);

GPU_CONTEXT_HANDLE gpuContextHandle = 0;
bool found = false;

if (m_noCycledGpuCxtMgmt)
{
// new created context at the end of m_gpuContextArray.
gpuContextHandle = m_gpuContextArray.size() ? m_gpuContextArray.size() : 0;
gpuContextHandle = m_gpuContextHanleForNonCycledCase;
m_gpuContextHanleForNonCycledCase++;
}
else
{
// Directly replace nullptr with new created context in m_gpuContextArray.
GpuContextNext *curGpuContext = nullptr;
int index = 0;
for (auto &curGpuContext : m_gpuContextArray)
for (auto &igpu : m_gpuContextMap)
{
if (curGpuContext == nullptr)
if (igpu.second == nullptr)
{
gpuContextHandle = igpu.first;
igpu.second = gpuContext;
found = true;
break;
}
index++;
}
gpuContextHandle = m_gpuContextArray.size() ? index : 0;
if(!found)
{
gpuContextHandle = m_gpuContextMap.size();
}
}
gpuContext->SetGpuContextHandle(gpuContextHandle);

if (gpuContextHandle == m_gpuContextArray.size())
{
m_gpuContextArray.push_back(gpuContext);
}
else
{
m_gpuContextArray[gpuContextHandle] = gpuContext;
}

m_gpuContextMap[gpuContextHandle] = gpuContext;
m_gpuContextCount++;

MT_LOG5(MT_MOS_GPUCXT_CREATE, MT_NORMAL, MT_MOS_GPUCXT_MGR_PTR, (int64_t)this, MT_MOS_GPUCXT_PTR, (int64_t)gpuContext,
Expand All @@ -212,9 +212,11 @@ GpuContextNext *GpuContextMgrNext::GetGpuContext(GPU_CONTEXT_HANDLE gpuContextHa

GpuContextNext *gpuContext = nullptr;
MosUtilities::MosLockMutex(m_gpuContextArrayMutex);
if (!m_gpuContextArray.empty() && gpuContextHandle < m_gpuContextArray.size())
auto it = std::find_if(m_gpuContextMap.begin(), m_gpuContextMap.end(), [&](auto &curGpuCtx)
{ return curGpuCtx.first == gpuContextHandle; });
if (m_gpuContextMap.end() != it)
{
gpuContext = m_gpuContextArray.at(gpuContextHandle);
gpuContext = m_gpuContextMap.at(gpuContextHandle);
}
else
{
Expand All @@ -235,21 +237,25 @@ void GpuContextMgrNext::DestroyGpuContext(GpuContextNext *gpuContext)
bool found = false;

MosUtilities::MosLockMutex(m_gpuContextArrayMutex);
for (auto &curGpuContext : m_gpuContextArray)
auto it = std::find_if(m_gpuContextMap.begin(), m_gpuContextMap.end(), [&](auto &curGpuCtx)
{ return curGpuCtx.second == gpuContext; });
if (m_gpuContextMap.end() != it)
{
if (curGpuContext == gpuContext)
found = true;
if (m_noCycledGpuCxtMgmt)
{
m_gpuContextMap.erase(it);
}
else
{
found = true;
// to keep original order, here should not erase gpucontext, replace with nullptr in array.
curGpuContext = nullptr;
m_gpuContextCount--;
break;
it->second = nullptr;
}
m_gpuContextCount--;
}

if (m_gpuContextCount == 0 && !m_noCycledGpuCxtMgmt)
{
m_gpuContextArray.clear(); // clear whole array
m_gpuContextMap.clear(); // clear whole array
}

MT_LOG3(MT_MOS_GPUCXT_DESTROY, MT_NORMAL, MT_MOS_GPUCXT_MGR_PTR, (int64_t)this, MT_MOS_GPUCXT_PTR, (int64_t)gpuContext, MT_MOS_GPUCXT_COUNT, m_gpuContextCount);
Expand Down Expand Up @@ -278,13 +284,13 @@ void GpuContextMgrNext::DestroyAllGpuContexts()
MosUtilities::MosLockMutex(m_gpuContextArrayMutex);

// delete each instance in m_gpuContextArray
for (auto &curGpuContext : m_gpuContextArray)
for (auto &curGpuContext : m_gpuContextMap)
{
MT_LOG2(MT_MOS_GPUCXT_DESTROY, MT_NORMAL, MT_MOS_GPUCXT_MGR_PTR, (int64_t)this, MT_MOS_GPUCXT_PTR, (int64_t)curGpuContext);
MOS_Delete(curGpuContext);
MT_LOG2(MT_MOS_GPUCXT_DESTROY, MT_NORMAL, MT_MOS_GPUCXT_MGR_PTR, (int64_t)this, MT_MOS_GPUCXT_PTR, (int64_t)curGpuContext.second);
MOS_Delete(curGpuContext.second);
}

m_gpuContextArray.clear(); // clear whole array
m_gpuContextMap.clear(); // clear whole array

MosUtilities::MosUnlockMutex(m_gpuContextArrayMutex);
}
15 changes: 5 additions & 10 deletions media_softlet/agnostic/common/os/mos_gpucontextmgr_next.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,10 @@ class GpuContextMgrNext
//!
OsContextNext* GetOsContext(){ return m_osContext; }

//!
//! \brief Get Gpu context number
//! \return uint32_t
//! Number of all Gpu contexts, include the node which was already destroyed
//!
uint32_t GetGpuContextNumber()
std::map<GPU_CONTEXT_HANDLE, GpuContextNext *> &GetGpuContextMap()
{
return m_gpuContextArray.size();
return m_gpuContextMap;
}

//!
//! \brief Get the validity flag
//! \return bool
Expand Down Expand Up @@ -178,12 +172,13 @@ class GpuContextMgrNext

//! \brief Gpu context count
uint32_t m_gpuContextCount = 0;

uint32_t m_gpuContextHanleForNonCycledCase = 0;
//! \brief Maintained gpu context array
std::vector<GpuContextNext *> m_gpuContextArray;
std::map<GPU_CONTEXT_HANDLE, GpuContextNext *> m_gpuContextMap;

//! \brief Flag to indicate gpu context mgr initialized or not
bool m_initialized = false;

MEDIA_CLASS_DEFINE_END(GpuContextMgrNext)
};

Expand Down

0 comments on commit 82d2524

Please sign in to comment.