move to tt_device folder

tenstorrent · Nov 28, 2024 · 8101d97 · 8101d97
1 parent 03d1fc2
commit 8101d97
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 20 deletions.
diff --git a/device/CMakeLists.txt b/device/CMakeLists.txt
@@ -8,7 +8,6 @@ add_library(${PROJECT_NAME}::device ALIAS device)
 target_sources(
     device
     PRIVATE
-        tt_device.cpp
         blackhole/blackhole_coordinate_manager.cpp
         blackhole/tt_device_blackhole.cpp
         cluster.cpp
@@ -21,6 +20,7 @@ target_sources(
         simulation/tt_simulation_host.cpp
         tlb.cpp
         tt_cluster_descriptor.cpp
+        tt_device/tt_device.cpp
         tt_silicon_driver_common.cpp
         tt_soc_descriptor.cpp
         wormhole/wormhole_coordinate_manager.cpp

diff --git a/device/api/umd/device/tt_device_blackhole.h → ...md/device/tt_device/blackhole_tt_device.h b/device/api/umd/device/tt_device_blackhole.h → ...md/device/tt_device/blackhole_tt_device.h
@@ -10,7 +10,7 @@
 #include <stdexcept>
 
 #include "umd/device/tlb.h"
-#include "umd/device/tt_device.h"
+#include "umd/device/tt_device/tt_device.h"
 
 namespace tt::umd {
 

diff --git a/device/api/umd/device/tt_device_grayskull.h → ...md/device/tt_device/grayskull_tt_device.h b/device/api/umd/device/tt_device_grayskull.h → ...md/device/tt_device/grayskull_tt_device.h
@@ -9,7 +9,7 @@
 #include <array>
 
 #include "umd/device/tlb.h"
-#include "umd/device/tt_device.h"
+#include "umd/device/tt_device/tt_device.h"
 
 namespace tt::umd {
 

diff --git a/device/api/umd/device/tt_device.h → device/api/umd/device/tt_device/tt_device.h b/device/api/umd/device/tt_device.h → device/api/umd/device/tt_device/tt_device.h
diff --git a/device/api/umd/device/tt_device_wormhole.h → ...umd/device/tt_device/wormhole_tt_device.h b/device/api/umd/device/tt_device_wormhole.h → ...umd/device/tt_device/wormhole_tt_device.h
@@ -9,7 +9,7 @@
 #include <array>
 
 #include "umd/device/tlb.h"
-#include "umd/device/tt_device.h"
+#include "umd/device/tt_device/tt_device.h"
 
 namespace tt::umd {
 

diff --git a/device/blackhole/tt_device_blackhole.cpp b/device/blackhole/tt_device_blackhole.cpp
@@ -2,11 +2,10 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#include "umd/device/tt_device_blackhole.h"
-
 #include "blackhole/eth_interface.h"
 #include "blackhole/host_mem_address_map.h"
 #include "umd/device/cluster.h"
+#include "umd/device/tt_device/blackhole_tt_device.h"
 
 constexpr std::uint32_t NOC_ADDR_LOCAL_BITS = 36;   // source: noc_parameters.h, common for WH && BH
 constexpr std::uint32_t NOC_ADDR_NODE_ID_BITS = 6;  // source: noc_parameters.h, common for WH && BH

diff --git a/device/cluster.cpp b/device/cluster.cpp
@@ -42,7 +42,7 @@
 #include "umd/device/tlb.h"
 #include "umd/device/tt_arch_types.h"
 #include "umd/device/tt_cluster_descriptor.h"
-#include "umd/device/tt_device.h"
+#include "umd/device/tt_device/tt_device.h"
 #include "yaml-cpp/yaml.h"
 
 using namespace boost::interprocess;

diff --git a/device/grayskull/tt_device_grayskull.cpp b/device/grayskull/tt_device_grayskull.cpp
@@ -2,11 +2,10 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#include "umd/device/tt_device_grayskull.h"
-
 #include "grayskull/eth_interface.h"
 #include "grayskull/host_mem_address_map.h"
 #include "umd/device/cluster.h"
+#include "umd/device/tt_device/grayskull_tt_device.h"
 
 constexpr std::uint32_t NOC_ADDR_LOCAL_BITS = 32;   // source: noc_parameters.h, unique for GS
 constexpr std::uint32_t NOC_ADDR_NODE_ID_BITS = 6;  // source: noc_parameters.h, common for GS && WH && BH

diff --git a/device/pcie/pci_device.cpp b/device/pcie/pci_device.cpp
@@ -24,7 +24,7 @@
 #include "umd/device/driver_atomics.h"
 #include "umd/device/hugepage.h"
 #include "umd/device/tt_arch_types.h"
-#include "umd/device/tt_device.h"
+#include "umd/device/tt_device/tt_device.h"
 
 static const uint16_t GS_PCIE_DEVICE_ID = 0xfaca;
 static const uint16_t WH_PCIE_DEVICE_ID = 0x401e;

diff --git a/device/tt_device.cpp → device/tt_device/tt_device.cpp b/device/tt_device.cpp → device/tt_device/tt_device.cpp
@@ -2,11 +2,11 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#include "umd/device/tt_device.h"
+#include "umd/device/tt_device/tt_device.h"
 
-#include "umd/device/tt_device_blackhole.h"
-#include "umd/device/tt_device_grayskull.h"
-#include "umd/device/tt_device_wormhole.h"
+#include "umd/device/tt_device/blackhole_tt_device.h"
+#include "umd/device/tt_device/grayskull_tt_device.h"
+#include "umd/device/tt_device/wormhole_tt_device.h"
 
 namespace tt::umd {
 

diff --git a/device/wormhole/tt_device_wormhole.cpp b/device/wormhole/tt_device_wormhole.cpp
@@ -2,9 +2,8 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#include "umd/device/tt_device_wormhole.h"
-
 #include "umd/device/cluster.h"
+#include "umd/device/tt_device/wormhole_tt_device.h"
 #include "wormhole/eth_interface.h"
 #include "wormhole/host_mem_address_map.h"
 

diff --git a/tests/api/test_chip.cpp b/tests/api/test_chip.cpp
@@ -17,7 +17,7 @@
 // TODO: change to tt_cluster
 #include "umd/device/cluster.h"
 #include "umd/device/tt_cluster_descriptor.h"
-#include "umd/device/tt_device.h"
+#include "umd/device/tt_device/tt_device.h"
 
 using namespace tt::umd;
 

diff --git a/tests/blackhole/test_silicon_driver_bh.cpp b/tests/blackhole/test_silicon_driver_bh.cpp
@@ -14,7 +14,7 @@
 #include "tests/test_utils/device_test_utils.hpp"
 #include "tests/test_utils/generate_cluster_desc.hpp"
 #include "umd/device/tt_cluster_descriptor.h"
-#include "umd/device/tt_device_blackhole.h"
+#include "umd/device/tt_device/blackhole_tt_device.h"
 
 using namespace tt::umd;
 

diff --git a/tests/grayskull/test_silicon_driver.cpp b/tests/grayskull/test_silicon_driver.cpp
@@ -10,7 +10,7 @@
 #include "tests/test_utils/generate_cluster_desc.hpp"
 #include "umd/device/cluster.h"
 #include "umd/device/tt_cluster_descriptor.h"
-#include "umd/device/tt_device_wormhole.h"
+#include "umd/device/tt_device/wormhole_tt_device.h"
 #include "umd/device/tt_soc_descriptor.h"
 
 using namespace tt::umd;

diff --git a/tests/wormhole/test_silicon_driver_wh.cpp b/tests/wormhole/test_silicon_driver_wh.cpp
@@ -12,7 +12,7 @@
 #include "tests/test_utils/generate_cluster_desc.hpp"
 #include "umd/device/cluster.h"
 #include "umd/device/tt_cluster_descriptor.h"
-#include "umd/device/tt_device_wormhole.h"
+#include "umd/device/tt_device/wormhole_tt_device.h"
 
 using namespace tt::umd;