intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-08 22:12:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Dont use global namespaces of i915 definitions

Browse Source 
Related-To: NEO-6852
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2022-07-18 12:53:55 +00:00
committed by Compute-Runtime-Automation
parent 4ec546640f
commit a4e9ede440
34 changed files with 441 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
level_zero/tools/source/sysman/engine/linux/os_engine_imp.cpp
View File

@@ -14,19 +14,20 @@
namespace L0 { namespace L0 {
constexpr auto I915_SAMPLE_BUSY = NEO::I915::drm_i915_pmu_engine_sample::I915_SAMPLE_BUSY;
static const std::multimap<__u16, zes_engine_group_t> i915ToEngineMap = { static const std::multimap<__u16, zes_engine_group_t> i915ToEngineMap = {
{static_cast<__u16>(I915_ENGINE_CLASS_RENDER), ZES_ENGINE_GROUP_RENDER_SINGLE}, {static_cast<__u16>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER), ZES_ENGINE_GROUP_RENDER_SINGLE},
{static_cast<__u16>(I915_ENGINE_CLASS_VIDEO), ZES_ENGINE_GROUP_MEDIA_DECODE_SINGLE}, {static_cast<__u16>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO), ZES_ENGINE_GROUP_MEDIA_DECODE_SINGLE},
{static_cast<__u16>(I915_ENGINE_CLASS_VIDEO), ZES_ENGINE_GROUP_MEDIA_ENCODE_SINGLE}, {static_cast<__u16>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO), ZES_ENGINE_GROUP_MEDIA_ENCODE_SINGLE},
{static_cast<__u16>(I915_ENGINE_CLASS_COPY), ZES_ENGINE_GROUP_COPY_SINGLE}, {static_cast<__u16>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY), ZES_ENGINE_GROUP_COPY_SINGLE},
{static_cast<__u16>(I915_ENGINE_CLASS_VIDEO_ENHANCE), ZES_ENGINE_GROUP_MEDIA_ENHANCEMENT_SINGLE}}; {static_cast<__u16>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO_ENHANCE), ZES_ENGINE_GROUP_MEDIA_ENHANCEMENT_SINGLE}};
static const std::multimap<zes_engine_group_t, __u16> engineToI915Map = { static const std::multimap<zes_engine_group_t, __u16> engineToI915Map = {
{ZES_ENGINE_GROUP_RENDER_SINGLE, static_cast<__u16>(I915_ENGINE_CLASS_RENDER)}, {ZES_ENGINE_GROUP_RENDER_SINGLE, static_cast<__u16>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER)},
{ZES_ENGINE_GROUP_MEDIA_DECODE_SINGLE, static_cast<__u16>(I915_ENGINE_CLASS_VIDEO)}, {ZES_ENGINE_GROUP_MEDIA_DECODE_SINGLE, static_cast<__u16>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO)},
{ZES_ENGINE_GROUP_MEDIA_ENCODE_SINGLE, static_cast<__u16>(I915_ENGINE_CLASS_VIDEO)}, {ZES_ENGINE_GROUP_MEDIA_ENCODE_SINGLE, static_cast<__u16>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO)},
{ZES_ENGINE_GROUP_COPY_SINGLE, static_cast<__u16>(I915_ENGINE_CLASS_COPY)}, {ZES_ENGINE_GROUP_COPY_SINGLE, static_cast<__u16>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY)},
{ZES_ENGINE_GROUP_MEDIA_ENHANCEMENT_SINGLE, static_cast<__u16>(I915_ENGINE_CLASS_VIDEO_ENHANCE)}}; {ZES_ENGINE_GROUP_MEDIA_ENHANCEMENT_SINGLE, static_cast<__u16>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO_ENHANCE)}};
ze_result_t OsEngine::getNumEngineTypeAndInstances(std::set<std::pair<zes_engine_group_t, EngineInstanceSubDeviceId>> &engineGroupInstance, OsSysman *pOsSysman) { ze_result_t OsEngine::getNumEngineTypeAndInstances(std::set<std::pair<zes_engine_group_t, EngineInstanceSubDeviceId>> &engineGroupInstance, OsSysman *pOsSysman) {
LinuxSysmanImp *pLinuxSysmanImp = static_cast<LinuxSysmanImp *>(pOsSysman); LinuxSysmanImp *pLinuxSysmanImp = static_cast<LinuxSysmanImp *>(pOsSysman);

2
level_zero/tools/source/sysman/memory/linux/os_memory_imp_dg1.cpp
View File

@@ -53,7 +53,7 @@ ze_result_t LinuxMemoryImp::getState(zes_mem_state_t *pState) {
return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE; return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
} }
for (auto region : memoryInfo->getDrmRegionInfos()) { for (auto region : memoryInfo->getDrmRegionInfos()) {
if (region.region.memoryClass == I915_MEMORY_CLASS_DEVICE) { if (region.region.memoryClass == drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE) {
deviceRegions.push_back(region); deviceRegions.push_back(region);
} }
} }

2
level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.cpp
View File

@@ -294,7 +294,7 @@ ze_result_t LinuxMemoryImp::getState(zes_mem_state_t *pState) {
} }
auto regions = pDrm->getIoctlHelper()->translateToMemoryRegions(memRegions); auto regions = pDrm->getIoctlHelper()->translateToMemoryRegions(memRegions);
for (auto region : regions) { for (auto region : regions) {
if (region.region.memoryClass == I915_MEMORY_CLASS_DEVICE) { if (region.region.memoryClass == drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE) {
deviceRegions.push_back(region); deviceRegions.push_back(region);
} }
} }

20
level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp_prelim.cpp
View File

