Move drm command stream fixture to shared

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

Author: JablonskiMateusz

opencl/test/unit_test/os_interface/linux/drm_command_stream_mm_tests.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/command_container/command_encoder.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/os_interface/linux/drm_command_stream.h"
 #include "shared/source/os_interface/linux/drm_memory_manager.h"
@@ -18,11 +19,9 @@
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/os_interface/linux/device_command_stream_fixture.h"
 #include "shared/test/common/os_interface/linux/drm_buffer_object_fixture.h"
+#include "shared/test/common/os_interface/linux/drm_command_stream_fixture.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "opencl/source/platform/platform.h"
-#include "opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h"
-
 using namespace NEO;
 
 using DrmCommandStreamMMTest = ::testing::Test;

opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_1.cpp

@@ -33,14 +33,14 @@
 #include "shared/test/common/mocks/mock_gmm_page_table_mngr.h"
 #include "shared/test/common/mocks/mock_host_ptr_manager.h"
 #include "shared/test/common/mocks/mock_submissions_aggregator.h"
+#include "shared/test/common/os_interface/linux/drm_command_stream_fixture.h"
 #include "shared/test/common/test_macros/test.h"
 #include "shared/test/unit_test/helpers/gtest_helpers.h"
 
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_program.h"
-#include "opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h"
 
 #include "drm/i915_drm.h"
 #include "gtest/gtest.h"

opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_2.cpp

@@ -30,14 +30,14 @@
 #include "shared/test/common/mocks/mock_gmm_page_table_mngr.h"
 #include "shared/test/common/mocks/mock_host_ptr_manager.h"
 #include "shared/test/common/mocks/mock_submissions_aggregator.h"
+#include "shared/test/common/os_interface/linux/drm_command_stream_fixture.h"
 #include "shared/test/common/test_macros/test.h"
 
 #include "opencl/source/helpers/cl_memory_properties_helpers.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_program.h"
-#include "opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h"
 
 #include "drm/i915_drm.h"
 

opencl/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_tests.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/command_container/command_encoder.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/os_interface/linux/drm_command_stream.h"
 #include "shared/source/os_interface/linux/drm_memory_manager.h"
@@ -21,10 +22,9 @@
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/os_interface/linux/device_command_stream_fixture.h"
 #include "shared/test/common/os_interface/linux/drm_buffer_object_fixture.h"
