Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add ARM and noASM implementation for Fr #285

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add ARM and noASM implementation for Fr #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ca1f4c
Add ARM and no-ASM implementation for Fr
Aug 5, 2024
1756e10
Fix progname in makefile
Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions code_producers/src/c_elements/bls12381/fr.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,14 @@
global Fr_rawSub
global Fr_rawNeg
global Fr_rawMMul
global Fr_rawMMul1
global Fr_rawMSquare
global Fr_rawToMontgomery
global Fr_rawFromMontgomery
global Fr_rawIsEq
global Fr_rawIsZero
global Fr_rawShr
global Fr_rawShl
global Fr_rawq
global Fr_rawR3

Expand Down Expand Up @@ -350,7 +353,11 @@ Fr_longNeg:
Fr_longErr:
push rdi
mov rdi, 0
%ifdef PIC
call Fr_fail WRT ..plt
%else
call Fr_fail
%endif
pop rdi
mov rsp, rbp
pop rdx
Expand Down Expand Up @@ -6542,6 +6549,7 @@ tmp_107:
; Modified Registers:
; r8, r9, 10, r11, rax, rcx
;;;;;;;;;;;;;;;;;;;;;;
Fr_rawShr:
rawShr:
cmp rdx, 0
je Fr_rawCopy
Expand Down Expand Up @@ -6742,6 +6750,7 @@ rawShr_endif3_3:
; Modified Registers:
; r8, r9, 10, r11, rax, rcx
;;;;;;;;;;;;;;;;;;;;;;
Fr_rawShl:
rawShl:
cmp rdx, 0
je Fr_rawCopy
Expand Down
20 changes: 12 additions & 8 deletions code_producers/src/c_elements/bls12381/fr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <gmp.h>
#include <assert.h>
#include <string>
#include <stdexcept>



static mpz_t q;
Expand Down Expand Up @@ -163,9 +164,12 @@ void Fr_div(PFrElement r, PFrElement a, PFrElement b) {
}

void Fr_fail() {
assert(false);
throw std::runtime_error("Fr error");
}

void Fr_longErr() {
Fr_fail();
}

RawFr::RawFr() {
Fr_init();
Expand Down Expand Up @@ -212,7 +216,7 @@ void RawFr::set(Element &r, int value) {
}

mpz_export((void *)(r.v), NULL, -1, 8, -1, 0, mr);

for (int i=0; i<Fr_N64; i++) r.v[i] = 0;
mpz_export((void *)(r.v), NULL, -1, 8, -1, 0, mr);
Fr_rawToMontgomery(r.v,r.v);
Expand Down Expand Up @@ -242,7 +246,7 @@ void RawFr::inv(Element &r, const Element &a) {
for (int i=0; i<Fr_N64; i++) r.v[i] = 0;
mpz_export((void *)(r.v), NULL, -1, 8, -1, 0, mr);

Fr_rawMMul(r.v, r.v,Fr_rawR3);
Fr_rawMMul(r.v, r.v,Fr_R3.longVal);
mpz_clear(mr);
}

Expand Down Expand Up @@ -294,11 +298,11 @@ int RawFr::toRprBE(const Element &element, uint8_t *data, int bytes)

mpz_t r;
mpz_init(r);

toMpz(r, element);
mpz_export(data, NULL, 1, 8, 1, 0, r);

mpz_export(data, NULL, 1, bytes, 1, 0, r);

return Fr_N64 * 8;
}

Expand Down
214 changes: 166 additions & 48 deletions code_producers/src/c_elements/bls12381/fr.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,22 @@
#ifndef __FR_H
#define __FR_H

#include <stdint.h>
#include "fr_element.hpp"
#include <cstdint>
#include <string>
#include <gmp.h>

#ifdef __APPLE__
#include <sys/types.h> // typedef unsigned int uint;
#endif // __APPLE__

#define Fr_N64 4
#define Fr_SHORT 0x00000000
#define Fr_LONG 0x80000000
#define Fr_LONGMONTGOMERY 0xC0000000
typedef uint64_t FrRawElement[Fr_N64];
typedef struct __attribute__((__packed__)) {
int32_t shortVal;
uint32_t type;
FrRawElement longVal;
} FrElement;
typedef FrElement *PFrElement;
extern FrElement Fr_q;
extern FrElement Fr_R2;
extern FrElement Fr_R3;
extern FrRawElement Fr_rawq;
extern FrRawElement Fr_rawR3;

