Make KmdNotifyHelper thread safe

Change-Id: Iace168eb849e0d7090d17d63d7b47b057ff2385d

Author: BartoszDunajski

runtime/helpers/kmd_notify_properties.cpp

@@ -50,8 +50,7 @@ bool KmdNotifyHelper::obtainTimeoutParams(int64_t &timeoutValueOutput,
 
 bool KmdNotifyHelper::applyQuickKmdSleepForSporadicWait() const {
     if (properties->enableQuickKmdSleepForSporadicWaits) {
-        auto now = std::chrono::high_resolution_clock::now();
-        auto timeDiff = std::chrono::duration_cast<std::chrono::microseconds>(now - lastWaitForCompletionTimestamp).count();
+        auto timeDiff = getMicrosecondsSinceEpoch() - lastWaitForCompletionTimestampUs.load();
         if (timeDiff > properties->delayQuickKmdSleepForSporadicWaitsMicroseconds) {
             return true;
         }
@@ -60,7 +59,12 @@ bool KmdNotifyHelper::applyQuickKmdSleepForSporadicWait() const {
 }
 
 void KmdNotifyHelper::updateLastWaitForCompletionTimestamp() {
-    lastWaitForCompletionTimestamp = std::chrono::high_resolution_clock::now();
+    lastWaitForCompletionTimestampUs = getMicrosecondsSinceEpoch();
+}
+
+int64_t KmdNotifyHelper::getMicrosecondsSinceEpoch() const {
+    auto now = std::chrono::high_resolution_clock::now().time_since_epoch();
+    return std::chrono::duration_cast<std::chrono::microseconds>(now).count();
 }
 
 void KmdNotifyHelper::overrideFromDebugVariable(int32_t debugVariableValue, int64_t &destination) {

runtime/helpers/kmd_notify_properties.h

@@ -25,6 +25,7 @@
 
 #include <cstdint>
 #include <chrono>
+#include <atomic>
 
 namespace OCLRT {
 struct KmdNotifyProperties {
@@ -66,9 +67,10 @@ class KmdNotifyHelper {
   protected:
     bool applyQuickKmdSleepForSporadicWait() const;
     int64_t getBaseTimeout(const int64_t &multiplier) const;
+    int64_t getMicrosecondsSinceEpoch() const;
 
     const KmdNotifyProperties *properties = nullptr;
-    std::chrono::high_resolution_clock::time_point lastWaitForCompletionTimestamp;
-    bool acLineConnected = true;
+    std::atomic<int64_t> lastWaitForCompletionTimestampUs{0};
+    std::atomic<bool> acLineConnected{true};
 };
 } // namespace OCLRT

unit_tests/helpers/kmd_notify_tests.cpp

@@ -57,7 +57,9 @@ struct KmdNotifyTests : public ::testing::Test {
     class MockKmdNotifyHelper : public KmdNotifyHelper {
       public:
         using KmdNotifyHelper::acLineConnected;
-        using KmdNotifyHelper::lastWaitForCompletionTimestamp;
+        using KmdNotifyHelper::getMicrosecondsSinceEpoch;
+        using KmdNotifyHelper::lastWaitForCompletionTimestampUs;
+        using KmdNotifyHelper::properties;
 
         MockKmdNotifyHelper() = delete;
         MockKmdNotifyHelper(const KmdNotifyProperties *newProperties) : KmdNotifyHelper(newProperties){};
@@ -190,14 +192,15 @@ HWTEST_F(KmdNotifyTests, givenZeroFlushStampWhenWaitIsCalledThenDisableTimeout)
 }
 
 HWTEST_F(KmdNotifyTests, givenNonQuickSleepRequestWhenItsSporadicWaitThenOverrideQuickSleepRequest) {
-    overrideKmdNotifyParams(true, 3, true, 2, true, 0);
+    overrideKmdNotifyParams(true, 3, true, 2, true, 1);
     auto csr = createMockCsr<FamilyType>();
 
     auto expectedDelay = device->getHardwareInfo().capabilityTable.kmdNotifyProperties.delayQuickKmdSleepMicroseconds;
     EXPECT_CALL(*csr, waitForCompletionWithTimeout(::testing::_, expectedDelay, ::testing::_)).Times(1).WillOnce(::testing::Return(true));
 
-    auto now = std::chrono::high_resolution_clock::now();
-    mockKmdNotifyHelper->lastWaitForCompletionTimestamp = now - std::chrono::hours(24);
+    int64_t timeSinceLastWait = mockKmdNotifyHelper->properties->delayQuickKmdSleepForSporadicWaitsMicroseconds + 1;
+
+    mockKmdNotifyHelper->lastWaitForCompletionTimestampUs = mockKmdNotifyHelper->getMicrosecondsSinceEpoch() - timeSinceLastWait;
     csr->waitForTaskCountWithKmdNotifyFallback(taskCountToWait, 1, false);
 }
 
@@ -247,7 +250,7 @@ HWTEST_F(KmdNotifyTests, givenDefaultCommandStreamReceiverWhenWaitCalledThenUpda
     overrideKmdNotifyParams(true, 3, true, 2, true, 1);
 
     auto csr = createMockCsr<FamilyType>();
-    EXPECT_NE(0, mockKmdNotifyHelper->lastWaitForCompletionTimestamp.time_since_epoch().count());
+    EXPECT_NE(0, mockKmdNotifyHelper->lastWaitForCompletionTimestampUs.load());
 
     EXPECT_EQ(1u, mockKmdNotifyHelper->updateLastWaitForCompletionTimestampCalled);
     csr->waitForTaskCountWithKmdNotifyFallback(0, 0, false);
@@ -258,7 +261,7 @@ HWTEST_F(KmdNotifyTests, givenDefaultCommandStreamReceiverWithDisabledSporadicWa
     overrideKmdNotifyParams(true, 3, true, 2, false, 0);
 
     auto csr = createMockCsr<FamilyType>();
-    EXPECT_EQ(0, mockKmdNotifyHelper->lastWaitForCompletionTimestamp.time_since_epoch().count());
+    EXPECT_EQ(0, mockKmdNotifyHelper->lastWaitForCompletionTimestampUs.load());
 
     csr->waitForTaskCountWithKmdNotifyFallback(0, 0, false);
     EXPECT_EQ(0u, mockKmdNotifyHelper->updateLastWaitForCompletionTimestampCalled);