feat: added tan component and tests

TaceoLabs · Jan 9, 2024 · 640bc38 · 640bc38
1 parent ff582cd
commit 640bc38
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 17 deletions.
diff --git a/libs/blueprint b/libs/blueprint
diff --git a/mlir-assigner/include/mlir-assigner/components/fixedpoint/trigonometric.hpp b/mlir-assigner/include/mlir-assigner/components/fixedpoint/trigonometric.hpp
@@ -59,6 +59,28 @@ namespace nil {
                                      1, 1);
             fill_trace(component, input, operation, frame, bp, assignment, start_row);
         }
+
+        template<typename BlueprintFieldType, typename ArithmetizationParams>
+        void handle_tan(
+            mlir::KrnlTanOp &operation,
+            stack_frame<crypto3::zk::snark::plonk_variable<typename BlueprintFieldType::value_type>> &frame,
+            circuit_proxy<crypto3::zk::snark::plonk_constraint_system<BlueprintFieldType, ArithmetizationParams>> &bp,
+            assignment_proxy<crypto3::zk::snark::plonk_constraint_system<BlueprintFieldType, ArithmetizationParams>>
+                &assignment,
+            std::uint32_t start_row) {
+            using component_type = components::fix_tan<
+                crypto3::zk::snark::plonk_constraint_system<BlueprintFieldType, ArithmetizationParams>,
+                BlueprintFieldType, basic_non_native_policy<BlueprintFieldType>>;
+
+            auto input = PREPARE_UNARY_INPUT(mlir::KrnlTanOp);
+            using manifest_reader = detail::ManifestReader<component_type, ArithmetizationParams, 1, 1>;
+            const auto p = detail::PolicyManager::get_parameters(
+                detail::ManifestReader<component_type, ArithmetizationParams, 1, 1>::get_witness(0, 1, 1));
+
+            component_type component(p.witness, manifest_reader::get_constants(), manifest_reader::get_public_inputs(),
+                                     1, 1);
+            fill_trace(component, input, operation, frame, bp, assignment, start_row);
+        }
         template<typename BlueprintFieldType, typename ArithmetizationParams>
         void handle_tanh(
             mlir::math::TanhOp &operation,

diff --git a/mlir-assigner/include/mlir-assigner/components/handle_component.hpp b/mlir-assigner/include/mlir-assigner/components/handle_component.hpp
@@ -31,6 +31,7 @@
 #include <nil/blueprint/components/algebra/fixedpoint/plonk/to_fixedpoint.hpp>
 #include <nil/blueprint/components/algebra/fixedpoint/plonk/sin.hpp>
 #include <nil/blueprint/components/algebra/fixedpoint/plonk/cos.hpp>
+#include <nil/blueprint/components/algebra/fixedpoint/plonk/tan.hpp>
 #include <nil/blueprint/components/algebra/fixedpoint/plonk/tanh.hpp>
 #include <nil/blueprint/components/algebra/fixedpoint/plonk/argmin.hpp>
 #include <nil/blueprint/components/algebra/fixedpoint/plonk/argmax.hpp>

diff --git a/mlir-assigner/include/mlir-assigner/parser/evaluator.hpp b/mlir-assigner/include/mlir-assigner/parser/evaluator.hpp
@@ -669,6 +669,7 @@ namespace zk_ml_toolchain {
         void handleKrnlOpeeration(Operation *op) {
             // Print the operation itself and some of its properties
             // Print the operation attributes
+            std::uint32_t start_row = assignmnt.allocated_rows();
             std::string opName = op->getName().getIdentifier().str();
             logger.debug("visiting %s", opName);
             if (KrnlGlobalOp operation = llvm::dyn_cast<KrnlGlobalOp>(op)) {
@@ -807,7 +808,7 @@ namespace zk_ml_toolchain {
             } else if (KrnlAsinhOp operation = llvm::dyn_cast<KrnlAsinhOp>(op)) {
                 UNREACHABLE(std::string("TODO KrnlSinh: link to bluebrint component"));
             } else if (KrnlTanOp operation = llvm::dyn_cast<KrnlTanOp>(op)) {
-                UNREACHABLE("TODO: component for tan not ready");
+                handle_tan(operation, frames.back(), bp, assignmnt, start_row);
             } else if (KrnlAtanOp operation = llvm::dyn_cast<KrnlAtanOp>(op)) {
                 UNREACHABLE("TODO: component for atan not ready");
             } else if (KrnlAtanhOp operation = llvm::dyn_cast<KrnlAtanhOp>(op)) {

diff --git a/mlir-assigner/tests/Ops/NeedsBlueprintComponent/Tan/TanSimple.mlir b/mlir-assigner/tests/Ops/NeedsBlueprintComponent/Tan/TanSimple.mlir
diff --git a/...eedsBlueprintComponent/Tan/TanSimple.json → ...ssigner/tests/Ops/Onnx/Tan/TanSimple.json b/...eedsBlueprintComponent/Tan/TanSimple.json → ...ssigner/tests/Ops/Onnx/Tan/TanSimple.json
diff --git a/...eedsBlueprintComponent/Tan/TanSimple.onnx → ...ssigner/tests/Ops/Onnx/Tan/TanSimple.onnx b/...eedsBlueprintComponent/Tan/TanSimple.onnx → ...ssigner/tests/Ops/Onnx/Tan/TanSimple.onnx
diff --git a/...NeedsBlueprintComponent/Tan/TanSimple.res → ...assigner/tests/Ops/Onnx/Tan/TanSimple.res b/...NeedsBlueprintComponent/Tan/TanSimple.res → ...assigner/tests/Ops/Onnx/Tan/TanSimple.res
@@ -1,3 +1,3 @@
 Result:
 memref<1x10xf32>[0.21356424689292908, 0.43476253747940063, 0.9388334155082703, 1.4897156953811646, 0.5585304498672485, 0.6736464500427246, 1.0364264249801636, 0.7319538593292236, 0.01287913043051958, 0.3991353213787079]
-ADD THE ROWS HERE
+20
diff --git a/mlir-assigner/tests/Ops/Onnx/zkml-onnx-compiler b/mlir-assigner/tests/Ops/Onnx/zkml-onnx-compiler
+3 −1		CMakeLists.txt
+2 −3		include/nil/blueprint/components/algebra/fixedpoint/plonk/cos.hpp
+5 −4		include/nil/blueprint/components/algebra/fixedpoint/plonk/div.hpp
+11 −4		include/nil/blueprint/components/algebra/fixedpoint/plonk/dot_rescale_1_gate.hpp
+14 −7		include/nil/blueprint/components/algebra/fixedpoint/plonk/dot_rescale_2_gates.hpp
+2 −3		include/nil/blueprint/components/algebra/fixedpoint/plonk/sin.hpp
+986 −0		include/nil/blueprint/components/algebra/fixedpoint/plonk/tan.hpp
+15 −0		include/nil/blueprint/components/algebra/fixedpoint/plonk/tester.hpp
+76 −74		include/nil/blueprint/components/algebra/fixedpoint/type.hpp
+57 −0		test/algebra/fixedpoint/plonk/tester.cpp
+110 −3		test/algebra/fixedpoint/plonk/trigonometric.cpp
+3 −7		test/test_plonk_component.hpp