#ifdef USE_ASM

#if defined(ARCH_X86_64)

extern "C" void Fr_copy(PFrElement r, PFrElement a);
extern "C" void Fr_copyn(PFrElement r, PFrElement a, int n);
Expand Down Expand Up @@ -62,13 +55,141 @@ extern "C" void Fr_rawNeg(FrRawElement pRawResult, const FrRawElement pRawA);
extern "C" void Fr_rawMMul(FrRawElement pRawResult, const FrRawElement pRawA, const FrRawElement pRawB);
extern "C" void Fr_rawMSquare(FrRawElement pRawResult, const FrRawElement pRawA);
extern "C" void Fr_rawMMul1(FrRawElement pRawResult, const FrRawElement pRawA, uint64_t pRawB);
extern "C" void Fr_rawToMontgomery(FrRawElement pRawResult, const FrRawElement &pRawA);
extern "C" void Fr_rawFromMontgomery(FrRawElement pRawResult, const FrRawElement &pRawA);
extern "C" int Fr_rawIsEq(const FrRawElement pRawA, const FrRawElement pRawB);
extern "C" void Fr_rawToMontgomery(FrRawElement pRawResult, const FrRawElement pRawA);
extern "C" void Fr_rawFromMontgomery(FrRawElement pRawResult, const FrRawElement pRawA);
extern "C" int Fr_rawIsEq(FrRawElement const pRawA, const FrRawElement pRawB);
extern "C" int Fr_rawIsZero(const FrRawElement pRawB);
extern "C" void Fr_rawShl(FrRawElement r, FrRawElement a, uint64_t b);
extern "C" void Fr_rawShr(FrRawElement r, FrRawElement a, uint64_t b);

extern "C" void Fr_fail();

#elif defined(ARCH_ARM64)

void Fr_copy(PFrElement r, PFrElement a);
void Fr_mul(PFrElement r, PFrElement a, PFrElement b);
void Fr_toNormal(PFrElement r, PFrElement a);

void Fr_toLongNormal(PFrElement r, PFrElement a);
int Fr_isTrue(PFrElement pE);
void Fr_copyn(PFrElement r, PFrElement a, int n);
void Fr_lt(PFrElement r, PFrElement a, PFrElement b);
int Fr_toInt(PFrElement pE);
void Fr_shr(PFrElement r, PFrElement a, PFrElement b);
void Fr_shl(PFrElement r, PFrElement a, PFrElement b);
void Fr_band(PFrElement r, PFrElement a, PFrElement b);
void Fr_bor(PFrElement r, PFrElement a, PFrElement b);
void Fr_bxor(PFrElement r, PFrElement a, PFrElement b);
void Fr_bnot(PFrElement r, PFrElement a);
void Fr_sub(PFrElement r, PFrElement a, PFrElement b);
void Fr_eq(PFrElement r, PFrElement a, PFrElement b);
void Fr_neq(PFrElement r, PFrElement a, PFrElement b);
void Fr_add(PFrElement r, PFrElement a, PFrElement b);
void Fr_gt(PFrElement r, PFrElement a, PFrElement b);
void Fr_leq(PFrElement r, PFrElement a, PFrElement b);
void Fr_geq(PFrElement r, PFrElement a, PFrElement b);
void Fr_lor(PFrElement r, PFrElement a, PFrElement b);
void Fr_lnot(PFrElement r, PFrElement a);
void Fr_land(PFrElement r, PFrElement a, PFrElement b);
void Fr_neg(PFrElement r, PFrElement a);
void Fr_toMontgomery(PFrElement r, PFrElement a);
void Fr_square(PFrElement r, PFrElement a);

