Skip to content

Commit 6cb44ae

Browse files
ArturHarasimiukCompute-Runtime-Automation
ArturHarasimiuk
authored and
Compute-Runtime-Automation
committed
includes refactor
use gen specific hw_cmds instead of all-in-one Signed-off-by: Artur Harasimiuk <[email protected]>
1 parent ee27711 commit 6cb44ae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+58
-35
lines changed

‎level_zero/core/source/gen12lp/cmdlist_gen12lp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#include "level_zero/core/source/cmdlist/cmdlist_hw_base.inl"
1313
#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h"
1414
#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl"
15+
#include "level_zero/core/source/gen12lp/definitions/cache_flush_gen12lp.inl"
1516

16-
#include "cache_flush_gen12lp.inl"
1717
#include "cmdlist_extended.inl"
1818

1919
namespace L0 {

‎level_zero/core/test/unit_tests/gen12lp/test_cache_flush.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*
66
*/
77

8+
#include "shared/source/gen12lp/hw_cmds_base.h"
89
#include "shared/source/helpers/cache_flush.inl"
910
#include "shared/source/helpers/l3_range.h"
1011
#include "shared/test/common/cmd_parse/gen_cmd_parse.h"

‎level_zero/core/test/unit_tests/gen12lp/test_events_gen12lp.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
*
66
*/
77

8+
#include "shared/source/gen12lp/hw_cmds_base.h"
89
#include "shared/test/common/mocks/mock_timestamp_packet.h"
9-
#include "shared/test/common/test_macros/hw_test.h"
10+
#include "shared/test/common/test_macros/header/per_product_test_definitions.h"
1011

11-
#include "level_zero/core/source/driver/driver_handle_imp.h"
1212
#include "level_zero/core/source/event/event.h"
1313
#include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
1414
#include "level_zero/core/test/unit_tests/mocks/mock_event.h"

‎opencl/source/gen11/gtpin_setup_gen11.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
/*
2-
* Copyright (C) 2019-2021 Intel Corporation
2+
* Copyright (C) 2019-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
66
*/
77

8+
#include "shared/source/gen11/hw_cmds_base.h"
9+
810
#include "opencl/source/gtpin/gtpin_hw_helper.h"
911
#include "opencl/source/gtpin/gtpin_hw_helper.inl"
1012
#include "opencl/source/gtpin/gtpin_hw_helper_bdw_and_later.inl"

‎opencl/source/gen12lp/gtpin_setup_gen12lp.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
/*
2-
* Copyright (C) 2019-2021 Intel Corporation
2+
* Copyright (C) 2019-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
66
*/
77

8+
#include "shared/source/gen12lp/hw_cmds_base.h"
9+
810
#include "opencl/source/gtpin/gtpin_hw_helper.h"
911
#include "opencl/source/gtpin/gtpin_hw_helper.inl"
1012
#include "opencl/source/gtpin/gtpin_hw_helper_bdw_and_later.inl"

‎opencl/source/gen8/gtpin_setup_gen8.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
/*
2-
* Copyright (C) 2018-2021 Intel Corporation
2+
* Copyright (C) 2018-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
66
*/
77

8+
#include "shared/source/gen8/hw_cmds_base.h"
9+
810
#include "opencl/source/gtpin/gtpin_hw_helper.h"
911
#include "opencl/source/gtpin/gtpin_hw_helper.inl"
1012
#include "opencl/source/gtpin/gtpin_hw_helper_bdw_and_later.inl"

‎opencl/source/gen9/gtpin_setup_gen9.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
/*
2-
* Copyright (C) 2018-2021 Intel Corporation
2+
* Copyright (C) 2018-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
66
*/
77

8+
#include "shared/source/gen9/hw_cmds_base.h"
9+
810
#include "opencl/source/gtpin/gtpin_hw_helper.h"
911
#include "opencl/source/gtpin/gtpin_hw_helper.inl"
1012
#include "opencl/source/gtpin/gtpin_hw_helper_bdw_and_later.inl"

‎opencl/source/gtpin/gtpin_hw_helper.inl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
#include "opencl/source/gtpin/gtpin_hw_helper.h"
1111
#include "opencl/source/kernel/kernel.h"
1212

13-
#include "hw_cmds.h"
14-
1513
namespace NEO {
1614

1715
template <typename GfxFamily>

‎opencl/source/xe_hp_core/gtpin_setup_xe_hp_core.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
/*
2-
* Copyright (C) 2021 Intel Corporation
2+
* Copyright (C) 2021-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
66
*/
77

8+
#include "shared/source/xe_hp_core/hw_cmds_base.h"
9+
810
#include "opencl/source/gtpin/gtpin_hw_helper.h"
911
#include "opencl/source/gtpin/gtpin_hw_helper.inl"
1012
#include "opencl/source/gtpin/gtpin_hw_helper_xehp_and_later.inl"

‎opencl/source/xe_hpc_core/gtpin_setup_xe_hpc_core.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "opencl/source/gtpin/gtpin_hw_helper.inl"
1010
#include "opencl/source/gtpin/gtpin_hw_helper_xehp_and_later.inl"
1111

12+
#include "hw_cmds_xe_hpc_core_base.h"
1213
#include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h"
1314

1415
namespace NEO {

‎opencl/source/xe_hpg_core/gtpin_setup_xe_hpg_core.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "opencl/source/gtpin/gtpin_hw_helper.inl"
1010
#include "opencl/source/gtpin/gtpin_hw_helper_xehp_and_later.inl"
1111

12+
#include "hw_cmds_xe_hpg_core_base.h"
1213
#include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h"
1314

1415
namespace NEO {

‎shared/source/command_stream/command_stream_receiver_hw_bdw_and_later.inl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
#include "shared/source/command_stream/command_stream_receiver_hw_base.inl"
99
#include "shared/source/helpers/address_patch.h"
1010

11-
#include "hw_cmds.h"
12-
1311
namespace NEO {
1412

1513
template <typename GfxFamily>

‎shared/source/debugger/debugger_l0.inl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
#include "shared/source/debugger/debugger_l0.h"
1212
#include "shared/source/gmm_helper/gmm_helper.h"
1313

14-
#include "hw_cmds.h"
15-
1614
namespace NEO {
1715

1816
template <typename GfxFamily>
@@ -134,4 +132,4 @@ void DebuggerL0Hw<GfxFamily>::programSbaAddressLoad(NEO::LinearStream &cmdStream
134132
true);
135133
}
136134

137-
} // namespace NEO
135+
} // namespace NEO

‎shared/source/gen11/command_stream_receiver_hw_gen11.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "shared/source/command_stream/command_stream_receiver_hw_bdw_and_later.inl"
1010
#include "shared/source/command_stream/device_command_stream.h"
1111
#include "shared/source/debug_settings/debug_settings_manager.h"
12+
#include "shared/source/gen11/hw_cmds_base.h"
1213
#include "shared/source/gen11/reg_configs.h"
1314
#include "shared/source/helpers/blit_commands_helper_bdw_and_later.inl"
1415
#include "shared/source/helpers/populate_factory.h"

‎shared/source/gen11/debugger_gen11.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include "shared/source/debugger/debugger_l0.inl"
99
#include "shared/source/debugger/debugger_l0_base.inl"
10+
#include "shared/source/gen11/hw_cmds_base.h"
1011
#include "shared/source/helpers/populate_factory.h"
1112

1213
namespace NEO {
@@ -20,4 +21,4 @@ void populateFactoryTable<DebuggerL0Hw<GfxFamily>>() {
2021
debuggerL0Factory[coreFamily] = DebuggerL0Hw<GfxFamily>::allocate;
2122
}
2223
template class DebuggerL0Hw<GfxFamily>;
23-
} // namespace NEO
24+
} // namespace NEO

‎shared/source/gen11/preamble_gen11.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77

88
#include "shared/source/command_stream/csr_definitions.h"
9+
#include "shared/source/gen11/hw_cmds_base.h"
910
#include "shared/source/helpers/pipeline_select_helper.h"
1011
#include "shared/source/helpers/preamble_bdw_and_later.inl"
1112

‎shared/source/gen11/state_base_address_gen11.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/*
2-
* Copyright (C) 2019-2021 Intel Corporation
2+
* Copyright (C) 2019-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
66
*/
77

8+
#include "shared/source/gen11/hw_cmds_base.h"
89
#include "shared/source/helpers/state_base_address.h"
910
#include "shared/source/helpers/state_base_address_bdw_and_later.inl"
1011
#include "shared/source/helpers/state_base_address_icllp_and_later.inl"

‎shared/source/gen12lp/debugger_gen12lp.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include "shared/source/debugger/debugger_l0.inl"
99
#include "shared/source/debugger/debugger_l0_tgllp_and_later.inl"
10+
#include "shared/source/gen12lp/hw_cmds_base.h"
1011
#include "shared/source/helpers/populate_factory.h"
1112

1213
namespace NEO {
@@ -21,4 +22,4 @@ void populateFactoryTable<DebuggerL0Hw<Family>>() {
2122
debuggerL0Factory[coreFamily] = DebuggerL0Hw<Family>::allocate;
2223
}
2324
template class DebuggerL0Hw<Family>;
24-
} // namespace NEO
25+
} // namespace NEO

‎shared/source/gen12lp/preamble_gen12lp.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77

88
#include "shared/source/command_stream/csr_definitions.h"
9+
#include "shared/source/gen12lp/hw_cmds_base.h"
910
#include "shared/source/helpers/engine_node_helper.h"
1011
#include "shared/source/helpers/pipe_control_args.h"
1112
#include "shared/source/helpers/preamble_bdw_and_later.inl"

‎shared/source/gen12lp/state_base_address_gen12lp.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/*
2-
* Copyright (C) 2019-2021 Intel Corporation
2+
* Copyright (C) 2019-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
66
*/
77

8+
#include "shared/source/gen12lp/hw_cmds_base.h"
89
#include "shared/source/helpers/state_base_address.h"
910
#include "shared/source/helpers/state_base_address_bdw_and_later.inl"
1011
#include "shared/source/helpers/state_base_address_icllp_and_later.inl"

‎shared/source/gen8/command_stream_receiver_hw_gen8.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include "shared/source/command_stream/command_stream_receiver_hw_bdw_and_later.inl"
99
#include "shared/source/command_stream/device_command_stream.h"
10-
#include "shared/source/gen8/hw_cmds.h"
10+
#include "shared/source/gen8/hw_cmds_base.h"
1111
#include "shared/source/helpers/blit_commands_helper_bdw_and_later.inl"
1212
#include "shared/source/helpers/populate_factory.h"
1313

‎shared/source/gen8/debugger_gen8.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include "shared/source/debugger/debugger_l0.inl"
99
#include "shared/source/debugger/debugger_l0_base.inl"
10+
#include "shared/source/gen8/hw_cmds_base.h"
1011
#include "shared/source/helpers/populate_factory.h"
1112

1213
namespace NEO {
@@ -21,4 +22,4 @@ void populateFactoryTable<DebuggerL0Hw<GfxFamily>>() {
2122
debuggerL0Factory[coreFamily] = DebuggerL0Hw<GfxFamily>::allocate;
2223
}
2324
template class DebuggerL0Hw<GfxFamily>;
24-
} // namespace NEO
25+
} // namespace NEO