@@ -24,11 +24,11 @@ const std::string LinuxSchedulerImp::engineDir("engine");
constexpr uint16_t milliSecsToMicroSecs = 1000; constexpr uint16_t milliSecsToMicroSecs = 1000;
static const std::map<__u16, std::string> i915EngineClassToSysfsEngineMap = { static const std::map<__u16, std::string> i915EngineClassToSysfsEngineMap = {
{I915_ENGINE_CLASS_RENDER, "rcs"}, {drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER, "rcs"},
{static_cast<__u16>(I915_ENGINE_CLASS_COMPUTE), "ccs"}, {static_cast<__u16>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_COMPUTE), "ccs"},
{I915_ENGINE_CLASS_COPY, "bcs"}, {drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY, "bcs"},
{I915_ENGINE_CLASS_VIDEO, "vcs"}, {drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO, "vcs"},
{I915_ENGINE_CLASS_VIDEO_ENHANCE, "vecs"}}; {drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO_ENHANCE, "vecs"}};
static const std::map<std::string, zes_engine_type_flag_t> sysfsEngineMapToLevel0EngineType = { static const std::map<std::string, zes_engine_type_flag_t> sysfsEngineMapToLevel0EngineType = {
{"rcs", ZES_ENGINE_TYPE_FLAG_RENDER}, {"rcs", ZES_ENGINE_TYPE_FLAG_RENDER},
@@ -45,11 +45,11 @@ static const std::multimap<zes_engine_type_flag_t, std::string> level0EngineType
{ZES_ENGINE_TYPE_FLAG_OTHER, "vecs"}}; {ZES_ENGINE_TYPE_FLAG_OTHER, "vecs"}};
static const std::map<std::string, __u16> sysfsEngineMapToi915EngineClass = { static const std::map<std::string, __u16> sysfsEngineMapToi915EngineClass = {
{"rcs", I915_ENGINE_CLASS_RENDER}, {"rcs", drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER},
{"ccs", static_cast<__u16>(I915_ENGINE_CLASS_COMPUTE)}, {"ccs", static_cast<__u16>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_COMPUTE)},
{"bcs", I915_ENGINE_CLASS_COPY}, {"bcs", drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY},
{"vcs", I915_ENGINE_CLASS_VIDEO}, {"vcs", drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO},
{"vecs", I915_ENGINE_CLASS_VIDEO_ENHANCE}}; {"vecs", drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO_ENHANCE}};
ze_result_t LinuxSchedulerImp::getProperties(zes_sched_properties_t &schedProperties) { ze_result_t LinuxSchedulerImp::getProperties(zes_sched_properties_t &schedProperties) {
schedProperties.onSubdevice = onSubdevice; schedProperties.onSubdevice = onSubdevice;

8
level_zero/tools/test/unit_tests/sources/debug/linux/test_debug_api_linux.cpp
View File

@@ -4870,7 +4870,7 @@ TEST_F(DebugApiLinuxTest, GivenContextParamEventWhenTypeIsParamEngineThenEventIs
auto enginesOffset = offsetof(i915_context_param_engines, engines); auto enginesOffset = offsetof(i915_context_param_engines, engines);
auto *classInstance = ptrOffset(memory, offset + valueOffset + enginesOffset); auto *classInstance = ptrOffset(memory, offset + valueOffset + enginesOffset);
i915_engine_class_instance ci = {I915_ENGINE_CLASS_RENDER, 1}; i915_engine_class_instance ci = {drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER, 1};
memcpy(classInstance, &ci, sizeof(i915_engine_class_instance)); memcpy(classInstance, &ci, sizeof(i915_engine_class_instance));
::testing::internal::CaptureStdout(); ::testing::internal::CaptureStdout();
@@ -4878,7 +4878,7 @@ TEST_F(DebugApiLinuxTest, GivenContextParamEventWhenTypeIsParamEngineThenEventIs
alignedFree(memory); alignedFree(memory);
EXPECT_EQ(1u, session->clientHandleToConnection[MockDebugSessionLinux::mockClientHandle]->contextsCreated[contextHandle].engines.size()); EXPECT_EQ(1u, session->clientHandleToConnection[MockDebugSessionLinux::mockClientHandle]->contextsCreated[contextHandle].engines.size());
EXPECT_EQ(static_cast<uint32_t>(I915_ENGINE_CLASS_RENDER), session->clientHandleToConnection[MockDebugSessionLinux::mockClientHandle]->contextsCreated[contextHandle].engines[0].engine_class); EXPECT_EQ(static_cast<uint32_t>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER), session->clientHandleToConnection[MockDebugSessionLinux::mockClientHandle]->contextsCreated[contextHandle].engines[0].engine_class);
EXPECT_EQ(1u, session->clientHandleToConnection[MockDebugSessionLinux::mockClientHandle]->contextsCreated[contextHandle].engines[0].engine_instance); EXPECT_EQ(1u, session->clientHandleToConnection[MockDebugSessionLinux::mockClientHandle]->contextsCreated[contextHandle].engines[0].engine_instance);
EXPECT_NE(session->clientHandleToConnection[MockDebugSessionLinux::mockClientHandle]->vmToTile.end(), EXPECT_NE(session->clientHandleToConnection[MockDebugSessionLinux::mockClientHandle]->vmToTile.end(),
@@ -4934,13 +4934,13 @@ TEST_F(DebugApiLinuxTest, GivenNoVmIdWhenOrZeroEnginesContextParamEventIsHandled
auto enginesOffset = offsetof(i915_context_param_engines, engines); auto enginesOffset = offsetof(i915_context_param_engines, engines);
auto *classInstance = ptrOffset(memory, offset + valueOffset + enginesOffset); auto *classInstance = ptrOffset(memory, offset + valueOffset + enginesOffset);
i915_engine_class_instance ci = {I915_ENGINE_CLASS_RENDER, 1}; i915_engine_class_instance ci = {drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER, 1};
memcpy(classInstance, &ci, sizeof(i915_engine_class_instance)); memcpy(classInstance, &ci, sizeof(i915_engine_class_instance));
session->handleEvent(&contextParamEvent->base); session->handleEvent(&contextParamEvent->base);
EXPECT_EQ(1u, session->clientHandleToConnection[MockDebugSessionLinux::mockClientHandle]->contextsCreated[contextHandle].engines.size()); EXPECT_EQ(1u, session->clientHandleToConnection[MockDebugSessionLinux::mockClientHandle]->contextsCreated[contextHandle].engines.size());
EXPECT_EQ(static_cast<uint32_t>(I915_ENGINE_CLASS_RENDER), session->clientHandleToConnection[MockDebugSessionLinux::mockClientHandle]->contextsCreated[contextHandle].engines[0].engine_class); EXPECT_EQ(static_cast<uint32_t>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER), session->clientHandleToConnection[MockDebugSessionLinux::mockClientHandle]->contextsCreated[contextHandle].engines[0].engine_class);
EXPECT_EQ(1u, session->clientHandleToConnection[MockDebugSessionLinux::mockClientHandle]->contextsCreated[contextHandle].engines[0].engine_instance); EXPECT_EQ(1u, session->clientHandleToConnection[MockDebugSessionLinux::mockClientHandle]->contextsCreated[contextHandle].engines[0].engine_instance);
EXPECT_EQ(session->clientHandleToConnection[MockDebugSessionLinux::mockClientHandle]->vmToTile.end(), EXPECT_EQ(session->clientHandleToConnection[MockDebugSessionLinux::mockClientHandle]->vmToTile.end(),

10
level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp
View File

@@ -64,13 +64,13 @@ class DrmPrelimMock : public DrmMock {
std::vector<DistanceInfo> distances(4); std::vector<DistanceInfo> distances(4);
distances[0].engine = engines[0].engine; distances[0].engine = engines[0].engine;
distances[0].region = {I915_MEMORY_CLASS_DEVICE, 0}; distances[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
distances[1].engine = engines[1].engine; distances[1].engine = engines[1].engine;
distances[1].region = {I915_MEMORY_CLASS_DEVICE, 1}; distances[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 1};
distances[2].engine = engines[2].engine; distances[2].engine = engines[2].engine;
distances[2].region = {I915_MEMORY_CLASS_DEVICE, 2}; distances[2].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 2};
distances[3].engine = engines[3].engine; distances[3].engine = engines[3].engine;
distances[3].region = {I915_MEMORY_CLASS_DEVICE, 3}; distances[3].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 3};
std::vector<QueryItem> queryItems{distances.size()}; std::vector<QueryItem> queryItems{distances.size()};
for (auto i = 0u; i < distances.size(); i++) { for (auto i = 0u; i < distances.size(); i++) {
@@ -89,7 +89,7 @@ class DrmPrelimMock : public DrmMock {
std::vector<DistanceInfo> distances(1); std::vector<DistanceInfo> distances(1);
distances[0].engine = engines[0].engine; distances[0].engine = engines[0].engine;
distances[0].region = {I915_MEMORY_CLASS_DEVICE, 0}; distances[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
std::vector<QueryItem> queryItems{distances.size()}; std::vector<QueryItem> queryItems{distances.size()};
for (auto i = 0u; i < distances.size(); i++) { for (auto i = 0u; i < distances.size(); i++) {

10
level_zero/tools/test/unit_tests/sources/sysman/engine/linux/mock_engine.h
View File

@@ -41,15 +41,15 @@ struct Mock<EngineNeoDrm> : public EngineNeoDrm {
bool queryEngineInfoMockPositiveTest() { bool queryEngineInfoMockPositiveTest() {
std::vector<NEO::EngineCapabilities> i915engineInfo(6); std::vector<NEO::EngineCapabilities> i915engineInfo(6);
i915engineInfo[0].engine.engineClass = I915_ENGINE_CLASS_RENDER; i915engineInfo[0].engine.engineClass = drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER;
i915engineInfo[0].engine.engineInstance = 0; i915engineInfo[0].engine.engineInstance = 0;
i915engineInfo[1].engine.engineClass = I915_ENGINE_CLASS_RENDER; i915engineInfo[1].engine.engineClass = drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER;
i915engineInfo[1].engine.engineInstance = 1; i915engineInfo[1].engine.engineInstance = 1;
i915engineInfo[2].engine.engineClass = I915_ENGINE_CLASS_VIDEO; i915engineInfo[2].engine.engineClass = drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO;
i915engineInfo[2].engine.engineInstance = 1; i915engineInfo[2].engine.engineInstance = 1;
i915engineInfo[3].engine.engineClass = I915_ENGINE_CLASS_COPY; i915engineInfo[3].engine.engineClass = drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY;
i915engineInfo[3].engine.engineInstance = 0; i915engineInfo[3].engine.engineInstance = 0;
i915engineInfo[4].engine.engineClass = I915_ENGINE_CLASS_VIDEO_ENHANCE; i915engineInfo[4].engine.engineClass = drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO_ENHANCE;
i915engineInfo[4].engine.engineInstance = 0; i915engineInfo[4].engine.engineInstance = 0;
i915engineInfo[5].engine.engineClass = I915_INVALID_ENGINE_CLASS; i915engineInfo[5].engine.engineClass = I915_INVALID_ENGINE_CLASS;
i915engineInfo[5].engine.engineInstance = 0; i915engineInfo[5].engine.engineInstance = 0;

4
level_zero/tools/test/unit_tests/sources/sysman/engine/linux/test_zes_engine.cpp
View File

@@ -229,7 +229,7 @@ TEST_F(ZesEngineFixture, givenEngineInfoQuerySupportedWhenQueryingEngineInfoThen
auto drm = std::make_unique<DrmMockEngine>((const_cast<NEO::RootDeviceEnvironment &>(neoDevice->getRootDeviceEnvironment()))); auto drm = std::make_unique<DrmMockEngine>((const_cast<NEO::RootDeviceEnvironment &>(neoDevice->getRootDeviceEnvironment())));
ASSERT_NE(nullptr, drm); ASSERT_NE(nullptr, drm);
std::vector<MemoryRegion> memRegions{ std::vector<MemoryRegion> memRegions{
{{I915_MEMORY_CLASS_SYSTEM, 0}, 1024, 0}}; {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0}, 1024, 0}};
drm->memoryInfo.reset(new MemoryInfo(memRegions)); drm->memoryInfo.reset(new MemoryInfo(memRegions));
drm->sysmanQueryEngineInfo(); drm->sysmanQueryEngineInfo();
auto engineInfo = drm->getEngineInfo(); auto engineInfo = drm->getEngineInfo();
@@ -241,7 +241,7 @@ TEST_F(ZesEngineFixture, GivenEngineInfoWithVideoQuerySupportedWhenQueryingEngin
auto drm = std::make_unique<DrmMockEngine>((const_cast<NEO::RootDeviceEnvironment &>(neoDevice->getRootDeviceEnvironment()))); auto drm = std::make_unique<DrmMockEngine>((const_cast<NEO::RootDeviceEnvironment &>(neoDevice->getRootDeviceEnvironment())));
ASSERT_NE(nullptr, drm); ASSERT_NE(nullptr, drm);
std::vector<MemoryRegion> memRegions{ std::vector<MemoryRegion> memRegions{
{{I915_MEMORY_CLASS_SYSTEM, 0}, 1024, 0}}; {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0}, 1024, 0}};
drm->memoryInfo.reset(new MemoryInfo(memRegions)); drm->memoryInfo.reset(new MemoryInfo(memRegions));
drm->sysmanQueryEngineInfo(); drm->sysmanQueryEngineInfo();
auto engineInfo = drm->getEngineInfo(); auto engineInfo = drm->getEngineInfo();

4
level_zero/tools/test/unit_tests/sources/sysman/memory/linux/mock_memory.h
View File

@@ -43,10 +43,10 @@ struct Mock<MemoryNeoDrm> : public MemoryNeoDrm {
Mock<MemoryNeoDrm>(RootDeviceEnvironment &rootDeviceEnvironment) : MemoryNeoDrm(rootDeviceEnvironment) {} Mock<MemoryNeoDrm>(RootDeviceEnvironment &rootDeviceEnvironment) : MemoryNeoDrm(rootDeviceEnvironment) {}
bool queryMemoryInfoMockPositiveTest() { bool queryMemoryInfoMockPositiveTest() {
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[0].probedSize = probedSizeRegionZero; regionInfo[0].probedSize = probedSizeRegionZero;
regionInfo[0].unallocatedSize = unallocatedSizeRegionZero; regionInfo[0].unallocatedSize = unallocatedSizeRegionZero;
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
regionInfo[1].probedSize = probedSizeRegionOne; regionInfo[1].probedSize = probedSizeRegionOne;
regionInfo[1].unallocatedSize = unallocatedSizeRegionOne; regionInfo[1].unallocatedSize = unallocatedSizeRegionOne;

42
shared/source/os_interface/linux/i915.h
View File

@@ -5,9 +5,49 @@
* *
*/ */
#ifndef _UAPI_I915_DRM_H_
#include <linux/types.h>
#include <sys/ioctl.h>
namespace NEO { namespace NEO {
namespace I915 { namespace I915 {
#include "drm/i915_drm.h" #include "drm/i915_drm.h"
} }
} // namespace NEO } // namespace NEO
using namespace NEO::I915; using NEO::I915::drm_gem_close;
using NEO::I915::drm_i915_engine_info;
using NEO::I915::drm_i915_gem_context_create_ext;
using NEO::I915::drm_i915_gem_context_create_ext_setparam;
using NEO::I915::drm_i915_gem_context_destroy;
using NEO::I915::drm_i915_gem_context_param;
using NEO::I915::drm_i915_gem_context_param_sseu;
using NEO::I915::drm_i915_gem_create;
using NEO::I915::drm_i915_gem_create_ext;
using NEO::I915::drm_i915_gem_engine_class;
using NEO::I915::drm_i915_gem_exec_object2;
using NEO::I915::drm_i915_gem_execbuffer2;
using NEO::I915::drm_i915_gem_get_tiling;
using NEO::I915::drm_i915_gem_memory_class;
using NEO::I915::drm_i915_gem_memory_class_instance;
using NEO::I915::drm_i915_gem_mmap_offset;
using NEO::I915::drm_i915_gem_set_domain;
using NEO::I915::drm_i915_gem_set_tiling;
using NEO::I915::drm_i915_gem_userptr;
using NEO::I915::drm_i915_gem_vm_control;
using NEO::I915::drm_i915_gem_wait;
using NEO::I915::drm_i915_getparam;
using NEO::I915::drm_i915_getparam_t;
using NEO::I915::drm_i915_memory_region_info;
using NEO::I915::drm_i915_perf_open_param;
using NEO::I915::drm_i915_query;
using NEO::I915::drm_i915_query_engine_info;
using NEO::I915::drm_i915_query_item;
using NEO::I915::drm_i915_query_memory_regions;
using NEO::I915::drm_i915_query_topology_info;
using NEO::I915::drm_i915_reg_read;
using NEO::I915::drm_i915_reset_stats;
using NEO::I915::drm_prime_handle;
using NEO::I915::drm_version;
using NEO::I915::i915_engine_class_instance;
using NEO::I915::i915_user_extension;
#endif

69
shared/source/os_interface/linux/i915_prelim.h
View File

@@ -5,9 +5,76 @@
* *
*/ */
#include <linux/types.h>
#include <sys/ioctl.h>
namespace NEO { namespace NEO {
namespace PrelimI915 { namespace PrelimI915 {
#include "third_party/uapi/prelim/drm/i915_drm.h" #include "third_party/uapi/prelim/drm/i915_drm.h"
} }
} // namespace NEO } // namespace NEO
using namespace NEO::PrelimI915; using NEO::PrelimI915::drm_gem_close;
using NEO::PrelimI915::drm_i915_engine_info;
using NEO::PrelimI915::drm_i915_gem_context_create_ext;
using NEO::PrelimI915::drm_i915_gem_context_destroy;
using NEO::PrelimI915::drm_i915_gem_context_param;
using NEO::PrelimI915::drm_i915_gem_create;
using NEO::PrelimI915::drm_i915_gem_engine_class;
using NEO::PrelimI915::drm_i915_gem_execbuffer2;
using NEO::PrelimI915::drm_i915_gem_get_tiling;
using NEO::PrelimI915::drm_i915_gem_memory_class;
using NEO::PrelimI915::drm_i915_gem_mmap_offset;
using NEO::PrelimI915::drm_i915_gem_set_domain;
using NEO::PrelimI915::drm_i915_gem_set_tiling;
using NEO::PrelimI915::drm_i915_gem_userptr;
using NEO::PrelimI915::drm_i915_gem_vm_control;
using NEO::PrelimI915::drm_i915_gem_wait;
using NEO::PrelimI915::drm_i915_getparam_t;
using NEO::PrelimI915::drm_i915_memory_region_info;
using NEO::PrelimI915::drm_i915_query;
using NEO::PrelimI915::drm_i915_query_engine_info;
using NEO::PrelimI915::drm_i915_query_memory_regions;
using NEO::PrelimI915::drm_i915_reg_read;
using NEO::PrelimI915::drm_i915_reset_stats;
using NEO::PrelimI915::drm_prime_handle;
using NEO::PrelimI915::i915_context_engines_load_balance;
using NEO::PrelimI915::i915_context_param_engines;
using NEO::PrelimI915::i915_engine_class_instance;
using NEO::PrelimI915::i915_user_extension;
using NEO::PrelimI915::prelim_drm_i915_debug_engine_info;
using NEO::PrelimI915::prelim_drm_i915_debug_eu_control;
using NEO::PrelimI915::prelim_drm_i915_debug_event;
using NEO::PrelimI915::prelim_drm_i915_debug_event_ack;
using NEO::PrelimI915::prelim_drm_i915_debug_event_client;
using NEO::PrelimI915::prelim_drm_i915_debug_event_context;
using NEO::PrelimI915::prelim_drm_i915_debug_event_context_param;
using NEO::PrelimI915::prelim_drm_i915_debug_event_engines;
using NEO::PrelimI915::prelim_drm_i915_debug_event_eu_attention;
using NEO::PrelimI915::prelim_drm_i915_debug_event_uuid;
using NEO::PrelimI915::prelim_drm_i915_debug_event_vm;
using NEO::PrelimI915::prelim_drm_i915_debug_event_vm_bind;
using NEO::PrelimI915::prelim_drm_i915_debug_read_uuid;
using NEO::PrelimI915::prelim_drm_i915_debug_vm_open;
using NEO::PrelimI915::prelim_drm_i915_debugger_open_param;
using NEO::PrelimI915::prelim_drm_i915_eu_stall_property_id;
using NEO::PrelimI915::prelim_drm_i915_gem_cache_reserve;
using NEO::PrelimI915::prelim_drm_i915_gem_clos_free;
using NEO::PrelimI915::prelim_drm_i915_gem_clos_reserve;
using NEO::PrelimI915::prelim_drm_i915_gem_context_param_acc;
using NEO::PrelimI915::prelim_drm_i915_gem_create_ext;
using NEO::PrelimI915::prelim_drm_i915_gem_create_ext_setparam;
using NEO::PrelimI915::prelim_drm_i915_gem_create_ext_vm_private;
using NEO::PrelimI915::prelim_drm_i915_gem_engine_class;
using NEO::PrelimI915::prelim_drm_i915_gem_execbuffer_ext_user_fence;
using NEO::PrelimI915::prelim_drm_i915_gem_memory_class;
using NEO::PrelimI915::prelim_drm_i915_gem_memory_class_instance;
using NEO::PrelimI915::prelim_drm_i915_gem_object_param;
using NEO::PrelimI915::prelim_drm_i915_gem_vm_advise;
using NEO::PrelimI915::prelim_drm_i915_gem_vm_bind;
using NEO::PrelimI915::prelim_drm_i915_gem_vm_prefetch;
using NEO::PrelimI915::prelim_drm_i915_gem_vm_region_ext;
using NEO::PrelimI915::prelim_drm_i915_gem_wait_user_fence;
using NEO::PrelimI915::prelim_drm_i915_query_distance_info;
using NEO::PrelimI915::prelim_drm_i915_uuid_control;
using NEO::PrelimI915::prelim_drm_i915_vm_bind_ext_set_pat;
using NEO::PrelimI915::prelim_drm_i915_vm_bind_ext_user_fence;
using NEO::PrelimI915::prelim_drm_i915_vm_bind_ext_uuid;

14
shared/source/os_interface/linux/ioctl_helper.cpp
View File

@@ -186,15 +186,15 @@ unsigned int IoctlHelper::getIoctlRequestValueBase(DrmIoctl ioctlRequest) const
int IoctlHelper::getDrmParamValueBase(DrmParam drmParam) const { int IoctlHelper::getDrmParamValueBase(DrmParam drmParam) const {
switch (drmParam) { switch (drmParam) {
case DrmParam::EngineClassRender: case DrmParam::EngineClassRender:
return I915_ENGINE_CLASS_RENDER; return drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER;
case DrmParam::EngineClassCopy: case DrmParam::EngineClassCopy:
return I915_ENGINE_CLASS_COPY; return drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY;
case DrmParam::EngineClassVideo: case DrmParam::EngineClassVideo:
return I915_ENGINE_CLASS_VIDEO; return drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO;
case DrmParam::EngineClassVideoEnhance: case DrmParam::EngineClassVideoEnhance:
return I915_ENGINE_CLASS_VIDEO_ENHANCE; return drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO_ENHANCE;
case DrmParam::EngineClassInvalid: case DrmParam::EngineClassInvalid:
return I915_ENGINE_CLASS_INVALID; return drm_i915_gem_engine_class::I915_ENGINE_CLASS_INVALID;
case DrmParam::EngineClassInvalidNone: case DrmParam::EngineClassInvalidNone:
return I915_ENGINE_CLASS_INVALID_NONE; return I915_ENGINE_CLASS_INVALID_NONE;
case DrmParam::ExecBlt: case DrmParam::ExecBlt:
@@ -206,9 +206,9 @@ int IoctlHelper::getDrmParamValueBase(DrmParam drmParam) const {
case DrmParam::ExecRender: case DrmParam::ExecRender:
return I915_EXEC_RENDER; return I915_EXEC_RENDER;
case DrmParam::MemoryClassDevice: case DrmParam::MemoryClassDevice:
return I915_MEMORY_CLASS_DEVICE; return drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE;
case DrmParam::MemoryClassSystem: case DrmParam::MemoryClassSystem:
return I915_MEMORY_CLASS_SYSTEM; return drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM;
case DrmParam::ParamChipsetId: case DrmParam::ParamChipsetId:
return I915_PARAM_CHIPSET_ID; return I915_PARAM_CHIPSET_ID;
case DrmParam::ParamRevision: case DrmParam::ParamRevision:

18
shared/source/os_interface/linux/ioctl_helper_prelim.cpp
View File

@@ -282,7 +282,7 @@ uint32_t IoctlHelperPrelim20::queryDistances(std::vector<QueryItem> &queryItems,
} }
Query query{}; Query query{};
query.itemsPtr = reinterpret_cast<__u64>(queryItems.data()); query.itemsPtr = reinterpret_cast<uint64_t>(queryItems.data());
query.numItems = static_cast<uint32_t>(queryItems.size()); query.numItems = static_cast<uint32_t>(queryItems.size());
auto ret = IoctlHelper::ioctl(DrmIoctl::Query, &query); auto ret = IoctlHelper::ioctl(DrmIoctl::Query, &query);
for (auto i = 0u; i < i915Distances.size(); i++) { for (auto i = 0u; i < i915Distances.size(); i++) {
@@ -297,17 +297,17 @@ std::optional<DrmParam> IoctlHelperPrelim20::getHasPageFaultParamId() {
bool IoctlHelperPrelim20::getEuStallProperties(std::array<uint64_t, 12u> &properties, uint64_t dssBufferSize, uint64_t samplingRate, bool IoctlHelperPrelim20::getEuStallProperties(std::array<uint64_t, 12u> &properties, uint64_t dssBufferSize, uint64_t samplingRate,
uint64_t pollPeriod, uint64_t engineInstance, uint64_t notifyNReports) { uint64_t pollPeriod, uint64_t engineInstance, uint64_t notifyNReports) {
properties[0] = PRELIM_DRM_I915_EU_STALL_PROP_BUF_SZ; properties[0] = prelim_drm_i915_eu_stall_property_id::PRELIM_DRM_I915_EU_STALL_PROP_BUF_SZ;
properties[1] = dssBufferSize; properties[1] = dssBufferSize;
properties[2] = PRELIM_DRM_I915_EU_STALL_PROP_SAMPLE_RATE; properties[2] = prelim_drm_i915_eu_stall_property_id::PRELIM_DRM_I915_EU_STALL_PROP_SAMPLE_RATE;
properties[3] = samplingRate; properties[3] = samplingRate;
properties[4] = PRELIM_DRM_I915_EU_STALL_PROP_POLL_PERIOD; properties[4] = prelim_drm_i915_eu_stall_property_id::PRELIM_DRM_I915_EU_STALL_PROP_POLL_PERIOD;
properties[5] = pollPeriod; properties[5] = pollPeriod;
properties[6] = PRELIM_DRM_I915_EU_STALL_PROP_ENGINE_CLASS; properties[6] = prelim_drm_i915_eu_stall_property_id::PRELIM_DRM_I915_EU_STALL_PROP_ENGINE_CLASS;
properties[7] = PRELIM_I915_ENGINE_CLASS_COMPUTE; properties[7] = prelim_drm_i915_gem_engine_class::PRELIM_I915_ENGINE_CLASS_COMPUTE;
properties[8] = PRELIM_DRM_I915_EU_STALL_PROP_ENGINE_INSTANCE; properties[8] = prelim_drm_i915_eu_stall_property_id::PRELIM_DRM_I915_EU_STALL_PROP_ENGINE_INSTANCE;
properties[9] = engineInstance; properties[9] = engineInstance;
properties[10] = PRELIM_DRM_I915_EU_STALL_PROP_EVENT_REPORT_COUNT; properties[10] = prelim_drm_i915_eu_stall_property_id::PRELIM_DRM_I915_EU_STALL_PROP_EVENT_REPORT_COUNT;
properties[11] = notifyNReports; properties[11] = notifyNReports;
return true; return true;
@@ -548,7 +548,7 @@ unsigned int IoctlHelperPrelim20::getIoctlRequestValue(DrmIoctl ioctlRequest) co
int IoctlHelperPrelim20::getDrmParamValue(DrmParam drmParam) const { int IoctlHelperPrelim20::getDrmParamValue(DrmParam drmParam) const {
switch (drmParam) { switch (drmParam) {
case DrmParam::EngineClassCompute: case DrmParam::EngineClassCompute:
return PRELIM_I915_ENGINE_CLASS_COMPUTE; return prelim_drm_i915_gem_engine_class::PRELIM_I915_ENGINE_CLASS_COMPUTE;
case DrmParam::ParamHasVmBind: case DrmParam::ParamHasVmBind:
return PRELIM_I915_PARAM_HAS_VM_BIND; return PRELIM_I915_PARAM_HAS_VM_BIND;
case DrmParam::ParamHasPageFault: case DrmParam::ParamHasPageFault:

4
shared/source/os_interface/linux/memory_info.cpp
View File

@@ -22,10 +22,10 @@ namespace NEO {
MemoryInfo::MemoryInfo(const RegionContainer &regionInfo) MemoryInfo::MemoryInfo(const RegionContainer &regionInfo)
: drmQueryRegions(regionInfo), systemMemoryRegion(drmQueryRegions[0]) { : drmQueryRegions(regionInfo), systemMemoryRegion(drmQueryRegions[0]) {
UNRECOVERABLE_IF(systemMemoryRegion.region.memoryClass != I915_MEMORY_CLASS_SYSTEM); UNRECOVERABLE_IF(systemMemoryRegion.region.memoryClass != drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM);
std::copy_if(drmQueryRegions.begin(), drmQueryRegions.end(), std::back_inserter(localMemoryRegions), std::copy_if(drmQueryRegions.begin(), drmQueryRegions.end(), std::back_inserter(localMemoryRegions),
[](const MemoryRegion &memoryRegionInfo) { [](const MemoryRegion &memoryRegionInfo) {
return (memoryRegionInfo.region.memoryClass == I915_MEMORY_CLASS_DEVICE); return (memoryRegionInfo.region.memoryClass == drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE);
}); });
} }

24
shared/test/common/libult/linux/drm_mock_prelim_context.cpp
View File

@@ -183,7 +183,7 @@ int DrmMockPrelimContext::handlePrelimRequest(DrmIoctl request, void *arg) {
} }
const auto firstMemoryRegion = receivedCreateGemExt->memoryRegions[0]; const auto firstMemoryRegion = receivedCreateGemExt->memoryRegions[0];
if ((firstMemoryRegion.memoryClass != PRELIM_I915_MEMORY_CLASS_SYSTEM) && (firstMemoryRegion.memoryClass != PRELIM_I915_MEMORY_CLASS_DEVICE)) { if ((firstMemoryRegion.memoryClass != prelim_drm_i915_gem_memory_class::PRELIM_I915_MEMORY_CLASS_SYSTEM) && (firstMemoryRegion.memoryClass != prelim_drm_i915_gem_memory_class::PRELIM_I915_MEMORY_CLASS_DEVICE)) {
return EINVAL; return EINVAL;
} }
@@ -287,19 +287,19 @@ bool DrmMockPrelimContext::handlePrelimQueryItem(void *arg) {
queryEngineInfo->num_engines = numberOfEngines; queryEngineInfo->num_engines = numberOfEngines;
auto p = queryEngineInfo->engines; auto p = queryEngineInfo->engines;
for (uint32_t tile = 0u; tile < numberOfTiles; tile++) { for (uint32_t tile = 0u; tile < numberOfTiles; tile++) {
p++->engine = {I915_ENGINE_CLASS_RENDER, DrmMockHelper::getEngineOrMemoryInstanceValue(tile, 0)}; p++->engine = {drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER, DrmMockHelper::getEngineOrMemoryInstanceValue(tile, 0)};
for (uint32_t i = 0u; i < supportedCopyEnginesMask.size(); i++) { for (uint32_t i = 0u; i < supportedCopyEnginesMask.size(); i++) {
if (supportedCopyEnginesMask.test(i)) { if (supportedCopyEnginesMask.test(i)) {
auto copyEngineInfo = p++; auto copyEngineInfo = p++;
copyEngineInfo->engine = {I915_ENGINE_CLASS_COPY, DrmMockHelper::getEngineOrMemoryInstanceValue(tile, i)}; copyEngineInfo->engine = {drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY, DrmMockHelper::getEngineOrMemoryInstanceValue(tile, i)};
copyEngineInfo->capabilities = copyEnginesCapsMap[i]; copyEngineInfo->capabilities = copyEnginesCapsMap[i];
} }
} }
p++->engine = {I915_ENGINE_CLASS_VIDEO, DrmMockHelper::getEngineOrMemoryInstanceValue(tile, 0)}; p++->engine = {drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO, DrmMockHelper::getEngineOrMemoryInstanceValue(tile, 0)};
p++->engine = {I915_ENGINE_CLASS_VIDEO, DrmMockHelper::getEngineOrMemoryInstanceValue(tile, 0)}; p++->engine = {drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO, DrmMockHelper::getEngineOrMemoryInstanceValue(tile, 0)};
p++->engine = {I915_ENGINE_CLASS_VIDEO_ENHANCE, DrmMockHelper::getEngineOrMemoryInstanceValue(tile, 0)}; p++->engine = {drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO_ENHANCE, DrmMockHelper::getEngineOrMemoryInstanceValue(tile, 0)};
for (auto i = 0u; i < numberOfCCS; i++) { for (auto i = 0u; i < numberOfCCS; i++) {
p++->engine = {PRELIM_I915_ENGINE_CLASS_COMPUTE, DrmMockHelper::getEngineOrMemoryInstanceValue(tile, i)}; p++->engine = {prelim_drm_i915_gem_engine_class::PRELIM_I915_ENGINE_CLASS_COMPUTE, DrmMockHelper::getEngineOrMemoryInstanceValue(tile, i)};
} }
} }
} }
@@ -325,11 +325,11 @@ bool DrmMockPrelimContext::handlePrelimQueryItem(void *arg) {
auto queryMemoryRegionInfo = reinterpret_cast<drm_i915_query_memory_regions *>(queryItem->dataPtr); auto queryMemoryRegionInfo = reinterpret_cast<drm_i915_query_memory_regions *>(queryItem->dataPtr);
EXPECT_EQ(0u, queryMemoryRegionInfo->num_regions); EXPECT_EQ(0u, queryMemoryRegionInfo->num_regions);
queryMemoryRegionInfo->num_regions = numberOfRegions; queryMemoryRegionInfo->num_regions = numberOfRegions;
queryMemoryRegionInfo->regions[0].region.memory_class = PRELIM_I915_MEMORY_CLASS_SYSTEM; queryMemoryRegionInfo->regions[0].region.memory_class = prelim_drm_i915_gem_memory_class::PRELIM_I915_MEMORY_CLASS_SYSTEM;
queryMemoryRegionInfo->regions[0].region.memory_instance = 1; queryMemoryRegionInfo->regions[0].region.memory_instance = 1;
queryMemoryRegionInfo->regions[0].probed_size = 2 * MemoryConstants::gigaByte; queryMemoryRegionInfo->regions[0].probed_size = 2 * MemoryConstants::gigaByte;
for (auto tile = 0u; tile < numberOfLocalMemories; tile++) { for (auto tile = 0u; tile < numberOfLocalMemories; tile++) {
queryMemoryRegionInfo->regions[1 + tile].region.memory_class = PRELIM_I915_MEMORY_CLASS_DEVICE; queryMemoryRegionInfo->regions[1 + tile].region.memory_class = prelim_drm_i915_gem_memory_class::PRELIM_I915_MEMORY_CLASS_DEVICE;
queryMemoryRegionInfo->regions[1 + tile].region.memory_instance = DrmMockHelper::getEngineOrMemoryInstanceValue(tile, 0); queryMemoryRegionInfo->regions[1 + tile].region.memory_instance = DrmMockHelper::getEngineOrMemoryInstanceValue(tile, 0);
queryMemoryRegionInfo->regions[1 + tile].probed_size = 2 * MemoryConstants::gigaByte; queryMemoryRegionInfo->regions[1 + tile].probed_size = 2 * MemoryConstants::gigaByte;
} }
@@ -344,11 +344,11 @@ bool DrmMockPrelimContext::handlePrelimQueryItem(void *arg) {
auto queryDistanceInfo = reinterpret_cast<prelim_drm_i915_query_distance_info *>(queryItem->dataPtr); auto queryDistanceInfo = reinterpret_cast<prelim_drm_i915_query_distance_info *>(queryItem->dataPtr);
switch (queryDistanceInfo->region.memory_class) { switch (queryDistanceInfo->region.memory_class) {
case PRELIM_I915_MEMORY_CLASS_SYSTEM: case prelim_drm_i915_gem_memory_class::PRELIM_I915_MEMORY_CLASS_SYSTEM:
EXPECT_EQ(sizeof(prelim_drm_i915_query_distance_info), static_cast<size_t>(queryItem->length)); EXPECT_EQ(sizeof(prelim_drm_i915_query_distance_info), static_cast<size_t>(queryItem->length));
queryDistanceInfo->distance = -1; queryDistanceInfo->distance = -1;
break; break;
case PRELIM_I915_MEMORY_CLASS_DEVICE: { case prelim_drm_i915_gem_memory_class::PRELIM_I915_MEMORY_CLASS_DEVICE: {
EXPECT_EQ(sizeof(prelim_drm_i915_query_distance_info), static_cast<size_t>(queryItem->length)); EXPECT_EQ(sizeof(prelim_drm_i915_query_distance_info), static_cast<size_t>(queryItem->length));
auto engineTile = DrmMockHelper::getTileFromEngineOrMemoryInstance(queryDistanceInfo->engine.engine_instance); auto engineTile = DrmMockHelper::getTileFromEngineOrMemoryInstance(queryDistanceInfo->engine.engine_instance);
@@ -463,7 +463,7 @@ uint32_t DrmPrelimHelper::getDistanceInfoQueryId() {
} }
uint32_t DrmPrelimHelper::getComputeEngineClass() { uint32_t DrmPrelimHelper::getComputeEngineClass() {
return PRELIM_I915_ENGINE_CLASS_COMPUTE; return prelim_drm_i915_gem_engine_class::PRELIM_I915_ENGINE_CLASS_COMPUTE;
} }
uint32_t DrmPrelimHelper::getStringUuidClass() { uint32_t DrmPrelimHelper::getStringUuidClass() {

2
shared/test/common/libult/linux/drm_query_mock.cpp
View File

@@ -46,7 +46,7 @@ int DrmQueryMock::handleRemainingRequests(DrmIoctl request, void *arg) {
} else if (request == DrmIoctl::GemContextSetparam && receivedContextParamRequest.param == I915_CONTEXT_PARAM_ENGINES) { } else if (request == DrmIoctl::GemContextSetparam && receivedContextParamRequest.param == I915_CONTEXT_PARAM_ENGINES) {
EXPECT_LE(receivedContextParamRequest.size, sizeof(receivedContextParamEngines)); EXPECT_LE(receivedContextParamRequest.size, sizeof(receivedContextParamEngines));
memcpy(&receivedContextParamEngines, reinterpret_cast<const void *>(receivedContextParamRequest.value), receivedContextParamRequest.size); memcpy(&receivedContextParamEngines, reinterpret_cast<const void *>(receivedContextParamRequest.value), receivedContextParamRequest.size);
auto srcBalancer = reinterpret_cast<const i915_context_engines_load_balance *>(receivedContextParamEngines.extensions); auto srcBalancer = reinterpret_cast<const I915::i915_context_engines_load_balance *>(receivedContextParamEngines.extensions);
if (srcBalancer) { if (srcBalancer) {
EXPECT_EQ(static_cast<__u32>(I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE), srcBalancer->base.name); EXPECT_EQ(static_cast<__u32>(I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE), srcBalancer->base.name);
auto balancerSize = ptrDiff(srcBalancer->engines + srcBalancer->num_siblings, srcBalancer); auto balancerSize = ptrDiff(srcBalancer->engines + srcBalancer->num_siblings, srcBalancer);

2
shared/test/common/os_interface/linux/device_command_stream_fixture.cpp
View File

@@ -182,7 +182,7 @@ int DrmMockCustom::ioctl(DrmIoctl request, void *arg) {
} }
} break; } break;
case DrmIoctl::GemCreateExt: { case DrmIoctl::GemCreateExt: {
auto createExtParams = reinterpret_cast<drm_i915_gem_create_ext *>(arg); auto createExtParams = reinterpret_cast<NEO::I915::drm_i915_gem_create_ext *>(arg);
createExtSize = createExtParams->size; createExtSize = createExtParams->size;
createExtHandle = createExtParams->handle; createExtHandle = createExtParams->handle;
createExtExtensions = createExtParams->extensions; createExtExtensions = createExtParams->extensions;

4
shared/test/common/os_interface/linux/drm_memory_manager_fixture.cpp
View File

@@ -132,9 +132,9 @@ void DrmMemoryManagerFixtureWithoutQuietIoctlExpectation::SetUp(bool enableLocal
} }
mock = static_cast<DrmMockCustom *>(executionEnvironment->rootDeviceEnvironments[rootDeviceIndex]->osInterface->getDriverModel()->as<Drm>()); mock = static_cast<DrmMockCustom *>(executionEnvironment->rootDeviceEnvironments[rootDeviceIndex]->osInterface->getDriverModel()->as<Drm>());
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[0].probedSize = 8 * GB; regionInfo[0].probedSize = 8 * GB;
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
regionInfo[1].probedSize = 16 * GB; regionInfo[1].probedSize = 16 * GB;
mock->memoryInfo.reset(new MockedMemoryInfo(regionInfo)); mock->memoryInfo.reset(new MockedMemoryInfo(regionInfo));
executionEnvironment->rootDeviceEnvironments[0]->memoryOperationsInterface = DrmMemoryOperationsHandler::create(*mock, 0u); executionEnvironment->rootDeviceEnvironments[0]->memoryOperationsInterface = DrmMemoryOperationsHandler::create(*mock, 0u);

4
shared/test/common/os_interface/linux/drm_memory_manager_prelim_fixtures.h
View File

@@ -85,8 +85,8 @@ class DrmMemoryManagerFixturePrelim : public DrmMemoryManagerFixture {
public: public:
void SetUp() override { void SetUp() override {
regionInfo.resize(2); regionInfo.resize(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 1}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 1};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
MemoryManagementFixture::SetUp(); MemoryManagementFixture::SetUp();
executionEnvironment = MockDevice::prepareExecutionEnvironment(defaultHwInfo.get(), numRootDevices - 1); executionEnvironment = MockDevice::prepareExecutionEnvironment(defaultHwInfo.get(), numRootDevices - 1);

14
shared/test/common/os_interface/linux/drm_mock_memory_info.h
View File

@@ -14,8 +14,8 @@
#include <vector> #include <vector>
const std::vector<NEO::MemoryRegion> memoryRegions = { const std::vector<NEO::MemoryRegion> memoryRegions = {
{{I915_MEMORY_CLASS_SYSTEM, 0}, 64 * GB, 0}, {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0}, 64 * GB, 0},
{{I915_MEMORY_CLASS_DEVICE, 0}, 8 * GB, 0}}; {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0}, 8 * GB, 0}};
struct MockMemoryInfo : public NEO::MemoryInfo { struct MockMemoryInfo : public NEO::MemoryInfo {
MockMemoryInfo() : MemoryInfo(memoryRegions) {} MockMemoryInfo() : MemoryInfo(memoryRegions) {}
@@ -23,11 +23,11 @@ struct MockMemoryInfo : public NEO::MemoryInfo {
}; };
const std::vector<NEO::MemoryRegion> extendedMemoryRegions = { const std::vector<NEO::MemoryRegion> extendedMemoryRegions = {
{{I915_MEMORY_CLASS_SYSTEM, 1}, 64 * GB, 0}, {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 1}, 64 * GB, 0},
{{I915_MEMORY_CLASS_DEVICE, 0x100}, 8 * GB, 0}, {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0x100}, 8 * GB, 0},
{{I915_MEMORY_CLASS_DEVICE, 0x200}, 8 * GB, 0}, {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0x200}, 8 * GB, 0},
{{I915_MEMORY_CLASS_DEVICE, 0x400}, 8 * GB, 0}, {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0x400}, 8 * GB, 0},
{{I915_MEMORY_CLASS_DEVICE, 0x800}, 8 * GB, 0}}; {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0x800}, 8 * GB, 0}};
struct MockExtendedMemoryInfo : public NEO::MemoryInfo { struct MockExtendedMemoryInfo : public NEO::MemoryInfo {
MockExtendedMemoryInfo() : MemoryInfo(extendedMemoryRegions) {} MockExtendedMemoryInfo() : MemoryInfo(extendedMemoryRegions) {}

24
shared/test/unit_test/os_interface/linux/drm_engine_info_prelim_tests.cpp
View File

@@ -40,7 +40,7 @@ TEST(DrmTest, givenEngineQuerySupportedWhenQueryingEngineInfoThenEngineInfoIsIni
auto engineInfo = drm->engineInfo.get(); auto engineInfo = drm->engineInfo.get();
auto pEngine = engineInfo->getEngineInstance(0, renderEngine); auto pEngine = engineInfo->getEngineInstance(0, renderEngine);
ASSERT_NE(nullptr, pEngine); ASSERT_NE(nullptr, pEngine);
EXPECT_EQ(I915_ENGINE_CLASS_RENDER, pEngine->engineClass); EXPECT_EQ(drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER, pEngine->engineClass);
EXPECT_EQ(0, DrmMockHelper::getIdFromEngineOrMemoryInstance(pEngine->engineInstance)); EXPECT_EQ(0, DrmMockHelper::getIdFromEngineOrMemoryInstance(pEngine->engineInstance));
EXPECT_EQ(0u, engineInfo->getEngineTileIndex(*pEngine)); EXPECT_EQ(0u, engineInfo->getEngineTileIndex(*pEngine));
@@ -173,7 +173,7 @@ TEST(DrmTest, givenRcsEngineWhenBindingDrmContextThenContextParamEngineIsSet) {
auto renderEngine = EngineHelpers::remapEngineTypeToHwSpecific(aub_stream::EngineType::ENGINE_RCS, *hwInfo); auto renderEngine = EngineHelpers::remapEngineTypeToHwSpecific(aub_stream::EngineType::ENGINE_RCS, *hwInfo);
givenEngineTypeWhenBindingDrmContextThenContextParamEngineIsSet(drm, renderEngine, I915_ENGINE_CLASS_RENDER); givenEngineTypeWhenBindingDrmContextThenContextParamEngineIsSet(drm, renderEngine, drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER);
} }
static void givenBcsEngineTypeWhenBindingDrmContextThenContextParamEngineIsSet(std::unique_ptr<DrmQueryMock> &drm, aub_stream::EngineType engineType, size_t numBcsSiblings, unsigned int engineIndex, uint32_t tileId) { static void givenBcsEngineTypeWhenBindingDrmContextThenContextParamEngineIsSet(std::unique_ptr<DrmQueryMock> &drm, aub_stream::EngineType engineType, size_t numBcsSiblings, unsigned int engineIndex, uint32_t tileId) {
@@ -189,15 +189,15 @@ static void givenBcsEngineTypeWhenBindingDrmContextThenContextParamEngineIsSet(s
if (EngineHelpers::isBcsVirtualEngineEnabled(engineType)) { if (EngineHelpers::isBcsVirtualEngineEnabled(engineType)) {
EXPECT_NE(0ull, extensions); EXPECT_NE(0ull, extensions);
EXPECT_EQ(ptrDiff(drm->receivedContextParamEngines.engines + 1 + numBcsSiblings, &drm->receivedContextParamEngines), drm->receivedContextParamRequest.size); EXPECT_EQ(ptrDiff(drm->receivedContextParamEngines.engines + 1 + numBcsSiblings, &drm->receivedContextParamEngines), drm->receivedContextParamRequest.size);
EXPECT_EQ(static_cast<__u16>(I915_ENGINE_CLASS_INVALID), drm->receivedContextParamEngines.engines[0].engine_class); EXPECT_EQ(static_cast<__u16>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_INVALID), drm->receivedContextParamEngines.engines[0].engine_class);
EXPECT_EQ(static_cast<__u16>(I915_ENGINE_CLASS_INVALID_NONE), drm->receivedContextParamEngines.engines[0].engine_instance); EXPECT_EQ(static_cast<__u16>(I915_ENGINE_CLASS_INVALID_NONE), drm->receivedContextParamEngines.engines[0].engine_instance);
EXPECT_EQ(static_cast<__u32>(I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE), drm->receivedContextEnginesLoadBalance.base.name); EXPECT_EQ(static_cast<__u32>(I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE), drm->receivedContextEnginesLoadBalance.base.name);
EXPECT_EQ(numBcsSiblings, drm->receivedContextEnginesLoadBalance.num_siblings); EXPECT_EQ(numBcsSiblings, drm->receivedContextEnginesLoadBalance.num_siblings);
for (auto balancedEngine = 0u; balancedEngine < numBcsSiblings; balancedEngine++) { for (auto balancedEngine = 0u; balancedEngine < numBcsSiblings; balancedEngine++) {
EXPECT_EQ(I915_ENGINE_CLASS_COPY, drm->receivedContextEnginesLoadBalance.engines[balancedEngine].engine_class); EXPECT_EQ(drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY, drm->receivedContextEnginesLoadBalance.engines[balancedEngine].engine_class);
auto engineInstance = engineIndex ? balancedEngine + 1 : balancedEngine; auto engineInstance = engineIndex ? balancedEngine + 1 : balancedEngine;
EXPECT_EQ(engineInstance, DrmMockHelper::getIdFromEngineOrMemoryInstance(drm->receivedContextEnginesLoadBalance.engines[balancedEngine].engine_instance)); EXPECT_EQ(engineInstance, DrmMockHelper::getIdFromEngineOrMemoryInstance(drm->receivedContextEnginesLoadBalance.engines[balancedEngine].engine_instance));
EXPECT_EQ(I915_ENGINE_CLASS_COPY, drm->receivedContextParamEngines.engines[1 + balancedEngine].engine_class); EXPECT_EQ(drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY, drm->receivedContextParamEngines.engines[1 + balancedEngine].engine_class);
EXPECT_EQ(engineInstance, DrmMockHelper::getIdFromEngineOrMemoryInstance(drm->receivedContextParamEngines.engines[1 + balancedEngine].engine_instance)); EXPECT_EQ(engineInstance, DrmMockHelper::getIdFromEngineOrMemoryInstance(drm->receivedContextParamEngines.engines[1 + balancedEngine].engine_instance));
auto engineTile = DrmMockHelper::getTileFromEngineOrMemoryInstance(drm->receivedContextEnginesLoadBalance.engines[balancedEngine].engine_instance); auto engineTile = DrmMockHelper::getTileFromEngineOrMemoryInstance(drm->receivedContextEnginesLoadBalance.engines[balancedEngine].engine_instance);
EXPECT_EQ(engineTile, tileId); EXPECT_EQ(engineTile, tileId);
@@ -214,7 +214,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, DrmTestXeHPAndLater, givenBcsEngineWhenBindingDrmCo
executionEnvironment->rootDeviceEnvironments[0]->initGmm(); executionEnvironment->rootDeviceEnvironments[0]->initGmm();
auto drm = std::make_unique<DrmQueryMock>(*executionEnvironment->rootDeviceEnvironments[0]); auto drm = std::make_unique<DrmQueryMock>(*executionEnvironment->rootDeviceEnvironments[0]);
givenEngineTypeWhenBindingDrmContextThenContextParamEngineIsSet(drm, aub_stream::ENGINE_BCS, I915_ENGINE_CLASS_COPY); givenEngineTypeWhenBindingDrmContextThenContextParamEngineIsSet(drm, aub_stream::ENGINE_BCS, drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY);
auto hwInfo = drm->rootDeviceEnvironment.getHardwareInfo(); auto hwInfo = drm->rootDeviceEnvironment.getHardwareInfo();
EXPECT_EQ(1u, hwInfo->featureTable.ftrBcsInfo.to_ulong()); EXPECT_EQ(1u, hwInfo->featureTable.ftrBcsInfo.to_ulong());
} }
@@ -287,7 +287,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, DrmTestXeHPAndLater, givenLinkBcsEngineWithoutMainC
auto extensions = drm->receivedContextParamEngines.extensions; auto extensions = drm->receivedContextParamEngines.extensions;
EXPECT_NE(0ull, extensions); EXPECT_NE(0ull, extensions);
EXPECT_EQ(ptrDiff(drm->receivedContextParamEngines.engines + 1 + numBcsSiblings, &drm->receivedContextParamEngines), drm->receivedContextParamRequest.size); EXPECT_EQ(ptrDiff(drm->receivedContextParamEngines.engines + 1 + numBcsSiblings, &drm->receivedContextParamEngines), drm->receivedContextParamRequest.size);
EXPECT_EQ(static_cast<__u16>(I915_ENGINE_CLASS_INVALID), drm->receivedContextParamEngines.engines[0].engine_class); EXPECT_EQ(static_cast<__u16>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_INVALID), drm->receivedContextParamEngines.engines[0].engine_class);
EXPECT_EQ(static_cast<__u16>(I915_ENGINE_CLASS_INVALID_NONE), drm->receivedContextParamEngines.engines[0].engine_instance); EXPECT_EQ(static_cast<__u16>(I915_ENGINE_CLASS_INVALID_NONE), drm->receivedContextParamEngines.engines[0].engine_instance);
EXPECT_EQ(static_cast<__u32>(I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE), drm->receivedContextEnginesLoadBalance.base.name); EXPECT_EQ(static_cast<__u32>(I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE), drm->receivedContextEnginesLoadBalance.base.name);
EXPECT_EQ(numBcsSiblings, drm->receivedContextEnginesLoadBalance.num_siblings); EXPECT_EQ(numBcsSiblings, drm->receivedContextEnginesLoadBalance.num_siblings);
@@ -335,7 +335,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, DrmTestXeHPAndLater, giveNotAllLinkBcsEnginesWhenBi
auto extensions = drm->receivedContextParamEngines.extensions; auto extensions = drm->receivedContextParamEngines.extensions;
EXPECT_NE(0ull, extensions); EXPECT_NE(0ull, extensions);
EXPECT_EQ(ptrDiff(drm->receivedContextParamEngines.engines + 1 + numBcsSiblings, &drm->receivedContextParamEngines), drm->receivedContextParamRequest.size); EXPECT_EQ(ptrDiff(drm->receivedContextParamEngines.engines + 1 + numBcsSiblings, &drm->receivedContextParamEngines), drm->receivedContextParamRequest.size);
EXPECT_EQ(static_cast<__u16>(I915_ENGINE_CLASS_INVALID), drm->receivedContextParamEngines.engines[0].engine_class); EXPECT_EQ(static_cast<__u16>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_INVALID), drm->receivedContextParamEngines.engines[0].engine_class);
EXPECT_EQ(static_cast<__u16>(I915_ENGINE_CLASS_INVALID_NONE), drm->receivedContextParamEngines.engines[0].engine_instance); EXPECT_EQ(static_cast<__u16>(I915_ENGINE_CLASS_INVALID_NONE), drm->receivedContextParamEngines.engines[0].engine_instance);
EXPECT_EQ(static_cast<__u32>(I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE), drm->receivedContextEnginesLoadBalance.base.name); EXPECT_EQ(static_cast<__u32>(I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE), drm->receivedContextEnginesLoadBalance.base.name);
EXPECT_EQ(numBcsSiblings, drm->receivedContextEnginesLoadBalance.num_siblings); EXPECT_EQ(numBcsSiblings, drm->receivedContextEnginesLoadBalance.num_siblings);
@@ -468,7 +468,7 @@ HWTEST2_F(DrmTestXeHPCAndLater, givenBcsVirtualEnginesDisabledWhenCreatingContex
EXPECT_EQ(ptrDiff(drm->receivedContextParamEngines.engines + 1, &drm->receivedContextParamEngines), drm->receivedContextParamRequest.size); EXPECT_EQ(ptrDiff(drm->receivedContextParamEngines.engines + 1, &drm->receivedContextParamEngines), drm->receivedContextParamRequest.size);
auto extensions = drm->receivedContextParamEngines.extensions; auto extensions = drm->receivedContextParamEngines.extensions;
EXPECT_EQ(0ull, extensions); EXPECT_EQ(0ull, extensions);
EXPECT_EQ(static_cast<__u16>(I915_ENGINE_CLASS_COPY), drm->receivedContextParamEngines.engines[0].engine_class); EXPECT_EQ(static_cast<__u16>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY), drm->receivedContextParamEngines.engines[0].engine_class);
EXPECT_EQ(static_cast<__u16>(engineIndex), DrmMockHelper::getIdFromEngineOrMemoryInstance(drm->receivedContextParamEngines.engines[0].engine_instance)); EXPECT_EQ(static_cast<__u16>(engineIndex), DrmMockHelper::getIdFromEngineOrMemoryInstance(drm->receivedContextParamEngines.engines[0].engine_instance));
} }
} }
@@ -516,7 +516,7 @@ TEST(DrmTest, givenVirtualEnginesEnabledWhenCreatingContextThenEnableLoadBalanci
EXPECT_NE(0ull, extensions); EXPECT_NE(0ull, extensions);
EXPECT_EQ(static_cast<__u32>(I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE), drm->receivedContextEnginesLoadBalance.base.name); EXPECT_EQ(static_cast<__u32>(I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE), drm->receivedContextEnginesLoadBalance.base.name);
EXPECT_EQ(numberOfCCS, drm->receivedContextEnginesLoadBalance.num_siblings); EXPECT_EQ(numberOfCCS, drm->receivedContextEnginesLoadBalance.num_siblings);
EXPECT_EQ(static_cast<__u16>(I915_ENGINE_CLASS_INVALID), drm->receivedContextParamEngines.engines[0].engine_class); EXPECT_EQ(static_cast<__u16>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_INVALID), drm->receivedContextParamEngines.engines[0].engine_class);
EXPECT_EQ(static_cast<__u16>(I915_ENGINE_CLASS_INVALID_NONE), drm->receivedContextParamEngines.engines[0].engine_instance); EXPECT_EQ(static_cast<__u16>(I915_ENGINE_CLASS_INVALID_NONE), drm->receivedContextParamEngines.engines[0].engine_instance);
for (auto balancedEngine = 0u; balancedEngine < numberOfCCS; balancedEngine++) { for (auto balancedEngine = 0u; balancedEngine < numberOfCCS; balancedEngine++) {
EXPECT_EQ(DrmPrelimHelper::getComputeEngineClass(), drm->receivedContextEnginesLoadBalance.engines[balancedEngine].engine_class); EXPECT_EQ(DrmPrelimHelper::getComputeEngineClass(), drm->receivedContextEnginesLoadBalance.engines[balancedEngine].engine_class);
@@ -560,7 +560,7 @@ TEST(DrmTest, givenVirtualEnginesEnabledWhenCreatingContextThenEnableLoadBalanci
EXPECT_NE(0ull, extensions); EXPECT_NE(0ull, extensions);
EXPECT_EQ(static_cast<__u32>(I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE), drm->receivedContextEnginesLoadBalance.base.name); EXPECT_EQ(static_cast<__u32>(I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE), drm->receivedContextEnginesLoadBalance.base.name);
EXPECT_EQ(numberOfCCS, drm->receivedContextEnginesLoadBalance.num_siblings); EXPECT_EQ(numberOfCCS, drm->receivedContextEnginesLoadBalance.num_siblings);
EXPECT_EQ(static_cast<__u16>(I915_ENGINE_CLASS_INVALID), drm->receivedContextParamEngines.engines[0].engine_class); EXPECT_EQ(static_cast<__u16>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_INVALID), drm->receivedContextParamEngines.engines[0].engine_class);
EXPECT_EQ(static_cast<__u16>(I915_ENGINE_CLASS_INVALID_NONE), drm->receivedContextParamEngines.engines[0].engine_instance); EXPECT_EQ(static_cast<__u16>(I915_ENGINE_CLASS_INVALID_NONE), drm->receivedContextParamEngines.engines[0].engine_instance);
for (auto balancedEngine = 0u; balancedEngine < numberOfCCS; balancedEngine++) { for (auto balancedEngine = 0u; balancedEngine < numberOfCCS; balancedEngine++) {
EXPECT_EQ(DrmPrelimHelper::getComputeEngineClass(), drm->receivedContextEnginesLoadBalance.engines[balancedEngine].engine_class); EXPECT_EQ(DrmPrelimHelper::getComputeEngineClass(), drm->receivedContextEnginesLoadBalance.engines[balancedEngine].engine_class);
@@ -720,7 +720,7 @@ TEST(DrmTest, givenVirtualEnginesEnabledAndNonCcsEnginesWhenCreatingContextThenD
auto extensions = drm->receivedContextParamEngines.extensions; auto extensions = drm->receivedContextParamEngines.extensions;
EXPECT_EQ(0ull, extensions); EXPECT_EQ(0ull, extensions);
EXPECT_EQ(I915_ENGINE_CLASS_COPY, drm->receivedContextParamEngines.engines[0].engine_class); EXPECT_EQ(drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY, drm->receivedContextParamEngines.engines[0].engine_class);
} }
TEST(DrmTest, givenInvalidTileWhenBindingDrmContextThenErrorIsReturned) { TEST(DrmTest, givenInvalidTileWhenBindingDrmContextThenErrorIsReturned) {

16
shared/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp
View File

@@ -114,13 +114,13 @@ TEST(EngineInfoTest, whenGetEngineInstanceAndTileThenCorrectValuesReturned) {
std::vector<DistanceInfo> distances(4); std::vector<DistanceInfo> distances(4);
distances[0].engine = engines[0].engine; distances[0].engine = engines[0].engine;
distances[0].region = {I915_MEMORY_CLASS_DEVICE, 0}; distances[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
distances[1].engine = engines[1].engine; distances[1].engine = engines[1].engine;
distances[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; distances[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
distances[2].engine = engines[2].engine; distances[2].engine = engines[2].engine;
distances[2].region = {I915_MEMORY_CLASS_DEVICE, 1}; distances[2].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 1};
distances[3].engine = engines[3].engine; distances[3].engine = engines[3].engine;
distances[3].region = {I915_MEMORY_CLASS_DEVICE, 1}; distances[3].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 1};
std::vector<QueryItem> queryItems{distances.size()}; std::vector<QueryItem> queryItems{distances.size()};
for (auto i = 0u; i < distances.size(); i++) { for (auto i = 0u; i < distances.size(); i++) {
@@ -165,13 +165,13 @@ TEST(EngineInfoTest, whenCreateEngineInfoAndInvalidQueryThenNoEnginesSet) {
std::vector<DistanceInfo> distances(4); std::vector<DistanceInfo> distances(4);
distances[0].engine = engines[0].engine; distances[0].engine = engines[0].engine;
distances[0].region = {I915_MEMORY_CLASS_DEVICE, 0}; distances[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
distances[1].engine = engines[1].engine; distances[1].engine = engines[1].engine;
distances[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; distances[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
distances[2].engine = engines[2].engine; distances[2].engine = engines[2].engine;
distances[2].region = {I915_MEMORY_CLASS_DEVICE, 1}; distances[2].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 1};
distances[3].engine = engines[3].engine; distances[3].engine = engines[3].engine;
distances[3].region = {I915_MEMORY_CLASS_DEVICE, 1}; distances[3].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 1};
std::vector<QueryItem> queryItems{distances.size()}; std::vector<QueryItem> queryItems{distances.size()};
for (auto i = 0u; i < distances.size(); i++) { for (auto i = 0u; i < distances.size(); i++) {

60
shared/test/unit_test/os_interface/linux/drm_memory_info_prelim_tests.cpp
View File

@@ -218,11 +218,11 @@ TEST_F(MultiTileMemoryInfoPrelimTest, givenMemoryInfoWithRegionsWhenGettingMemor
DebugManagerStateRestore restorer; DebugManagerStateRestore restorer;
DebugManager.flags.EnableLocalMemory.set(1); DebugManager.flags.EnableLocalMemory.set(1);
std::vector<MemoryRegion> regionInfo(3); std::vector<MemoryRegion> regionInfo(3);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 1}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 1};
regionInfo[0].probedSize = 8 * GB; regionInfo[0].probedSize = 8 * GB;
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
regionInfo[1].probedSize = 16 * GB; regionInfo[1].probedSize = 16 * GB;
regionInfo[2].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(1, 0)}; regionInfo[2].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(1, 0)};
regionInfo[2].probedSize = 32 * GB; regionInfo[2].probedSize = 32 * GB;
setupMemoryInfo(regionInfo, 2); setupMemoryInfo(regionInfo, 2);
@@ -250,11 +250,11 @@ TEST_F(MultiTileMemoryInfoPrelimTest, givenDisabledLocalMemoryAndMemoryInfoWithR
DebugManagerStateRestore restorer; DebugManagerStateRestore restorer;
DebugManager.flags.EnableLocalMemory.set(0); DebugManager.flags.EnableLocalMemory.set(0);
std::vector<MemoryRegion> regionInfo(3); std::vector<MemoryRegion> regionInfo(3);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 1}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 1};
regionInfo[0].probedSize = 8 * GB; regionInfo[0].probedSize = 8 * GB;
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
regionInfo[1].probedSize = 16 * GB; regionInfo[1].probedSize = 16 * GB;
regionInfo[2].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(1, 0)}; regionInfo[2].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(1, 0)};
regionInfo[2].probedSize = 32 * GB; regionInfo[2].probedSize = 32 * GB;
setupMemoryInfo(regionInfo, 2); setupMemoryInfo(regionInfo, 2);
@@ -276,11 +276,11 @@ TEST_F(MultiTileMemoryInfoPrelimTest, givenMemoryInfoWithRegionsWhenGettingMemor
DebugManagerStateRestore restorer; DebugManagerStateRestore restorer;
DebugManager.flags.EnableLocalMemory.set(1); DebugManager.flags.EnableLocalMemory.set(1);
std::vector<MemoryRegion> regionInfo(3); std::vector<MemoryRegion> regionInfo(3);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 1}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 1};
regionInfo[0].probedSize = 8 * GB; regionInfo[0].probedSize = 8 * GB;
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
regionInfo[1].probedSize = 16 * GB; regionInfo[1].probedSize = 16 * GB;
regionInfo[2].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(1, 0)}; regionInfo[2].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(1, 0)};
regionInfo[2].probedSize = 32 * GB; regionInfo[2].probedSize = 32 * GB;
setupMemoryInfo(regionInfo, 2); setupMemoryInfo(regionInfo, 2);
@@ -333,7 +333,7 @@ TEST_F(MultiTileMemoryInfoPrelimTest, givenMemoryInfoWithoutRegionsWhenGettingMe
DebugManagerStateRestore restorer; DebugManagerStateRestore restorer;
DebugManager.flags.EnableLocalMemory.set(1); DebugManager.flags.EnableLocalMemory.set(1);
std::vector<MemoryRegion> regionInfo(1); std::vector<MemoryRegion> regionInfo(1);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 1}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 1};
regionInfo[0].probedSize = 8 * GB; regionInfo[0].probedSize = 8 * GB;
setupMemoryInfo(regionInfo, 0); setupMemoryInfo(regionInfo, 0);
@@ -349,7 +349,7 @@ TEST_F(MultiTileMemoryInfoPrelimTest, whenDebugVariablePrintMemoryRegionSizeIsSe
DebugManager.flags.PrintMemoryRegionSizes.set(true); DebugManager.flags.PrintMemoryRegionSizes.set(true);
std::vector<MemoryRegion> regionInfo(1); std::vector<MemoryRegion> regionInfo(1);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 1}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 1};
regionInfo[0].probedSize = 16 * GB; regionInfo[0].probedSize = 16 * GB;
setupMemoryInfo(regionInfo, 0); setupMemoryInfo(regionInfo, 0);
@@ -365,9 +365,9 @@ TEST_F(MultiTileMemoryInfoPrelimTest, whenDebugVariablePrintMemoryRegionSizeIsSe
TEST(MemoryInfo, givenMemoryInfoWithRegionsWhenCreatingGemWithExtensionsThenReturnCorrectValues) { TEST(MemoryInfo, givenMemoryInfoWithRegionsWhenCreatingGemWithExtensionsThenReturnCorrectValues) {
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[0].probedSize = 8 * GB; regionInfo[0].probedSize = 8 * GB;
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
regionInfo[1].probedSize = 16 * GB; regionInfo[1].probedSize = 16 * GB;
auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo); auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo);
@@ -391,9 +391,9 @@ TEST(MemoryInfo, givenMemoryInfoWithRegionsWhenCreatingGemExtWithSingleRegionThe
DebugManager.flags.EnableLocalMemory.set(1); DebugManager.flags.EnableLocalMemory.set(1);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[0].probedSize = 8 * GB; regionInfo[0].probedSize = 8 * GB;
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
regionInfo[1].probedSize = 16 * GB; regionInfo[1].probedSize = 16 * GB;
auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo); auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo);
@@ -411,7 +411,7 @@ TEST(MemoryInfo, givenMemoryInfoWithRegionsWhenCreatingGemExtWithSingleRegionThe
const auto &createExt = drm->context.receivedCreateGemExt; const auto &createExt = drm->context.receivedCreateGemExt;
ASSERT_TRUE(createExt); ASSERT_TRUE(createExt);
ASSERT_EQ(1u, createExt->memoryRegions.size()); ASSERT_EQ(1u, createExt->memoryRegions.size());
EXPECT_EQ(I915_MEMORY_CLASS_DEVICE, createExt->memoryRegions[0].memoryClass); EXPECT_EQ(drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, createExt->memoryRegions[0].memoryClass);
EXPECT_EQ(1024u, drm->context.receivedCreateGemExt->size); EXPECT_EQ(1024u, drm->context.receivedCreateGemExt->size);
} }
@@ -421,9 +421,9 @@ TEST(MemoryInfo, givenMemoryInfoWithRegionsAndPrivateBOSupportWhenCreatingGemExt
DebugManager.flags.EnablePrivateBO.set(true); DebugManager.flags.EnablePrivateBO.set(true);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[0].probedSize = 8 * GB; regionInfo[0].probedSize = 8 * GB;
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
regionInfo[1].probedSize = 16 * GB; regionInfo[1].probedSize = 16 * GB;
auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo); auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo);
@@ -452,9 +452,9 @@ TEST(MemoryInfo, givenMemoryInfoWithRegionsAndNoPrivateBOSupportWhenCreatingGemE
DebugManager.flags.EnablePrivateBO.set(false); DebugManager.flags.EnablePrivateBO.set(false);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[0].probedSize = 8 * GB; regionInfo[0].probedSize = 8 * GB;
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
regionInfo[1].probedSize = 16 * GB; regionInfo[1].probedSize = 16 * GB;
auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo); auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo);
@@ -482,9 +482,9 @@ TEST(MemoryInfo, givenMemoryInfoWithRegionsAndPrivateBOSupportedAndIsPerContextV
DebugManager.flags.EnablePrivateBO.set(true); DebugManager.flags.EnablePrivateBO.set(true);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[0].probedSize = 8 * GB; regionInfo[0].probedSize = 8 * GB;
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
regionInfo[1].probedSize = 16 * GB; regionInfo[1].probedSize = 16 * GB;
auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo); auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo);
@@ -511,15 +511,15 @@ TEST(MemoryInfo, givenMemoryInfoWithRegionsWhenCreatingGemExtWithMultipleRegions
DebugManager.flags.EnableLocalMemory.set(1); DebugManager.flags.EnableLocalMemory.set(1);
std::vector<MemoryRegion> regionInfo(5); std::vector<MemoryRegion> regionInfo(5);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[0].probedSize = 8 * GB; regionInfo[0].probedSize = 8 * GB;
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
regionInfo[1].probedSize = 16 * GB; regionInfo[1].probedSize = 16 * GB;
regionInfo[2].region = {I915_MEMORY_CLASS_DEVICE, 1}; regionInfo[2].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 1};
regionInfo[2].probedSize = 16 * GB; regionInfo[2].probedSize = 16 * GB;
regionInfo[3].region = {I915_MEMORY_CLASS_DEVICE, 2}; regionInfo[3].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 2};
regionInfo[3].probedSize = 16 * GB; regionInfo[3].probedSize = 16 * GB;
regionInfo[4].region = {I915_MEMORY_CLASS_DEVICE, 3}; regionInfo[4].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 3};
regionInfo[4].probedSize = 16 * GB; regionInfo[4].probedSize = 16 * GB;
auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo); auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo);
@@ -538,11 +538,11 @@ TEST(MemoryInfo, givenMemoryInfoWithRegionsWhenCreatingGemExtWithMultipleRegions
const auto &createExt = drm->context.receivedCreateGemExt; const auto &createExt = drm->context.receivedCreateGemExt;
ASSERT_TRUE(createExt); ASSERT_TRUE(createExt);
ASSERT_EQ(3u, createExt->memoryRegions.size()); ASSERT_EQ(3u, createExt->memoryRegions.size());
EXPECT_EQ(I915_MEMORY_CLASS_DEVICE, createExt->memoryRegions[0].memoryClass); EXPECT_EQ(drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, createExt->memoryRegions[0].memoryClass);
EXPECT_EQ(0u, createExt->memoryRegions[0].memoryInstance); EXPECT_EQ(0u, createExt->memoryRegions[0].memoryInstance);
EXPECT_EQ(I915_MEMORY_CLASS_DEVICE, createExt->memoryRegions[1].memoryClass); EXPECT_EQ(drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, createExt->memoryRegions[1].memoryClass);
EXPECT_EQ(1u, createExt->memoryRegions[1].memoryInstance); EXPECT_EQ(1u, createExt->memoryRegions[1].memoryInstance);
EXPECT_EQ(I915_MEMORY_CLASS_DEVICE, createExt->memoryRegions[2].memoryClass); EXPECT_EQ(drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, createExt->memoryRegions[2].memoryClass);
EXPECT_EQ(3u, createExt->memoryRegions[2].memoryInstance); EXPECT_EQ(3u, createExt->memoryRegions[2].memoryInstance);
EXPECT_EQ(1024u, drm->context.receivedCreateGemExt->size); EXPECT_EQ(1024u, drm->context.receivedCreateGemExt->size);
} }

28
shared/test/unit_test/os_interface/linux/drm_memory_info_tests.cpp
View File

@@ -86,9 +86,9 @@ TEST(MemoryInfo, givenMemoryInfoWithRegionsAndLocalMemoryEnabledWhenGettingMemor
DebugManagerStateRestore restorer; DebugManagerStateRestore restorer;
DebugManager.flags.EnableLocalMemory.set(1); DebugManager.flags.EnableLocalMemory.set(1);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[0].probedSize = 8 * GB; regionInfo[0].probedSize = 8 * GB;
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
regionInfo[1].probedSize = 16 * GB; regionInfo[1].probedSize = 16 * GB;
auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo); auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo);
@@ -109,7 +109,7 @@ TEST(MemoryInfo, givenMemoryInfoWithRegionsAndLocalMemoryEnabledWhenGettingMemor
TEST(MemoryInfo, givenMemoryInfoWithoutDeviceRegionWhenGettingDeviceRegionSizeThenReturnCorrectSize) { TEST(MemoryInfo, givenMemoryInfoWithoutDeviceRegionWhenGettingDeviceRegionSizeThenReturnCorrectSize) {
std::vector<MemoryRegion> regionInfo(1); std::vector<MemoryRegion> regionInfo(1);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[0].probedSize = 8 * GB; regionInfo[0].probedSize = 8 * GB;
auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo); auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo);
ASSERT_NE(nullptr, memoryInfo); ASSERT_NE(nullptr, memoryInfo);
@@ -121,9 +121,9 @@ TEST(MemoryInfo, givenMemoryInfoWithRegionsAndLocalMemoryDisabledWhenGettingMemo
DebugManagerStateRestore restorer; DebugManagerStateRestore restorer;
DebugManager.flags.EnableLocalMemory.set(0); DebugManager.flags.EnableLocalMemory.set(0);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[0].probedSize = 8 * GB; regionInfo[0].probedSize = 8 * GB;
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
regionInfo[1].probedSize = 16 * GB; regionInfo[1].probedSize = 16 * GB;
auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo); auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo);
@@ -147,7 +147,7 @@ TEST(MemoryInfo, whenDebugVariablePrintMemoryRegionSizeIsSetAndGetMemoryRegionSi
DebugManager.flags.PrintMemoryRegionSizes.set(true); DebugManager.flags.PrintMemoryRegionSizes.set(true);
std::vector<MemoryRegion> regionInfo(1); std::vector<MemoryRegion> regionInfo(1);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 1}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 1};
regionInfo[0].probedSize = 16 * GB; regionInfo[0].probedSize = 16 * GB;
auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo); auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo);
@@ -166,11 +166,11 @@ TEST(MemoryInfo, givenMemoryInfoWithRegionsWhenGettingMemoryRegionClassAndInstan
DebugManagerStateRestore restorer; DebugManagerStateRestore restorer;
DebugManager.flags.EnableLocalMemory.set(1); DebugManager.flags.EnableLocalMemory.set(1);
std::vector<MemoryRegion> regionInfo(3); std::vector<MemoryRegion> regionInfo(3);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[0].probedSize = 8 * GB; regionInfo[0].probedSize = 8 * GB;
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
regionInfo[1].probedSize = 16 * GB; regionInfo[1].probedSize = 16 * GB;
regionInfo[2].region = {I915_MEMORY_CLASS_DEVICE, 1}; regionInfo[2].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 1};
regionInfo[2].probedSize = 32 * GB; regionInfo[2].probedSize = 32 * GB;
auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo); auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo);
@@ -212,9 +212,9 @@ using MemoryInfoTest = ::testing::Test;
HWTEST2_F(MemoryInfoTest, givenMemoryInfoWithRegionsWhenCreatingGemWithExtensionsThenReturnCorrectValues, NonDefaultIoctlsSupported) { HWTEST2_F(MemoryInfoTest, givenMemoryInfoWithRegionsWhenCreatingGemWithExtensionsThenReturnCorrectValues, NonDefaultIoctlsSupported) {
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[0].probedSize = 8 * GB; regionInfo[0].probedSize = 8 * GB;
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
regionInfo[1].probedSize = 16 * GB; regionInfo[1].probedSize = 16 * GB;
auto executionEnvironment = std::make_unique<ExecutionEnvironment>(); auto executionEnvironment = std::make_unique<ExecutionEnvironment>();
@@ -237,9 +237,9 @@ HWTEST2_F(MemoryInfoTest, givenMemoryInfoWithRegionsWhenCreatingGemExtWithSingle
DebugManagerStateRestore restorer; DebugManagerStateRestore restorer;
DebugManager.flags.EnableLocalMemory.set(1); DebugManager.flags.EnableLocalMemory.set(1);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[0].probedSize = 8 * GB; regionInfo[0].probedSize = 8 * GB;
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
regionInfo[1].probedSize = 16 * GB; regionInfo[1].probedSize = 16 * GB;
auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo); auto memoryInfo = std::make_unique<MemoryInfo>(regionInfo);
@@ -254,6 +254,6 @@ HWTEST2_F(MemoryInfoTest, givenMemoryInfoWithRegionsWhenCreatingGemExtWithSingle
EXPECT_EQ(1u, handle); EXPECT_EQ(1u, handle);
EXPECT_EQ(0u, ret); EXPECT_EQ(0u, ret);
EXPECT_EQ(1u, drm->ioctlCallsCount); EXPECT_EQ(1u, drm->ioctlCallsCount);
EXPECT_EQ(I915_MEMORY_CLASS_DEVICE, drm->memRegions.memoryClass); EXPECT_EQ(drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, drm->memRegions.memoryClass);
EXPECT_EQ(1024u, drm->createExt.size); EXPECT_EQ(1024u, drm->createExt.size);
} }

154
shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_prelim_tests.cpp
View File

@@ -41,8 +41,8 @@ TEST_F(DrmMemoryManagerLocalMemoryWithCustomPrelimMockTest, givenDrmMemoryManage
TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenDrmMemoryManagerWithPrelimSupportWhenCreateBufferObjectInMemoryRegionIsCalledThenBufferObjectWithAGivenGpuAddressAndSizeIsCreatedAndAllocatedInASpecifiedMemoryRegion) { TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenDrmMemoryManagerWithPrelimSupportWhenCreateBufferObjectInMemoryRegionIsCalledThenBufferObjectWithAGivenGpuAddressAndSizeIsCreatedAndAllocatedInASpecifiedMemoryRegion) {
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 1}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 1};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->queryEngineInfo(); mock->queryEngineInfo();
@@ -72,7 +72,7 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenDrmMemoryManagerWithPrelimSup
EXPECT_EQ(DrmPrelimHelper::getMemoryRegionsParamFlag(), regionParam.param); EXPECT_EQ(DrmPrelimHelper::getMemoryRegionsParamFlag(), regionParam.param);
const auto &memRegions = createExt.memoryRegions; const auto &memRegions = createExt.memoryRegions;
EXPECT_EQ(I915_MEMORY_CLASS_DEVICE, memRegions.at(0).memoryClass); EXPECT_EQ(drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, memRegions.at(0).memoryClass);
EXPECT_EQ(regionInfo[1].region.memoryInstance, memRegions.at(0).memoryInstance); EXPECT_EQ(regionInfo[1].region.memoryInstance, memRegions.at(0).memoryInstance);
EXPECT_EQ(gpuAddress, bo->peekAddress()); EXPECT_EQ(gpuAddress, bo->peekAddress());
@@ -92,8 +92,8 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenMultiRootDeviceEnvironmentAnd
auto mock = new DrmQueryMock(*executionEnvironment->rootDeviceEnvironments[i]); auto mock = new DrmQueryMock(*executionEnvironment->rootDeviceEnvironments[i]);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->queryEngineInfo(); mock->queryEngineInfo();
@@ -142,8 +142,8 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenMultiRootDeviceEnvironmentAnd
auto mock = new DrmQueryMock(*executionEnvironment->rootDeviceEnvironments[i]); auto mock = new DrmQueryMock(*executionEnvironment->rootDeviceEnvironments[i]);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->queryEngineInfo(); mock->queryEngineInfo();
@@ -182,8 +182,8 @@ TEST_F(DrmMemoryManagerUsmSharedHandlePrelimTest, givenMultiRootDeviceEnvironmen
auto mock = new DrmQueryMock(*executionEnvironment->rootDeviceEnvironments[rootDeviceIndex]); auto mock = new DrmQueryMock(*executionEnvironment->rootDeviceEnvironments[rootDeviceIndex]);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->queryEngineInfo(); mock->queryEngineInfo();
@@ -247,8 +247,8 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenMultiRootDeviceEnvironmentAnd
TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, whenCreateUnifiedMemoryAllocationThenGemCreateExtIsUsed) { TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, whenCreateUnifiedMemoryAllocationThenGemCreateExtIsUsed) {
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 1}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 1};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->queryEngineInfo(); mock->queryEngineInfo();
@@ -272,9 +272,9 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, whenCreateUnifiedMemoryAllocationT
const auto &memRegions = createExt.memoryRegions; const auto &memRegions = createExt.memoryRegions;
ASSERT_EQ(memRegions.size(), 2u); ASSERT_EQ(memRegions.size(), 2u);
EXPECT_EQ(memRegions[0].memoryClass, I915_MEMORY_CLASS_SYSTEM); EXPECT_EQ(memRegions[0].memoryClass, drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM);
EXPECT_EQ(memRegions[0].memoryInstance, 1u); EXPECT_EQ(memRegions[0].memoryInstance, 1u);
EXPECT_EQ(memRegions[1].memoryClass, I915_MEMORY_CLASS_DEVICE); EXPECT_EQ(memRegions[1].memoryClass, drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE);
EXPECT_EQ(memRegions[1].memoryInstance, regionInfo[1].region.memoryInstance); EXPECT_EQ(memRegions[1].memoryInstance, regionInfo[1].region.memoryInstance);
memoryManager->freeGraphicsMemory(allocation); memoryManager->freeGraphicsMemory(allocation);
@@ -282,10 +282,10 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, whenCreateUnifiedMemoryAllocationT
TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, whenCreateUnifiedMemoryAllocationWithMultiMemoryRegionsThenGemCreateExtIsUsedWithAllRegions) { TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, whenCreateUnifiedMemoryAllocationWithMultiMemoryRegionsThenGemCreateExtIsUsedWithAllRegions) {
std::vector<MemoryRegion> regionInfo(4); std::vector<MemoryRegion> regionInfo(4);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 1}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 1};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
regionInfo[2].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(1, 0)}; regionInfo[2].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(1, 0)};
regionInfo[3].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(2, 0)}; regionInfo[3].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(2, 0)};
auto hwInfo = mock->getRootDeviceEnvironment().getMutableHardwareInfo(); auto hwInfo = mock->getRootDeviceEnvironment().getMutableHardwareInfo();
hwInfo->gtSystemInfo.MultiTileArchInfo.IsValid = 1; hwInfo->gtSystemInfo.MultiTileArchInfo.IsValid = 1;
@@ -316,11 +316,11 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, whenCreateUnifiedMemoryAllocationW
const auto &memRegions = createExt.memoryRegions; const auto &memRegions = createExt.memoryRegions;
ASSERT_EQ(memRegions.size(), 3u); ASSERT_EQ(memRegions.size(), 3u);
EXPECT_EQ(memRegions[0].memoryClass, I915_MEMORY_CLASS_SYSTEM); EXPECT_EQ(memRegions[0].memoryClass, drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM);
EXPECT_EQ(memRegions[0].memoryInstance, 1u); EXPECT_EQ(memRegions[0].memoryInstance, 1u);
EXPECT_EQ(memRegions[1].memoryClass, I915_MEMORY_CLASS_DEVICE); EXPECT_EQ(memRegions[1].memoryClass, drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE);
EXPECT_EQ(memRegions[1].memoryInstance, regionInfo[1].region.memoryInstance); EXPECT_EQ(memRegions[1].memoryInstance, regionInfo[1].region.memoryInstance);
EXPECT_EQ(memRegions[2].memoryClass, I915_MEMORY_CLASS_DEVICE); EXPECT_EQ(memRegions[2].memoryClass, drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE);
EXPECT_EQ(memRegions[2].memoryInstance, regionInfo[3].region.memoryInstance); EXPECT_EQ(memRegions[2].memoryInstance, regionInfo[3].region.memoryInstance);
memoryManager->freeGraphicsMemory(allocation); memoryManager->freeGraphicsMemory(allocation);
@@ -333,8 +333,8 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenUseKmdMigrationSetWhenCreateS
std::map<uint32_t, DeviceBitfield> deviceBitfields{{mockRootDeviceIndex, mockDeviceBitfield}}; std::map<uint32_t, DeviceBitfield> deviceBitfields{{mockRootDeviceIndex, mockDeviceBitfield}};
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 1}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 1};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->queryEngineInfo(); mock->queryEngineInfo();
@@ -359,9 +359,9 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenUseKmdMigrationSetWhenCreateS
const auto &memRegions = createExt.memoryRegions; const auto &memRegions = createExt.memoryRegions;
EXPECT_EQ(memRegions.size(), 2u); EXPECT_EQ(memRegions.size(), 2u);
EXPECT_EQ(memRegions[0].memoryClass, I915_MEMORY_CLASS_SYSTEM); EXPECT_EQ(memRegions[0].memoryClass, drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM);
EXPECT_EQ(memRegions[0].memoryInstance, 1u); EXPECT_EQ(memRegions[0].memoryInstance, 1u);
EXPECT_EQ(memRegions[1].memoryClass, I915_MEMORY_CLASS_DEVICE); EXPECT_EQ(memRegions[1].memoryClass, drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE);
EXPECT_EQ(memRegions[1].memoryInstance, regionInfo[1].region.memoryInstance); EXPECT_EQ(memRegions[1].memoryInstance, regionInfo[1].region.memoryInstance);
unifiedMemoryManager.freeSVMAlloc(ptr); unifiedMemoryManager.freeSVMAlloc(ptr);
@@ -374,8 +374,8 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, MmapFailWhenCreateSharedUnifiedMem
std::map<uint32_t, DeviceBitfield> deviceBitfields{{mockRootDeviceIndex, mockDeviceBitfield}}; std::map<uint32_t, DeviceBitfield> deviceBitfields{{mockRootDeviceIndex, mockDeviceBitfield}};
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 1}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 1};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->queryEngineInfo(); mock->queryEngineInfo();
@@ -402,8 +402,8 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenUseKmdMigrationSetWhenCreateS
std::map<uint32_t, DeviceBitfield> deviceBitfields{{mockRootDeviceIndex, mockDeviceBitfield}}; std::map<uint32_t, DeviceBitfield> deviceBitfields{{mockRootDeviceIndex, mockDeviceBitfield}};
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 1}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 1};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->queryEngineInfo(); mock->queryEngineInfo();
@@ -434,9 +434,9 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenUseKmdMigrationSetWhenCreateS
const auto &memRegions = createExt.memoryRegions; const auto &memRegions = createExt.memoryRegions;
EXPECT_EQ(memRegions.size(), 2u); EXPECT_EQ(memRegions.size(), 2u);
EXPECT_EQ(memRegions[0].memoryClass, I915_MEMORY_CLASS_SYSTEM); EXPECT_EQ(memRegions[0].memoryClass, drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM);
EXPECT_EQ(memRegions[0].memoryInstance, 1u); EXPECT_EQ(memRegions[0].memoryInstance, 1u);
EXPECT_EQ(memRegions[1].memoryClass, I915_MEMORY_CLASS_DEVICE); EXPECT_EQ(memRegions[1].memoryClass, drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE);
EXPECT_EQ(memRegions[1].memoryInstance, regionInfo[1].region.memoryInstance); EXPECT_EQ(memRegions[1].memoryInstance, regionInfo[1].region.memoryInstance);
unifiedMemoryManager.freeSVMAlloc(ptr); unifiedMemoryManager.freeSVMAlloc(ptr);
@@ -449,8 +449,8 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenSetVmAdviseAtomicAttributeWhe
std::map<uint32_t, DeviceBitfield> deviceBitfields{{mockRootDeviceIndex, mockDeviceBitfield}}; std::map<uint32_t, DeviceBitfield> deviceBitfields{{mockRootDeviceIndex, mockDeviceBitfield}};
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 1}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 1};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->queryEngineInfo(); mock->queryEngineInfo();
@@ -497,11 +497,11 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenUseKmdMigrationAndUsmInitialP
std::map<uint32_t, DeviceBitfield> deviceBitfields{{mockRootDeviceIndex, mockDeviceBitfield}}; std::map<uint32_t, DeviceBitfield> deviceBitfields{{mockRootDeviceIndex, mockDeviceBitfield}};
std::vector<MemoryRegion> regionInfo(5); std::vector<MemoryRegion> regionInfo(5);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 1}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 1};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
regionInfo[2].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(1, 0)}; regionInfo[2].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(1, 0)};
regionInfo[3].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(2, 0)}; regionInfo[3].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(2, 0)};
regionInfo[4].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(3, 0)}; regionInfo[4].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(3, 0)};
auto hwInfo = mock->getRootDeviceEnvironment().getMutableHardwareInfo(); auto hwInfo = mock->getRootDeviceEnvironment().getMutableHardwareInfo();
hwInfo->gtSystemInfo.MultiTileArchInfo.IsValid = 1; hwInfo->gtSystemInfo.MultiTileArchInfo.IsValid = 1;
@@ -523,9 +523,9 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenUseKmdMigrationAndUsmInitialP
const auto memRegions = mock->context.receivedCreateGemExt.value().memoryRegions; const auto memRegions = mock->context.receivedCreateGemExt.value().memoryRegions;
EXPECT_EQ(memRegions.size(), 2u); EXPECT_EQ(memRegions.size(), 2u);
EXPECT_EQ(memRegions[0].memoryClass, I915_MEMORY_CLASS_DEVICE); EXPECT_EQ(memRegions[0].memoryClass, drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE);
EXPECT_EQ(memRegions[0].memoryInstance, regionInfo[1].region.memoryInstance); EXPECT_EQ(memRegions[0].memoryInstance, regionInfo[1].region.memoryInstance);
EXPECT_EQ(memRegions[1].memoryClass, I915_MEMORY_CLASS_SYSTEM); EXPECT_EQ(memRegions[1].memoryClass, drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM);
EXPECT_EQ(memRegions[1].memoryInstance, 1u); EXPECT_EQ(memRegions[1].memoryInstance, 1u);
unifiedMemoryManager.freeSVMAlloc(ptr); unifiedMemoryManager.freeSVMAlloc(ptr);
@@ -539,11 +539,11 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenUseKmdMigrationAndUsmInitialP
std::map<uint32_t, DeviceBitfield> deviceBitfields{{mockRootDeviceIndex, mockDeviceBitfield}}; std::map<uint32_t, DeviceBitfield> deviceBitfields{{mockRootDeviceIndex, mockDeviceBitfield}};
std::vector<MemoryRegion> regionInfo(5); std::vector<MemoryRegion> regionInfo(5);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 1}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 1};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
regionInfo[2].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(1, 0)}; regionInfo[2].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(1, 0)};
regionInfo[3].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(2, 0)}; regionInfo[3].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(2, 0)};
regionInfo[4].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(3, 0)}; regionInfo[4].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(3, 0)};
auto hwInfo = mock->getRootDeviceEnvironment().getMutableHardwareInfo(); auto hwInfo = mock->getRootDeviceEnvironment().getMutableHardwareInfo();
hwInfo->gtSystemInfo.MultiTileArchInfo.IsValid = 1; hwInfo->gtSystemInfo.MultiTileArchInfo.IsValid = 1;
@@ -565,15 +565,15 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenUseKmdMigrationAndUsmInitialP
const auto memRegions = mock->context.receivedCreateGemExt.value().memoryRegions; const auto memRegions = mock->context.receivedCreateGemExt.value().memoryRegions;
EXPECT_EQ(memRegions.size(), 5u); EXPECT_EQ(memRegions.size(), 5u);
EXPECT_EQ(memRegions[0].memoryClass, I915_MEMORY_CLASS_DEVICE); EXPECT_EQ(memRegions[0].memoryClass, drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE);
EXPECT_EQ(memRegions[0].memoryInstance, regionInfo[1].region.memoryInstance); EXPECT_EQ(memRegions[0].memoryInstance, regionInfo[1].region.memoryInstance);
EXPECT_EQ(memRegions[1].memoryClass, I915_MEMORY_CLASS_DEVICE); EXPECT_EQ(memRegions[1].memoryClass, drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE);
EXPECT_EQ(memRegions[1].memoryInstance, regionInfo[2].region.memoryInstance); EXPECT_EQ(memRegions[1].memoryInstance, regionInfo[2].region.memoryInstance);
EXPECT_EQ(memRegions[2].memoryClass, I915_MEMORY_CLASS_DEVICE); EXPECT_EQ(memRegions[2].memoryClass, drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE);
EXPECT_EQ(memRegions[2].memoryInstance, regionInfo[3].region.memoryInstance); EXPECT_EQ(memRegions[2].memoryInstance, regionInfo[3].region.memoryInstance);
EXPECT_EQ(memRegions[3].memoryClass, I915_MEMORY_CLASS_DEVICE); EXPECT_EQ(memRegions[3].memoryClass, drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE);
EXPECT_EQ(memRegions[3].memoryInstance, regionInfo[4].region.memoryInstance); EXPECT_EQ(memRegions[3].memoryInstance, regionInfo[4].region.memoryInstance);
EXPECT_EQ(memRegions[4].memoryClass, I915_MEMORY_CLASS_SYSTEM); EXPECT_EQ(memRegions[4].memoryClass, drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM);
EXPECT_EQ(memRegions[4].memoryInstance, 1u); EXPECT_EQ(memRegions[4].memoryInstance, 1u);
unifiedMemoryManager.freeSVMAlloc(ptr); unifiedMemoryManager.freeSVMAlloc(ptr);
@@ -586,8 +586,8 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, whenVmAdviseIoctlFailsThenCreateSh
std::map<uint32_t, DeviceBitfield> deviceBitfields{{mockRootDeviceIndex, mockDeviceBitfield}}; std::map<uint32_t, DeviceBitfield> deviceBitfields{{mockRootDeviceIndex, mockDeviceBitfield}};
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->queryEngineInfo(); mock->queryEngineInfo();
@@ -610,8 +610,8 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenUseKmdMigrationSetWhenCreateS
std::map<uint32_t, DeviceBitfield> deviceBitfields{{mockRootDeviceIndex, mockDeviceBitfield}}; std::map<uint32_t, DeviceBitfield> deviceBitfields{{mockRootDeviceIndex, mockDeviceBitfield}};
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->queryEngineInfo(); mock->queryEngineInfo();
@@ -640,8 +640,8 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenNoMemoryInfoWhenCreateUnified
TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenMmapFailWhenCreateUnifiedMemoryAllocationThenNullptr) { TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenMmapFailWhenCreateUnifiedMemoryAllocationThenNullptr) {
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->queryEngineInfo(); mock->queryEngineInfo();
@@ -658,8 +658,8 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenMmapFailWhenCreateUnifiedMemo
TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenGemCreateExtFailWhenCreateUnifiedMemoryAllocationThenNullptr) { TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenGemCreateExtFailWhenCreateUnifiedMemoryAllocationThenNullptr) {
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->queryEngineInfo(); mock->queryEngineInfo();
@@ -679,8 +679,8 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenMemoryInfoWhenAllocateWithAli
DebugManager.flags.EnableBOMmapCreate.set(-1); DebugManager.flags.EnableBOMmapCreate.set(-1);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->queryEngineInfo(); mock->queryEngineInfo();
@@ -707,8 +707,8 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenAlignmentAndSizeWhenMmapRetur
DebugManager.flags.EnableBOMmapCreate.set(-1); DebugManager.flags.EnableBOMmapCreate.set(-1);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->queryEngineInfo(); mock->queryEngineInfo();
@@ -749,8 +749,8 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenAlignmentAndSizeWhenMmapRetur
DebugManager.flags.EnableBOMmapCreate.set(-1); DebugManager.flags.EnableBOMmapCreate.set(-1);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->queryEngineInfo(); mock->queryEngineInfo();
@@ -791,8 +791,8 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenInvalidCacheRegionWhenMmapRet
DebugManager.flags.EnableBOMmapCreate.set(-1); DebugManager.flags.EnableBOMmapCreate.set(-1);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->queryEngineInfo(); mock->queryEngineInfo();
@@ -831,8 +831,8 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenMemoryInfoAndFailedMmapOffset
DebugManager.flags.EnableBOMmapCreate.set(-1); DebugManager.flags.EnableBOMmapCreate.set(-1);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->queryEngineInfo(); mock->queryEngineInfo();
@@ -851,8 +851,8 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenMemoryInfoAndDisabledMmapBOCr
DebugManager.flags.EnableBOMmapCreate.set(0); DebugManager.flags.EnableBOMmapCreate.set(0);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->queryEngineInfo(); mock->queryEngineInfo();
@@ -874,8 +874,8 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenMemoryInfoAndNotUseObjectMmap
DebugManager.flags.EnableBOMmapCreate.set(0); DebugManager.flags.EnableBOMmapCreate.set(0);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->queryEngineInfo(); mock->queryEngineInfo();
@@ -898,8 +898,8 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenMemoryInfoAndFailedGemCreateE
DebugManager.flags.EnableBOMmapCreate.set(-1); DebugManager.flags.EnableBOMmapCreate.set(-1);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->queryEngineInfo(); mock->queryEngineInfo();
@@ -1238,8 +1238,8 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenPrintBOCreateDestroyResultFla
DebugManager.flags.PrintBOCreateDestroyResult.set(true); DebugManager.flags.PrintBOCreateDestroyResult.set(true);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 1}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 1};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
auto gpuAddress = 0x1234u; auto gpuAddress = 0x1234u;
auto size = MemoryConstants::pageSize64k; auto size = MemoryConstants::pageSize64k;
@@ -1270,8 +1270,8 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenPrintBOCreateDestroyResultFla
std::map<uint32_t, DeviceBitfield> deviceBitfields{{mockRootDeviceIndex, mockDeviceBitfield}}; std::map<uint32_t, DeviceBitfield> deviceBitfields{{mockRootDeviceIndex, mockDeviceBitfield}};
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 1}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 1};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, DrmMockHelper::getEngineOrMemoryInstanceValue(0, 0)};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->queryEngineInfo(); mock->queryEngineInfo();

46
shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_upstream_tests.cpp
View File

@@ -104,8 +104,8 @@ HWTEST2_F(DrmMemoryManagerLocalMemoryTest, givenDrmMemoryManagerWhenCreateBuffer
DebugManagerStateRestore restorer; DebugManagerStateRestore restorer;
DebugManager.flags.EnableLocalMemory.set(1); DebugManager.flags.EnableLocalMemory.set(1);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->ioctlCallsCount = 0; mock->ioctlCallsCount = 0;
@@ -127,7 +127,7 @@ HWTEST2_F(DrmMemoryManagerLocalMemoryTest, givenDrmMemoryManagerWhenCreateBuffer
EXPECT_EQ(1u, mock->numRegions); EXPECT_EQ(1u, mock->numRegions);
auto memRegions = mock->memRegions; auto memRegions = mock->memRegions;
EXPECT_EQ(I915_MEMORY_CLASS_DEVICE, memRegions.memoryClass); EXPECT_EQ(drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, memRegions.memoryClass);
EXPECT_EQ(0u, memRegions.memoryInstance); EXPECT_EQ(0u, memRegions.memoryInstance);
EXPECT_EQ(gpuAddress, bo->peekAddress()); EXPECT_EQ(gpuAddress, bo->peekAddress());
@@ -146,8 +146,8 @@ HWTEST2_F(DrmMemoryManagerLocalMemoryTest, givenMultiRootDeviceEnvironmentAndMem
auto mock = new DrmTipMock(*executionEnvironment->rootDeviceEnvironments[i]); auto mock = new DrmTipMock(*executionEnvironment->rootDeviceEnvironments[i]);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->ioctlCallsCount = 0; mock->ioctlCallsCount = 0;
@@ -192,8 +192,8 @@ TEST_F(DrmMemoryManagerLocalMemoryTest, givenMultiRootDeviceEnvironmentAndMemory
auto mock = new DrmTipMock(*executionEnvironment->rootDeviceEnvironments[i]); auto mock = new DrmTipMock(*executionEnvironment->rootDeviceEnvironments[i]);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->ioctlCallsCount = 0; mock->ioctlCallsCount = 0;
@@ -252,8 +252,8 @@ TEST_F(DrmMemoryManagerUsmSharedHandleTest, givenMultiRootDeviceEnvironmentAndMe
auto mock = new DrmTipMock(*executionEnvironment->rootDeviceEnvironments[rootDeviceIndex]); auto mock = new DrmTipMock(*executionEnvironment->rootDeviceEnvironments[rootDeviceIndex]);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->ioctlCallsCount = 0; mock->ioctlCallsCount = 0;
@@ -320,8 +320,8 @@ HWTEST2_F(DrmMemoryManagerLocalMemoryTest, givenMemoryInfoWhenAllocateWithAlignm
DebugManager.flags.EnableBOMmapCreate.set(-1); DebugManager.flags.EnableBOMmapCreate.set(-1);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->ioctlCallsCount = 0; mock->ioctlCallsCount = 0;
@@ -345,8 +345,8 @@ TEST_F(DrmMemoryManagerLocalMemoryTest, givenMemoryInfoAndNotUseObjectMmapProper
DebugManager.flags.EnableBOMmapCreate.set(0); DebugManager.flags.EnableBOMmapCreate.set(0);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->mmapOffsetRetVal = -1; mock->mmapOffsetRetVal = -1;
@@ -368,8 +368,8 @@ TEST_F(DrmMemoryManagerLocalMemoryTest, givenMemoryInfoAndFailedMmapOffsetWhenAl
DebugManager.flags.EnableBOMmapCreate.set(-1); DebugManager.flags.EnableBOMmapCreate.set(-1);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->mmapOffsetRetVal = -1; mock->mmapOffsetRetVal = -1;
@@ -388,8 +388,8 @@ TEST_F(DrmMemoryManagerLocalMemoryTest, givenMemoryInfoAndDisabledMmapBOCreation
DebugManager.flags.EnableBOMmapCreate.set(0); DebugManager.flags.EnableBOMmapCreate.set(0);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->mmapOffsetRetVal = -1; mock->mmapOffsetRetVal = -1;
@@ -410,8 +410,8 @@ TEST_F(DrmMemoryManagerLocalMemoryTest, givenMemoryInfoAndFailedGemCreateExtWhen
DebugManager.flags.EnableBOMmapCreate.set(-1); DebugManager.flags.EnableBOMmapCreate.set(-1);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->gemCreateExtRetVal = -1; mock->gemCreateExtRetVal = -1;
@@ -957,8 +957,8 @@ HWTEST2_F(DrmMemoryManagerLocalMemoryTest, givenAlignmentAndSizeWhenMmapReturnsU
DebugManager.flags.EnableBOMmapCreate.set(-1); DebugManager.flags.EnableBOMmapCreate.set(-1);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->ioctlCallsCount = 0; mock->ioctlCallsCount = 0;
@@ -995,8 +995,8 @@ HWTEST2_F(DrmMemoryManagerLocalMemoryTest, givenAlignmentAndSizeWhenMmapReturnsA
DebugManager.flags.EnableBOMmapCreate.set(-1); DebugManager.flags.EnableBOMmapCreate.set(-1);
std::vector<MemoryRegion> regionInfo(2); std::vector<MemoryRegion> regionInfo(2);
regionInfo[0].region = {I915_MEMORY_CLASS_SYSTEM, 0}; regionInfo[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0};
regionInfo[1].region = {I915_MEMORY_CLASS_DEVICE, 0}; regionInfo[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
mock->memoryInfo.reset(new MemoryInfo(regionInfo)); mock->memoryInfo.reset(new MemoryInfo(regionInfo));
mock->ioctlCallsCount = 0; mock->ioctlCallsCount = 0;

8
shared/test/unit_test/os_interface/linux/drm_mock_impl.h
View File

@@ -81,10 +81,10 @@ class DrmTipMock : public DrmMock {
auto queryMemoryRegionInfo = reinterpret_cast<drm_i915_query_memory_regions *>(queryItem->dataPtr); auto queryMemoryRegionInfo = reinterpret_cast<drm_i915_query_memory_regions *>(queryItem->dataPtr);
EXPECT_EQ(0u, queryMemoryRegionInfo->num_regions); EXPECT_EQ(0u, queryMemoryRegionInfo->num_regions);
queryMemoryRegionInfo->num_regions = numberOfRegions; queryMemoryRegionInfo->num_regions = numberOfRegions;
queryMemoryRegionInfo->regions[0].region.memory_class = I915_MEMORY_CLASS_SYSTEM; queryMemoryRegionInfo->regions[0].region.memory_class = drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM;
queryMemoryRegionInfo->regions[0].region.memory_instance = 1; queryMemoryRegionInfo->regions[0].region.memory_instance = 1;
queryMemoryRegionInfo->regions[0].probed_size = 2 * MemoryConstants::gigaByte; queryMemoryRegionInfo->regions[0].probed_size = 2 * MemoryConstants::gigaByte;
queryMemoryRegionInfo->regions[1].region.memory_class = I915_MEMORY_CLASS_DEVICE; queryMemoryRegionInfo->regions[1].region.memory_class = drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE;
queryMemoryRegionInfo->regions[1].region.memory_instance = 1; queryMemoryRegionInfo->regions[1].region.memory_instance = 1;
queryMemoryRegionInfo->regions[1].probed_size = 2 * MemoryConstants::gigaByte; queryMemoryRegionInfo->regions[1].probed_size = 2 * MemoryConstants::gigaByte;
} }
@@ -101,7 +101,7 @@ class DrmTipMock : public DrmMock {
} }
createExtParams->handle = 1u; createExtParams->handle = 1u;
this->createExt = *createExtParams; this->createExt = *createExtParams;
auto extMemRegions = reinterpret_cast<drm_i915_gem_create_ext_memory_regions *>(createExt.extensions); auto extMemRegions = reinterpret_cast<I915::drm_i915_gem_create_ext_memory_regions *>(createExt.extensions);
if (extMemRegions->base.name != I915_GEM_CREATE_EXT_MEMORY_REGIONS) { if (extMemRegions->base.name != I915_GEM_CREATE_EXT_MEMORY_REGIONS) {
return EINVAL; return EINVAL;
} }
@@ -110,7 +110,7 @@ class DrmTipMock : public DrmMock {
if (this->numRegions == 0) { if (this->numRegions == 0) {
return EINVAL; return EINVAL;
} }
if ((this->memRegions.memoryClass != I915_MEMORY_CLASS_SYSTEM) && (this->memRegions.memoryClass != I915_MEMORY_CLASS_DEVICE)) { if ((this->memRegions.memoryClass != drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM) && (this->memRegions.memoryClass != drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE)) {
return EINVAL; return EINVAL;
} }
return gemCreateExtRetVal; return gemCreateExtRetVal;

9
shared/test/unit_test/os_interface/linux/drm_mock_prod_dg1.h
View File

@@ -9,6 +9,11 @@
#include "shared/test/unit_test/os_interface/linux/drm_mock_impl.h" #include "shared/test/unit_test/os_interface/linux/drm_mock_impl.h"
using NEO::I915::drm_drawable_t;
using NEO::I915::drm_handle_t;
using NEO::I915::drm_tex_region;
using NEO::I915::drm_vblank_seq_type;
namespace PROD_DG1 { namespace PROD_DG1 {
#undef DRM_IOCTL_I915_GEM_CREATE_EXT #undef DRM_IOCTL_I915_GEM_CREATE_EXT
#undef __I915_EXEC_UNKNOWN_FLAGS #undef __I915_EXEC_UNKNOWN_FLAGS
@@ -41,10 +46,10 @@ class DrmMockProdDg1 : public DrmTipMock {
auto queryMemoryRegionInfo = reinterpret_cast<PROD_DG1::drm_i915_query_memory_regions *>(queryItem->dataPtr); auto queryMemoryRegionInfo = reinterpret_cast<PROD_DG1::drm_i915_query_memory_regions *>(queryItem->dataPtr);
EXPECT_EQ(0u, queryMemoryRegionInfo->num_regions); EXPECT_EQ(0u, queryMemoryRegionInfo->num_regions);
queryMemoryRegionInfo->num_regions = numberOfRegions; queryMemoryRegionInfo->num_regions = numberOfRegions;
queryMemoryRegionInfo->regions[0].region.memory_class = I915_MEMORY_CLASS_SYSTEM; queryMemoryRegionInfo->regions[0].region.memory_class = drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM;
queryMemoryRegionInfo->regions[0].region.memory_instance = 1; queryMemoryRegionInfo->regions[0].region.memory_instance = 1;
queryMemoryRegionInfo->regions[0].probed_size = 2 * MemoryConstants::gigaByte; queryMemoryRegionInfo->regions[0].probed_size = 2 * MemoryConstants::gigaByte;
queryMemoryRegionInfo->regions[1].region.memory_class = I915_MEMORY_CLASS_DEVICE; queryMemoryRegionInfo->regions[1].region.memory_class = drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE;
queryMemoryRegionInfo->regions[1].region.memory_instance = 1; queryMemoryRegionInfo->regions[1].region.memory_instance = 1;
queryMemoryRegionInfo->regions[1].probed_size = 2 * MemoryConstants::gigaByte; queryMemoryRegionInfo->regions[1].probed_size = 2 * MemoryConstants::gigaByte;
} }

20
shared/test/unit_test/os_interface/linux/drm_tests.cpp
View File

@@ -1443,11 +1443,11 @@ TEST(IoctlHelperTest, whenGettingDrmParamValueThenProperValueIsReturned) {
auto executionEnvironment = std::make_unique<MockExecutionEnvironment>(); auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();
DrmMock drm{*executionEnvironment->rootDeviceEnvironments[0]}; DrmMock drm{*executionEnvironment->rootDeviceEnvironments[0]};
auto ioctlHelper = drm.getIoctlHelper(); auto ioctlHelper = drm.getIoctlHelper();
EXPECT_EQ(static_cast<int>(I915_ENGINE_CLASS_RENDER), ioctlHelper->getDrmParamValue(DrmParam::EngineClassRender)); EXPECT_EQ(static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER), ioctlHelper->getDrmParamValue(DrmParam::EngineClassRender));
EXPECT_EQ(static_cast<int>(I915_ENGINE_CLASS_COPY), ioctlHelper->getDrmParamValue(DrmParam::EngineClassCopy)); EXPECT_EQ(static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY), ioctlHelper->getDrmParamValue(DrmParam::EngineClassCopy));
EXPECT_EQ(static_cast<int>(I915_ENGINE_CLASS_VIDEO), ioctlHelper->getDrmParamValue(DrmParam::EngineClassVideo)); EXPECT_EQ(static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO), ioctlHelper->getDrmParamValue(DrmParam::EngineClassVideo));
EXPECT_EQ(static_cast<int>(I915_ENGINE_CLASS_VIDEO_ENHANCE), ioctlHelper->getDrmParamValue(DrmParam::EngineClassVideoEnhance)); EXPECT_EQ(static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO_ENHANCE), ioctlHelper->getDrmParamValue(DrmParam::EngineClassVideoEnhance));
EXPECT_EQ(static_cast<int>(I915_ENGINE_CLASS_INVALID), ioctlHelper->getDrmParamValue(DrmParam::EngineClassInvalid)); EXPECT_EQ(static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_INVALID), ioctlHelper->getDrmParamValue(DrmParam::EngineClassInvalid));
EXPECT_EQ(static_cast<int>(I915_ENGINE_CLASS_INVALID_NONE), ioctlHelper->getDrmParamValue(DrmParam::EngineClassInvalidNone)); EXPECT_EQ(static_cast<int>(I915_ENGINE_CLASS_INVALID_NONE), ioctlHelper->getDrmParamValue(DrmParam::EngineClassInvalidNone));
EXPECT_THROW(ioctlHelper->getDrmParamValueBase(DrmParam::EngineClassCompute), std::runtime_error); EXPECT_THROW(ioctlHelper->getDrmParamValueBase(DrmParam::EngineClassCompute), std::runtime_error);
@@ -1459,10 +1459,10 @@ TEST(DistanceInfoTest, givenDistanceInfosWhenAssignRegionsFromDistancesThenCorre
auto ioctlHelper = drm.getIoctlHelper(); auto ioctlHelper = drm.getIoctlHelper();
std::vector<MemoryRegion> memRegions(4); std::vector<MemoryRegion> memRegions(4);
memRegions[0] = {{I915_MEMORY_CLASS_SYSTEM, 0}, 1024, 0}; memRegions[0] = {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0}, 1024, 0};
memRegions[1] = {{I915_MEMORY_CLASS_DEVICE, 0}, 1024, 0}; memRegions[1] = {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0}, 1024, 0};
memRegions[2] = {{I915_MEMORY_CLASS_DEVICE, 1}, 1024, 0}; memRegions[2] = {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 1}, 1024, 0};
memRegions[3] = {{I915_MEMORY_CLASS_DEVICE, 2}, 1024, 0}; memRegions[3] = {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 2}, 1024, 0};
auto memoryInfo = std::make_unique<MemoryInfo>(memRegions); auto memoryInfo = std::make_unique<MemoryInfo>(memRegions);
std::vector<EngineClassInstance> engines(3); std::vector<EngineClassInstance> engines(3);
@@ -1472,7 +1472,7 @@ TEST(DistanceInfoTest, givenDistanceInfosWhenAssignRegionsFromDistancesThenCorre
auto distances = std::vector<DistanceInfo>(); auto distances = std::vector<DistanceInfo>();
for (const auto &region : memRegions) { for (const auto &region : memRegions) {
if (region.region.memoryClass == I915_MEMORY_CLASS_SYSTEM) { if (region.region.memoryClass == drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM) {
continue; continue;
} }
for (const auto &engine : engines) { for (const auto &engine : engines) {

40
shared/test/unit_test/os_interface/linux/drm_with_prelim_tests.cpp
View File

@@ -111,7 +111,7 @@ TEST_F(IoctlHelperPrelimFixture, givenPrelimsWhenCreateGemExtThenReturnSuccess)
drm->ioctlCallsCount = 0; drm->ioctlCallsCount = 0;
auto ioctlHelper = drm->getIoctlHelper(); auto ioctlHelper = drm->getIoctlHelper();
uint32_t handle = 0; uint32_t handle = 0;
MemRegionsVec memClassInstance = {{I915_MEMORY_CLASS_DEVICE, 0}}; MemRegionsVec memClassInstance = {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0}};
auto ret = ioctlHelper->createGemExt(memClassInstance, 1024, handle, {}); auto ret = ioctlHelper->createGemExt(memClassInstance, 1024, handle, {});
EXPECT_EQ(1u, handle); EXPECT_EQ(1u, handle);
@@ -126,7 +126,7 @@ TEST_F(IoctlHelperPrelimFixture, givenPrelimsWhenCreateGemExtWithDebugFlagThenPr
testing::internal::CaptureStdout(); testing::internal::CaptureStdout();
auto ioctlHelper = drm->getIoctlHelper(); auto ioctlHelper = drm->getIoctlHelper();
uint32_t handle = 0; uint32_t handle = 0;
MemRegionsVec memClassInstance = {{I915_MEMORY_CLASS_DEVICE, 0}}; MemRegionsVec memClassInstance = {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0}};
ioctlHelper->createGemExt(memClassInstance, 1024, handle, {}); ioctlHelper->createGemExt(memClassInstance, 1024, handle, {});
std::string output = testing::internal::GetCapturedStdout(); std::string output = testing::internal::GetCapturedStdout();
@@ -310,11 +310,11 @@ TEST_F(IoctlHelperPrelimFixture, givenPrelimsWhenQueryDistancesThenCorrectDistan
auto ioctlHelper = drm->getIoctlHelper(); auto ioctlHelper = drm->getIoctlHelper();
std::vector<DistanceInfo> distances(3); std::vector<DistanceInfo> distances(3);
distances[0].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassRender)), 0}; distances[0].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassRender)), 0};
distances[0].region = {I915_MEMORY_CLASS_DEVICE, 0}; distances[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
distances[1].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassRender)), 1}; distances[1].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassRender)), 1};
distances[1].region = {I915_MEMORY_CLASS_DEVICE, 1}; distances[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 1};
distances[2].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassCopy)), 4}; distances[2].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassCopy)), 4};
distances[2].region = {I915_MEMORY_CLASS_DEVICE, 2}; distances[2].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 2};
std::vector<QueryItem> queryItems(distances.size()); std::vector<QueryItem> queryItems(distances.size());
auto ret = ioctlHelper->queryDistances(queryItems, distances); auto ret = ioctlHelper->queryDistances(queryItems, distances);
EXPECT_EQ(0u, ret); EXPECT_EQ(0u, ret);
@@ -326,10 +326,10 @@ TEST_F(IoctlHelperPrelimFixture, givenPrelimsWhenQueryDistancesThenCorrectDistan
TEST_F(IoctlHelperPrelimFixture, givenPrelimWhenQueryEngineInfoWithDeviceMemoryThenDistancesUsedAndMultileValuesSet) { TEST_F(IoctlHelperPrelimFixture, givenPrelimWhenQueryEngineInfoWithDeviceMemoryThenDistancesUsedAndMultileValuesSet) {
drm->ioctlCallsCount = 0; drm->ioctlCallsCount = 0;
std::vector<MemoryRegion> memRegions{ std::vector<MemoryRegion> memRegions{
{{I915_MEMORY_CLASS_SYSTEM, 0}, 1024, 0}, {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0}, 1024, 0},
{{I915_MEMORY_CLASS_DEVICE, 0}, 1024, 0}, {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0}, 1024, 0},
{{I915_MEMORY_CLASS_DEVICE, 1}, 1024, 0}, {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 1}, 1024, 0},
{{I915_MEMORY_CLASS_DEVICE, 2}, 1024, 0}}; {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 2}, 1024, 0}};
drm->memoryInfo.reset(new MemoryInfo(memRegions)); drm->memoryInfo.reset(new MemoryInfo(memRegions));
EXPECT_TRUE(drm->queryEngineInfo()); EXPECT_TRUE(drm->queryEngineInfo());
EXPECT_EQ(3u, drm->ioctlCallsCount); EXPECT_EQ(3u, drm->ioctlCallsCount);
@@ -357,9 +357,9 @@ TEST_F(IoctlHelperPrelimFixture, givenPrelimWhenQueryEngineInfoWithDeviceMemoryT
TEST_F(IoctlHelperPrelimFixture, givenPrelimWhenQueryEngineInfoThenCorrectCCSFlagsSet) { TEST_F(IoctlHelperPrelimFixture, givenPrelimWhenQueryEngineInfoThenCorrectCCSFlagsSet) {
drm->ioctlCallsCount = 0; drm->ioctlCallsCount = 0;
std::vector<MemoryRegion> memRegions{ std::vector<MemoryRegion> memRegions{
{{I915_MEMORY_CLASS_SYSTEM, 0}, 1024, 0}, {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0}, 1024, 0},
{{I915_MEMORY_CLASS_DEVICE, 0}, 1024, 0}, {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0}, 1024, 0},
{{I915_MEMORY_CLASS_DEVICE, 1}, 1024, 0}}; {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 1}, 1024, 0}};
drm->memoryInfo.reset(new MemoryInfo(memRegions)); drm->memoryInfo.reset(new MemoryInfo(memRegions));
EXPECT_TRUE(drm->queryEngineInfo()); EXPECT_TRUE(drm->queryEngineInfo());
EXPECT_EQ(3u, drm->ioctlCallsCount); EXPECT_EQ(3u, drm->ioctlCallsCount);
@@ -373,10 +373,10 @@ TEST_F(IoctlHelperPrelimFixture, givenPrelimWhenQueryEngineInfoThenCorrectCCSFla
TEST_F(IoctlHelperPrelimFixture, givenPrelimWhenSysmanQueryEngineInfoThenAdditionalEnginesUsed) { TEST_F(IoctlHelperPrelimFixture, givenPrelimWhenSysmanQueryEngineInfoThenAdditionalEnginesUsed) {
drm->ioctlCallsCount = 0; drm->ioctlCallsCount = 0;
std::vector<MemoryRegion> memRegions{ std::vector<MemoryRegion> memRegions{
{{I915_MEMORY_CLASS_SYSTEM, 0}, 1024, 0}, {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0}, 1024, 0},
{{I915_MEMORY_CLASS_DEVICE, 0}, 1024, 0}, {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0}, 1024, 0},
{{I915_MEMORY_CLASS_DEVICE, 1}, 1024, 0}, {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 1}, 1024, 0},
{{I915_MEMORY_CLASS_DEVICE, 2}, 1024, 0}}; {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 2}, 1024, 0}};
drm->memoryInfo.reset(new MemoryInfo(memRegions)); drm->memoryInfo.reset(new MemoryInfo(memRegions));
EXPECT_TRUE(drm->sysmanQueryEngineInfo()); EXPECT_TRUE(drm->sysmanQueryEngineInfo());
EXPECT_EQ(3u, drm->ioctlCallsCount); EXPECT_EQ(3u, drm->ioctlCallsCount);
@@ -396,10 +396,10 @@ TEST_F(IoctlHelperPrelimFixture, givenPrelimWhenQueryEngineInfoAndFailIoctlThenF
drm->queryDistanceIoctlRetVal = -1; drm->queryDistanceIoctlRetVal = -1;
std::vector<MemoryRegion> memRegions{ std::vector<MemoryRegion> memRegions{
{{I915_MEMORY_CLASS_SYSTEM, 0}, 1024, 0}, {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0}, 1024, 0},
{{I915_MEMORY_CLASS_DEVICE, 0}, 1024, 0}, {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0}, 1024, 0},
{{I915_MEMORY_CLASS_DEVICE, 1}, 1024, 0}, {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 1}, 1024, 0},
{{I915_MEMORY_CLASS_DEVICE, 2}, 1024, 0}}; {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 2}, 1024, 0}};
drm->memoryInfo.reset(new MemoryInfo(memRegions)); drm->memoryInfo.reset(new MemoryInfo(memRegions));
EXPECT_FALSE(drm->queryEngineInfo()); EXPECT_FALSE(drm->queryEngineInfo());