extern "C" void Fr_rawCopy(FrRawElement pRawResult, const FrRawElement pRawA);
extern "C" void Fr_rawSwap(FrRawElement pRawResult, FrRawElement pRawA);
extern "C" void Fr_rawAdd(FrRawElement pRawResult, const FrRawElement pRawA, const FrRawElement pRawB);
extern "C" void Fr_rawSub(FrRawElement pRawResult, const FrRawElement pRawA, const FrRawElement pRawB);
extern "C" void Fr_rawNeg(FrRawElement pRawResult, const FrRawElement pRawA);
extern "C" void Fr_rawMMul(FrRawElement pRawResult, const FrRawElement pRawA, const FrRawElement pRawB);
void Fr_rawMSquare(FrRawElement pRawResult, const FrRawElement pRawA);
extern "C" void Fr_rawMMul1(FrRawElement pRawResult, const FrRawElement pRawA, uint64_t pRawB);
void Fr_rawToMontgomery(FrRawElement pRawResult, const FrRawElement pRawA);
extern "C" void Fr_rawFromMontgomery(FrRawElement pRawResult, const FrRawElement pRawA);
extern "C" int Fr_rawIsEq(const FrRawElement pRawA, const FrRawElement pRawB);
extern "C" int Fr_rawIsZero(const FrRawElement pRawB);
void Fr_rawZero(FrRawElement pRawResult);
extern "C" void Fr_rawCopyS2L(FrRawElement pRawResult, int64_t val);
extern "C" void Fr_rawAddLS(FrRawElement pRawResult, FrRawElement pRawA, uint64_t rawB);
extern "C" void Fr_rawSubSL(FrRawElement pRawResult, uint64_t rawA, FrRawElement pRawB);
extern "C" void Fr_rawSubLS(FrRawElement pRawResult, FrRawElement pRawA, uint64_t rawB);
extern "C" void Fr_rawNegLS(FrRawElement pRawResult, FrRawElement pRawA, uint64_t rawB);
extern "C" int Fr_rawCmp(FrRawElement pRawA, FrRawElement pRawB);
extern "C" void Fr_rawAnd(FrRawElement pRawResult, FrRawElement pRawA, FrRawElement pRawB);
extern "C" void Fr_rawOr(FrRawElement pRawResult, FrRawElement pRawA, FrRawElement pRawB);
extern "C" void Fr_rawXor(FrRawElement pRawResult, FrRawElement pRawA, FrRawElement pRawB);
extern "C" void Fr_rawShl(FrRawElement r, FrRawElement a, uint64_t b);
extern "C" void Fr_rawShr(FrRawElement r, FrRawElement a, uint64_t b);
extern "C" void Fr_rawNot(FrRawElement pRawResult, FrRawElement pRawA);
extern "C" void Fr_rawSubRegular(FrRawElement pRawResult, FrRawElement pRawA, FrRawElement pRawB);

void Fr_fail();
void Fr_longErr();

#endif

#else


void Fr_copy(PFrElement r, PFrElement a);
void Fr_mul(PFrElement r, PFrElement a, PFrElement b);
void Fr_toNormal(PFrElement r, PFrElement a);

void Fr_toLongNormal(PFrElement r, PFrElement a);
int Fr_isTrue(PFrElement pE);
void Fr_copyn(PFrElement r, PFrElement a, int n);
void Fr_lt(PFrElement r, PFrElement a, PFrElement b);
int Fr_toInt(PFrElement pE);
void Fr_shl(PFrElement r, PFrElement a, PFrElement b);
void Fr_shr(PFrElement r, PFrElement a, PFrElement b);
void Fr_band(PFrElement r, PFrElement a, PFrElement b);
void Fr_bor(PFrElement r, PFrElement a, PFrElement b);
void Fr_bxor(PFrElement r, PFrElement a, PFrElement b);
void Fr_bnot(PFrElement r, PFrElement a);
void Fr_sub(PFrElement r, PFrElement a, PFrElement b);
void Fr_eq(PFrElement r, PFrElement a, PFrElement b);
void Fr_neq(PFrElement r, PFrElement a, PFrElement b);
void Fr_add(PFrElement r, PFrElement a, PFrElement b);
void Fr_gt(PFrElement r, PFrElement a, PFrElement b);
void Fr_leq(PFrElement r, PFrElement a, PFrElement b);
void Fr_geq(PFrElement r, PFrElement a, PFrElement b);
void Fr_lor(PFrElement r, PFrElement a, PFrElement b);
void Fr_lnot(PFrElement r, PFrElement a);
void Fr_land(PFrElement r, PFrElement a, PFrElement b);
void Fr_neg(PFrElement r, PFrElement a);
void Fr_toMontgomery(PFrElement r, PFrElement a);
void Fr_square(PFrElement r, PFrElement a);

