diff --git a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_localmem_upstream_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_localmem_upstream_tests.cpp index c0df2150ac..98ce020c14 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_localmem_upstream_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_localmem_upstream_tests.cpp @@ -59,14 +59,14 @@ class DrmMemoryManagerLocalMemoryTest : public ::testing::Test { class DrmMemoryManagerLocalMemoryWithCustomMockTest : public ::testing::Test { public: - DrmMockCustomImpl *mock; + DrmMockCustom *mock; void SetUp() override { const bool localMemoryEnabled = true; executionEnvironment = new ExecutionEnvironment; executionEnvironment->prepareRootDeviceEnvironments(1); executionEnvironment->rootDeviceEnvironments[0]->setHwInfo(defaultHwInfo.get()); - mock = new DrmMockCustomImpl(*executionEnvironment->rootDeviceEnvironments[0]); + mock = new DrmMockCustom(*executionEnvironment->rootDeviceEnvironments[0]); executionEnvironment->rootDeviceEnvironments[0]->osInterface = std::make_unique(); executionEnvironment->rootDeviceEnvironments[0]->osInterface->setDriverModel(std::unique_ptr(mock)); @@ -776,7 +776,7 @@ TEST_F(DrmMemoryManagerCopyMemoryToAllocationTest, givenDrmMemoryManagerWhenCopy using DrmMemoryManagerTestImpl = Test; HWTEST2_F(DrmMemoryManagerTestImpl, givenDrmMemoryManagerWhenLockUnlockIsCalledOnAllocationInLocalMemoryThenCallIoctlGemMapOffsetAndReturnLockedPtr, NonDefaultIoctlsSupported) { - mockExp->ioctlImpl_expected.gemCreateExt = 1; + mockExp->ioctl_expected.gemCreateExt = 1; mockExp->ioctl_expected.gemWait = 1; mockExp->ioctl_expected.gemClose = 1; mockExp->ioctl_expected.gemMmapOffset = 1; diff --git a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests_impl.h b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests_impl.h index 0a7479ccf6..b85732601c 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests_impl.h +++ b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests_impl.h @@ -8,14 +8,13 @@ #pragma once #include "shared/test/common/helpers/ult_hw_config.h" #include "shared/test/common/helpers/variable_backup.h" -#include "shared/test/common/os_interface/linux/device_command_stream_fixture_impl.h" #include "shared/test/common/os_interface/linux/drm_memory_manager_tests.h" namespace NEO { class DrmMemoryManagerFixtureImpl : public DrmMemoryManagerFixture { public: - DrmMockCustomImpl *mockExp; + DrmMockCustom *mockExp; void SetUp() override { backup = std::make_unique>(&ultHwConfig); @@ -23,7 +22,7 @@ class DrmMemoryManagerFixtureImpl : public DrmMemoryManagerFixture { MemoryManagementFixture::SetUp(); executionEnvironment = MockDevice::prepareExecutionEnvironment(defaultHwInfo.get(), numRootDevices - 1); - mockExp = new DrmMockCustomImpl(*executionEnvironment->rootDeviceEnvironments[0]); + mockExp = new DrmMockCustom(*executionEnvironment->rootDeviceEnvironments[0]); DrmMemoryManagerFixture::SetUp(mockExp, true); } diff --git a/shared/test/common/os_interface/linux/device_command_stream_fixture.cpp b/shared/test/common/os_interface/linux/device_command_stream_fixture.cpp index ac9ce859c9..d963b99c73 100644 --- a/shared/test/common/os_interface/linux/device_command_stream_fixture.cpp +++ b/shared/test/common/os_interface/linux/device_command_stream_fixture.cpp @@ -16,6 +16,7 @@ void Ioctls::reset() { execbuffer2 = 0; gemUserptr = 0; gemCreate = 0; + gemCreateExt = 0; gemSetTiling = 0; gemGetTiling = 0; gemVmCreate = 0; @@ -46,6 +47,7 @@ void DrmMockCustom::testIoctls() { NEO_IOCTL_EXPECT_EQ(execbuffer2); NEO_IOCTL_EXPECT_EQ(gemUserptr); NEO_IOCTL_EXPECT_EQ(gemCreate); + NEO_IOCTL_EXPECT_EQ(gemCreateExt); NEO_IOCTL_EXPECT_EQ(gemSetTiling); NEO_IOCTL_EXPECT_EQ(gemGetTiling); NEO_IOCTL_EXPECT_EQ(primeFdToHandle); @@ -187,6 +189,17 @@ int DrmMockCustom::ioctl(DrmIoctl request, void *arg) { return -1; } } break; + case DrmIoctl::GemCreateExt: { + auto createExtParams = reinterpret_cast(arg); + createExtSize = createExtParams->size; + createExtHandle = createExtParams->handle; + createExtExtensions = createExtParams->extensions; + ioctl_cnt.gemCreateExt++; + } break; + case DrmIoctl::GemVmBind: { + } break; + case DrmIoctl::GemVmUnbind: { + } break; default: int res = ioctlExtra(request, arg); if (returnIoctlExtraErrorValue) { diff --git a/shared/test/common/os_interface/linux/device_command_stream_fixture.h b/shared/test/common/os_interface/linux/device_command_stream_fixture.h index 305e4ec9fb..4aca358939 100644 --- a/shared/test/common/os_interface/linux/device_command_stream_fixture.h +++ b/shared/test/common/os_interface/linux/device_command_stream_fixture.h @@ -38,6 +38,7 @@ class Ioctls { std::atomic execbuffer2; std::atomic gemUserptr; std::atomic gemCreate; + std::atomic gemCreateExt; std::atomic gemSetTiling; std::atomic gemGetTiling; std::atomic gemVmCreate; @@ -214,6 +215,11 @@ class DrmMockCustom : public Drm { bool failOnMmapOffset = false; bool failOnPrimeFdToHandle = false; + //DRM_IOCTL_I915_GEM_CREATE_EXT + uint64_t createExtSize = 0; + uint32_t createExtHandle = 0; + uint64_t createExtExtensions = 0; + int errnoValue = 0; bool returnIoctlExtraErrorValue = false; diff --git a/shared/test/common/os_interface/linux/device_command_stream_fixture_context.cpp b/shared/test/common/os_interface/linux/device_command_stream_fixture_context.cpp index 0020d6fa62..d38d4fb34c 100644 --- a/shared/test/common/os_interface/linux/device_command_stream_fixture_context.cpp +++ b/shared/test/common/os_interface/linux/device_command_stream_fixture_context.cpp @@ -13,16 +13,6 @@ int DrmMockCustomPrelimContext::ioctlExtra(DrmIoctl request, void *arg) { switch (request) { - case DrmIoctl::GemCreateExt: { - auto createExtParams = reinterpret_cast(arg); - createExtSize = createExtParams->size; - createExtHandle = createExtParams->handle; - createExtExtensions = createExtParams->extensions; - } break; - case DrmIoctl::GemVmBind: { - } break; - case DrmIoctl::GemVmUnbind: { - } break; case DrmIoctl::GemWaitUserFence: { const auto wait = reinterpret_cast(arg); receivedGemWaitUserFence = WaitUserFence{ diff --git a/shared/test/common/os_interface/linux/device_command_stream_fixture_impl.h b/shared/test/common/os_interface/linux/device_command_stream_fixture_impl.h deleted file mode 100644 index 41f35426fa..0000000000 --- a/shared/test/common/os_interface/linux/device_command_stream_fixture_impl.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (C) 2020-2022 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#pragma once -#include "shared/test/common/os_interface/linux/device_command_stream_fixture.h" - -class DrmMockCustomImpl : public DrmMockCustom { - public: - using Drm::memoryInfo; - - class Ioctls { - public: - void reset() { - gemCreateExt = 0; - gemMmapOffset = 0; - } - std::atomic gemCreateExt; - std::atomic gemMmapOffset; - }; - - Ioctls ioctlImpl_cnt; - Ioctls ioctlImpl_expected; - - void testIoctls() { -#define NEO_IOCTL_EXPECT_EQ(PARAM) \ - if (this->ioctlImpl_expected.PARAM >= 0) { \ - EXPECT_EQ(this->ioctlImpl_expected.PARAM, this->ioctlImpl_cnt.PARAM); \ - } - NEO_IOCTL_EXPECT_EQ(gemMmapOffset); -#undef NEO_IOCTL_EXPECT_EQ - } - - //DRM_IOCTL_I915_GEM_CREATE_EXT - __u64 createExtSize = 0; - __u32 createExtHandle = 0; - __u64 createExtExtensions = 0; - - int ioctlExtra(DrmIoctl request, void *arg) override { - switch (request) { - case DrmIoctl::GemCreateExt: { - auto createExtParams = reinterpret_cast(arg); - createExtSize = createExtParams->size; - createExtHandle = createExtParams->handle; - createExtExtensions = createExtParams->extensions; - ioctlImpl_cnt.gemCreateExt++; - } break; - default: { - UNRECOVERABLE_IF(true); - } break; - } - return 0; - } - - DrmMockCustomImpl(RootDeviceEnvironment &rootDeviceEnvironment) : DrmMockCustom(rootDeviceEnvironment) { - ioctlImpl_cnt.reset(); - ioctlImpl_expected.reset(); - } -};