Move interlockedMax to core helpers

Change-Id: I5496ea963e68e0ef1e107c860112b7123d38aa81
Signed-off-by: Zbigniew Zdanowicz <[email protected]>

Author: zzdanowicz

core/helpers/CMakeLists.txt

@@ -7,6 +7,7 @@
 set(NEO_CORE_HELPERS
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/basic_math.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/interlocked_max.h
   ${CMAKE_CURRENT_SOURCE_DIR}/vec.h
 )
 

core/helpers/interlocked_max.h

@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+
+#include <atomic>
+template <typename Type>
+void interlockedMax(std::atomic<Type> &dest, Type newVal) {
+    Type oldVal = dest;
+    Type maxVal = oldVal < newVal ? newVal : oldVal;
+    while (!std::atomic_compare_exchange_weak(&dest, &oldVal, maxVal)) {
+        oldVal = dest;
+        maxVal = oldVal < newVal ? newVal : oldVal;
+    }
+}

runtime/helpers/CMakeLists.txt

@@ -100,7 +100,6 @@ set(RUNTIME_SRCS_HELPERS_WINDOWS
   ${CMAKE_CURRENT_SOURCE_DIR}/gmm_callbacks.h
   ${CMAKE_CURRENT_SOURCE_DIR}/gmm_callbacks.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/windows/kmd_notify_properties_windows.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/wddm_helper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/windows/gl_helper.h
 )
 set(RUNTIME_SRCS_HELPERS_LINUX

runtime/helpers/wddm_helper.h

@@ -7,11 +7,11 @@
 
 #include "runtime/os_interface/windows/wddm/wddm.h"
 
+#include "core/helpers/interlocked_max.h"
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/gmm_helper/page_table_mngr.h"
 #include "runtime/gmm_helper/resource_info.h"
-#include "runtime/helpers/wddm_helper.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/os_interface/hw_info_config.h"
 #include "runtime/os_interface/windows/gdi_interface.h"

runtime/os_interface/windows/wddm/wddm.cpp

@@ -1,13 +1,13 @@
 #
-# Copyright (C) 2017-2018 Intel Corporation
+# Copyright (C) 2017-2019 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 set(IGDRCL_SRCS_mt_tests_helpers
   # local files
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/wddm_helper_mt_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/interlocked_max_mt_tests.cpp
 
   # necessary dependencies from igdrcl_tests
   ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/base_object_tests_mt.cpp

unit_tests/mt_tests/helpers/CMakeLists.txt

@@ -1,17 +1,17 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "runtime/helpers/wddm_helper.h"
+#include "core/helpers/interlocked_max.h"
 
 #include "gtest/gtest.h"
 
 #include <thread>
 
-TEST(MtTestWddmFixture, givenCurrentPagingFenceValueWhenValueChangedThenValueIsSet) {
+TEST(MtTestInterlockedMaxFixture, givenCurrentPagingFenceValueWhenValueChangedThenValueIsSet) {
     std::atomic<uint64_t> currentPagingFenceValue;
     std::atomic<int> testCount;
     std::atomic<int> maxValue;