From 97c9d8f1a395de7df74893376a7abbd65406beff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Semenov=20Herman=20=28=D0=A1=D0=B5=D0=BC=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=20=D0=93=D0=B5=D1=80=D0=BC=D0=B0=D0=BD=29?= Date: Sun, 3 Nov 2024 22:24:25 +0300 Subject: [PATCH] [CM] Strict indication const and static in methods --- media_driver/agnostic/common/cm/cm_array.cpp | 8 ++++---- media_driver/agnostic/common/cm/cm_array.h | 8 ++++---- .../agnostic/common/cm/cm_buffer_rt.cpp | 10 +++++----- media_driver/agnostic/common/cm/cm_buffer_rt.h | 10 +++++----- media_driver/agnostic/common/cm/cm_dsh.h | 2 +- .../agnostic/common/cm/cm_event_rt.cpp | 10 +++++----- media_driver/agnostic/common/cm/cm_event_rt.h | 10 +++++----- .../agnostic/common/cm/cm_group_space.cpp | 2 +- .../agnostic/common/cm/cm_group_space.h | 4 ++-- .../agnostic/common/cm/cm_hal_hashtable.cpp | 2 +- .../agnostic/common/cm/cm_hal_hashtable.h | 4 ++-- .../agnostic/common/cm/cm_kernel_data.cpp | 8 ++++---- .../agnostic/common/cm/cm_kernel_data.h | 10 +++++----- media_driver/agnostic/common/cm/cm_kernel_ex.h | 2 +- .../agnostic/common/cm/cm_kernel_rt.cpp | 16 ++++++++-------- media_driver/agnostic/common/cm/cm_kernel_rt.h | 12 ++++++------ media_driver/agnostic/common/cm/cm_log.cpp | 3 +-- media_driver/agnostic/common/cm/cm_perf.cpp | 4 ++-- media_driver/agnostic/common/cm/cm_perf.h | 4 ++-- media_driver/agnostic/common/cm/cm_program.cpp | 12 ++++++------ media_driver/agnostic/common/cm/cm_program.h | 18 +++++++++--------- .../agnostic/common/cm/cm_queue_rt.cpp | 2 +- media_driver/agnostic/common/cm/cm_queue_rt.h | 12 ++++++------ .../agnostic/common/cm/cm_scratch_space.cpp | 2 +- .../agnostic/common/cm/cm_scratch_space.h | 6 +++--- media_driver/agnostic/common/cm/cm_ssh.cpp | 8 ++++---- media_driver/agnostic/common/cm/cm_ssh.h | 10 +++++----- 27 files changed, 99 insertions(+), 100 deletions(-) diff --git a/media_driver/agnostic/common/cm/cm_array.cpp b/media_driver/agnostic/common/cm/cm_array.cpp index 698fd2c8358..0c0fbb99b66 100644 --- a/media_driver/agnostic/common/cm/cm_array.cpp +++ b/media_driver/agnostic/common/cm/cm_array.cpp @@ -111,7 +111,7 @@ CmDynamicArray::~CmDynamicArray( void ) \*****************************************************************************/ -void* CmDynamicArray::GetElement( const uint32_t index ) +void* CmDynamicArray::GetElement( const uint32_t index ) const { void* element; @@ -180,7 +180,7 @@ bool CmDynamicArray::SetElement( const uint32_t index, const void* element ) \*****************************************************************************/ -uint32_t CmDynamicArray::GetSize( void ) +uint32_t CmDynamicArray::GetSize( void ) const { const uint32_t size = m_usedSize; return size; @@ -357,7 +357,7 @@ void CmDynamicArray::DeleteArray( void ) uint32_t length \*****************************************************************************/ -uint32_t CmDynamicArray::GetMaxSize( void ) +uint32_t CmDynamicArray::GetMaxSize( void ) const { return m_actualSize; } @@ -378,7 +378,7 @@ uint32_t CmDynamicArray::GetMaxSize( void ) \*****************************************************************************/ -bool CmDynamicArray::IsValidIndex( const uint32_t index ) +bool CmDynamicArray::IsValidIndex( const uint32_t index ) const { return ( index < GetSize() ); } diff --git a/media_driver/agnostic/common/cm/cm_array.h b/media_driver/agnostic/common/cm/cm_array.h index 84402ba3bc0..48c87424581 100644 --- a/media_driver/agnostic/common/cm/cm_array.h +++ b/media_driver/agnostic/common/cm/cm_array.h @@ -38,11 +38,11 @@ class CmDynamicArray CmDynamicArray(); ~CmDynamicArray( void ); - void* GetElement( const uint32_t index ) ; + void* GetElement( const uint32_t index ) const; bool SetElement( const uint32_t index, const void* element ); - uint32_t GetSize( void ) ; - uint32_t GetMaxSize( void ) ; + uint32_t GetSize( void ) const; + uint32_t GetMaxSize( void ) const; void Delete( void ); @@ -56,7 +56,7 @@ class CmDynamicArray void CreateArray( const uint32_t size ); void DeleteArray( void ); - bool IsValidIndex( const uint32_t index ) ; + bool IsValidIndex( const uint32_t index ) const; void** m_arrayBuffer; diff --git a/media_driver/agnostic/common/cm/cm_buffer_rt.cpp b/media_driver/agnostic/common/cm/cm_buffer_rt.cpp index 0e44f23ad45..aad8c9bcb84 100644 --- a/media_driver/agnostic/common/cm/cm_buffer_rt.cpp +++ b/media_driver/agnostic/common/cm/cm_buffer_rt.cpp @@ -551,12 +551,12 @@ void CmBuffer_RT::SetSize( size_t size ) m_size = size; } -bool CmBuffer_RT::IsUpSurface() +bool CmBuffer_RT::IsUpSurface() const { return (m_bufferType == CM_BUFFER_UP); } -bool CmBuffer_RT::IsSVMSurface() +bool CmBuffer_RT::IsSVMSurface() const { return (m_bufferType == CM_BUFFER_SVM); } @@ -573,17 +573,17 @@ bool CmBuffer_RT::IsCMRTAllocatedSVMBuffer() return m_isCMRTAllocatedSVMBuffer; } -bool CmBuffer_RT::IsConditionalSurface() +bool CmBuffer_RT::IsConditionalSurface() const { return m_isConditionalBuffer; } -uint32_t CmBuffer_RT::GetConditionalCompareValue() +uint32_t CmBuffer_RT::GetConditionalCompareValue() const { return m_comparisonValue; } -bool CmBuffer_RT::IsCompareMaskEnabled() +bool CmBuffer_RT::IsCompareMaskEnabled() const { return m_enableCompareMask; } diff --git a/media_driver/agnostic/common/cm/cm_buffer_rt.h b/media_driver/agnostic/common/cm/cm_buffer_rt.h index 0b072ff5957..0ced9dbfc48 100644 --- a/media_driver/agnostic/common/cm/cm_buffer_rt.h +++ b/media_driver/agnostic/common/cm/cm_buffer_rt.h @@ -108,17 +108,17 @@ class CmBuffer_RT: public CmBuffer, void SetSize(size_t size); - bool IsUpSurface(); + bool IsUpSurface() const; - bool IsSVMSurface(); + bool IsSVMSurface() const; virtual bool IsCMRTAllocatedSVMBuffer(); - bool IsConditionalSurface(); + bool IsConditionalSurface() const; - uint32_t GetConditionalCompareValue(); + uint32_t GetConditionalCompareValue() const; - bool IsCompareMaskEnabled(); + bool IsCompareMaskEnabled() const; uint32_t GetBufferType() { return m_bufferType; } diff --git a/media_driver/agnostic/common/cm/cm_dsh.h b/media_driver/agnostic/common/cm/cm_dsh.h index c346cf4da4d..7b451ed9e82 100644 --- a/media_driver/agnostic/common/cm/cm_dsh.h +++ b/media_driver/agnostic/common/cm/cm_dsh.h @@ -39,7 +39,7 @@ class CmDSH MOS_STATUS Initialize(FrameTrackerProducer *trackerProducer); CmMediaState* CreateMediaState(); - void DestroyMediaState(CmMediaState *mediaState); + static void DestroyMediaState(CmMediaState *mediaState); protected: HeapManager *m_heapMgr; diff --git a/media_driver/agnostic/common/cm/cm_event_rt.cpp b/media_driver/agnostic/common/cm/cm_event_rt.cpp index 0f0be2f9939..ffa925a39ad 100644 --- a/media_driver/agnostic/common/cm/cm_event_rt.cpp +++ b/media_driver/agnostic/common/cm/cm_event_rt.cpp @@ -242,7 +242,7 @@ int32_t CmEventRT::ModifyStatus(CM_STATUS status, uint64_t elapsedTime) return CM_SUCCESS; } -int32_t CmEventRT::GetQueue(CmQueueRT *& queue) +int32_t CmEventRT::GetQueue(CmQueueRT *& queue) const { queue = m_queue; return CM_SUCCESS; @@ -331,7 +331,7 @@ int32_t CmEventRT::GetHWStartTime(LARGE_INTEGER* time) } -uint32_t CmEventRT::GetKernelCount() +uint32_t CmEventRT::GetKernelCount() const { return m_kernelCount; } @@ -466,7 +466,7 @@ int32_t CmEventRT::SetCompleteTime( LARGE_INTEGER time ) return CM_SUCCESS; } -int32_t CmEventRT::GetIndex( uint32_t & index ) +int32_t CmEventRT::GetIndex( uint32_t & index ) const { index = m_index; return CM_SUCCESS; @@ -513,7 +513,7 @@ int32_t CmEventRT::SetTaskOsData( void *data ) //| Purpose: Get Task ID //| Returns: Result of the operation. //*----------------------------------------------------------------------------- -int32_t CmEventRT::GetTaskDriverId( int32_t & id ) +int32_t CmEventRT::GetTaskDriverId( int32_t & id ) const { id = m_taskDriverId; return CM_SUCCESS; @@ -595,7 +595,7 @@ int32_t CmEventRT::Query( void ) //| Purpose: Get m_status. //| Returns: return m_status. //*----------------------------------------------------------------------------- -CM_STATUS CmEventRT::GetStatusWithoutFlush() +CM_STATUS CmEventRT::GetStatusWithoutFlush() const { return m_status; } diff --git a/media_driver/agnostic/common/cm/cm_event_rt.h b/media_driver/agnostic/common/cm/cm_event_rt.h index 5cb42066ff3..e20cc3d2c83 100644 --- a/media_driver/agnostic/common/cm/cm_event_rt.h +++ b/media_driver/agnostic/common/cm/cm_event_rt.h @@ -79,11 +79,11 @@ class CmEventRT: public CmEvent CM_RT_API int32_t GetExecutionTickTime(uint64_t &ticks); - int32_t GetIndex(uint32_t &index); + int32_t GetIndex(uint32_t &index) const; int32_t SetTaskDriverId(int32_t id); - int32_t GetTaskDriverId(int32_t &id); + int32_t GetTaskDriverId(int32_t &id) const; int32_t SetTaskOsData(void *data); @@ -109,7 +109,7 @@ class CmEventRT: public CmEvent int32_t GetCompleteTime(LARGE_INTEGER *time); - uint32_t GetKernelCount(); + uint32_t GetKernelCount() const; int32_t GetEnqueueTime(LARGE_INTEGER *time); @@ -119,11 +119,11 @@ class CmEventRT: public CmEvent int32_t ModifyStatus(CM_STATUS status, uint64_t elapsedTime); - int32_t GetQueue(CmQueueRT *&queue); + int32_t GetQueue(CmQueueRT *&queue) const; int32_t Query(); - CM_STATUS GetStatusWithoutFlush(); + CM_STATUS GetStatusWithoutFlush() const; #if CM_LOG_ON std::string Log(const char *callerFuncName); diff --git a/media_driver/agnostic/common/cm/cm_group_space.cpp b/media_driver/agnostic/common/cm/cm_group_space.cpp index 624461532e3..42f0b69088f 100644 --- a/media_driver/agnostic/common/cm/cm_group_space.cpp +++ b/media_driver/agnostic/common/cm/cm_group_space.cpp @@ -145,7 +145,7 @@ uint32_t CmThreadGroupSpace::GetIndexInTGsArray( void ) } #if CM_LOG_ON -std::string CmThreadGroupSpace::Log() +std::string CmThreadGroupSpace::Log() const { std::ostringstream oss; diff --git a/media_driver/agnostic/common/cm/cm_group_space.h b/media_driver/agnostic/common/cm/cm_group_space.h index 2c4f5f04b9a..ed1b62d90c4 100644 --- a/media_driver/agnostic/common/cm/cm_group_space.h +++ b/media_driver/agnostic/common/cm/cm_group_space.h @@ -44,14 +44,14 @@ class CmThreadGroupSpace virtual uint32_t GetIndexInTGsArray(); #if CM_LOG_ON - std::string Log(); + std::string Log() const; #endif protected: CmThreadGroupSpace(CmDeviceRT* device, uint32_t index, uint32_t threadSpaceWidth, uint32_t threadSpaceHeight, uint32_t groupSpaceWidth, uint32_t groupSpaceHeight); CmThreadGroupSpace(CmDeviceRT* device, uint32_t index, uint32_t threadSpaceWidth, uint32_t threadSpaceHeight, uint32_t threadSpaceDepth, uint32_t groupSpaceWidth, uint32_t groupSpaceHeight, uint32_t groupSpaceDepth); ~CmThreadGroupSpace( void ); - int32_t Initialize( void ); + static int32_t Initialize( void ); CmDeviceRT* m_device; uint32_t m_threadSpaceWidth; diff --git a/media_driver/agnostic/common/cm/cm_hal_hashtable.cpp b/media_driver/agnostic/common/cm/cm_hal_hashtable.cpp index 0e5d49e9315..1ce0274551f 100644 --- a/media_driver/agnostic/common/cm/cm_hal_hashtable.cpp +++ b/media_driver/agnostic/common/cm/cm_hal_hashtable.cpp @@ -64,7 +64,7 @@ MOS_STATUS CmHashTable::Init() return eStatus; } -void CmHashTable::Free() +void CmHashTable::Free() const { if (m_hashTable.pHashEntries) MOS_FreeMemory(m_hashTable.pHashEntries); } diff --git a/media_driver/agnostic/common/cm/cm_hal_hashtable.h b/media_driver/agnostic/common/cm/cm_hal_hashtable.h index 71bffcbf240..8c0ea5c552d 100644 --- a/media_driver/agnostic/common/cm/cm_hal_hashtable.h +++ b/media_driver/agnostic/common/cm/cm_hal_hashtable.h @@ -55,13 +55,13 @@ class CmHashTable { public: MOS_STATUS Init(); - void Free(); + void Free() const; MOS_STATUS Register(int32_t UniqID, int32_t CacheID, void *pData); void* Search(int32_t UniqID, int32_t CacheID, uint16_t &wSearchIndex); void* Unregister(int32_t UniqID, int32_t CacheID); private: - uint16_t SimpleHash(int32_t value); + static uint16_t SimpleHash(int32_t value); MOS_STATUS Extend(); CM_HAL_COALESCED_HASH_TABLE m_hashTable; }; diff --git a/media_driver/agnostic/common/cm/cm_kernel_data.cpp b/media_driver/agnostic/common/cm/cm_kernel_data.cpp index 47d806be099..dfc8d3e3728 100644 --- a/media_driver/agnostic/common/cm/cm_kernel_data.cpp +++ b/media_driver/agnostic/common/cm/cm_kernel_data.cpp @@ -142,7 +142,7 @@ int32_t CmKernelData::Initialize( void ) //| Purpose: Get Kernel Data pointer //| Returns: Result of the operation. //*----------------------------------------------------------------------------- -int32_t CmKernelData::GetCmKernel( CmKernelRT*& kernel ) +int32_t CmKernelData::GetCmKernel( CmKernelRT*& kernel ) const { kernel = m_kernel; return CM_SUCCESS; @@ -162,7 +162,7 @@ int32_t CmKernelData::SetKernelDataSize(int32_t value) //| Purpose: Get Kernel Data pointer //| Returns: Result of the operation. //*----------------------------------------------------------------------------- -int32_t CmKernelData::GetKernelDataSize() +int32_t CmKernelData::GetKernelDataSize() const { return m_kerneldatasize; } @@ -212,7 +212,7 @@ PCM_HAL_KERNEL_PARAM CmKernelData::GetHalCmKernelData( ) //| Purpose: Whether the kernel data is in use //| Returns: Result of the operation. //*----------------------------------------------------------------------------- -bool CmKernelData::IsInUse() +bool CmKernelData::IsInUse() const { return m_isInUse; } @@ -221,7 +221,7 @@ bool CmKernelData::IsInUse() //| Purpose: Get Curbe Size from kernel data //| Returns: Result of the operation. //*----------------------------------------------------------------------------- -uint32_t CmKernelData::GetKernelCurbeSize( void ) +uint32_t CmKernelData::GetKernelCurbeSize( void ) const { return m_halKernelParam.totalCurbeSize; } diff --git a/media_driver/agnostic/common/cm/cm_kernel_data.h b/media_driver/agnostic/common/cm/cm_kernel_data.h index 66b89665d59..2b69173885d 100644 --- a/media_driver/agnostic/common/cm/cm_kernel_data.h +++ b/media_driver/agnostic/common/cm/cm_kernel_data.h @@ -41,15 +41,15 @@ class CmKernelData : public CmDynamicArray static int32_t Create( CmKernelRT* kernel, CmKernelData*& kernelData ); static int32_t Destroy( CmKernelData* &kernelData ); - int32_t GetCmKernel( CmKernelRT*& kernel ); + int32_t GetCmKernel( CmKernelRT*& kernel ) const; int32_t SetKernelDataSize(int32_t value); - int32_t GetKernelDataSize(); + int32_t GetKernelDataSize() const; uint32_t Acquire(void); uint32_t SafeRelease(void); virtual PCM_HAL_KERNEL_PARAM GetHalCmKernelData( ); - bool IsInUse( void ); - uint32_t GetKernelCurbeSize( void ); + bool IsInUse( void ) const; + uint32_t GetKernelCurbeSize( void ) const; int32_t ResetStatus( void ); protected: @@ -57,7 +57,7 @@ class CmKernelData : public CmDynamicArray CmKernelData( CmKernelRT* kernel ); ~CmKernelData( void ); - int32_t Initialize( void ); + static int32_t Initialize( void ); uint32_t m_kerneldatasize; CmKernelRT* m_kernel; diff --git a/media_driver/agnostic/common/cm/cm_kernel_ex.h b/media_driver/agnostic/common/cm/cm_kernel_ex.h index d071bf18d05..295a25fdc71 100644 --- a/media_driver/agnostic/common/cm/cm_kernel_ex.h +++ b/media_driver/agnostic/common/cm/cm_kernel_ex.h @@ -145,7 +145,7 @@ class CmKernelEx : public CMRT_UMD::CmKernelRT bool IsSurface(uint16_t kind); - CM_ARG_KIND ToArgKind(CMRT_UMD::CmSurface *surface); + static CM_ARG_KIND ToArgKind(CMRT_UMD::CmSurface *surface); inline bool ArgArraySupported(uint16_t kind) {return IsSurface(kind) || kind == ARG_KIND_SAMPLER; } diff --git a/media_driver/agnostic/common/cm/cm_kernel_rt.cpp b/media_driver/agnostic/common/cm/cm_kernel_rt.cpp index f5cb877b8e4..77ad789bcc5 100644 --- a/media_driver/agnostic/common/cm/cm_kernel_rt.cpp +++ b/media_driver/agnostic/common/cm/cm_kernel_rt.cpp @@ -911,13 +911,13 @@ CM_RT_API int32_t CmKernelRT::SetThreadCount(uint32_t count ) return CM_SUCCESS; } -int32_t CmKernelRT::GetThreadCount(uint32_t& count ) +int32_t CmKernelRT::GetThreadCount(uint32_t& count ) const { count = m_threadCount; return CM_SUCCESS; } -int32_t CmKernelRT::GetKernelSurfaces(bool *&surfArray) +int32_t CmKernelRT::GetKernelSurfaces(bool *&surfArray) const { surfArray = m_surfaceArray; return CM_SUCCESS; @@ -945,7 +945,7 @@ int32_t CmKernelRT::ResetKernelSurfaces() //| Use "value + indexSurfaceArray" to locate its surfaceIndex //| Returns: CmSurface. Null if not found //*----------------------------------------------------------------------------- -CmSurface* CmKernelRT::GetSurfaceFromSurfaceArray( SurfaceIndex* value, uint32_t indexSurfaceArray) +CmSurface* CmKernelRT::GetSurfaceFromSurfaceArray( SurfaceIndex* value, uint32_t indexSurfaceArray) const { int32_t hr = CM_SUCCESS; CmSurface *surface = nullptr; @@ -1105,7 +1105,7 @@ int32_t CmKernelRT::SetArgsVme(CM_KERNEL_INTERNAL_ARG_TYPE nArgType, uint32_t ar //| vmeCmIndexArray points to arg.surfIndex //| Returns: Result of the operation. //*----------------------------------------------------------------------------- -int32_t CmKernelRT::SetArgsSingleVme(CmSurfaceVme* vmeSurface, uint8_t *vmeArgValueArray, uint16_t *cmSufacesArray) +int32_t CmKernelRT::SetArgsSingleVme(CmSurfaceVme* vmeSurface, uint8_t *vmeArgValueArray, uint16_t *cmSufacesArray) const { int32_t hr = CM_SUCCESS; @@ -2391,10 +2391,10 @@ CM_RT_API int32_t CmKernelRT::SetThreadArg(uint32_t threadId, uint32_t index, si //| Purpose: Calculate the total size of kernel data //*----------------------------------------------------------------------------- int32_t CmKernelRT::CalcKernelDataSize( - uint32_t movInstNum, // [in] the number of move instructions - uint32_t numArgs, // [in] number of args , surface array count - uint32_t argSize, // [in] Size of arguments - uint32_t & totalKernelDataSize) // [out] total size of kernel data + uint32_t movInstNum, // [in] the number of move instructions + uint32_t numArgs, // [in] number of args , surface array count + uint32_t argSize, // [in] Size of arguments + uint32_t & totalKernelDataSize) const // [out] total size of kernel data { int32_t hr = CM_SUCCESS; diff --git a/media_driver/agnostic/common/cm/cm_kernel_rt.h b/media_driver/agnostic/common/cm/cm_kernel_rt.h index 7d065e77a64..0a43d7120c7 100644 --- a/media_driver/agnostic/common/cm/cm_kernel_rt.h +++ b/media_driver/agnostic/common/cm/cm_kernel_rt.h @@ -165,7 +165,7 @@ class CmKernelRT: public CmKernel static int32_t Destroy(CmKernelRT *&kernel, CmProgramRT *&program); - int32_t GetThreadCount(uint32_t &count); + int32_t GetThreadCount(uint32_t &count) const; CM_RT_API int32_t SetThreadCount(uint32_t count); @@ -272,7 +272,7 @@ class CmKernelRT: public CmKernel int32_t CollectKernelSurface(); - int32_t GetKernelSurfaces(bool *&surfArray); + int32_t GetKernelSurfaces(bool *&surfArray) const; int32_t ResetKernelSurfaces(); @@ -339,7 +339,7 @@ class CmKernelRT: public CmKernel int32_t CalcKernelDataSize(uint32_t movInstNum, uint32_t numArgs, uint32_t argSize, - uint32_t &totalKernelDataSize); + uint32_t &totalKernelDataSize) const; int32_t GetArgCountPlusSurfArray(uint32_t &argSize, uint32_t &argCountPlus); @@ -397,15 +397,15 @@ class CmKernelRT: public CmKernel int32_t SetArgsSingleVme(CmSurfaceVme *vmeSurface, uint8_t *vmeArgValueArray, - uint16_t *cmSufacesArray); + uint16_t *cmSufacesArray) const; - int32_t GetVmeSurfaceIndex(uint32_t *vmeIndexArray, + static int32_t GetVmeSurfaceIndex(uint32_t *vmeIndexArray, uint32_t *vmeCmIndexArray, uint32_t index, uint32_t *outputValue); CmSurface *GetSurfaceFromSurfaceArray(SurfaceIndex *value, - uint32_t indexSurfaceArray); + uint32_t indexSurfaceArray) const; void ArgLog(std::ostringstream &oss, uint32_t index, diff --git a/media_driver/agnostic/common/cm/cm_log.cpp b/media_driver/agnostic/common/cm/cm_log.cpp index bd0b55e1c18..0bbc7da1518 100644 --- a/media_driver/agnostic/common/cm/cm_log.cpp +++ b/media_driver/agnostic/common/cm/cm_log.cpp @@ -88,8 +88,7 @@ CmLogger* CmLogger::GetInstance(CM_HAL_STATE *halState) return &m_globalCmLogger; } -void CmLogger::GetVerbosityLevel(CM_HAL_STATE *halState) -{ +void CmLogger::GetVerbosityLevel(CM_HAL_STATE *halState) { // Read VerbosityLevel from RegisterKey MOS_USER_FEATURE_VALUE_DATA userFeatureValueData; // User feature key reads diff --git a/media_driver/agnostic/common/cm/cm_perf.cpp b/media_driver/agnostic/common/cm/cm_perf.cpp index d935dccfd44..345c0cc04b6 100644 --- a/media_driver/agnostic/common/cm/cm_perf.cpp +++ b/media_driver/agnostic/common/cm/cm_perf.cpp @@ -72,12 +72,12 @@ void CmTimer::Stop() return; } -float CmTimer::TotalMilliSecond() +float CmTimer::TotalMilliSecond() const { return (float)m_cycles*(float)1000.0 / (float)m_freq.QuadPart; } -std::string CmTimer::ToString() +std::string CmTimer::ToString() const { std::ostringstream oss; oss << m_funcName << " Duration " << TotalMilliSecond() << std::endl; diff --git a/media_driver/agnostic/common/cm/cm_perf.h b/media_driver/agnostic/common/cm/cm_perf.h index 9af55cf6146..67949694743 100644 --- a/media_driver/agnostic/common/cm/cm_perf.h +++ b/media_driver/agnostic/common/cm/cm_perf.h @@ -38,10 +38,10 @@ class CmTimer CmTimer(std::string FunctionName); ~CmTimer(); void Stop(); - std::string ToString(); + std::string ToString() const; private: - float TotalMilliSecond(); + float TotalMilliSecond() const; void Start(); uint64_t m_cycles; diff --git a/media_driver/agnostic/common/cm/cm_program.cpp b/media_driver/agnostic/common/cm/cm_program.cpp index 5b807bb9d77..87684a7312d 100644 --- a/media_driver/agnostic/common/cm/cm_program.cpp +++ b/media_driver/agnostic/common/cm/cm_program.cpp @@ -750,7 +750,7 @@ int32_t CmProgramRT::GetIsaFileName( char* & isaFileName ) //| Purpose: Get Kernel's options //| Returns: Result of the operation. //*----------------------------------------------------------------------------- -int32_t CmProgramRT::GetKernelOptions( char* & kernelOptions ) +int32_t CmProgramRT::GetKernelOptions( char* & kernelOptions ) const { kernelOptions = m_options; return CM_SUCCESS; @@ -760,7 +760,7 @@ int32_t CmProgramRT::GetKernelOptions( char* & kernelOptions ) //| Purpose: Get the number of Surfaces //| Returns: Result of the operation. //*----------------------------------------------------------------------------- -uint32_t CmProgramRT::GetSurfaceCount(void) +uint32_t CmProgramRT::GetSurfaceCount(void) const { return m_surfaceCount; } @@ -919,7 +919,7 @@ uint32_t CmProgramRT::ReleaseKernelInfo(uint32_t index) } } -int32_t CmProgramRT::GetKernelInfoRefCount(uint32_t index, uint32_t& refCount) +int32_t CmProgramRT::GetKernelInfoRefCount(uint32_t index, uint32_t& refCount) const { CM_KERNEL_INFO* kernelInfo = nullptr; @@ -944,7 +944,7 @@ int32_t CmProgramRT::GetKernelInfoRefCount(uint32_t index, uint32_t& refCount) } } -int32_t CmProgramRT::GetCISAVersion(uint32_t& majorVersion, uint32_t& minorVersion) +int32_t CmProgramRT::GetCISAVersion(uint32_t& majorVersion, uint32_t& minorVersion) const { majorVersion = m_cisaMajorVersion; minorVersion = m_cisaMinorVersion; @@ -957,7 +957,7 @@ uint32_t CmProgramRT::GetProgramIndex() return m_programIndex; } -vISA::ISAfile *CmProgramRT::getISAfile() +vISA::ISAfile *CmProgramRT::getISAfile() const { return m_isaFile; } @@ -975,7 +975,7 @@ inline void hashCombineString(uint32_t &res, char *str) hashCombine(res, strHash); } -uint32_t CmProgramRT::GetKernelInfoHash(CM_KERNEL_INFO *kernelInfo) +uint32_t CmProgramRT::GetKernelInfoHash(CM_KERNEL_INFO *kernelInfo) const { uint32_t value = 0; hashCombineString(value, kernelInfo->kernelName); diff --git a/media_driver/agnostic/common/cm/cm_program.h b/media_driver/agnostic/common/cm/cm_program.h index 78beb90c1c7..08539d0b0bb 100644 --- a/media_driver/agnostic/common/cm/cm_program.h +++ b/media_driver/agnostic/common/cm/cm_program.h @@ -186,26 +186,26 @@ class CmProgramRT : public CmProgram virtual int32_t GetKernelCount( uint32_t& kernelCount ); virtual int32_t GetKernelInfo( uint32_t index, CM_KERNEL_INFO*& kernelInfo ); int32_t GetIsaFileName( char* & kernelName ); - int32_t GetKernelOptions( char* & kernelOptions ); + int32_t GetKernelOptions( char* & kernelOptions ) const; - uint32_t GetSurfaceCount(void); + uint32_t GetSurfaceCount(void) const; int32_t SetSurfaceCount(uint32_t count); - bool IsJitterEnabled( void ){ return m_isJitterEnabled; } - bool IsHwDebugEnabled (void ){ return m_isHwDebugEnabled;} + bool IsJitterEnabled( void ) const { return m_isJitterEnabled; } + bool IsHwDebugEnabled (void ) const { return m_isHwDebugEnabled;} uint32_t AcquireKernelInfo(uint32_t index); uint32_t ReleaseKernelInfo(uint32_t index); - int32_t GetKernelInfoRefCount(uint32_t index, uint32_t& refCount); + int32_t GetKernelInfoRefCount(uint32_t index, uint32_t& refCount) const; - int32_t GetCISAVersion(uint32_t& majorVersion, uint32_t& minorVersion); + int32_t GetCISAVersion(uint32_t& majorVersion, uint32_t& minorVersion) const; int32_t Acquire( void); int32_t SafeRelease( void); virtual uint32_t GetProgramIndex(); - uint32_t GetKernelStartIndex() + uint32_t GetKernelStartIndex() const { return m_kernelIndex; } @@ -213,7 +213,7 @@ class CmProgramRT : public CmProgram //! \brief get m_isaFile object //! \detail m_isaFile object provides methods to read, parse and write ISA files. //! \return Pointer to m_isaFile object - vISA::ISAfile *getISAfile(); + vISA::ISAfile *getISAfile() const; protected: CmProgramRT( CmDeviceRT* device, uint32_t programId ); @@ -223,7 +223,7 @@ class CmProgramRT : public CmProgram #if USE_EXTENSION_CODE int InitForGTPin(const char *jitFlags[CM_RT_JITTER_MAX_NUM_FLAGS], int &numJitFlags); #endif - uint32_t GetKernelInfoHash(CM_KERNEL_INFO *kernelInfo); + uint32_t GetKernelInfoHash(CM_KERNEL_INFO *kernelInfo) const; CmDeviceRT* m_device; diff --git a/media_driver/agnostic/common/cm/cm_queue_rt.cpp b/media_driver/agnostic/common/cm/cm_queue_rt.cpp index 4c550021115..32ef6131b3b 100644 --- a/media_driver/agnostic/common/cm/cm_queue_rt.cpp +++ b/media_driver/agnostic/common/cm/cm_queue_rt.cpp @@ -2708,7 +2708,7 @@ CM_QUEUE_CREATE_OPTION &CmQueueRT::GetQueueOption() //| Purpose: Get the count of task in queue //| Returns: Result of the operation. //*----------------------------------------------------------------------------- -int32_t CmQueueRT::GetTaskCount( uint32_t& numTasks ) +int32_t CmQueueRT::GetTaskCount( uint32_t& numTasks ) const { numTasks = m_enqueuedTasks.GetCount() + m_flushedTasks.GetCount(); return CM_SUCCESS; diff --git a/media_driver/agnostic/common/cm/cm_queue_rt.h b/media_driver/agnostic/common/cm/cm_queue_rt.h index 67270185916..17ff1ebe6af 100644 --- a/media_driver/agnostic/common/cm/cm_queue_rt.h +++ b/media_driver/agnostic/common/cm/cm_queue_rt.h @@ -85,7 +85,7 @@ class ThreadSafeQueue return element; } - CmTaskInternal *Top() + CmTaskInternal *Top() const { CmTaskInternal *element = nullptr; if (mQueue.empty()) @@ -99,9 +99,9 @@ class ThreadSafeQueue return element; } - bool IsEmpty() { return mQueue.empty(); } + bool IsEmpty() const { return mQueue.empty(); } - int GetCount() { return mQueue.size(); } + int GetCount() const { return mQueue.size(); } private: std::queue mQueue; @@ -224,11 +224,11 @@ class CmQueueRT: public CmQueue int32_t FlushTaskWithoutSync(bool flushBlocked = false); - int32_t GetTaskCount(uint32_t &numTasks); + int32_t GetTaskCount(uint32_t &numTasks) const; virtual int32_t TouchFlushedTasks(); - int32_t GetTaskHasThreadArg(CmKernelRT *kernelArray[], + static int32_t GetTaskHasThreadArg(CmKernelRT *kernelArray[], uint32_t numKernels, bool &threadArgExists); virtual int32_t CleanQueue(); @@ -310,7 +310,7 @@ class CmQueueRT: public CmQueue int32_t AddGPUCopyKernel(CM_GPUCOPY_KERNEL* &kernelParam); - int32_t GetGPUCopyKrnID(uint32_t widthInByte, + static int32_t GetGPUCopyKrnID(uint32_t widthInByte, uint32_t height, CM_SURFACE_FORMAT format, CM_GPUCOPY_DIRECTION copyDirection, diff --git a/media_driver/agnostic/common/cm/cm_scratch_space.cpp b/media_driver/agnostic/common/cm/cm_scratch_space.cpp index 8dde034119e..f4f9103a430 100644 --- a/media_driver/agnostic/common/cm/cm_scratch_space.cpp +++ b/media_driver/agnostic/common/cm/cm_scratch_space.cpp @@ -102,7 +102,7 @@ MOS_STATUS CmScratchSpace::Allocate(CmKernelEx **kernels, uint32_t count) return MOS_STATUS_SUCCESS; } -void CmScratchSpace::Submit(uint32_t trackerIndex, uint32_t tracker) +void CmScratchSpace::Submit(uint32_t trackerIndex, uint32_t tracker) const { if (m_buffer == nullptr || m_scratchSize == 0) { diff --git a/media_driver/agnostic/common/cm/cm_scratch_space.h b/media_driver/agnostic/common/cm/cm_scratch_space.h index 0e4c8c1c8f0..ecc9813c3a3 100644 --- a/media_driver/agnostic/common/cm/cm_scratch_space.h +++ b/media_driver/agnostic/common/cm/cm_scratch_space.h @@ -43,10 +43,10 @@ class CmScratchSpace MOS_STATUS Initialize(CMRT_UMD::CmDeviceRT *device); MOS_STATUS Allocate(CmKernelEx **kernels, uint32_t count); - void Submit(uint32_t trackerIndex, uint32_t tracker); + void Submit(uint32_t trackerIndex, uint32_t tracker) const; - inline MOS_RESOURCE *GetResource() {return m_resource; } - inline uint32_t GetSize() {return m_scratchSize; } + inline MOS_RESOURCE *GetResource() const {return m_resource; } + inline uint32_t GetSize() const {return m_scratchSize; } protected: CMRT_UMD::CmDeviceRT *m_device; diff --git a/media_driver/agnostic/common/cm/cm_ssh.cpp b/media_driver/agnostic/common/cm/cm_ssh.cpp index 0dcb489886a..177bab5aeb8 100644 --- a/media_driver/agnostic/common/cm/cm_ssh.cpp +++ b/media_driver/agnostic/common/cm/cm_ssh.cpp @@ -480,7 +480,7 @@ int CmSSH::AddScratchSpace(CmScratchSpace *scratch) return surfStateOffset; } -int CmSSH::GetBindingTableOffset(int btIndex) +int CmSSH::GetBindingTableOffset(int btIndex) const { if (btIndex == -1) { @@ -493,7 +493,7 @@ int CmSSH::GetBindingTableOffset(int btIndex) return m_btStart + m_btStartPerKernel[btIndex]*m_btEntrySize; } -int CmSSH::EstimateBTSize(int maxBteNum, std::map &reservedBteIndex) +int CmSSH::EstimateBTSize(int maxBteNum, std::map &reservedBteIndex) const { int estimatedSize = maxBteNum + m_normalBteStart; if (reservedBteIndex.empty()) @@ -520,7 +520,7 @@ int CmSSH::EstimateBTSize(int maxBteNum, std::map &reserv return estimatedSize; } -MOS_STATUS CmSSH::PrepareResourcesForCp() +MOS_STATUS CmSSH::PrepareResourcesForCp() const { if (m_resCount > 0 && m_renderhal->pOsInterface->osCpInterface) { @@ -537,7 +537,7 @@ using namespace std; #define PLATFORM_DIR_SEPERATOR "\\" #endif -void CmSSH::DumpSSH() +void CmSSH::DumpSSH() const { #if MDF_SURFACE_STATE_DUMP if (m_cmhal->dumpSurfaceState) diff --git a/media_driver/agnostic/common/cm/cm_ssh.h b/media_driver/agnostic/common/cm/cm_ssh.h index 140575f3482..b9931777f00 100644 --- a/media_driver/agnostic/common/cm/cm_ssh.h +++ b/media_driver/agnostic/common/cm/cm_ssh.h @@ -39,22 +39,22 @@ class CmSSH int AssignBindingTable(); - int GetBindingTableOffset(int btIndex = -1); + int GetBindingTableOffset(int btIndex = -1) const; virtual int AddSurfaceState(CmSurfaceState *surfState, int bteIndex = -1, int btIndex = -1); int AddScratchSpace(CmScratchSpace *scratch); - MOS_STATUS PrepareResourcesForCp(); + MOS_STATUS PrepareResourcesForCp() const; static void DumpSSH(CM_HAL_STATE *cmhal, PMOS_COMMAND_BUFFER cmdBuf); // to dump legacy path - void DumpSSH(); + void DumpSSH() const; protected: int GetFreeBindingTableEntries(int surfNum, int btIndex = -1); int GetFreeSurfStateIndex(int surfNum); - int EstimateBTSize(int maxBteNum, std::map &reservedBteIndex); + int EstimateBTSize(int maxBteNum, std::map &reservedBteIndex) const; private: struct _BteFlag @@ -69,7 +69,7 @@ class CmSSH _map |= temp; } - inline bool IsSet(int start, int count) + inline bool IsSet(int start, int count) const { uint64_t mask = 0xffffffff >> (32-count); std::bitset<256> temp(mask);