From ee6818be7815e10be4535645f0472ae5ad116309 Mon Sep 17 00:00:00 2001 From: Sadik Armagan Date: Fri, 5 Nov 2021 14:41:52 +0000 Subject: IVGCVSW-5636 'Implement NNAPI caching functions' * Fixed test failures. !armnn:6617 Signed-off-by: Sadik Armagan Signed-off-by: Kevin May Change-Id: I9989ece8999d67dd40dfcf69b73f4d80f71687a4 --- CacheDataHandler.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'CacheDataHandler.cpp') diff --git a/CacheDataHandler.cpp b/CacheDataHandler.cpp index 36881629..5f3a3076 100644 --- a/CacheDataHandler.cpp +++ b/CacheDataHandler.cpp @@ -18,19 +18,22 @@ CacheDataHandler& CacheDataHandlerInstance() void CacheDataHandler::Register(const HidlToken token, const size_t hashValue, const size_t cacheSize) { - if (m_CacheDataMap.find(hashValue) != m_CacheDataMap.end()) + if (m_CacheDataMap.find(hashValue) != m_CacheDataMap.end() + && m_CacheDataMap.at(hashValue).GetToken() == token + && m_CacheDataMap.at(hashValue).GetCacheSize() == cacheSize) { - ALOGV("CacheHandler::Register() Token has been already registered."); + ALOGV("CacheHandler::Register() Hash value has already registered."); return; } CacheHandle cacheHandle(token, cacheSize); m_CacheDataMap.insert({hashValue, cacheHandle}); } -bool CacheDataHandler::Validate(const HidlToken token, const size_t hashValue) const +bool CacheDataHandler::Validate(const HidlToken token, const size_t hashValue, const size_t cacheSize) const { return (m_CacheDataMap.find(hashValue) != m_CacheDataMap.end() - && m_CacheDataMap.at(hashValue).GetToken() == token); + && m_CacheDataMap.at(hashValue).GetToken() == token + && m_CacheDataMap.at(hashValue).GetCacheSize() == cacheSize); } size_t CacheDataHandler::Hash(std::vector& cacheData) @@ -38,7 +41,7 @@ size_t CacheDataHandler::Hash(std::vector& cacheData) std::size_t hash = cacheData.size(); for (auto& i : cacheData) { - hash ^= std::hash{}(i); + hash = ((hash << 5) - hash) + i; } return hash; } -- cgit v1.2.1