#9036: GS & BH --> Combine llk param files using variable args

tenstorrent · Jun 4, 2024 · 4b3674c · 4b3674c
1 parent d280a3f
commit 4b3674c
Show file tree

Hide file tree

Showing 84 changed files with 613 additions and 945 deletions.
diff --git a/tt_metal/hw/ckernels/blackhole/metal/llk_api/llk_sfpu/llk_math_eltwise_unary_sfpu_0_param.h b/tt_metal/hw/ckernels/blackhole/metal/llk_api/llk_sfpu/llk_math_eltwise_unary_sfpu_0_param.h
diff --git a/tt_metal/hw/ckernels/blackhole/metal/llk_api/llk_sfpu/llk_math_eltwise_unary_sfpu_2_param.h b/tt_metal/hw/ckernels/blackhole/metal/llk_api/llk_sfpu/llk_math_eltwise_unary_sfpu_2_param.h
diff --git a/tt_metal/hw/ckernels/blackhole/metal/llk_api/llk_sfpu/llk_math_eltwise_unary_sfpu_3_param.h b/tt_metal/hw/ckernels/blackhole/metal/llk_api/llk_sfpu/llk_math_eltwise_unary_sfpu_3_param.h
diff --git a/tt_metal/hw/ckernels/blackhole/metal/llk_api/llk_sfpu/llk_math_eltwise_unary_sfpu_5_param.h b/tt_metal/hw/ckernels/blackhole/metal/llk_api/llk_sfpu/llk_math_eltwise_unary_sfpu_5_param.h
diff --git a/tt_metal/hw/ckernels/blackhole/metal/llk_api/llk_sfpu/llk_math_eltwise_unary_sfpu_abs.h b/tt_metal/hw/ckernels/blackhole/metal/llk_api/llk_sfpu/llk_math_eltwise_unary_sfpu_abs.h
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "ckernel_sfpu_abs.h"
-#include "llk_math_eltwise_unary_sfpu_0_param.h"
 #include "llk_math_eltwise_unary_sfpu_init.h"
+#include "llk_math_eltwise_unary_sfpu_params.h"
+#include "ckernel_sfpu_abs.h"
 
 namespace ckernel {
 
@@ -19,8 +19,10 @@ inline void llk_math_eltwise_unary_sfpu_abs_init() {
 
 template <bool APPROXIMATE>
 inline void llk_math_eltwise_unary_sfpu_abs(uint dst_index, int vector_mode = (int)VectorMode::RC) {
-    llk_math_eltwise_unary_sfpu_0_param<APPROXIMATE>(
-        ckernel::sfpu::calculate_abs<APPROXIMATE>, ckernel::sfpu::calculate_abs<APPROXIMATE>, dst_index, vector_mode);
+    llk_math_eltwise_unary_sfpu_params<APPROXIMATE>(
+        ckernel::sfpu::calculate_abs<APPROXIMATE>,
+        dst_index,
+        vector_mode);
 }
 
-}  // namespace ckernel
+}
diff --git a/tt_metal/hw/ckernels/blackhole/metal/llk_api/llk_sfpu/llk_math_eltwise_unary_sfpu_add1.h b/tt_metal/hw/ckernels/blackhole/metal/llk_api/llk_sfpu/llk_math_eltwise_unary_sfpu_add1.h
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "ckernel_sfpu_add1.h"
-#include "llk_math_eltwise_unary_sfpu_0_param.h"
 #include "llk_math_eltwise_unary_sfpu_init.h"
+#include "llk_math_eltwise_unary_sfpu_params.h"
+#include "ckernel_sfpu_add1.h"
 
 namespace ckernel {
 
@@ -19,8 +19,10 @@ inline void llk_math_eltwise_unary_sfpu_add1_init() {
 
 template <bool APPROXIMATE>
 inline void llk_math_eltwise_unary_sfpu_add1(uint dst_index, int vector_mode = (int)VectorMode::RC) {
-    llk_math_eltwise_unary_sfpu_0_param<APPROXIMATE>(
-        ckernel::sfpu::calculate_add1<APPROXIMATE>, ckernel::sfpu::calculate_add1<APPROXIMATE>, dst_index, vector_mode);
+    llk_math_eltwise_unary_sfpu_params<APPROXIMATE>(
+        ckernel::sfpu::calculate_add1<APPROXIMATE>,
+        dst_index,
+        vector_mode);
 }
 
-}  // namespace ckernel
+}
diff --git a/...ckernels/blackhole/metal/llk_api/llk_sfpu/llk_math_eltwise_unary_sfpu_binop_with_scalar.h b/...ckernels/blackhole/metal/llk_api/llk_sfpu/llk_math_eltwise_unary_sfpu_binop_with_scalar.h
@@ -5,18 +5,16 @@
 #pragma once
 
 #include "ckernel_sfpu_binop_with_unary.h"