+#include "shared/test/common/os_interface/linux/drm_command_stream_fixture.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h"
-
 using namespace NEO;
 
 struct DrmCommandStreamMultiTileMemExecFixture {

shared/test/common/os_interface/linux/CMakeLists.txt

@@ -7,6 +7,7 @@
 if(UNIX)
   target_sources(${TARGET_NAME} PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                 ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream_fixture.h
                  ${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_manager_tests.h
                  ${CMAKE_CURRENT_SOURCE_DIR}/drm_mock_cache_info.h
                  ${CMAKE_CURRENT_SOURCE_DIR}/drm_mock_device_blob.h

…rface/linux/drm_command_stream_fixture.h …rface/linux/drm_command_stream_fixture.hopencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h renamed to shared/test/common/os_interface/linux/drm_command_stream_fixture.h opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h renamed to shared/test/common/os_interface/linux/drm_command_stream_fixture.h

@@ -7,19 +7,14 @@
 
 #pragma once
 #include "shared/source/command_stream/preemption.h"
-#include "shared/source/os_interface/linux/drm_command_stream.h"
 #include "shared/source/os_interface/linux/drm_memory_operations_handler.h"
 #include "shared/source/os_interface/linux/os_context_linux.h"
-#include "shared/source/os_interface/os_interface.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/mocks/linux/mock_drm_command_stream_receiver.h"
+#include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
-#include "shared/test/common/os_interface/linux/device_command_stream_fixture.h"
-#include "shared/test/common/test_macros/test.h"
-
-#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 
 #include "gtest/gtest.h"
 

shared/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp

@@ -5,118 +5,44 @@
  *
  */
 
-#include "shared/source/command_stream/preemption.h"
 #include "shared/source/helpers/api_specific_config.h"
-#include "shared/source/os_interface/linux/drm_command_stream.h"
-#include "shared/source/os_interface/linux/drm_memory_operations_handler.h"
-#include "shared/source/os_interface/linux/os_context_linux.h"
-#include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/common/helpers/default_hw_info.h"
-#include "shared/test/common/helpers/engine_descriptor_helper.h"
-#include "shared/test/common/helpers/variable_backup.h"
-#include "shared/test/common/libult/linux/drm_mock.h"
-#include "shared/test/common/mocks/linux/mock_drm_command_stream_receiver.h"
-#include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
-#include "shared/test/common/os_interface/linux/device_command_stream_fixture.h"
+#include "shared/test/common/os_interface/linux/drm_command_stream_fixture.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "drm/i915_drm.h"
-#include "gtest/gtest.h"
-
 namespace NEO {
 extern ApiSpecificConfig::ApiType apiTypeForUlts;
 } //namespace NEO
 using namespace NEO;
 
-class DrmCommandStreamTest2 : public ::testing::Test {
-  public:
-    template <typename GfxFamily>
-    void SetUpT() {
-
-        //make sure this is disabled, we don't want to test this now
-        DebugManager.flags.EnableForcePin.set(false);
-        auto hwInfo = executionEnvironment.rootDeviceEnvironments[0]->getHardwareInfo();
-
-        mock = new DrmMock(mockFd, *executionEnvironment.rootDeviceEnvironments[0]);
-        mock->setupIoctlHelper(hwInfo->platform.eProductFamily);
-
-        executionEnvironment.rootDeviceEnvironments[0]->osInterface = std::make_unique<OSInterface>();
-        executionEnvironment.rootDeviceEnvironments[0]->osInterface->setDriverModel(std::unique_ptr<DriverModel>(mock));
-        executionEnvironment.rootDeviceEnvironments[0]->memoryOperationsInterface = DrmMemoryOperationsHandler::create(*mock, 0u);
-
-        mock->createVirtualMemoryAddressSpace(HwHelper::getSubDevicesCount(hwInfo));
-        osContext = std::make_unique<OsContextLinux>(*mock, 0u,
-                                                     EngineDescriptorHelper::getDefaultDescriptor(HwHelper::get(hwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*hwInfo)[0],
-                                                                                                  PreemptionHelper::getDefaultPreemptionMode(*hwInfo)));
-        osContext->ensureContextInitialized();
-
-        csr = new DrmCommandStreamReceiver<GfxFamily>(executionEnvironment, 0, 1, gemCloseWorkerMode::gemCloseWorkerActive);
-        ASSERT_NE(nullptr, csr);
-        csr->setupContext(*osContext);
-
-        mock->ioctlCallsCount = 0u;
-        memoryManager = new DrmMemoryManager(gemCloseWorkerMode::gemCloseWorkerActive,
-                                             DebugManager.flags.EnableForcePin.get(),
-                                             true,
-                                             executionEnvironment);
-        executionEnvironment.memoryManager.reset(memoryManager);
-        // Memory manager creates pinBB with ioctl, expect one call
-        EXPECT_EQ(1u, mock->ioctlCallsCount);
-
-        //assert we have memory manager
-        ASSERT_NE(nullptr, memoryManager);
-    }
-
-    template <typename GfxFamily>
-    void TearDownT() {
-        memoryManager->waitForDeletions();
-        memoryManager->peekGemCloseWorker()->close(true);
-        delete csr;
-        // Expect 1 call with DRM_IOCTL_I915_GEM_CONTEXT_DESTROY request on destroyDrmContext
-        // Expect 1 call with DRM_IOCTL_GEM_CLOSE request on BufferObject close
-        mock->expectedIoctlCallsOnDestruction = mock->ioctlCallsCount + 2;
-        mock->expectIoctlCallsOnDestruction = true;
-    }
-
-    CommandStreamReceiver *csr = nullptr;
-    DrmMemoryManager *memoryManager = nullptr;
-    DrmMock *mock = nullptr;
-    const int mockFd = 33;
-    static const uint64_t alignment = MemoryConstants::allocationAlignment;
-    DebugManagerStateRestore dbgState;
-    MockExecutionEnvironment executionEnvironment;
-    std::unique_ptr<OsContextLinux> osContext;
-};
-
 template <typename GfxFamily>
 struct MockDrmCsr : public DrmCommandStreamReceiver<GfxFamily> {
     using DrmCommandStreamReceiver<GfxFamily>::DrmCommandStreamReceiver;
     using DrmCommandStreamReceiver<GfxFamily>::dispatchMode;
 };
 
-HWTEST_TEMPLATED_F(DrmCommandStreamTest2, givenL0ApiConfigWhenCreatingDrmCsrThenEnableImmediateDispatch) {
+HWTEST_TEMPLATED_F(DrmCommandStreamTest, givenL0ApiConfigWhenCreatingDrmCsrThenEnableImmediateDispatch) {
     VariableBackup<ApiSpecificConfig::ApiType> backup(&apiTypeForUlts, ApiSpecificConfig::L0);
     MockDrmCsr<FamilyType> csr(executionEnvironment, 0, 1, gemCloseWorkerMode::gemCloseWorkerInactive);
     EXPECT_EQ(DispatchMode::ImmediateDispatch, csr.dispatchMode);
 }
 
-HWTEST_TEMPLATED_F(DrmCommandStreamTest2, whenGettingCompletionValueThenTaskCountOfAllocationIsReturned) {
+HWTEST_TEMPLATED_F(DrmCommandStreamTest, whenGettingCompletionValueThenTaskCountOfAllocationIsReturned) {
     MockGraphicsAllocation allocation{};
     uint32_t expectedValue = 0x1234;
     allocation.updateTaskCount(expectedValue, osContext->getContextId());
     EXPECT_EQ(expectedValue, csr->getCompletionValue(allocation));
 }
 
-HWTEST_TEMPLATED_F(DrmCommandStreamTest2, whenGettingCompletionAddressThenOffsettedTagAddressIsReturned) {
+HWTEST_TEMPLATED_F(DrmCommandStreamTest, whenGettingCompletionAddressThenOffsettedTagAddressIsReturned) {
     csr->initializeTagAllocation();
     EXPECT_NE(nullptr, csr->getTagAddress());
     uint64_t tagAddress = castToUint64(const_cast<uint32_t *>(csr->getTagAddress()));
     auto expectedAddress = tagAddress + Drm::completionFenceOffset;
     EXPECT_EQ(expectedAddress, csr->getCompletionAddress());
 }
 
-HWTEST_TEMPLATED_F(DrmCommandStreamTest2, givenNoTagAddressWhenGettingCompletionAddressThenZeroIsReturned) {
+HWTEST_TEMPLATED_F(DrmCommandStreamTest, givenNoTagAddressWhenGettingCompletionAddressThenZeroIsReturned) {
     EXPECT_EQ(nullptr, csr->getTagAddress());
     EXPECT_EQ(0u, csr->getCompletionAddress());
 }