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

includes refactor

Browse Source 
Change-Id: I4dd85112b20b26fe1ecc95b8098cb160548db1d4
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
This commit is contained in:
Artur Harasimiuk
2020-08-26 22:36:51 +02:00
committed by sys_ocldev
parent cfe1d76781
commit 0dbcac46bd
27 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opencl/source/command_stream/aub_command_stream_receiver_hw.h
View File

@@ -11,11 +11,11 @@
#include "opencl/source/aub/aub_center.h"
#include "opencl/source/command_stream/aub_command_stream_receiver.h"
#include "opencl/source/gen_common/aub_mapper.h"
#include "opencl/source/memory_manager/os_agnostic_memory_manager.h"
#include "opencl/source/memory_manager/page_table.h"
#include "opencl/source/memory_manager/physical_address_allocator.h"
#include "aub_mapper.h"
#include "command_stream_receiver_simulated_hw.h"
namespace NEO {

2
opencl/source/command_stream/command_stream_receiver_simulated_common_hw.h
View File

@@ -8,9 +8,9 @@
#pragma once
#include "shared/source/command_stream/command_stream_receiver_hw.h"
#include "opencl/source/gen_common/aub_mapper.h"
#include "opencl/source/memory_manager/memory_banks.h"
#include "aub_mapper.h"
#include "third_party/aub_stream/headers/hardware_context.h"
namespace aub_stream {

2
opencl/source/command_stream/tbx_command_stream_receiver_hw.h
View File

@@ -7,11 +7,11 @@
#pragma once
#include "opencl/source/command_stream/tbx_command_stream_receiver.h"
#include "opencl/source/gen_common/aub_mapper.h"
#include "opencl/source/memory_manager/address_mapper.h"
#include "opencl/source/memory_manager/os_agnostic_memory_manager.h"
#include "opencl/source/memory_manager/page_table.h"
#include "aub_mapper.h"
#include "command_stream_receiver_simulated_hw.h"
#include <set>

4
opencl/source/enable_gens.cmake
View File

@@ -13,10 +13,6 @@ set(RUNTIME_SRCS_GENX_CPP_LINUX
linux/command_stream_receiver
)
set(RUNTIME_SRCS_GENX_H_BASE
aub_mapper.h
)
set(RUNTIME_SRCS_GENX_CPP_BASE
aub_command_stream_receiver
aub_mem_dump

31
opencl/source/gen11/aub_mapper.h
View File

@@ -1,31 +0,0 @@
/*
* Copyright (C) 2018-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#pragma once
#include "shared/source/helpers/constants.h"
#include "opencl/source/gen_common/aub_mapper_base.h"
#include "engine_node.h"
namespace NEO {
struct ICLFamily;
template <>
struct AUBFamilyMapper<ICLFamily> {
enum { device = AubMemDump::DeviceValues::Icllp };
using AubTraits = AubMemDump::Traits<device, MemoryConstants::GfxAddressBits>;
static const AubMemDump::LrcaHelper *const csTraits[aub_stream::NUM_ENGINES];
static const MMIOList globalMMIO;
static const MMIOList *perEngineMMIO[aub_stream::NUM_ENGINES];
typedef AubMemDump::AubDump<AubTraits> AUB;
};
} // namespace NEO

2
opencl/source/gen11/aub_mem_dump_gen11.cpp
View File

@@ -5,6 +5,7 @@
*
*/
#include "shared/source/gen11/aub_mapper.h"
#include "shared/source/helpers/completion_stamp.h"
#include "shared/source/helpers/hw_helper.h"
@@ -12,7 +13,6 @@
#include "opencl/source/aub_mem_dump/aub_alloc_dump.inl"
#include "opencl/source/aub_mem_dump/aub_mem_dump.inl"
#include "aub_mapper.h"
#include "config.h"
namespace AubMemDump {

31
opencl/source/gen12lp/aub_mapper.h
View File

@@ -1,31 +0,0 @@
/*
* Copyright (C) 2019-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#pragma once
#include "shared/source/helpers/constants.h"
#include "opencl/source/gen_common/aub_mapper_base.h"
#include "engine_node.h"
namespace NEO {
struct TGLLPFamily;
template <>
struct AUBFamilyMapper<TGLLPFamily> {
enum { device = AubMemDump::DeviceValues::Tgllp };
using AubTraits = AubMemDump::Traits<device, MemoryConstants::GfxAddressBits>;
static const AubMemDump::LrcaHelper *const csTraits[aub_stream::NUM_ENGINES];
static const MMIOList globalMMIO;
static const MMIOList *perEngineMMIO[aub_stream::NUM_ENGINES];
typedef AubMemDump::AubDump<AubTraits> AUB;
};
} // namespace NEO

2
opencl/source/gen12lp/aub_mem_dump_gen12lp.cpp
View File

@@ -5,6 +5,7 @@
*
*/
#include "shared/source/gen12lp/aub_mapper.h"
#include "shared/source/helpers/completion_stamp.h"
#include "shared/source/helpers/hw_helper.h"
@@ -12,7 +13,6 @@
#include "opencl/source/aub_mem_dump/aub_alloc_dump.inl"
#include "opencl/source/aub_mem_dump/aub_mem_dump.inl"
#include "aub_mapper.h"
#include "config.h"
#include "reg_configs_common.h"

31
opencl/source/gen8/aub_mapper.h
View File

@@ -1,31 +0,0 @@
/*
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#pragma once
#include "shared/source/helpers/constants.h"
#include "opencl/source/gen_common/aub_mapper_base.h"
#include "engine_node.h"
namespace NEO {
struct BDWFamily;
template <>
struct AUBFamilyMapper<BDWFamily> {
enum { device = AubMemDump::DeviceValues::Bdw };
using AubTraits = AubMemDump::Traits<device, MemoryConstants::GfxAddressBits>;
static const AubMemDump::LrcaHelper *const csTraits[aub_stream::NUM_ENGINES];
static const MMIOList globalMMIO;
static const MMIOList *perEngineMMIO[aub_stream::NUM_ENGINES];
typedef AubMemDump::AubDump<AubTraits> AUB;
};
} // namespace NEO

3
opencl/source/gen8/aub_mem_dump_gen8.cpp
View File

@@ -5,14 +5,13 @@
*
*/
#include "shared/source/gen8/aub_mapper.h"
#include "shared/source/helpers/hw_helper.h"
#include "opencl/source/aub/aub_helper_bdw_plus.inl"
#include "opencl/source/aub_mem_dump/aub_alloc_dump.inl"
#include "opencl/source/aub_mem_dump/aub_mem_dump.inl"
#include "aub_mapper.h"
namespace AubMemDump {
enum {

31
opencl/source/gen9/aub_mapper.h
View File

@@ -1,31 +0,0 @@
/*
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#pragma once
#include "shared/source/helpers/constants.h"
#include "opencl/source/gen_common/aub_mapper_base.h"
#include "engine_node.h"
namespace NEO {
struct SKLFamily;
template <>
struct AUBFamilyMapper<SKLFamily> {
enum { device = AubMemDump::DeviceValues::Skl };
using AubTraits = AubMemDump::Traits<device, MemoryConstants::GfxAddressBits>;
static const AubMemDump::LrcaHelper *const csTraits[aub_stream::NUM_ENGINES];
static const MMIOList globalMMIO;
static const MMIOList *perEngineMMIO[aub_stream::NUM_ENGINES];
typedef AubMemDump::AubDump<AubTraits> AUB;
};
} // namespace NEO

3
opencl/source/gen9/aub_mem_dump_gen9.cpp
View File

@@ -5,14 +5,13 @@
*
*/
#include "shared/source/gen9/aub_mapper.h"
#include "shared/source/helpers/hw_helper.h"
#include "opencl/source/aub/aub_helper_bdw_plus.inl"
#include "opencl/source/aub_mem_dump/aub_alloc_dump.inl"
#include "opencl/source/aub_mem_dump/aub_mem_dump.inl"
#include "aub_mapper.h"
namespace AubMemDump {
enum {

3
opencl/source/gen_common/CMakeLists.txt
View File

@@ -6,8 +6,9 @@
set(RUNTIME_SRCS_GEN_COMMON
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/aub_mapper.h
${CMAKE_CURRENT_SOURCE_DIR}/aub_mapper_base.h
)
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_GEN_COMMON})
add_subdirectories()

20
opencl/source/gen_common/aub_mapper.h
View File

@@ -1,20 +0,0 @@
/*
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#pragma once
#ifdef SUPPORT_GEN8
#include "opencl/source/gen8/aub_mapper.h"
#endif
#ifdef SUPPORT_GEN9
#include "opencl/source/gen9/aub_mapper.h"
#endif
#ifdef SUPPORT_GEN11
#include "opencl/source/gen11/aub_mapper.h"
#endif
#ifdef SUPPORT_GEN12LP
#include "opencl/source/gen12lp/aub_mapper.h"
#endif