From e15eff17927f2922c49763e988fb4186152c6d01 Mon Sep 17 00:00:00 2001
From: Ata Tuzuner <atuzuner@tenstorrent.com>
Date: Wed, 26 Feb 2025 09:59:04 -0500
Subject: [PATCH] #18250: Reverting changes from CFGSHIFTMASK PR (#18285)

### Ticket
[Link to Github
Issue](https://github.com/tenstorrent/tt-metal/issues/18250)

### Problem description
Some of the changes introduced in [this
PR](https://github.com/tenstorrent/tt-metal/pull/17723) have caused a
hang on Resnet50 BH tests.

### What's changed
Changes introduced by this PR have been reverted.

### Checklist
- [x] [All post
commit](https://github.com/tenstorrent/tt-metal/actions/runs/13524349269)
CI passes
- [x] [Blackhole Post
commit](https://github.com/tenstorrent/tt-metal/actions/runs/13524359482)
CI passes (if applicable)
---
 tt_metal/third_party/tt_llk                                 | 2 +-
 .../compute/bmm_large_block_zm_fused_bias_activation.cpp    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tt_metal/third_party/tt_llk b/tt_metal/third_party/tt_llk
index 8dde27a7c3e..3af8549802d 160000
--- a/tt_metal/third_party/tt_llk
+++ b/tt_metal/third_party/tt_llk
@@ -1 +1 @@
-Subproject commit 8dde27a7c3e1f4ea0b900cdb07509875e9d695d0
+Subproject commit 3af8549802d082f4ce9e9dd12165a7c01a00427d
diff --git a/ttnn/cpp/ttnn/operations/matmul/device/kernels/compute/bmm_large_block_zm_fused_bias_activation.cpp b/ttnn/cpp/ttnn/operations/matmul/device/kernels/compute/bmm_large_block_zm_fused_bias_activation.cpp
index f3275fe122f..73ef8d67cfb 100644
--- a/ttnn/cpp/ttnn/operations/matmul/device/kernels/compute/bmm_large_block_zm_fused_bias_activation.cpp
+++ b/ttnn/cpp/ttnn/operations/matmul/device/kernels/compute/bmm_large_block_zm_fused_bias_activation.cpp
@@ -401,6 +401,9 @@ void MAIN {
                     pack_untilize_uninit(mm_partials_cb_id);
                 }
                 if constexpr (batch > 1 || num_blocks_w_dim > 1 || num_blocks_h_dim > 1) {
+                    // reconfigure init for matmul
+                    mm_block_init_short(
+                        in0_cb_id, in1_cb_id, in1_transpose_tile, out_subblock_w, out_subblock_h, in0_block_w);
 #ifdef FUSE_BIAS
                     // reconfigure unpacker df for src A and src B
                     reconfig_data_format(mm_partials_cb_id, in1_cb_id, bias_cb_id, in0_cb_id);
@@ -408,9 +411,6 @@ void MAIN {
                     // reconfigure unpacker df for src A
                     reconfig_data_format_srca(mm_partials_cb_id, in1_cb_id);
 #endif
-                    // reconfigure init for matmul
-                    mm_block_init_short(
-                        in0_cb_id, in1_cb_id, in1_transpose_tile, out_subblock_w, out_subblock_h, in0_block_w);
                 }
             }
         }