commit ee6818be7815e10be4535645f0472ae5ad116309
author Sadik Armagan <sadik.armagan@arm.com> Fri Nov 05 14:41:52 2021 +0000
committer Sadik Armagan <sadik.armagan@arm.com> Mon Nov 08 17:22:50 2021 +0000
tree 8880c9d0d8832f147afe05742716362de40a34c2
parent e27d4e89a34b07628b9a3de89706ca2558e9ee8e

IVGCVSW-5636 'Implement NNAPI caching functions'

* Fixed test failures.

!armnn:6617

Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: I9989ece8999d67dd40dfcf69b73f4d80f71687a4

CacheDataHandler.cpp

diff --git a/CacheDataHandler.cpp b/CacheDataHandler.cpp
index 3688162..5f3a307 100644
--- a/CacheDataHandler.cpp
+++ b/CacheDataHandler.cpp
@@ -18,19 +18,22 @@
 
 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<uint8_t>& cacheData)
@@ -38,7 +41,7 @@
     std::size_t hash = cacheData.size();
     for (auto& i : cacheData)
     {
-        hash ^= std::hash<unsigned int>{}(i);
+        hash = ((hash << 5) - hash) + i;
     }
     return hash;
 }