Move some os_interface tests to shared

Signed-off-by: Daniel Chabrowski <[email protected]>

Author: DanielChabrowski

opencl/test/unit_test/os_interface/CMakeLists.txt

@@ -9,7 +9,6 @@ set(IGDRCL_SRCS_tests_os_interface_base
     ${CMAKE_CURRENT_SOURCE_DIR}/device_factory_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_tests.cpp
 )
 

opencl/test/unit_test/os_interface/os_interface_tests.cpp

@@ -6,16 +6,13 @@
 
 set(IGDRCL_SRCS_tests_os_interface_windows
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/device_os_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/driver_info_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/file_logger_win_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_kmdaf_listener.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_os_time_win.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_win.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_win.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_win_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_win_tests.h
     ${CMAKE_CURRENT_SOURCE_DIR}/os_time_win_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_win_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/registry_reader_tests.cpp

opencl/test/unit_test/os_interface/windows/CMakeLists.txt

@@ -14,6 +14,7 @@
 #include <cstdint>
 #include <limits>
 #include <memory>
+#include <type_traits>
 #include <vector>
 
 namespace NEO {
@@ -124,4 +125,10 @@ class OSInterface : public NonCopyableClass {
   protected:
     std::unique_ptr<DriverModel> driverModel = nullptr;
 };
+
+static_assert(!std::is_move_constructible_v<NEO::OSInterface>);
+static_assert(!std::is_copy_constructible_v<NEO::OSInterface>);
+static_assert(!std::is_move_assignable_v<NEO::OSInterface>);
+static_assert(!std::is_copy_assignable_v<NEO::OSInterface>);
+
 } // namespace NEO

shared/source/os_interface/os_interface.h

@@ -9,11 +9,14 @@ set(NEO_CORE_OS_INTERFACE_TESTS_WINDOWS
     ${CMAKE_CURRENT_SOURCE_DIR}/adapter_info_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/adapter_info_tests.h
     ${CMAKE_CURRENT_SOURCE_DIR}/deferrable_deletion_win_tests.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/gdi_interface_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/gmm_helper_tests_win.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_win_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_win_tests.h
     ${CMAKE_CURRENT_SOURCE_DIR}/os_context_win_tests.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_win_tests.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_win_tests.h
     ${CMAKE_CURRENT_SOURCE_DIR}/os_library_win_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/self_lib_win.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/um_km_data_translator_tests.cpp

shared/test/unit_test/os_interface/windows/CMakeLists.txt

@@ -44,8 +44,6 @@
 #include "shared/test/common/test_macros/test.h"
 #include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h"
 
-#include "opencl/test/unit_test/mocks/mock_buffer.h"
-
 #include "hw_cmds.h"
 
 using namespace NEO;
@@ -680,17 +678,17 @@ TEST_F(WddmCommandStreamTest, WhenProcesssingEvictionThenEvictionAllocationsList
 
 TEST_F(WddmCommandStreamTest, WhenMakingResidentAndNonResidentThenAllocationIsMovedCorrectly) {
     GraphicsAllocation *gfxAllocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{csr->getRootDeviceIndex(), MemoryConstants::pageSize});
-    Buffer *buffer = new AlignedBuffer(gfxAllocation);
 
-    csr->makeResident(*buffer->getGraphicsAllocation(csr->getRootDeviceIndex()));
+    ASSERT_NE(gfxAllocation, nullptr);
+
+    csr->makeResident(*gfxAllocation);
     EXPECT_EQ(0u, wddm->makeResidentResult.called);
     EXPECT_EQ(1u, csr->getResidencyAllocations().size());
     EXPECT_EQ(gfxAllocation, csr->getResidencyAllocations()[0]);
 
-    csr->makeNonResident(*buffer->getGraphicsAllocation(csr->getRootDeviceIndex()));
+    csr->makeNonResident(*gfxAllocation);
     EXPECT_EQ(gfxAllocation, csr->getEvictionAllocations()[0]);
 
-    delete buffer;
     memoryManager->freeGraphicsMemory(gfxAllocation);
 }
 

…/windows/device_command_stream_tests.cpp …/windows/device_command_stream_tests.cppopencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp renamed to shared/test/unit_test/os_interface/windows/device_command_stream_tests.cpp opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp renamed to shared/test/unit_test/os_interface/windows/device_command_stream_tests.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "opencl/test/unit_test/os_interface/windows/os_interface_win_tests.h"
+#include "shared/test/unit_test/os_interface/windows/os_interface_win_tests.h"
 
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/os_interface/windows/os_context_win.h"

…rface/windows/os_interface_win_tests.cpp …rface/windows/os_interface_win_tests.cppopencl/test/unit_test/os_interface/windows/os_interface_win_tests.cpp renamed to shared/test/unit_test/os_interface/windows/os_interface_win_tests.cpp opencl/test/unit_test/os_interface/windows/os_interface_win_tests.cpp renamed to shared/test/unit_test/os_interface/windows/os_interface_win_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *