intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-11 00:10:58 +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

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 *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));
::testing::internal::CaptureStdout();
@@ -4878,7 +4878,7 @@ TEST_F(DebugApiLinuxTest, GivenContextParamEventWhenTypeIsParamEngineThenEventIs
alignedFree(memory);
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_NE(session->clientHandleToConnection[MockDebugSessionLinux::mockClientHandle]->vmToTile.end(),
@@ -4934,13 +4934,13 @@ TEST_F(DebugApiLinuxTest, GivenNoVmIdWhenOrZeroEnginesContextParamEventIsHandled
auto enginesOffset = offsetof(i915_context_param_engines, engines);
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));
session->handleEvent(&contextParamEvent->base);
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(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);
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].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].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].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()};
for (auto i = 0u; i < distances.size(); i++) {
@@ -89,7 +89,7 @@ class DrmPrelimMock : public DrmMock {
std::vector<DistanceInfo> distances(1);
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()};
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() {
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[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[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[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[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[5].engine.engineClass = I915_INVALID_ENGINE_CLASS;
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())));
ASSERT_NE(nullptr, drm);
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->sysmanQueryEngineInfo();
auto engineInfo = drm->getEngineInfo();
@@ -241,7 +241,7 @@ TEST_F(ZesEngineFixture, GivenEngineInfoWithVideoQuerySupportedWhenQueryingEngin
auto drm = std::make_unique<DrmMockEngine>((const_cast<NEO::RootDeviceEnvironment &>(neoDevice->getRootDeviceEnvironment())));
ASSERT_NE(nullptr, drm);
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->sysmanQueryEngineInfo();
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) {}
bool queryMemoryInfoMockPositiveTest() {
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].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].unallocatedSize = unallocatedSizeRegionOne;