8
shared/test/unit_test/os_interface/linux/ioctl_helper_tests_dg1.cpp
View File

@@ -26,14 +26,14 @@ DG1TEST_F(IoctlHelperTestsDg1, givenDg1WhenCreateGemExtThenReturnCorrectValue) {
auto ioctlHelper = drm->getIoctlHelper(); auto ioctlHelper = drm->getIoctlHelper();
uint32_t handle = 0; uint32_t handle = 0;
MemRegionsVec memClassInstance = {{I915_MEMORY_CLASS_DEVICE, 0}}; MemRegionsVec memClassInstance = {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0}};
auto ret = ioctlHelper->createGemExt(memClassInstance, 1024, handle, {}); auto ret = ioctlHelper->createGemExt(memClassInstance, 1024, handle, {});
EXPECT_EQ(0u, ret); EXPECT_EQ(0u, ret);
EXPECT_EQ(1u, handle); EXPECT_EQ(1u, handle);
EXPECT_EQ(1u, drm->numRegions); EXPECT_EQ(1u, drm->numRegions);
EXPECT_EQ(1024u, drm->createExt.size); EXPECT_EQ(1024u, drm->createExt.size);
EXPECT_EQ(I915_MEMORY_CLASS_DEVICE, drm->memRegions.memoryClass); EXPECT_EQ(drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, drm->memRegions.memoryClass);
} }
DG1TEST_F(IoctlHelperTestsDg1, givenDg1WithDrmTipWhenCreateGemExtWithDebugFlagThenPrintDebugInfo) { DG1TEST_F(IoctlHelperTestsDg1, givenDg1WithDrmTipWhenCreateGemExtWithDebugFlagThenPrintDebugInfo) {
@@ -48,7 +48,7 @@ DG1TEST_F(IoctlHelperTestsDg1, givenDg1WithDrmTipWhenCreateGemExtWithDebugFlagTh
testing::internal::CaptureStdout(); testing::internal::CaptureStdout();
auto ioctlHelper = drm->getIoctlHelper(); auto ioctlHelper = drm->getIoctlHelper();
uint32_t handle = 0; uint32_t handle = 0;
MemRegionsVec memClassInstance = {{I915_MEMORY_CLASS_DEVICE, 0}}; MemRegionsVec memClassInstance = {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0}};
auto ret = ioctlHelper->createGemExt(memClassInstance, 1024, handle, {}); auto ret = ioctlHelper->createGemExt(memClassInstance, 1024, handle, {});
std::string output = testing::internal::GetCapturedStdout(); std::string output = testing::internal::GetCapturedStdout();
@@ -69,7 +69,7 @@ DG1TEST_F(IoctlHelperTestsDg1, givenDg1WhenCreateGemExtWithDebugFlagThenPrintDeb
testing::internal::CaptureStdout(); testing::internal::CaptureStdout();
auto ioctlHelper = drm->getIoctlHelper(); auto ioctlHelper = drm->getIoctlHelper();
uint32_t handle = 0; uint32_t handle = 0;
MemRegionsVec memClassInstance = {{I915_MEMORY_CLASS_DEVICE, 0}}; MemRegionsVec memClassInstance = {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0}};
auto ret = ioctlHelper->createGemExt(memClassInstance, 1024, handle, {}); auto ret = ioctlHelper->createGemExt(memClassInstance, 1024, handle, {});
std::string output = testing::internal::GetCapturedStdout(); std::string output = testing::internal::GetCapturedStdout();

38
shared/test/unit_test/os_interface/linux/ioctl_helper_tests_prelim.cpp
View File

@@ -115,19 +115,19 @@ TEST_F(IoctlPrelimHelperTests, whenGettingIoctlRequestStringThenProperStringIsRe
} }
TEST_F(IoctlPrelimHelperTests, whenGettingDrmParamValueThenPropertValueIsReturned) { TEST_F(IoctlPrelimHelperTests, whenGettingDrmParamValueThenPropertValueIsReturned) {
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassCompute), static_cast<int>(PRELIM_I915_ENGINE_CLASS_COMPUTE)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassCompute), static_cast<int>(prelim_drm_i915_gem_engine_class::PRELIM_I915_ENGINE_CLASS_COMPUTE));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassRender), static_cast<int>(I915_ENGINE_CLASS_RENDER)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassRender), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassCopy), static_cast<int>(I915_ENGINE_CLASS_COPY)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassCopy), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassVideo), static_cast<int>(I915_ENGINE_CLASS_VIDEO)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassVideo), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassVideoEnhance), static_cast<int>(I915_ENGINE_CLASS_VIDEO_ENHANCE)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassVideoEnhance), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO_ENHANCE));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassInvalid), static_cast<int>(I915_ENGINE_CLASS_INVALID)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassInvalid), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_INVALID));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassInvalidNone), static_cast<int>(I915_ENGINE_CLASS_INVALID_NONE)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassInvalidNone), static_cast<int>(I915_ENGINE_CLASS_INVALID_NONE));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecBlt), static_cast<int>(I915_EXEC_BLT)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecBlt), static_cast<int>(I915_EXEC_BLT));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecDefault), static_cast<int>(I915_EXEC_DEFAULT)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecDefault), static_cast<int>(I915_EXEC_DEFAULT));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecNoReloc), static_cast<int>(I915_EXEC_NO_RELOC)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecNoReloc), static_cast<int>(I915_EXEC_NO_RELOC));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecRender), static_cast<int>(I915_EXEC_RENDER)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecRender), static_cast<int>(I915_EXEC_RENDER));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::MemoryClassDevice), static_cast<int>(I915_MEMORY_CLASS_DEVICE)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::MemoryClassDevice), static_cast<int>(drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::MemoryClassSystem), static_cast<int>(I915_MEMORY_CLASS_SYSTEM)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::MemoryClassSystem), static_cast<int>(drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ParamChipsetId), static_cast<int>(I915_PARAM_CHIPSET_ID)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ParamChipsetId), static_cast<int>(I915_PARAM_CHIPSET_ID));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ParamRevision), static_cast<int>(I915_PARAM_REVISION)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ParamRevision), static_cast<int>(I915_PARAM_REVISION));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ParamHasExecSoftpin), static_cast<int>(I915_PARAM_HAS_EXEC_SOFTPIN)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ParamHasExecSoftpin), static_cast<int>(I915_PARAM_HAS_EXEC_SOFTPIN));
@@ -149,10 +149,10 @@ TEST_F(IoctlPrelimHelperTests, whenGettingDrmParamValueThenPropertValueIsReturne
TEST_F(IoctlPrelimHelperTests, givenPrelimsWhenTranslateToMemoryRegionsThenReturnSameData) { TEST_F(IoctlPrelimHelperTests, givenPrelimsWhenTranslateToMemoryRegionsThenReturnSameData) {
std::vector<MemoryRegion> expectedMemRegions(2); std::vector<MemoryRegion> expectedMemRegions(2);
expectedMemRegions[0].region.memoryClass = PRELIM_I915_MEMORY_CLASS_SYSTEM; expectedMemRegions[0].region.memoryClass = prelim_drm_i915_gem_memory_class::PRELIM_I915_MEMORY_CLASS_SYSTEM;
expectedMemRegions[0].region.memoryInstance = 0; expectedMemRegions[0].region.memoryInstance = 0;
expectedMemRegions[0].probedSize = 1024; expectedMemRegions[0].probedSize = 1024;
expectedMemRegions[1].region.memoryClass = PRELIM_I915_MEMORY_CLASS_DEVICE; expectedMemRegions[1].region.memoryClass = prelim_drm_i915_gem_memory_class::PRELIM_I915_MEMORY_CLASS_DEVICE;
expectedMemRegions[1].region.memoryInstance = 0; expectedMemRegions[1].region.memoryInstance = 0;
expectedMemRegions[1].probedSize = 1024; expectedMemRegions[1].probedSize = 1024;
@@ -176,7 +176,7 @@ TEST_F(IoctlPrelimHelperTests, givenEmptyRegionInstanceClassWhenCreatingVmContro
} }
TEST_F(IoctlPrelimHelperTests, givenValidRegionInstanceClassWhenCreatingVmControlRegionExtThenProperStructIsReturned) { TEST_F(IoctlPrelimHelperTests, givenValidRegionInstanceClassWhenCreatingVmControlRegionExtThenProperStructIsReturned) {
std::optional<MemoryClassInstance> regionInstanceClass = MemoryClassInstance{PRELIM_I915_MEMORY_CLASS_DEVICE, 2}; std::optional<MemoryClassInstance> regionInstanceClass = MemoryClassInstance{prelim_drm_i915_gem_memory_class::PRELIM_I915_MEMORY_CLASS_DEVICE, 2};
EXPECT_TRUE(regionInstanceClass.has_value()); EXPECT_TRUE(regionInstanceClass.has_value());
@@ -187,7 +187,7 @@ TEST_F(IoctlPrelimHelperTests, givenValidRegionInstanceClassWhenCreatingVmContro
auto regionExt = reinterpret_cast<prelim_drm_i915_gem_vm_region_ext *>(retVal.get()); auto regionExt = reinterpret_cast<prelim_drm_i915_gem_vm_region_ext *>(retVal.get());
EXPECT_EQ(static_cast<uint32_t>(PRELIM_I915_GEM_VM_CONTROL_EXT_REGION), regionExt->base.name); EXPECT_EQ(static_cast<uint32_t>(PRELIM_I915_GEM_VM_CONTROL_EXT_REGION), regionExt->base.name);
EXPECT_EQ(static_cast<uint32_t>(PRELIM_I915_MEMORY_CLASS_DEVICE), regionExt->region.memory_class); EXPECT_EQ(static_cast<uint32_t>(prelim_drm_i915_gem_memory_class::PRELIM_I915_MEMORY_CLASS_DEVICE), regionExt->region.memory_class);
EXPECT_EQ(2u, regionExt->region.memory_instance); EXPECT_EQ(2u, regionExt->region.memory_instance);
} }
@@ -317,17 +317,17 @@ TEST_F(IoctlPrelimHelperTests, givenValidInputWhenFillVmBindUserFenceThenProperV
TEST_F(IoctlPrelimHelperTests, givenPrelimWhenGettingEuStallPropertiesThenCorrectPropertiesAreReturned) { TEST_F(IoctlPrelimHelperTests, givenPrelimWhenGettingEuStallPropertiesThenCorrectPropertiesAreReturned) {
std::array<uint64_t, 12u> properties = {}; std::array<uint64_t, 12u> properties = {};
EXPECT_TRUE(ioctlHelper.getEuStallProperties(properties, 0x101, 0x102, 0x103, 1, 20u)); EXPECT_TRUE(ioctlHelper.getEuStallProperties(properties, 0x101, 0x102, 0x103, 1, 20u));
EXPECT_EQ(properties[0], PRELIM_DRM_I915_EU_STALL_PROP_BUF_SZ); EXPECT_EQ(properties[0], prelim_drm_i915_eu_stall_property_id::PRELIM_DRM_I915_EU_STALL_PROP_BUF_SZ);
EXPECT_EQ(properties[1], 0x101u); EXPECT_EQ(properties[1], 0x101u);
EXPECT_EQ(properties[2], PRELIM_DRM_I915_EU_STALL_PROP_SAMPLE_RATE); EXPECT_EQ(properties[2], prelim_drm_i915_eu_stall_property_id::PRELIM_DRM_I915_EU_STALL_PROP_SAMPLE_RATE);
EXPECT_EQ(properties[3], 0x102u); EXPECT_EQ(properties[3], 0x102u);
EXPECT_EQ(properties[4], PRELIM_DRM_I915_EU_STALL_PROP_POLL_PERIOD); EXPECT_EQ(properties[4], prelim_drm_i915_eu_stall_property_id::PRELIM_DRM_I915_EU_STALL_PROP_POLL_PERIOD);
EXPECT_EQ(properties[5], 0x103u); EXPECT_EQ(properties[5], 0x103u);
EXPECT_EQ(properties[6], PRELIM_DRM_I915_EU_STALL_PROP_ENGINE_CLASS); EXPECT_EQ(properties[6], prelim_drm_i915_eu_stall_property_id::PRELIM_DRM_I915_EU_STALL_PROP_ENGINE_CLASS);
EXPECT_EQ(properties[7], PRELIM_I915_ENGINE_CLASS_COMPUTE); EXPECT_EQ(properties[7], prelim_drm_i915_gem_engine_class::PRELIM_I915_ENGINE_CLASS_COMPUTE);
EXPECT_EQ(properties[8], PRELIM_DRM_I915_EU_STALL_PROP_ENGINE_INSTANCE); EXPECT_EQ(properties[8], prelim_drm_i915_eu_stall_property_id::PRELIM_DRM_I915_EU_STALL_PROP_ENGINE_INSTANCE);
EXPECT_EQ(properties[9], 1u); EXPECT_EQ(properties[9], 1u);
EXPECT_EQ(properties[10], PRELIM_DRM_I915_EU_STALL_PROP_EVENT_REPORT_COUNT); EXPECT_EQ(properties[10], prelim_drm_i915_eu_stall_property_id::PRELIM_DRM_I915_EU_STALL_PROP_EVENT_REPORT_COUNT);
EXPECT_EQ(properties[11], 20u); EXPECT_EQ(properties[11], 20u);
} }

28
shared/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp
View File

@@ -100,18 +100,18 @@ TEST(IoctlHelperUpstreamTest, whenGettingDrmParamValueThenPropertValueIsReturned
auto drm = std::make_unique<DrmTipMock>(*executionEnvironment->rootDeviceEnvironments[0]); auto drm = std::make_unique<DrmTipMock>(*executionEnvironment->rootDeviceEnvironments[0]);
IoctlHelperUpstream ioctlHelper{*drm}; IoctlHelperUpstream ioctlHelper{*drm};
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassCompute), 4); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassCompute), 4);
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassRender), static_cast<int>(I915_ENGINE_CLASS_RENDER)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassRender), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassCopy), static_cast<int>(I915_ENGINE_CLASS_COPY)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassCopy), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassVideo), static_cast<int>(I915_ENGINE_CLASS_VIDEO)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassVideo), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassVideoEnhance), static_cast<int>(I915_ENGINE_CLASS_VIDEO_ENHANCE)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassVideoEnhance), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO_ENHANCE));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassInvalid), static_cast<int>(I915_ENGINE_CLASS_INVALID)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassInvalid), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_INVALID));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassInvalidNone), static_cast<int>(I915_ENGINE_CLASS_INVALID_NONE)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassInvalidNone), static_cast<int>(I915_ENGINE_CLASS_INVALID_NONE));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecBlt), static_cast<int>(I915_EXEC_BLT)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecBlt), static_cast<int>(I915_EXEC_BLT));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecDefault), static_cast<int>(I915_EXEC_DEFAULT)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecDefault), static_cast<int>(I915_EXEC_DEFAULT));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecNoReloc), static_cast<int>(I915_EXEC_NO_RELOC)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecNoReloc), static_cast<int>(I915_EXEC_NO_RELOC));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecRender), static_cast<int>(I915_EXEC_RENDER)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecRender), static_cast<int>(I915_EXEC_RENDER));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::MemoryClassDevice), static_cast<int>(I915_MEMORY_CLASS_DEVICE)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::MemoryClassDevice), static_cast<int>(drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::MemoryClassSystem), static_cast<int>(I915_MEMORY_CLASS_SYSTEM)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::MemoryClassSystem), static_cast<int>(drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ParamChipsetId), static_cast<int>(I915_PARAM_CHIPSET_ID)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ParamChipsetId), static_cast<int>(I915_PARAM_CHIPSET_ID));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ParamRevision), static_cast<int>(I915_PARAM_REVISION)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ParamRevision), static_cast<int>(I915_PARAM_REVISION));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ParamHasExecSoftpin), static_cast<int>(I915_PARAM_HAS_EXEC_SOFTPIN)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ParamHasExecSoftpin), static_cast<int>(I915_PARAM_HAS_EXEC_SOFTPIN));
@@ -190,14 +190,14 @@ TEST(IoctlHelperTestsUpstream, givenUpstreamWhenCreateGemExtThenReturnCorrectVal
auto ioctlHelper = drm->getIoctlHelper(); auto ioctlHelper = drm->getIoctlHelper();
uint32_t handle = 0; uint32_t handle = 0;
MemRegionsVec memClassInstance = {{I915_MEMORY_CLASS_DEVICE, 0}}; MemRegionsVec memClassInstance = {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0}};
auto ret = ioctlHelper->createGemExt(memClassInstance, 1024, handle, {}); auto ret = ioctlHelper->createGemExt(memClassInstance, 1024, handle, {});
EXPECT_EQ(0u, ret); EXPECT_EQ(0u, ret);
EXPECT_EQ(1u, handle); EXPECT_EQ(1u, handle);
EXPECT_EQ(1u, drm->numRegions); EXPECT_EQ(1u, drm->numRegions);
EXPECT_EQ(1024u, drm->createExt.size); EXPECT_EQ(1024u, drm->createExt.size);
EXPECT_EQ(I915_MEMORY_CLASS_DEVICE, drm->memRegions.memoryClass); EXPECT_EQ(drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, drm->memRegions.memoryClass);
} }
TEST(IoctlHelperTestsUpstream, givenUpstreamWhenCreateGemExtWithDebugFlagThenPrintDebugInfo) { TEST(IoctlHelperTestsUpstream, givenUpstreamWhenCreateGemExtWithDebugFlagThenPrintDebugInfo) {
@@ -211,7 +211,7 @@ TEST(IoctlHelperTestsUpstream, givenUpstreamWhenCreateGemExtWithDebugFlagThenPri
testing::internal::CaptureStdout(); testing::internal::CaptureStdout();
auto ioctlHelper = drm->getIoctlHelper(); auto ioctlHelper = drm->getIoctlHelper();
uint32_t handle = 0; uint32_t handle = 0;
MemRegionsVec memClassInstance = {{I915_MEMORY_CLASS_DEVICE, 0}}; MemRegionsVec memClassInstance = {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0}};
ioctlHelper->createGemExt(memClassInstance, 1024, handle, {}); ioctlHelper->createGemExt(memClassInstance, 1024, handle, {});
std::string output = testing::internal::GetCapturedStdout(); std::string output = testing::internal::GetCapturedStdout();
@@ -316,7 +316,7 @@ TEST(IoctlHelperTestsUpstream, givenUpstreamWhenQueryEngineInfoWithoutDeviceMemo
ASSERT_NE(nullptr, drm); ASSERT_NE(nullptr, drm);
drm->ioctlCallsCount = 0; drm->ioctlCallsCount = 0;
std::vector<MemoryRegion> memRegions{ std::vector<MemoryRegion> memRegions{
{{I915_MEMORY_CLASS_SYSTEM, 0}, 1024, 0}}; {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0}, 1024, 0}};
drm->memoryInfo.reset(new MemoryInfo(memRegions)); drm->memoryInfo.reset(new MemoryInfo(memRegions));
EXPECT_TRUE(drm->queryEngineInfo()); EXPECT_TRUE(drm->queryEngineInfo());
EXPECT_EQ(2u, drm->ioctlCallsCount); EXPECT_EQ(2u, drm->ioctlCallsCount);
@@ -336,9 +336,9 @@ TEST(IoctlHelperTestsUpstream, givenUpstreamWhenQueryEngineInfoWithDeviceMemoryA
ASSERT_NE(nullptr, drm); ASSERT_NE(nullptr, drm);
drm->ioctlCallsCount = 0; drm->ioctlCallsCount = 0;
std::vector<MemoryRegion> memRegions{ std::vector<MemoryRegion> memRegions{
{{I915_MEMORY_CLASS_SYSTEM, 0}, 1024, 0}, {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM, 0}, 1024, 0},
{{I915_MEMORY_CLASS_DEVICE, 0}, 1024, 0}, {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0}, 1024, 0},
{{I915_MEMORY_CLASS_DEVICE, 1}, 1024, 0}}; {{drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 1}, 1024, 0}};
drm->memoryInfo.reset(new MemoryInfo(memRegions)); drm->memoryInfo.reset(new MemoryInfo(memRegions));
EXPECT_TRUE(drm->queryEngineInfo()); EXPECT_TRUE(drm->queryEngineInfo());
EXPECT_EQ(2u, drm->ioctlCallsCount); EXPECT_EQ(2u, drm->ioctlCallsCount);

12
shared/test/unit_test/os_interface/linux/prelim_helper_func.cpp
View File

@@ -45,7 +45,7 @@ int handlePrelimRequests(DrmIoctl request, void *arg, int ioctlRetVal, int query
return EINVAL; return EINVAL;
} }
if ((data->memoryClass != PRELIM_I915_MEMORY_CLASS_SYSTEM) && (data->memoryClass != PRELIM_I915_MEMORY_CLASS_DEVICE)) { if ((data->memoryClass != prelim_drm_i915_gem_memory_class::PRELIM_I915_MEMORY_CLASS_SYSTEM) && (data->memoryClass != prelim_drm_i915_gem_memory_class::PRELIM_I915_MEMORY_CLASS_DEVICE)) {
return EINVAL; return EINVAL;
} }
} else if (request == DrmIoctl::GemClosReserve) { } else if (request == DrmIoctl::GemClosReserve) {
@@ -77,11 +77,11 @@ int handlePrelimRequests(DrmIoctl request, void *arg, int ioctlRetVal, int query
queryEngineInfo->num_engines = numberOfEngines; queryEngineInfo->num_engines = numberOfEngines;
auto p = queryEngineInfo->engines; auto p = queryEngineInfo->engines;
for (uint16_t tile = 0u; tile < numberOfTiles; tile++) { for (uint16_t tile = 0u; tile < numberOfTiles; tile++) {
p++->engine = {I915_ENGINE_CLASS_RENDER, tile}; p++->engine = {drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER, tile};
p++->engine = {I915_ENGINE_CLASS_COPY, tile}; p++->engine = {drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY, tile};
p++->engine = {I915_ENGINE_CLASS_VIDEO, tile}; p++->engine = {drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO, tile};
p++->engine = {I915_ENGINE_CLASS_VIDEO_ENHANCE, tile}; p++->engine = {drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO_ENHANCE, tile};
p++->engine = {PRELIM_I915_ENGINE_CLASS_COMPUTE, tile}; p++->engine = {prelim_drm_i915_gem_engine_class::PRELIM_I915_ENGINE_CLASS_COMPUTE, tile};
p++->engine = {UINT16_MAX, tile}; p++->engine = {UINT16_MAX, tile};
} }
} }