#18250: Reverting changes from CFGSHIFTMASK PR (#18285)

### Ticket [Link to Github Issue](#18250) ### Problem description Some of the changes introduced in [this PR](#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)
tenstorrent · Feb 26, 2025 · e15eff1 · e15eff1
1 parent 1e8cb4a
commit e15eff1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tt_metal/third_party/tt_llk b/tt_metal/third_party/tt_llk
diff --git a/...tnn/operations/matmul/device/kernels/compute/bmm_large_block_zm_fused_bias_activation.cpp b/...tnn/operations/matmul/device/kernels/compute/bmm_large_block_zm_fused_bias_activation.cpp
@@ -401,16 +401,16 @@ 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);
 #else
                     // 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);
                 }
             }
         }