From 91b2a4533a369b8a3da8ed1eb917db5cb9e68e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bojan=20Ro=C5=A1ko?= <156314064+broskoTT@users.noreply.github.com> Date: Fri, 22 Nov 2024 15:34:52 +0100 Subject: [PATCH] UMD create_mock_cluster (#15301) ### Ticket Related to https://github.com/tenstorrent/tt-metal/issues/13948 ### Problem description Tied to UMD change https://github.com/tenstorrent/tt-umd/pull/310 ### What's changed - Rename and clear up create_for_grayskull_cluster to create_mock_cluster - For grayskull, the CEM already works, and the create_from_yaml path is successfully used already ### Checklist - [x] Post commit CI passes : https://github.com/tenstorrent/tt-metal/actions/runs/11972671759 - [x] Blackhole Post commit (if applicable): Not applicable - [x] Model regression CI testing passes (if applicable): Not applicable - [x] Device performance regression CI testing passes (if applicable): Not applicable - [x] New/Existing tests provide coverage for changes: Not applicable --- tt_metal/llrt/tt_cluster.cpp | 12 ++---------- tt_metal/third_party/umd | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/tt_metal/llrt/tt_cluster.cpp b/tt_metal/llrt/tt_cluster.cpp index 114ac7353b7..c29d8d1d5b8 100644 --- a/tt_metal/llrt/tt_cluster.cpp +++ b/tt_metal/llrt/tt_cluster.cpp @@ -128,16 +128,8 @@ void Cluster::generate_cluster_descriptor() { // Cluster descriptor yaml not available for Blackhole bring up if (this->target_type_ == TargetDevice::Simulator) { - // Cannot use tt::umd::Cluster::detect_available_device_ids because that returns physical device IDs - std::vector physical_mmio_device_ids; - std::set logical_mmio_device_ids; - physical_mmio_device_ids = tt_SimulationDevice::detect_available_device_ids(); - for (chip_id_t logical_mmio_device_id = 0; logical_mmio_device_id < physical_mmio_device_ids.size(); - logical_mmio_device_id++) { - logical_mmio_device_ids.insert(logical_mmio_device_id); - } - this->cluster_desc_ = - tt_ClusterDescriptor::create_for_grayskull_cluster(logical_mmio_device_ids, physical_mmio_device_ids); + // Passing simulator reported physical devices as logical devices. + this->cluster_desc_ = tt_ClusterDescriptor::create_mock_cluster(tt_SimulationDevice::detect_available_device_ids(), this->arch_); } else { this->cluster_desc_ = tt_ClusterDescriptor::create_from_yaml(this->cluster_desc_path_); for (const auto &chip_id : this->cluster_desc_->get_all_chips()) { diff --git a/tt_metal/third_party/umd b/tt_metal/third_party/umd index 8985708a924..e9dc0d12fc2 160000 --- a/tt_metal/third_party/umd +++ b/tt_metal/third_party/umd @@ -1 +1 @@ -Subproject commit 8985708a924ee48f202f79f31e05fc15a25a7a44 +Subproject commit e9dc0d12fc24aba9196b05e6ba142be475447694