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

Create wrappers for different version of i915 headers

Browse Source 
Related-To: NEO-6852
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2022-07-15 13:12:14 +02:00
committed by Compute-Runtime-Automation
parent 56a264a33d
commit 78c96db2fa
39 changed files with 120 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,11 +5,8 @@
*
*/
#include "shared/source/os_interface/linux/i915_prelim.h"
// Force prelim headers over upstream headers
// clang-format off
#include "third_party/uapi/prelim/drm/i915_drm.h"
// clang-format on
// prevent including any other headers to avoid redefintion errors
#define _I915_DRM_H_
#define _UAPI_I915_DRM_H_
@@ -17,11 +14,13 @@
#include "shared/source/os_interface/linux/drm_debug.h"
#include "shared/source/os_interface/os_interface.h"
#include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "shared/test/common/libult/linux/drm_mock_helper.h"
#include "shared/test/common/libult/linux/drm_query_mock.h"
#include "shared/test/common/mocks/mock_sip.h"
#include "shared/test/common/mocks/ult_device_factory.h"
#include "shared/test/common/test_macros/test.h"
#include "shared/test/unit_test/helpers/gtest_helpers.h"
#include "shared/test/common/libult/linux/drm_mock_helper.h"
#include "level_zero/core/source/hw_helpers/l0_hw_helper.h"
#include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
#include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h"
@@ -29,8 +28,6 @@
#include "level_zero/tools/source/debug/debug_handlers.h"
#include "level_zero/tools/source/debug/linux/prelim/debug_session.h"
#include "level_zero/tools/test/unit_tests/sources/debug/mock_debug_session.h"
#include "shared/test/common/mocks/ult_device_factory.h"
#include "shared/test/unit_test/helpers/gtest_helpers.h"
#include "common/StateSaveAreaHeader.h"

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

@@ -6,13 +6,13 @@
*/
#pragma once
#include "shared/source/os_interface/linux/i915.h"
#include "shared/source/os_interface/linux/memory_info.h"
#include "level_zero/core/test/unit_tests/mocks/mock_memory_manager.h"
#include "level_zero/tools/source/sysman/memory/linux/os_memory_imp.h"
#include "level_zero/tools/source/sysman/memory/memory_imp.h"
#include "drm/i915_drm.h"
#include "sysman/linux/os_sysman_imp.h"
using namespace NEO;