Skip to content

Commit

Permalink
Merge branch 'main' into dev/daiki/fabric_pkt_hdr_optim
Browse files Browse the repository at this point in the history
  • Loading branch information
@daminakaTT
daminakaTT authored Feb 18, 2025
2 parents f7b8c96 + b904dcf commit 297511b
Show file tree
Hide file tree
Showing 21 changed files with 696 additions and 782 deletions.
4 changes: 3 additions & 1 deletion infra/data_collection/github/download_cicd_logs_and_artifacts.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ download_artifacts() {
local repo=$1
local workflow_run_id=$2

if gh api --paginate /repos/$repo/actions/runs/$workflow_run_id/artifacts | jq '.artifacts[] | .name' | grep -q "test_reports_"; then
echo "[info] Downloading test reports for workflow run $workflow_run_id"
api_output=$(gh api --paginate /repos/$repo/actions/runs/$workflow_run_id/artifacts | jq -r '.artifacts[] | .name')
if echo "$api_output" | grep -q "test_reports_"; then
gh run download --repo $repo -D generated/cicd/$workflow_run_id/artifacts --pattern test_reports_* $workflow_run_id
else
echo "[Warning] Test reports not found for workflow run $workflow_run_id"
Expand Down
10 changes: 7 additions & 3 deletions tests/tt_metal/distributed/test_mesh_buffer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ struct DeviceLocalShardedBufferTestConfig {
TensorMemoryLayout mem_config = TensorMemoryLayout::HEIGHT_SHARDED;
ShardOrientation shard_orientation = ShardOrientation::ROW_MAJOR;

Shape2D tensor2d_shape() {
Shape2D tensor2d_shape_in_pages() {
return {num_pages_per_core.height() * num_cores.height(), num_pages_per_core.width() * num_cores.width()};
}

uint32_t num_pages() { return tensor2d_shape().height() * tensor2d_shape().width(); }
uint32_t num_pages() { return tensor2d_shape_in_pages().height() * tensor2d_shape_in_pages().width(); }

std::array<uint32_t, 2> shard_shape() {
return {num_pages_per_core.height() * page_shape.height(), num_pages_per_core.width() * page_shape.width()};
Expand All @@ -44,7 +44,11 @@ struct DeviceLocalShardedBufferTestConfig {

ShardSpecBuffer shard_parameters() {
return ShardSpecBuffer(
this->shard_grid(), this->shard_shape(), this->shard_orientation, this->page_shape, this->tensor2d_shape());
this->shard_grid(),
this->shard_shape(),
this->shard_orientation,
this->page_shape,
this->tensor2d_shape_in_pages());
}
};

Expand Down
40 changes: 23 additions & 17 deletions ...metal/tt_metal/dispatch/dispatch_buffer/test_EnqueueWriteBuffer_and_EnqueueReadBuffer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ class BufferStressTestConfigSharded {
this->num_cores = cores;
}

std::array<uint32_t, 2> tensor2d_shape() {
std::array<uint32_t, 2> tensor2d_shape_in_pages() {
return {num_pages_per_core[0] * num_cores[0], num_pages_per_core[1] * num_cores[1]};
}

uint32_t num_pages() { return tensor2d_shape()[0] * tensor2d_shape()[1]; }
uint32_t num_pages() { return tensor2d_shape_in_pages()[0] * tensor2d_shape_in_pages()[1]; }

std::array<uint32_t, 2> shard_shape() {
return {num_pages_per_core[0] * page_shape[0], num_pages_per_core[1] * page_shape[1]};
Expand All @@ -73,7 +73,11 @@ class BufferStressTestConfigSharded {

ShardSpecBuffer shard_parameters() {
return ShardSpecBuffer(
this->shard_grid(), this->shard_shape(), this->shard_orientation, this->page_shape, this->tensor2d_shape());
this->shard_grid(),
this->shard_shape(),
this->shard_orientation,
this->page_shape,
this->tensor2d_shape_in_pages());
}

uint32_t page_size() { return page_shape[0] * page_shape[1] * element_size; }
Expand All @@ -87,7 +91,7 @@ struct ShardedSubBufferStressTestConfig {
CoreRangeSet cores;
Shape2D shard_shape;
Shape2D page_shape;
Shape2D tensor2d_shape;
Shape2D tensor2d_shape_in_pages;
TensorMemoryLayout layout;
ShardOrientation orientation;
};
Expand Down Expand Up @@ -133,11 +137,12 @@ vector<ShardedSubBufferStressTestConfig> generate_sharded_sub_buffer_test_config
uint32_t page_shape_width_div_factor = 1;
while (page_shape_width_div_factor <= num_pages_per_shard) {
if (page_shape_width_div_factor * page_shape_height_div_factor == num_pages_per_shard) {
uint32_t tensor2d_shape_height = page_shape_height_div_factor;
while (tensor2d_shape_height <= num_pages) {
uint32_t tensor2d_shape_width = page_shape_width_div_factor;
while (tensor2d_shape_width <= num_pages) {
if (tensor2d_shape_height * tensor2d_shape_width == num_pages) {
uint32_t tensor2d_shape_in_pages_height = page_shape_height_div_factor;
while (tensor2d_shape_in_pages_height <= num_pages) {
uint32_t tensor2d_shape_in_pages_width = page_shape_width_div_factor;
while (tensor2d_shape_in_pages_width <= num_pages) {
if (tensor2d_shape_in_pages_height * tensor2d_shape_in_pages_width ==
num_pages) {
for (TensorMemoryLayout layout :
{TensorMemoryLayout::HEIGHT_SHARDED,
TensorMemoryLayout::BLOCK_SHARDED,
Expand All @@ -157,17 +162,18 @@ vector<ShardedSubBufferStressTestConfig> generate_sharded_sub_buffer_test_config
page_shape_height_div_factor,
tt::constants::TILE_WIDTH /
page_shape_width_div_factor},
.tensor2d_shape =
{tensor2d_shape_height, tensor2d_shape_width},
.tensor2d_shape_in_pages =
{tensor2d_shape_in_pages_height,
tensor2d_shape_in_pages_width},
.layout = layout,
.orientation = orientation};
configs.push_back(config);
}
}
}
tensor2d_shape_width += page_shape_width_div_factor;
tensor2d_shape_in_pages_width += page_shape_width_div_factor;
}
tensor2d_shape_height += page_shape_height_div_factor;
tensor2d_shape_in_pages_height += page_shape_height_div_factor;
}
}
page_shape_width_div_factor += 1;
Expand Down Expand Up @@ -1018,7 +1024,7 @@ TEST_F(CommandQueueSingleCardBufferFixture, TestReadWriteShardedSubBufferForL1)
tt::log_debug(
tt::LogTest,
"Device: {} buffer_size: {} page_size: {} region_offset: {} region_size: {} shard_shape: [{}, {}] "
"page_shape: [{}, {}] tensor2d_shape: [{}, {}] layout: {} orientation: {} cores: {}",
"page_shape: [{}, {}] tensor2d_shape_in_pages: [{}, {}] layout: {} orientation: {} cores: {}",
device->id(),
config.buffer_size,
config.page_size,
Expand All @@ -1028,8 +1034,8 @@ TEST_F(CommandQueueSingleCardBufferFixture, TestReadWriteShardedSubBufferForL1)
config.shard_shape.width(),
config.page_shape.height(),
config.page_shape.width(),
config.tensor2d_shape.height(),
config.tensor2d_shape.width(),
config.tensor2d_shape_in_pages.height(),
config.tensor2d_shape_in_pages.width(),
magic_enum::enum_name(config.layout).data(),
magic_enum::enum_name(config.orientation).data(),
config.cores.str());
Expand All @@ -1039,7 +1045,7 @@ TEST_F(CommandQueueSingleCardBufferFixture, TestReadWriteShardedSubBufferForL1)
{tt::constants::TILE_HEIGHT, tt::constants::TILE_WIDTH},
config.orientation,
config.page_shape,
config.tensor2d_shape);
config.tensor2d_shape_in_pages);
auto buffer =
Buffer::create(device, config.buffer_size, config.page_size, BufferType::L1, config.layout, shard_spec);

Expand Down
Loading

0 comments on commit 297511b

Please sign in to comment.