‎shared/source/gen8/preamble_gen8.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*
66
*/
77

8+
#include "shared/source/gen8/hw_cmds_base.h"
89
#include "shared/source/helpers/preamble_bdw_and_later.inl"
910

1011
namespace NEO {

‎shared/source/gen8/state_base_address_gen8.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*
66
*/
77

8+
#include "shared/source/gen8/hw_cmds_base.h"
89
#include "shared/source/helpers/state_base_address.h"
910
#include "shared/source/helpers/state_base_address_bdw.inl"
1011
#include "shared/source/helpers/state_base_address_bdw_and_later.inl"

‎shared/source/gen9/command_stream_receiver_hw_gen9.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include "shared/source/command_stream/command_stream_receiver_hw_bdw_and_later.inl"
99
#include "shared/source/command_stream/device_command_stream.h"
10-
#include "shared/source/gen9/hw_cmds.h"
10+
#include "shared/source/gen9/hw_cmds_base.h"
1111
#include "shared/source/helpers/blit_commands_helper_bdw_and_later.inl"
1212
#include "shared/source/helpers/populate_factory.h"
1313

‎shared/source/gen9/debugger_gen9.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include "shared/source/debugger/debugger_l0.inl"
99
#include "shared/source/debugger/debugger_l0_base.inl"
10+
#include "shared/source/gen9/hw_cmds_base.h"
1011
#include "shared/source/helpers/populate_factory.h"
1112

1213
namespace NEO {
@@ -21,4 +22,4 @@ void populateFactoryTable<DebuggerL0Hw<GfxFamily>>() {
2122
debuggerL0Factory[coreFamily] = DebuggerL0Hw<GfxFamily>::allocate;
2223
}
2324
template class DebuggerL0Hw<GfxFamily>;
24-
} // namespace NEO
25+
} // namespace NEO

