#15122: Fix add int32 LLK

tenstorrent · Dec 10, 2024 · ae9b42d · ae9b42d
1 parent b32ae29
commit ae9b42d
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 17 deletions.
diff --git a/tt_metal/hw/ckernels/blackhole/metal/llk_api/llk_sfpu/ckernel_sfpu_add_int32.h b/tt_metal/hw/ckernels/blackhole/metal/llk_api/llk_sfpu/ckernel_sfpu_add_int32.h
@@ -13,9 +13,9 @@ using namespace sfpi;
 namespace ckernel {
 namespace sfpu {
 
-template <bool APPROXIMATION_MODE, int ITERATIONS = 8>
+template <bool APPROXIMATION_MODE, bool SIGN_MAGNITUDE_FORMAT, int ITERATIONS = 8>
 inline void calculate_add_int32(const uint dst_offset) {
-    _add_int32_<APPROXIMATION_MODE, ITERATIONS>(dst_offset);
+    _add_int32_<APPROXIMATION_MODE, SIGN_MAGNITUDE_FORMAT, ITERATIONS>(dst_offset);
 }
 
 }  // namespace sfpu

diff --git a/...tal/hw/ckernels/blackhole/metal/llk_api/llk_sfpu/llk_math_eltwise_binary_sfpu_add_int32.h b/...tal/hw/ckernels/blackhole/metal/llk_api/llk_sfpu/llk_math_eltwise_binary_sfpu_add_int32.h
@@ -17,11 +17,11 @@ inline void llk_math_eltwise_binary_sfpu_add_int32_init() {
     llk_math_eltwise_binary_sfpu_init<SfpuType::unused, APPROXIMATE>();
 }
 
-template <bool APPROXIMATE>
+template <bool APPROXIMATE, bool SIGN_MAGNITUDE_FORMAT>
 inline void llk_math_eltwise_binary_sfpu_add_int32(
     uint dst_index0, uint32_t dst_index1, int vector_mode = VectorMode::RC) {
     llk_math_eltwise_binary_sfpu_params<APPROXIMATE>(
-        ckernel::sfpu::calculate_add_int32<APPROXIMATE>, dst_index0, dst_index1, vector_mode);
+        ckernel::sfpu::calculate_add_int32<APPROXIMATE, SIGN_MAGNITUDE_FORMAT>, dst_index0, dst_index1, vector_mode);
 }
 
 }  // namespace ckernel
diff --git a/tt_metal/hw/ckernels/wormhole_b0/metal/llk_api/llk_sfpu/ckernel_sfpu_add_int32.h b/tt_metal/hw/ckernels/wormhole_b0/metal/llk_api/llk_sfpu/ckernel_sfpu_add_int32.h
@@ -13,9 +13,9 @@ using namespace sfpi;
 namespace ckernel {
 namespace sfpu {
 
-template <bool APPROXIMATION_MODE, int ITERATIONS = 8>
+template <bool APPROXIMATION_MODE, bool SIGN_MAGNITUDE_FORMAT, int ITERATIONS = 8>
 inline void calculate_add_int32(const uint dst_offset) {
-    _add_int32_<APPROXIMATION_MODE, ITERATIONS>(dst_offset);
+    _add_int32_<APPROXIMATION_MODE, SIGN_MAGNITUDE_FORMAT, ITERATIONS>(dst_offset);
 }
 
 }  // namespace sfpu

diff --git a/...l/hw/ckernels/wormhole_b0/metal/llk_api/llk_sfpu/llk_math_eltwise_binary_sfpu_add_int32.h b/...l/hw/ckernels/wormhole_b0/metal/llk_api/llk_sfpu/llk_math_eltwise_binary_sfpu_add_int32.h
@@ -17,11 +17,11 @@ inline void llk_math_eltwise_binary_sfpu_add_int32_init() {
     llk_math_eltwise_binary_sfpu_init<SfpuType::unused, APPROXIMATE>();
 }
 
-template <bool APPROXIMATE>
+template <bool APPROXIMATE, bool SIGN_MAGNITUDE_FORMAT>
 inline void llk_math_eltwise_binary_sfpu_add_int32(
     uint dst_index0, uint32_t dst_index1, int vector_mode = VectorMode::RC) {
     llk_math_eltwise_binary_sfpu_params<APPROXIMATE>(
-        ckernel::sfpu::calculate_add_int32<APPROXIMATE>, dst_index0, dst_index1, vector_mode);
+        ckernel::sfpu::calculate_add_int32<APPROXIMATE, SIGN_MAGNITUDE_FORMAT>, dst_index0, dst_index1, vector_mode);
 }
 
 }  // namespace ckernel
diff --git a/tt_metal/include/compute_kernel_api/add_int32_sfpu.h b/tt_metal/include/compute_kernel_api/add_int32_sfpu.h
@@ -24,15 +24,18 @@ namespace ckernel {
  *
  * Return value: None
  *
- * | Argument       | Description                                                           | Type     | Valid Range |
- * Required |
- * |----------------|-----------------------------------------------------------------------|----------|-------------------------------------------------------|----------|
- * | idst0          | The index of the tile in DST register buffer to use as first operand  | uint32_t | Must be less
- * than the size of the DST register buffer | True     | | idst1          | The index of the tile in DST register buffer
- * to use as second operand | uint32_t | Must be less than the size of the DST register buffer | True     |
+ * | Argument              | Description                                                                 | Type     |
+ * Valid Range                                           | Required |
+ * |-----------------------|-----------------------------------------------------------------------------|----------|-------------------------------------------------------|----------|
+ * | idst0                 | The index of the tile in DST register buffer to use as first operand        | uint32_t |
+ * Must be less than the size of the DST register buffer | True     | | idst1                 | The index of the tile in
+ * DST register buffer to use as second operand       | uint32_t | Must be less than the size of the DST register buffer
+ * | True     | | sign_magnitude_format | Whether the Int32 values are in sign-magnitude format (not 2's complement)  |
+ * bool     |                                                       | False    |
  */
+template <bool sign_magnitude_format = false>
 ALWI void add_int32_tile(uint32_t idst0, uint32_t idst1) {
-    MATH((llk_math_eltwise_binary_sfpu_add_int32<APPROX>(idst0, idst1)));
+    MATH((llk_math_eltwise_binary_sfpu_add_int32<APPROX, sign_magnitude_format>(idst0, idst1)));
 }
 
 /**

diff --git a/tt_metal/third_party/tt_llk_blackhole b/tt_metal/third_party/tt_llk_blackhole
diff --git a/tt_metal/third_party/tt_llk_wormhole_b0 b/tt_metal/third_party/tt_llk_wormhole_b0