void Fr_rawCopy(FrRawElement pRawResult, const FrRawElement pRawA);
void Fr_rawSwap(FrRawElement pRawResult, FrRawElement pRawA);
void Fr_rawAdd(FrRawElement pRawResult, const FrRawElement pRawA, const FrRawElement pRawB);
void Fr_rawSub(FrRawElement pRawResult, const FrRawElement pRawA, const FrRawElement pRawB);
void Fr_rawNeg(FrRawElement pRawResult, const FrRawElement pRawA);
void Fr_rawMMul(FrRawElement pRawResult, const FrRawElement pRawA, const FrRawElement pRawB);
void Fr_rawMSquare(FrRawElement pRawResult, const FrRawElement pRawA);
void Fr_rawMMul1(FrRawElement pRawResult, const FrRawElement pRawA, uint64_t pRawB);
void Fr_rawToMontgomery(FrRawElement pRawResult, const FrRawElement pRawA);
void Fr_rawFromMontgomery(FrRawElement pRawResult, const FrRawElement pRawA);
int Fr_rawIsEq(const FrRawElement pRawA, const FrRawElement pRawB);
int Fr_rawIsZero(const FrRawElement pRawB);
void Fr_rawZero(FrRawElement pRawResult);
void Fr_rawCopyS2L(FrRawElement pRawResult, int64_t val);
void Fr_rawAddLS(FrRawElement pRawResult, FrRawElement pRawA, uint64_t rawB);
void Fr_rawSubSL(FrRawElement pRawResult, uint64_t rawA, FrRawElement pRawB);
void Fr_rawSubLS(FrRawElement pRawResult, FrRawElement pRawA, uint64_t rawB);
void Fr_rawNegLS(FrRawElement pRawResult, FrRawElement pRawA, uint64_t rawB);
int Fr_rawCmp(FrRawElement pRawA, FrRawElement pRawB);
void Fr_rawAnd(FrRawElement pRawResult, FrRawElement pRawA, FrRawElement pRawB);
void Fr_rawOr(FrRawElement pRawResult, FrRawElement pRawA, FrRawElement pRawB);
void Fr_rawXor(FrRawElement pRawResult, FrRawElement pRawA, FrRawElement pRawB);
void Fr_rawShl(FrRawElement r, FrRawElement a, uint64_t b);
void Fr_rawShr(FrRawElement r, FrRawElement a, uint64_t b);
void Fr_rawNot(FrRawElement pRawResult, FrRawElement pRawA);
void Fr_rawSubRegular(FrRawElement pRawResult, FrRawElement pRawA, FrRawElement pRawB);

void Fr_fail();
void Fr_longErr();

#endif

// Pending functions to convert

