From 0a098db696dae166096708aa19b9e49c603ec8a8 Mon Sep 17 00:00:00 2001 From: moven0831 Date: Wed, 6 Nov 2024 16:00:26 +0700 Subject: [PATCH] chore: update path for contants.metal --- mopro-msm/src/msm/metal_msm/shader/bigint/bigint.metal | 2 +- mopro-msm/src/msm/metal_msm/shader/bigint/constants.metal | 8 -------- .../src/msm/metal_msm/tests/bigint/bigint_add_unsafe.rs | 2 +- .../src/msm/metal_msm/tests/bigint/bigint_add_wide.rs | 4 ++-- mopro-msm/src/msm/metal_msm/tests/bigint/bigint_sub.rs | 4 ++-- mopro-msm/src/msm/metal_msm/tests/field/ff_add.rs | 2 +- mopro-msm/src/msm/metal_msm/tests/field/ff_sub.rs | 2 +- 7 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 mopro-msm/src/msm/metal_msm/shader/bigint/constants.metal diff --git a/mopro-msm/src/msm/metal_msm/shader/bigint/bigint.metal b/mopro-msm/src/msm/metal_msm/shader/bigint/bigint.metal index d0ff646..f6455f8 100644 --- a/mopro-msm/src/msm/metal_msm/shader/bigint/bigint.metal +++ b/mopro-msm/src/msm/metal_msm/shader/bigint/bigint.metal @@ -1,7 +1,7 @@ // source: https://github.com/geometryxyz/msl-secp256k1 using namespace metal; -#include "constants.metal" +#include "../constants.metal" struct BigInt { array limbs; diff --git a/mopro-msm/src/msm/metal_msm/shader/bigint/constants.metal b/mopro-msm/src/msm/metal_msm/shader/bigint/constants.metal deleted file mode 100644 index 6ece636..0000000 --- a/mopro-msm/src/msm/metal_msm/shader/bigint/constants.metal +++ /dev/null @@ -1,8 +0,0 @@ -// THIS FILE IS AUTOGENERATED BY shader.rs -#define NUM_LIMBS 20 -#define NUM_LIMBS_WIDE 21 -#define LOG_LIMB_SIZE 13 -#define TWO_POW_WORD_SIZE 8192 -#define MASK 8191 -#define N0 0 -#define NSAFE 0 diff --git a/mopro-msm/src/msm/metal_msm/tests/bigint/bigint_add_unsafe.rs b/mopro-msm/src/msm/metal_msm/tests/bigint/bigint_add_unsafe.rs index 8058002..c35ffb6 100644 --- a/mopro-msm/src/msm/metal_msm/tests/bigint/bigint_add_unsafe.rs +++ b/mopro-msm/src/msm/metal_msm/tests/bigint/bigint_add_unsafe.rs @@ -41,7 +41,7 @@ pub fn test_bigint_add_unsafe() { let encoder = command_buffer.compute_command_encoder_with_descriptor(compute_pass_descriptor); write_constants( - "../mopro-msm/src/msm/metal_msm/shader/bigint", + "../mopro-msm/src/msm/metal_msm/shader", num_limbs, log_limb_size, 0, diff --git a/mopro-msm/src/msm/metal_msm/tests/bigint/bigint_add_wide.rs b/mopro-msm/src/msm/metal_msm/tests/bigint/bigint_add_wide.rs index 0eb7f9b..fbd1f72 100644 --- a/mopro-msm/src/msm/metal_msm/tests/bigint/bigint_add_wide.rs +++ b/mopro-msm/src/msm/metal_msm/tests/bigint/bigint_add_wide.rs @@ -45,7 +45,7 @@ pub fn test_bigint_add() { let encoder = command_buffer.compute_command_encoder_with_descriptor(compute_pass_descriptor); write_constants( - "../mopro-msm/src/msm/metal_msm/shader/bigint", + "../mopro-msm/src/msm/metal_msm/shader", num_limbs, log_limb_size, 0, @@ -133,7 +133,7 @@ pub fn test_bigint_add_no_overflow() { let encoder = command_buffer.compute_command_encoder_with_descriptor(compute_pass_descriptor); write_constants( - "../mopro-msm/src/msm/metal_msm/shader/bigint", + "../mopro-msm/src/msm/metal_msm/shader", num_limbs, log_limb_size, 0, diff --git a/mopro-msm/src/msm/metal_msm/tests/bigint/bigint_sub.rs b/mopro-msm/src/msm/metal_msm/tests/bigint/bigint_sub.rs index 6341b9e..561967d 100644 --- a/mopro-msm/src/msm/metal_msm/tests/bigint/bigint_sub.rs +++ b/mopro-msm/src/msm/metal_msm/tests/bigint/bigint_sub.rs @@ -35,7 +35,7 @@ pub fn test_bigint_sub() { let encoder = command_buffer.compute_command_encoder_with_descriptor(compute_pass_descriptor); write_constants( - "../mopro-msm/src/msm/metal_msm/shader/bigint", + "../mopro-msm/src/msm/metal_msm/shader", num_limbs, log_limb_size, 0, @@ -129,7 +129,7 @@ fn test_bigint_sub_underflow() { let encoder = command_buffer.compute_command_encoder_with_descriptor(compute_pass_descriptor); write_constants( - "../mopro-msm/src/msm/metal_msm/shader/bigint", + "../mopro-msm/src/msm/metal_msm/shader", num_limbs, log_limb_size, 0, diff --git a/mopro-msm/src/msm/metal_msm/tests/field/ff_add.rs b/mopro-msm/src/msm/metal_msm/tests/field/ff_add.rs index 15cfd31..0dda4e1 100644 --- a/mopro-msm/src/msm/metal_msm/tests/field/ff_add.rs +++ b/mopro-msm/src/msm/metal_msm/tests/field/ff_add.rs @@ -60,7 +60,7 @@ pub fn test_ff_add() { let encoder = command_buffer.compute_command_encoder_with_descriptor(compute_pass_descriptor); write_constants( - "../mopro-msm/src/msm/metal_msm/shader/field", + "../mopro-msm/src/msm/metal_msm/shader", num_limbs, log_limb_size, 0, diff --git a/mopro-msm/src/msm/metal_msm/tests/field/ff_sub.rs b/mopro-msm/src/msm/metal_msm/tests/field/ff_sub.rs index 9c0877a..7b25f14 100644 --- a/mopro-msm/src/msm/metal_msm/tests/field/ff_sub.rs +++ b/mopro-msm/src/msm/metal_msm/tests/field/ff_sub.rs @@ -60,7 +60,7 @@ pub fn test_ff_sub() { let encoder = command_buffer.compute_command_encoder_with_descriptor(compute_pass_descriptor); write_constants( - "../mopro-msm/src/msm/metal_msm/shader/field", + "../mopro-msm/src/msm/metal_msm/shader", num_limbs, log_limb_size, 0,