#8453: Update UMD version and t3k device indices

#0: add submodule update to build artifact

#0: Update umd device cmake to include newly added files

.github/workflows/build-artifact.yaml

@@ -21,6 +21,9 @@ jobs:
       - name: Set up dynamic env vars for build
         run: |
           echo "TT_METAL_HOME=$(pwd)" >> $GITHUB_ENV
+      - name: Update submodules
+        run: |
+          git submodule update --init --recursive
       - uses: ./.github/actions/install-python-deps
       - name: Build tt-metal and libs
         run: |

.gitmodules

@@ -15,7 +15,7 @@
 	url = https://github.com/tenstorrent-metal/tracy.git
 [submodule "tt_metal/third_party/umd"]
 	path = tt_metal/third_party/umd
-	url = https://github.com/tenstorrent-metal/umd.git
+	url = https://github.com/tenstorrent/tt-umd.git
 [submodule "tt_metal/third_party/tt_llk_grayskull"]
 	path = tt_metal/third_party/tt_llk_grayskull
 	url = https://github.com/tenstorrent/tt-llk-gs.git

cmake/umd_device.cmake

@@ -62,22 +62,21 @@ endif()
 
 # If in production build for python packaging, need to use objs built by umd_device
 if(NOT BUILD_SHARED_LIBS)
-    if($ENV{ARCH_NAME} STREQUAL "wormhole_b0")
-        set(UMD_OBJS ${CMAKE_BINARY_DIR}/obj/umd/device/wormhole/impl_device.o)
-    else()
-        set(UMD_OBJS ${CMAKE_BINARY_DIR}/obj/umd/device/$ENV{ARCH_NAME}/impl_device.o)
-    endif()
     set(UMD_OBJS
         ${UMD_OBJS}
+        ${CMAKE_BINARY_DIR}/obj/umd/device/architecture_implementation.o
+        ${CMAKE_BINARY_DIR}/obj/umd/device/blackhole_implementation.o
         ${CMAKE_BINARY_DIR}/obj/umd/device/cpuset_lib.o
+        ${CMAKE_BINARY_DIR}/obj/umd/device/grayskull_implementation.o
         ${CMAKE_BINARY_DIR}/obj/umd/device/tt_cluster_descriptor.o
         ${CMAKE_BINARY_DIR}/obj/umd/device/tt_device.o
         ${CMAKE_BINARY_DIR}/obj/umd/device/tt_emulation_stub.o
         ${CMAKE_BINARY_DIR}/obj/umd/device/tt_silicon_driver_common.o
         ${CMAKE_BINARY_DIR}/obj/umd/device/tt_silicon_driver.o
         ${CMAKE_BINARY_DIR}/obj/umd/device/tt_soc_descriptor.o
         ${CMAKE_BINARY_DIR}/obj/umd/device/tt_versim_stub.o
-        ${CMAKE_BINARY_DIR}/obj/umd/device/util.o
+        ${CMAKE_BINARY_DIR}/obj/umd/device/tlb.o
+        ${CMAKE_BINARY_DIR}/obj/umd/device/wormhole_implementation.o
     )
     set(UMD_STATIC_LIB ${CMAKE_BINARY_DIR}/lib/libdevice.a)
 

conftest.py

@@ -375,7 +375,7 @@ def t3k_device_mesh(request, silicon_arch_name, silicon_arch_wormhole_b0):
 
     if ttnn.get_num_devices() < 8:
         pytest.skip()
-    device_ids = [0, 7, 6, 1, 2, 5, 4, 3]
+    device_ids = [0, 4, 5, 1, 2, 6, 7, 3]
     try:
         num_devices_requested = min(request.param, len(device_ids))
     except (ValueError, AttributeError):

models/utility_functions.py

@@ -1021,7 +1021,7 @@ def get_devices_for_t3000(all_devices, num_devices):
         return all_devices[:num_devices]
     elif num_devices == 8:
         # TODO: Generalize this for different arch
-        hamiltonian_ring_indices = [0, 7, 6, 1, 2, 5, 4, 3]
+        hamiltonian_ring_indices = [0, 4, 5, 1, 2, 6, 7, 3]
         return [all_devices[i] for i in hamiltonian_ring_indices]
     else:
         raise NotImplementedError("Only supports 1, 2, 3, 4, and 8 chip configurations!")

tt_metal/impl/device/device.cpp

@@ -11,7 +11,6 @@
 #include "tt_metal/detail/tt_metal.hpp"
 #include "impl/debug/dprint_server.hpp"
 #include "impl/debug/watcher_server.hpp"
-#include "tt_metal/third_party/umd/device/util.hpp"
 #include "common/env_lib.hpp"
 #include "tt_metal/impl/dispatch/kernels/packet_queue_ctrl.hpp"
 #include "common/utils.hpp"

tt_metal/llrt/tt_cluster.cpp

@@ -108,7 +108,13 @@ std::filesystem::path get_cluster_desc_yaml() {
 
     // Generates the cluster descriptor in the CWD
 
-    const fs::path eth_fpath = tt_metal_dir / "third_party/umd/device/bin/silicon/wormhole/create-ethernet-map";
+#if defined(__x86_64__) || defined(__i386__)
+    const fs::path eth_fpath = tt_metal_dir / "third_party/umd/device/bin/silicon/x86/create-ethernet-map";
+#elif defined(__aarch64__) || defined(_M_ARM64)
+    const fs::path eth_fpath = tt_metal_dir / "third_party/umd/device/bin/silicon/aarch64/create-ethernet-map";
+#else
+#error "Unsupported host architecture"
+#endif
     std::string cmd = eth_fpath.string() + " " + cluster_desc_path.string();
     int val = system(cmd.c_str());
     if(val != 0) throw std::runtime_error("Cluster Generation with create-ethernet-map Failed!");