From 5239d95c69884def3eb724870a2ec52e720c450b Mon Sep 17 00:00:00 2001 From: Artem Yerofieiev Date: Fri, 7 Mar 2025 23:08:31 +0000 Subject: [PATCH] move to tt_metal/impl/dispatch/kernels --- .../dispatch/dispatch_event/test_EnqueueWaitForEvent.cpp | 2 +- tests/tt_metal/tt_metal/dispatch/dispatch_event/test_events.cpp | 2 +- .../tt_metal/dispatch/dispatch_util/test_device_command.cpp | 2 +- tests/tt_metal/tt_metal/perf_microbenchmark/dispatch/common.h | 2 +- .../tt_metal/perf_microbenchmark/dispatch/test_dispatcher.cpp | 2 +- .../tt_metal/perf_microbenchmark/dispatch/test_prefetcher.cpp | 2 +- .../tt_metal/perf_microbenchmark/routing/test_mux_demux.cpp | 2 +- .../perf_microbenchmark/routing/test_vc_bi_tunnel_2ep.cpp | 2 +- .../perf_microbenchmark/routing/test_vc_bi_tunnel_4ep.cpp | 2 +- .../perf_microbenchmark/routing/test_vc_loopback_tunnel.cpp | 2 +- .../tt_metal/perf_microbenchmark/routing/test_vc_mux_demux.cpp | 2 +- .../tt_metal/perf_microbenchmark/routing/test_vc_uni_tunnel.cpp | 2 +- tt_metal/CMakeLists.txt | 1 + tt_metal/hostdevcommon/CMakeLists.txt | 1 - tt_metal/impl/dispatch/debug_tools.cpp | 2 +- tt_metal/impl/dispatch/device_command.hpp | 2 +- tt_metal/impl/dispatch/device_command_calculator.hpp | 2 +- tt_metal/impl/dispatch/host_runtime_commands.cpp | 2 +- .../api/hostdevcommon => impl/dispatch/kernels}/cq_commands.hpp | 0 tt_metal/impl/dispatch/kernels/cq_dispatch.cpp | 2 +- tt_metal/impl/dispatch/util/dispatch_settings.cpp | 2 +- 21 files changed, 19 insertions(+), 19 deletions(-) rename tt_metal/{hostdevcommon/api/hostdevcommon => impl/dispatch/kernels}/cq_commands.hpp (100%) diff --git a/tests/tt_metal/tt_metal/dispatch/dispatch_event/test_EnqueueWaitForEvent.cpp b/tests/tt_metal/tt_metal/dispatch/dispatch_event/test_EnqueueWaitForEvent.cpp index 579e59363e6..5d7c262e911 100644 --- a/tests/tt_metal/tt_metal/dispatch/dispatch_event/test_EnqueueWaitForEvent.cpp +++ b/tests/tt_metal/tt_metal/dispatch/dispatch_event/test_EnqueueWaitForEvent.cpp @@ -12,7 +12,7 @@ #include #include -#include "hostdevcommon/cq_commands.hpp" +#include "tt_metal/impl/dispatch/kernels/cq_commands.hpp" namespace tt::tt_metal { diff --git a/tests/tt_metal/tt_metal/dispatch/dispatch_event/test_events.cpp b/tests/tt_metal/tt_metal/dispatch/dispatch_event/test_events.cpp index dd02bb5fdb3..038b43f67ba 100644 --- a/tests/tt_metal/tt_metal/dispatch/dispatch_event/test_events.cpp +++ b/tests/tt_metal/tt_metal/dispatch/dispatch_event/test_events.cpp @@ -10,7 +10,7 @@ #include #include -#include "hostdevcommon/cq_commands.hpp" +#include "tt_metal/impl/dispatch/kernels/cq_commands.hpp" namespace tt::tt_metal { diff --git a/tests/tt_metal/tt_metal/dispatch/dispatch_util/test_device_command.cpp b/tests/tt_metal/tt_metal/dispatch/dispatch_util/test_device_command.cpp index a96d103885a..0f6033308c5 100644 --- a/tests/tt_metal/tt_metal/dispatch/dispatch_util/test_device_command.cpp +++ b/tests/tt_metal/tt_metal/dispatch/dispatch_util/test_device_command.cpp @@ -6,7 +6,7 @@ #include #include "tt_metal/impl/dispatch/device_command.hpp" #include "tt_metal/impl/dispatch/device_command_calculator.hpp" -#include "hostdevcommon/cq_commands.hpp" +#include "tt_metal/impl/dispatch/kernels/cq_commands.hpp" namespace tt::tt_metal { diff --git a/tests/tt_metal/tt_metal/perf_microbenchmark/dispatch/common.h b/tests/tt_metal/tt_metal/perf_microbenchmark/dispatch/common.h index 3345f3e0fe8..74e280cd4ea 100644 --- a/tests/tt_metal/tt_metal/perf_microbenchmark/dispatch/common.h +++ b/tests/tt_metal/tt_metal/perf_microbenchmark/dispatch/common.h @@ -11,7 +11,7 @@ #include #include #include "noc/noc_parameters.h" -#include "hostdevcommon/cq_commands.hpp" +#include "tt_metal/impl/dispatch/kernels/cq_commands.hpp" #include #include "llrt.hpp" diff --git a/tests/tt_metal/tt_metal/perf_microbenchmark/dispatch/test_dispatcher.cpp b/tests/tt_metal/tt_metal/perf_microbenchmark/dispatch/test_dispatcher.cpp index 13e3c442c83..7fbe0815e41 100644 --- a/tests/tt_metal/tt_metal/perf_microbenchmark/dispatch/test_dispatcher.cpp +++ b/tests/tt_metal/tt_metal/perf_microbenchmark/dispatch/test_dispatcher.cpp @@ -11,7 +11,7 @@ #include #include #include -#include "hostdevcommon/cq_commands.hpp" +#include "tt_metal/impl/dispatch/kernels/cq_commands.hpp" #include "common.h" #include "test_common.hpp" diff --git a/tests/tt_metal/tt_metal/perf_microbenchmark/dispatch/test_prefetcher.cpp b/tests/tt_metal/tt_metal/perf_microbenchmark/dispatch/test_prefetcher.cpp index 3095f9baed6..570709251b9 100644 --- a/tests/tt_metal/tt_metal/perf_microbenchmark/dispatch/test_prefetcher.cpp +++ b/tests/tt_metal/tt_metal/perf_microbenchmark/dispatch/test_prefetcher.cpp @@ -15,7 +15,7 @@ #include #include "common.h" #include "tt_cluster.hpp" -#include "hostdevcommon/cq_commands.hpp" +#include "tt_metal/impl/dispatch/kernels/cq_commands.hpp" #include "tt_metal/impl/dispatch/kernels/packet_queue_ctrl.hpp" #include diff --git a/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_mux_demux.cpp b/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_mux_demux.cpp index 2288030e4e4..285c0d9c3bd 100644 --- a/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_mux_demux.cpp +++ b/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_mux_demux.cpp @@ -6,7 +6,7 @@ #include #include #include -#include "hostdevcommon/cq_commands.hpp" +#include "tt_metal/impl/dispatch/kernels/cq_commands.hpp" #include "tt_metal/impl/dispatch/kernels/packet_queue_ctrl.hpp" #include "test_common.hpp" #include "routing_test_common.hpp" diff --git a/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_vc_bi_tunnel_2ep.cpp b/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_vc_bi_tunnel_2ep.cpp index 87261aa8042..07de8af9fd9 100644 --- a/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_vc_bi_tunnel_2ep.cpp +++ b/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_vc_bi_tunnel_2ep.cpp @@ -5,7 +5,7 @@ #include #include #include -#include "hostdevcommon/cq_commands.hpp" +#include "tt_metal/impl/dispatch/kernels/cq_commands.hpp" #include "tt_metal/impl/dispatch/kernels/packet_queue_ctrl.hpp" #include #include "test_common.hpp" diff --git a/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_vc_bi_tunnel_4ep.cpp b/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_vc_bi_tunnel_4ep.cpp index bb1d4475d47..c8b28d44f02 100644 --- a/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_vc_bi_tunnel_4ep.cpp +++ b/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_vc_bi_tunnel_4ep.cpp @@ -5,7 +5,7 @@ #include #include #include -#include "hostdevcommon/cq_commands.hpp" +#include "tt_metal/impl/dispatch/kernels/cq_commands.hpp" #include "tt_metal/impl/dispatch/kernels/packet_queue_ctrl.hpp" #include #include "test_common.hpp" diff --git a/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_vc_loopback_tunnel.cpp b/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_vc_loopback_tunnel.cpp index b89b648c136..208c73768fe 100644 --- a/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_vc_loopback_tunnel.cpp +++ b/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_vc_loopback_tunnel.cpp @@ -5,7 +5,7 @@ #include #include #include -#include "hostdevcommon/cq_commands.hpp" +#include "tt_metal/impl/dispatch/kernels/cq_commands.hpp" #include "tt_metal/impl/dispatch/kernels/packet_queue_ctrl.hpp" #include #include "test_common.hpp" diff --git a/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_vc_mux_demux.cpp b/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_vc_mux_demux.cpp index 42ea880dd0e..7323f975894 100644 --- a/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_vc_mux_demux.cpp +++ b/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_vc_mux_demux.cpp @@ -6,7 +6,7 @@ #include #include #include -#include "hostdevcommon/cq_commands.hpp" +#include "tt_metal/impl/dispatch/kernels/cq_commands.hpp" #include "tt_metal/impl/dispatch/kernels/packet_queue_ctrl.hpp" #include "test_common.hpp" #include "routing_test_common.hpp" diff --git a/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_vc_uni_tunnel.cpp b/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_vc_uni_tunnel.cpp index d9a7cac91c9..83789dd4654 100644 --- a/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_vc_uni_tunnel.cpp +++ b/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_vc_uni_tunnel.cpp @@ -6,7 +6,7 @@ #include #include #include -#include "hostdevcommon/cq_commands.hpp" +#include "tt_metal/impl/dispatch/kernels/cq_commands.hpp" #include "tt_metal/impl/dispatch/kernels/packet_queue_ctrl.hpp" #include "test_common.hpp" #include "routing_test_common.hpp" diff --git a/tt_metal/CMakeLists.txt b/tt_metal/CMakeLists.txt index c0353daa16c..9210ac04b7c 100644 --- a/tt_metal/CMakeLists.txt +++ b/tt_metal/CMakeLists.txt @@ -30,6 +30,7 @@ target_sources( core_descriptors/blackhole_140_arch.yaml core_descriptors/grayskull_120_arch.yaml core_descriptors/wormhole_b0_80_arch.yaml + impl/dispatch/kernels/cq_commands.hpp impl/dispatch/kernels/cq_common.hpp impl/dispatch/kernels/cq_helpers.hpp impl/dispatch/kernels/packet_queue.hpp diff --git a/tt_metal/hostdevcommon/CMakeLists.txt b/tt_metal/hostdevcommon/CMakeLists.txt index ee435580293..670bac613b7 100644 --- a/tt_metal/hostdevcommon/CMakeLists.txt +++ b/tt_metal/hostdevcommon/CMakeLists.txt @@ -10,7 +10,6 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.23) BASE_DIRS api FILES api/hostdevcommon/common_values.hpp - api/hostdevcommon/cq_commands.hpp api/hostdevcommon/dprint_common.h api/hostdevcommon/kernel_structs.h api/hostdevcommon/profiler_common.h diff --git a/tt_metal/impl/dispatch/debug_tools.cpp b/tt_metal/impl/dispatch/debug_tools.cpp index bcf4779b3e0..b85610d12e8 100644 --- a/tt_metal/impl/dispatch/debug_tools.cpp +++ b/tt_metal/impl/dispatch/debug_tools.cpp @@ -5,7 +5,7 @@ #include "debug_tools.hpp" #include "tt_cluster.hpp" -#include "hostdevcommon/cq_commands.hpp" +#include "tt_metal/impl/dispatch/kernels/cq_commands.hpp" namespace internal { diff --git a/tt_metal/impl/dispatch/device_command.hpp b/tt_metal/impl/dispatch/device_command.hpp index 1593740476c..69e074fffc0 100644 --- a/tt_metal/impl/dispatch/device_command.hpp +++ b/tt_metal/impl/dispatch/device_command.hpp @@ -10,7 +10,7 @@ #include "env_lib.hpp" #include "command_queue_interface.hpp" -#include "hostdevcommon/cq_commands.hpp" +#include "tt_metal/impl/dispatch/kernels/cq_commands.hpp" #include "memcpy.hpp" #include "aligned_allocator.hpp" #include "hal.hpp" diff --git a/tt_metal/impl/dispatch/device_command_calculator.hpp b/tt_metal/impl/dispatch/device_command_calculator.hpp index c5df250eefd..bf95e7abc77 100644 --- a/tt_metal/impl/dispatch/device_command_calculator.hpp +++ b/tt_metal/impl/dispatch/device_command_calculator.hpp @@ -4,7 +4,7 @@ #include "hal.hpp" #include "tt_align.hpp" -#include "hostdevcommon/cq_commands.hpp" +#include "tt_metal/impl/dispatch/kernels/cq_commands.hpp" namespace tt::tt_metal { class DeviceCommandCalculator { diff --git a/tt_metal/impl/dispatch/host_runtime_commands.cpp b/tt_metal/impl/dispatch/host_runtime_commands.cpp index c4c45853cd0..91b07430980 100644 --- a/tt_metal/impl/dispatch/host_runtime_commands.cpp +++ b/tt_metal/impl/dispatch/host_runtime_commands.cpp @@ -30,7 +30,7 @@ #include #include "dprint_server.hpp" #include "tt_metal/impl/debug/watcher_server.hpp" -#include "hostdevcommon/cq_commands.hpp" +#include "tt_metal/impl/dispatch/kernels/cq_commands.hpp" #include "tt_metal/impl/dispatch/data_collection.hpp" #include #include diff --git a/tt_metal/hostdevcommon/api/hostdevcommon/cq_commands.hpp b/tt_metal/impl/dispatch/kernels/cq_commands.hpp similarity index 100% rename from tt_metal/hostdevcommon/api/hostdevcommon/cq_commands.hpp rename to tt_metal/impl/dispatch/kernels/cq_commands.hpp diff --git a/tt_metal/impl/dispatch/kernels/cq_dispatch.cpp b/tt_metal/impl/dispatch/kernels/cq_dispatch.cpp index dd675a3ce92..bf88eff6572 100644 --- a/tt_metal/impl/dispatch/kernels/cq_dispatch.cpp +++ b/tt_metal/impl/dispatch/kernels/cq_dispatch.cpp @@ -12,7 +12,7 @@ #include "debug/assert.h" #include "debug/dprint.h" -#include "hostdevcommon/common_values.hpp" +#include "tt_metal/impl/dispatch/kernels/cq_commands.hpp" #include "tt_metal/impl/dispatch/kernels/cq_common.hpp" #include "tt_metal/impl/dispatch/kernels/packet_queue_ctrl.hpp" diff --git a/tt_metal/impl/dispatch/util/dispatch_settings.cpp b/tt_metal/impl/dispatch/util/dispatch_settings.cpp index ee941c9b07b..91cf2e16092 100644 --- a/tt_metal/impl/dispatch/util/dispatch_settings.cpp +++ b/tt_metal/impl/dispatch/util/dispatch_settings.cpp @@ -7,7 +7,7 @@ #include #include "magic_enum/magic_enum.hpp" #include "umd/device/tt_core_coordinates.h" -#include "hostdevcommon/cq_commands.hpp" +#include "tt_metal/impl/dispatch/kernels/cq_commands.hpp" #include #include