Expand Down Expand Up @@ -101,64 +222,61 @@ class RawFr {
RawFr();
~RawFr();

const Element &zero() { return fZero; };
const Element &one() { return fOne; };
const Element &negOne() { return fNegOne; };
const Element &zero() { return fZero; }
const Element &one() { return fOne; }
const Element &negOne() { return fNegOne; }
Element set(int value);
void set(Element &r, int value);

void fromString(Element &r, const std::string &n, uint32_t radix = 10);
std::string toString(const Element &a, uint32_t radix = 10);

void inline copy(Element &r, const Element &a) { Fr_rawCopy(r.v, a.v); };
void inline swap(Element &a, Element &b) { Fr_rawSwap(a.v, b.v); };
void inline add(Element &r, const Element &a, const Element &b) { Fr_rawAdd(r.v, a.v, b.v); };
void inline sub(Element &r, const Element &a, const Element &b) { Fr_rawSub(r.v, a.v, b.v); };
void inline mul(Element &r, const Element &a, const Element &b) { Fr_rawMMul(r.v, a.v, b.v); };
void inline copy(Element &r, const Element &a) { Fr_rawCopy(r.v, a.v); }
void inline swap(Element &a, Element &b) { Fr_rawSwap(a.v, b.v); }
void inline add(Element &r, const Element &a, const Element &b) { Fr_rawAdd(r.v, a.v, b.v); }
void inline sub(Element &r, const Element &a, const Element &b) { Fr_rawSub(r.v, a.v, b.v); }
void inline mul(Element &r, const Element &a, const Element &b) { Fr_rawMMul(r.v, a.v, b.v); }

Element inline add(const Element &a, const Element &b) { Element r; Fr_rawAdd(r.v, a.v, b.v); return r;};
Element inline sub(const Element &a, const Element &b) { Element r; Fr_rawSub(r.v, a.v, b.v); return r;};
Element inline mul(const Element &a, const Element &b) { Element r; Fr_rawMMul(r.v, a.v, b.v); return r;};
Element inline add(const Element &a, const Element &b) { Element r; Fr_rawAdd(r.v, a.v, b.v); return r;}
Element inline sub(const Element &a, const Element &b) { Element r; Fr_rawSub(r.v, a.v, b.v); return r;}
Element inline mul(const Element &a, const Element &b) { Element r; Fr_rawMMul(r.v, a.v, b.v); return r;}

Element inline neg(const Element &a) { Element r; Fr_rawNeg(r.v, a.v); return r; };
Element inline square(const Element &a) { Element r; Fr_rawMSquare(r.v, a.v); return r; };
Element inline neg(const Element &a) { Element r; Fr_rawNeg(r.v, a.v); return r; }
Element inline square(const Element &a) { Element r; Fr_rawMSquare(r.v, a.v); return r; }

Element inline add(int a, const Element &b) { return add(set(a), b);};
Element inline sub(int a, const Element &b) { return sub(set(a), b);};
Element inline mul(int a, const Element &b) { return mul(set(a), b);};
Element inline add(int a, const Element &b) { return add(set(a), b);}
Element inline sub(int a, const Element &b) { return sub(set(a), b);}
Element inline mul(int a, const Element &b) { return mul(set(a), b);}

Element inline add(const Element &a, int b) { return add(a, set(b));};
Element inline sub(const Element &a, int b) { return sub(a, set(b));};
Element inline mul(const Element &a, int b) { return mul(a, set(b));};
Element inline add(const Element &a, int b) { return add(a, set(b));}
Element inline sub(const Element &a, int b) { return sub(a, set(b));}
Element inline mul(const Element &a, int b) { return mul(a, set(b));}

void inline mul1(Element &r, const Element &a, uint64_t b) { Fr_rawMMul1(r.v, a.v, b); };
void inline neg(Element &r, const Element &a) { Fr_rawNeg(r.v, a.v); };
void inline square(Element &r, const Element &a) { Fr_rawMSquare(r.v, a.v); };
void inline mul1(Element &r, const Element &a, uint64_t b) { Fr_rawMMul1(r.v, a.v, b); }
void inline neg(Element &r, const Element &a) { Fr_rawNeg(r.v, a.v); }
void inline square(Element &r, const Element &a) { Fr_rawMSquare(r.v, a.v); }
void inv(Element &r, const Element &a);
void div(Element &r, const Element &a, const Element &b);
void exp(Element &r, const Element &base, uint8_t* scalar, unsigned int scalarSize);

void inline toMontgomery(Element &r, const Element &a) { Fr_rawToMontgomery(r.v, a.v); };
void inline fromMontgomery(Element &r, const Element &a) { Fr_rawFromMontgomery(r.v, a.v); };
int inline eq(const Element &a, const Element &b) { return Fr_rawIsEq(a.v, b.v); };
int inline isZero(const Element &a) { return Fr_rawIsZero(a.v); };
void inline toMontgomery(Element &r, const Element &a) { Fr_rawToMontgomery(r.v, a.v); }
void inline fromMontgomery(Element &r, const Element &a) { Fr_rawFromMontgomery(r.v, a.v); }
int inline eq(const Element &a, const Element &b) { return Fr_rawIsEq(a.v, b.v); }
int inline isZero(const Element &a) { return Fr_rawIsZero(a.v); }

void toMpz(mpz_t r, const Element &a);
void fromMpz(Element &a, const mpz_t r);

int toRprBE(const Element &element, uint8_t *data, int bytes);
int fromRprBE(Element &element, const uint8_t *data, int bytes);

int bytes ( void ) { return Fr_N64 * 8; };
int bytes ( void ) { return Fr_N64 * 8; }


void fromUI(Element &r, unsigned long int v);

static RawFr field;

};


#endif // __FR_H



Loading