‎shared/source/gen9/preamble_gen9.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77

88
#include "shared/source/command_stream/csr_definitions.h"
9+
#include "shared/source/gen9/hw_cmds_base.h"
910
#include "shared/source/helpers/preamble_bdw_and_later.inl"
1011

1112
namespace NEO {

‎shared/source/gen9/state_base_address_gen9.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/*
2-
* Copyright (C) 2018-2021 Intel Corporation
2+
* Copyright (C) 2018-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
66
*/
77

8+
#include "shared/source/gen9/hw_cmds_base.h"
89
#include "shared/source/helpers/state_base_address.h"
910
#include "shared/source/helpers/state_base_address_bdw_and_later.inl"
1011
#include "shared/source/helpers/state_base_address_skl.inl"

‎shared/source/helpers/cache_flush.inl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021 Intel Corporation
2+
* Copyright (C) 2021-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -10,8 +10,6 @@
1010
#include "shared/source/helpers/l3_range.h"
1111
#include "shared/source/utilities/range.h"
1212

13-
#include "hw_cmds.h"
14-
1513
namespace NEO {
1614

1715
template <typename GfxFamily>

‎shared/source/helpers/preamble_base.inl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "shared/source/helpers/preamble.h"
1414
#include "shared/source/helpers/register_offsets.h"
1515

16-
#include "hw_cmds.h"
1716
#include "reg_configs_common.h"
1817

1918
#include <cstddef>

‎shared/source/helpers/state_base_address_base.inl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
#include "shared/source/indirect_heap/indirect_heap.h"
1515
#include "shared/source/os_interface/hw_info_config.h"
1616

17-
#include "hw_cmds.h"
18-
1917
namespace NEO {
2018
template <typename GfxFamily>
2119
void StateBaseAddressHelper<GfxFamily>::programStateBaseAddress(

‎shared/source/os_interface/windows/device_command_stream.inl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2018-2021 Intel Corporation
2+
* Copyright (C) 2018-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -14,7 +14,6 @@
1414
#include "shared/source/helpers/api_specific_config.h"
1515
#include "shared/source/os_interface/windows/wddm_device_command_stream.h"
1616

17-
#include "hw_cmds.h"
1817
#pragma warning(pop)
1918

2019
namespace NEO {

‎shared/source/os_interface/windows/wddm_device_command_stream.inl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "shared/source/os_interface/windows/wddm/wddm_residency_logger.h"
2323
#include "shared/source/os_interface/windows/wddm_device_command_stream.h"
2424

25-
#include "hw_cmds.h"
2625
#pragma warning(pop)
2726

2827
#include "shared/source/os_interface/windows/gdi_interface.h"

‎shared/source/xe_hp_core/debugger_xe_hp_core.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include "shared/source/debugger/debugger_l0.inl"
99
#include "shared/source/debugger/debugger_l0_tgllp_and_later.inl"
1010
#include "shared/source/helpers/populate_factory.h"
11+
#include "shared/source/xe_hp_core/hw_cmds_base.h"
1112

1213
namespace NEO {
1314

‎shared/source/xe_hp_core/state_base_address_xe_hp_core.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77

88
#include "shared/source/helpers/state_base_address_xehp_and_later.inl"
9+
#include "shared/source/xe_hp_core/hw_cmds_base.h"
910

1011
namespace NEO {
1112

0 commit comments

Comments
 (0)