Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unused methods 

Signed-off-by: Bartosz Dunajski <bartosz.dunajski@intel.com>
This commit is contained in:
Bartosz Dunajski 2021-04-08 16:24:52 +00:00 committed by Compute-Runtime-Automation
parent c642b288a9
commit d182d77a41
3 changed files with 2 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
opencl/test/unit_test/os_interface/linux/drm_memory_info_tests.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2019-2020 Intel Corporation
* Copyright (C) 2019-2021 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -44,30 +44,3 @@ TEST(DrmTest, givenMemoryInfoWhenGetMemoryInfoIsCalledThenValidPtrIsReturned) {
TEST(MemoryInfo, givenMemoryInfoImplementationWhenDestructingThenDestructorIsCalled) {
MemoryInfoImpl memoryInfoImpl;
}
TEST(MemoryInfo, givenMemoryRegionIdWhenGetMemoryTypeFromRegionAndGetInstanceFromRegionAreCalledThenMemoryTypeAndInstanceAreReturned) {
auto executionEnvironment = std::make_unique<ExecutionEnvironment>();
executionEnvironment->prepareRootDeviceEnvironments(1);
std::unique_ptr<DrmMock> drm = std::make_unique<DrmMock>(*executionEnvironment->rootDeviceEnvironments[0]);
EXPECT_NE(nullptr, drm);
auto regionSmem = drm->createMemoryRegionId(0, 0);
EXPECT_EQ(0u, drm->getMemoryTypeFromRegion(regionSmem));
EXPECT_EQ(0u, drm->getMemoryInstanceFromRegion(regionSmem));
auto regionLmem = drm->createMemoryRegionId(1, 0);
EXPECT_EQ(1u, drm->getMemoryTypeFromRegion(regionLmem));
EXPECT_EQ(0u, drm->getMemoryInstanceFromRegion(regionLmem));
auto regionLmem1 = drm->createMemoryRegionId(1, 1);
EXPECT_EQ(1u, drm->getMemoryTypeFromRegion(regionLmem1));
EXPECT_EQ(1u, drm->getMemoryInstanceFromRegion(regionLmem1));
auto regionLmem2 = drm->createMemoryRegionId(1, 2);
EXPECT_EQ(1u, drm->getMemoryTypeFromRegion(regionLmem2));
EXPECT_EQ(2u, drm->getMemoryInstanceFromRegion(regionLmem2));
auto regionLmem3 = drm->createMemoryRegionId(1, 3);
EXPECT_EQ(1u, drm->getMemoryTypeFromRegion(regionLmem3));
EXPECT_EQ(3u, drm->getMemoryInstanceFromRegion(regionLmem3));
}

17
opencl/test/unit_test/os_interface/linux/drm_memory_info_tests_dg1.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2020 Intel Corporation
* Copyright (C) 2020-2021 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -104,18 +104,3 @@ TEST(MemoryInfo, givenMemoryInfoWithoutRegionsWhenGettingMemoryRegionClassAndIns
auto regionSize = memoryInfo->getMemoryRegionSize(MemoryBanks::MainBank);
EXPECT_EQ(0 * GB, regionSize);
}
TEST(MemoryInfo, givenMemoryRegionIdWhenGetMemoryTypeFromRegionAndGetInstanceFromRegionAreCalledThenMemoryTypeAndInstanceAreReturned) {
auto executionEnvironment = std::make_unique<ExecutionEnvironment>();
executionEnvironment->prepareRootDeviceEnvironments(1);
auto drm = std::make_unique<DrmMockDg1>(*executionEnvironment->rootDeviceEnvironments[0]);
EXPECT_NE(nullptr, drm);
auto regionSmem = drm->createMemoryRegionId(0, 0);
EXPECT_EQ(0u, drm->getMemoryTypeFromRegion(regionSmem));
EXPECT_EQ(0u, drm->getMemoryInstanceFromRegion(regionSmem));
auto regionLmem = drm->createMemoryRegionId(1, 0);
EXPECT_EQ(1u, drm->getMemoryTypeFromRegion(regionLmem));
EXPECT_EQ(0u, drm->getMemoryInstanceFromRegion(regionLmem));
}

6
shared/source/os_interface/linux/drm_neo.h
View File

@ -162,12 +162,6 @@ class Drm {
return classHandles.size() > 0;
}
static inline uint32_t createMemoryRegionId(uint16_t type, uint16_t instance) {
return (1u << (type + 16)) | (1u << instance);
}
static inline uint16_t getMemoryTypeFromRegion(uint32_t region) { return Math::log2(region >> 16); };
static inline uint16_t getMemoryInstanceFromRegion(uint32_t region) { return Math::log2(region & 0xFFFF); };
static bool isi915Version(int fd);
static Drm *create(std::unique_ptr<HwDeviceId> hwDeviceId, RootDeviceEnvironment &rootDeviceEnvironment);