-#include "llk_math_eltwise_unary_sfpu_1_param.h"
+#include "llk_math_eltwise_unary_sfpu_params.h"
 #include "llk_math_eltwise_unary_sfpu_init.h"
 
 namespace ckernel {
 
 // New LLK SFPU APIs
 
 template <bool APPROXIMATE, int binop_mode>
-inline void llk_math_eltwise_unary_sfpu_binop_with_scalar(
-    uint dst_index, uint32_t param1, int vector_mode = VectorMode::RC) {
-    llk_math_eltwise_unary_sfpu_1_param<APPROXIMATE>(
-        ckernel::sfpu::calculate_binop_with_scalar<APPROXIMATE, binop_mode, 8>,
+inline void llk_math_eltwise_unary_sfpu_binop_with_scalar(uint dst_index, uint32_t param1, int vector_mode = VectorMode::RC) {
+    llk_math_eltwise_unary_sfpu_params<APPROXIMATE>(
         ckernel::sfpu::calculate_binop_with_scalar<APPROXIMATE, binop_mode, 8>,
         dst_index,
         vector_mode,

diff --git a/...kernels/blackhole/metal/llk_api/llk_sfpu/llk_math_eltwise_unary_sfpu_cast_fp32_to_fp16a.h b/...kernels/blackhole/metal/llk_api/llk_sfpu/llk_math_eltwise_unary_sfpu_cast_fp32_to_fp16a.h
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "ckernel_sfpu_cast_fp32_to_fp16a.h"
-#include "llk_math_eltwise_unary_sfpu_0_param.h"
 #include "llk_math_eltwise_unary_sfpu_init.h"
+#include "llk_math_eltwise_unary_sfpu_params.h"
+#include "ckernel_sfpu_cast_fp32_to_fp16a.h"
 
 namespace ckernel {
 
@@ -19,11 +19,10 @@ inline void llk_math_eltwise_unary_sfpu_cast_fp32_to_fp16a_init() {
 
 template <bool APPROXIMATE>
 inline void llk_math_eltwise_unary_sfpu_cast_fp32_to_fp16a(uint dst_index, int vector_mode = (int)VectorMode::RC) {
-    llk_math_eltwise_unary_sfpu_0_param<APPROXIMATE>(
-        ckernel::sfpu::calculate_cast_fp32_to_fp16a<APPROXIMATE>,
+    llk_math_eltwise_unary_sfpu_params<APPROXIMATE>(
         ckernel::sfpu::calculate_cast_fp32_to_fp16a<APPROXIMATE>,
         dst_index,
         vector_mode);
 }
 
-}  // namespace ckernel
+}
diff --git a/tt_metal/hw/ckernels/blackhole/metal/llk_api/llk_sfpu/llk_math_eltwise_unary_sfpu_clamp.h b/tt_metal/hw/ckernels/blackhole/metal/llk_api/llk_sfpu/llk_math_eltwise_unary_sfpu_clamp.h
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "ckernel_sfpu_clamp.h"
-#include "llk_math_eltwise_unary_sfpu_3_param.h"
 #include "llk_math_eltwise_unary_sfpu_init.h"
+#include "llk_math_eltwise_unary_sfpu_params.h"
+#include "ckernel_sfpu_clamp.h"
 
 namespace ckernel {
 
@@ -18,10 +18,8 @@ inline void llk_math_eltwise_unary_sfpu_clamp_init() {
 }
 
 template <bool APPROXIMATE>
-inline void llk_math_eltwise_unary_sfpu_clamp(
-    uint dst_index, uint param0, uint param1, uint param2, int vector_mode = (int)VectorMode::RC) {
-    llk_math_eltwise_unary_sfpu_3_param<APPROXIMATE>(
-        ckernel::sfpu::calculate_clamp<APPROXIMATE>,
+inline void llk_math_eltwise_unary_sfpu_clamp(uint dst_index, uint param0, uint param1, uint param2, int vector_mode = (int)VectorMode::RC) {
+    llk_math_eltwise_unary_sfpu_params<APPROXIMATE>(
         ckernel::sfpu::calculate_clamp<APPROXIMATE>,
         dst_index,
         vector_mode,
@@ -30,4 +28,4 @@ inline void llk_math_eltwise_unary_sfpu_clamp(
         param2);
 }
 
-}  // namespace ckernel
+}