From d79b4ae3274c8d64067e9ca1b7837002a01e0989 Mon Sep 17 00:00:00 2001 From: Pavle Janevski Date: Mon, 24 Feb 2025 07:49:39 -0500 Subject: [PATCH 1/2] Rename P150A to P150 --- device/api/umd/device/types/cluster_descriptor_types.h | 4 ++-- device/blackhole/blackhole_implementation.cpp | 2 +- device/tt_cluster_descriptor.cpp | 4 ++-- device/tt_soc_descriptor.cpp | 2 +- tests/blackhole/test_chip_info_bh.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/device/api/umd/device/types/cluster_descriptor_types.h b/device/api/umd/device/types/cluster_descriptor_types.h index 82c7ddf7..1f5e71ac 100644 --- a/device/api/umd/device/types/cluster_descriptor_types.h +++ b/device/api/umd/device/types/cluster_descriptor_types.h @@ -45,7 +45,7 @@ enum BoardType : uint32_t { N150, N300, P100, - P150A, + P150, P300, GALAXY, UNKNOWN, @@ -60,7 +60,7 @@ inline BoardType get_board_type_from_board_id(const uint64_t board_id) { } else if (upi == 0x43) { return BoardType::P100; } else if (upi == 0x40 || upi == 0x41) { - return BoardType::P150A; + return BoardType::P150; } throw std::runtime_error(fmt::format("No existing board type for board id {}", board_id)); diff --git a/device/blackhole/blackhole_implementation.cpp b/device/blackhole/blackhole_implementation.cpp index 3deb78bc..545329be 100644 --- a/device/blackhole/blackhole_implementation.cpp +++ b/device/blackhole/blackhole_implementation.cpp @@ -115,7 +115,7 @@ std::vector get_pcie_cores(const BoardType board_type, const bool is if (board_type == BoardType::UNKNOWN || board_type == BoardType::P100) { return PCIE_CORES_TYPE1; - } else if (board_type == BoardType::P150A) { + } else if (board_type == BoardType::P150) { return PCIE_CORES_TYPE2; } else if (board_type == BoardType::P300) { return is_chip_remote ? PCIE_CORES_TYPE1 : PCIE_CORES_TYPE2; diff --git a/device/tt_cluster_descriptor.cpp b/device/tt_cluster_descriptor.cpp index 9c589b29..daf34862 100644 --- a/device/tt_cluster_descriptor.cpp +++ b/device/tt_cluster_descriptor.cpp @@ -454,7 +454,7 @@ std::unique_ptr tt_ClusterDescriptor::create_mock_cluster( board_type = BoardType::N150; break; case tt::ARCH::BLACKHOLE: - board_type = BoardType::P150A; + board_type = BoardType::P150; break; default: board_type = BoardType::UNKNOWN; @@ -753,7 +753,7 @@ void tt_ClusterDescriptor::load_chips_from_connectivity_descriptor(YAML::Node &y } else if (chip_board_type.second == "p100") { board_type = BoardType::P100; } else if (chip_board_type.second == "p150A") { - board_type = BoardType::P150A; + board_type = BoardType::P150; } else if (chip_board_type.second == "p300") { board_type = BoardType::P300; } else if (chip_board_type.second == "GALAXY") { diff --git a/device/tt_soc_descriptor.cpp b/device/tt_soc_descriptor.cpp index 0ea04e65..95e7c1a1 100644 --- a/device/tt_soc_descriptor.cpp +++ b/device/tt_soc_descriptor.cpp @@ -291,7 +291,7 @@ std::string tt_SocDescriptor::get_soc_descriptor_path( if (board_type == BoardType::P100 || board_type == BoardType::UNKNOWN) { // TODO: this path needs to be changed to point to soc descriptors outside of tests directory. return tt::umd::utils::get_abs_path("tests/soc_descs/blackhole_140_arch_no_eth.yaml"); - } else if (board_type == BoardType::P150A) { + } else if (board_type == BoardType::P150) { // TODO: this path needs to be changed to point to soc descriptors outside of tests directory. return tt::umd::utils::get_abs_path("tests/soc_descs/blackhole_140_arch_type2.yaml"); } else if (board_type == BoardType::P300) { diff --git a/tests/blackhole/test_chip_info_bh.cpp b/tests/blackhole/test_chip_info_bh.cpp index fbefb512..a1fb2db8 100644 --- a/tests/blackhole/test_chip_info_bh.cpp +++ b/tests/blackhole/test_chip_info_bh.cpp @@ -14,7 +14,7 @@ TEST(BlackholeChipInfo, BasicChipInfo) { const ChipInfo chip_info = tt_device->get_chip_info(); - EXPECT_TRUE(chip_info.board_type == BoardType::P100 || chip_info.board_type == BoardType::P150A); + EXPECT_TRUE(chip_info.board_type == BoardType::P100 || chip_info.board_type == BoardType::P150); EXPECT_TRUE(chip_info.chip_uid.asic_location == 0 || chip_info.chip_uid.asic_location == 1); } From 1ac66d5a104648b7d7d8a1095942496087b52e79 Mon Sep 17 00:00:00 2001 From: pjanevski Date: Mon, 24 Feb 2025 14:41:48 +0000 Subject: [PATCH 2/2] Address comments --- device/tt_cluster_descriptor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device/tt_cluster_descriptor.cpp b/device/tt_cluster_descriptor.cpp index daf34862..3a5f1d56 100644 --- a/device/tt_cluster_descriptor.cpp +++ b/device/tt_cluster_descriptor.cpp @@ -752,7 +752,7 @@ void tt_ClusterDescriptor::load_chips_from_connectivity_descriptor(YAML::Node &y board_type = BoardType::N300; } else if (chip_board_type.second == "p100") { board_type = BoardType::P100; - } else if (chip_board_type.second == "p150A") { + } else if (chip_board_type.second == "p150A" || chip_board_type.second == "p150") { board_type = BoardType::P150; } else if (chip_board_type.second == "p300") { board_type = BoardType::P300;