intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-27 07:44:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove Gmock from Mock<Driver>

Browse Source 
Related-To: NEO-4914

Change-Id: I792df60a50c6a28eca8733faf323f9689f170960
Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
This commit is contained in:
Mateusz Hoppe
2020-07-31 13:48:40 +02:00
committed by sys_ocldev
parent 753b98c4f3
commit 296d8ac99e
12 changed files with 25 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
level_zero/core/test/unit_tests/mock.h
View File

@@ -6,8 +6,6 @@
*/
#pragma once
#include "gmock/gmock.h"
namespace L0 {
namespace ult {

2
level_zero/core/test/unit_tests/mocks/CMakeLists.txt
View File

@@ -15,6 +15,7 @@ set(L0_MOCKS_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/mock_cmdlist.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mock_cmdqueue.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_cmdqueue.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mock_context.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_device.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_device.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mock_driver.h
@@ -27,7 +28,6 @@ set(L0_MOCKS_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/mock_kernel.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_l0_debugger.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_memory_manager.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_memory_manager.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mock_module.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mock_module.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_sampler.h

2
level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h
View File

@@ -11,6 +11,8 @@
#include "level_zero/core/test/unit_tests/mock.h"
#include "level_zero/core/test/unit_tests/white_box.h"
#include "gmock/gmock.h"
namespace L0 {
namespace ult {

2
level_zero/core/test/unit_tests/mocks/mock_context.h
View File

@@ -12,6 +12,8 @@
#include "level_zero/core/test/unit_tests/mock.h"
#include "level_zero/core/test/unit_tests/white_box.h"
#include "gmock/gmock.h"
namespace L0 {
namespace ult {

2
level_zero/core/test/unit_tests/mocks/mock_device.h
View File

@@ -18,6 +18,8 @@
#include "level_zero/core/test/unit_tests/white_box.h"
#include "level_zero/tools/source/metrics/metric.h"
#include "gmock/gmock.h"
namespace L0 {
namespace ult {

3
level_zero/core/test/unit_tests/mocks/mock_driver.cpp
View File

@@ -11,13 +11,10 @@ namespace L0 {
namespace ult {
using MockDriver = Mock<L0::ult::Driver>;
using ::testing::Invoke;
Mock<Driver>::Mock() {
previousDriver = driver;
driver = this;
EXPECT_CALL(*this, initialize)
.WillRepeatedly(Invoke(this, &MockDriver::mockInitialize));
}
Mock<Driver>::~Mock() {

16
level_zero/core/test/unit_tests/mocks/mock_driver.h
View File

@@ -26,19 +26,13 @@ struct Mock<Driver> : public Driver {
Mock();
~Mock() override;
MOCK_METHOD(ze_result_t,
driverInit,
(ze_init_flags_t),
(override));
MOCK_METHOD(void,
initialize,
(ze_result_t * result),
(override));
ze_result_t mockInit(ze_init_flag_t) { return this->DriverImp::driverInit(ZE_INIT_FLAG_GPU_ONLY); }
void mockInitialize(ze_result_t *result) { *result = ZE_RESULT_SUCCESS; }
ze_result_t driverInit(ze_init_flags_t flag) override {
initCalledCount++;
return ZE_RESULT_SUCCESS;
}
Driver *previousDriver = nullptr;
uint32_t initCalledCount = 0;
};
} // namespace ult

2
level_zero/core/test/unit_tests/mocks/mock_event.h
View File

@@ -11,6 +11,8 @@
#include "level_zero/core/test/unit_tests/mock.h"
#include "level_zero/core/test/unit_tests/white_box.h"
#include "gmock/gmock.h"
#include <vector>
#if defined(__clang__)

55
level_zero/core/test/unit_tests/mocks/mock_memory_manager.cpp
View File

@@ -1,55 +0,0 @@
/*
* Copyright (C) 2019-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "mock_memory_manager.h"
#include "shared/source/helpers/aligned_memory.h"
#include "shared/source/helpers/string.h"
#include <iostream>
namespace L0 {
namespace ult {
using namespace testing;
using ::testing::Return;
Mock<NEO::MemoryManager>::Mock(NEO::ExecutionEnvironment &executionEnvironment) : MemoryManagerMock(executionEnvironment) {
EXPECT_CALL(*this, allocateGraphicsMemoryInPreferredPool)
.WillRepeatedly(Invoke(this, &Mock<NEO::MemoryManager>::doAllocateGraphicsMemoryInPreferredPool));
EXPECT_CALL(*this, freeGraphicsMemory)
.WillRepeatedly(Invoke(this, &Mock<NEO::MemoryManager>::doFreeGraphicsMemory));
}
inline NEO::GraphicsAllocation *Mock<NEO::MemoryManager>::doAllocateGraphicsMemoryInPreferredPool(const NEO::AllocationProperties &properties, const void *hostPtr) {
void *buffer;
if (hostPtr != nullptr) {
buffer = const_cast<void *>(hostPtr);
} else {
buffer = alignedMalloc(properties.size, MemoryConstants::pageSize);
}
uint64_t baseAddress = 0;
if (properties.allocationType == NEO::GraphicsAllocation::AllocationType::INTERNAL_HEAP) {
baseAddress = castToUint64(alignDown(buffer, MemoryConstants::pageSize64k));
}
auto allocation = new NEO::GraphicsAllocation(properties.rootDeviceIndex, properties.allocationType,
buffer, reinterpret_cast<uint64_t>(buffer), baseAddress, properties.size,
MemoryPool::System4KBPages);
return allocation;
}
inline void Mock<NEO::MemoryManager>::doFreeGraphicsMemory(NEO::GraphicsAllocation *allocation) {
if (allocation == nullptr) {
return;
}
alignedFree(allocation->getUnderlyingBuffer());
delete allocation;
}
} // namespace ult
} // namespace L0

11
level_zero/core/test/unit_tests/mocks/mock_memory_manager.h
View File

@@ -32,17 +32,6 @@ struct WhiteBox<::NEO::OsAgnosticMemoryManager> : public ::NEO::OsAgnosticMemory
using MemoryManagerMock = WhiteBox<::NEO::OsAgnosticMemoryManager>;
template <>
struct Mock<NEO::MemoryManager> : public MemoryManagerMock {
Mock(NEO::ExecutionEnvironment &executionEnvironment);
MOCK_METHOD2(allocateGraphicsMemoryInPreferredPool,
NEO::GraphicsAllocation *(const NEO::AllocationProperties &properties, const void *hostPtr));
MOCK_METHOD1(freeGraphicsMemory, void(NEO::GraphicsAllocation *));
NEO::GraphicsAllocation *doAllocateGraphicsMemoryInPreferredPool(const NEO::AllocationProperties &properties, const void *hostPtr);
void doFreeGraphicsMemory(NEO::GraphicsAllocation *allocation);
};
} // namespace ult
} // namespace L0

1
level_zero/core/test/unit_tests/mocks/mock_module.h
View File

@@ -14,6 +14,7 @@
#include "level_zero/core/test/unit_tests/mock.h"
#include "level_zero/core/test/unit_tests/white_box.h"
#include "gmock/gmock.h"
namespace L0 {
namespace ult {

10
level_zero/core/test/unit_tests/sources/driver/test_driver.cpp
View File

@@ -15,12 +15,22 @@
#include "level_zero/core/source/driver/driver_handle_imp.h"
#include "level_zero/core/source/driver/driver_imp.h"
#include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
#include "level_zero/core/test/unit_tests/mocks/mock_driver.h"
#include <bitset>
namespace L0 {
namespace ult {
TEST(zeInit, whenCallingZeInitThenInitializeOnDriverIsCalled) {
Mock<Driver> driver;
auto result = zeInit(ZE_INIT_FLAG_GPU_ONLY);
EXPECT_EQ(ZE_RESULT_SUCCESS, result);
EXPECT_EQ(1u, driver.initCalledCount);
}
using DriverVersionTest = Test<DeviceFixture>;
TEST_F(DriverVersionTest, givenCallToGetExtensionPropertiesThenUnsupportedIsReturned) {