From 7df871218a87d27e1ae77aa7eacc83a59d8ede6b Mon Sep 17 00:00:00 2001 From: rickb80 Date: Tue, 14 Nov 2023 05:03:41 +0100 Subject: [PATCH 1/3] Added Bits2FieldSha256 --- .../bits2field_sha256_executor.cpp | 164 ++++++++++++++++++ .../bits2field_sha256_executor.hpp | 52 ++++++ 2 files changed, 216 insertions(+) create mode 100644 src/sm/bits2field_sha256/bits2field_sha256_executor.cpp create mode 100644 src/sm/bits2field_sha256/bits2field_sha256_executor.hpp diff --git a/src/sm/bits2field_sha256/bits2field_sha256_executor.cpp b/src/sm/bits2field_sha256/bits2field_sha256_executor.cpp new file mode 100644 index 000000000..43627cba8 --- /dev/null +++ b/src/sm/bits2field_sha256/bits2field_sha256_executor.cpp @@ -0,0 +1,164 @@ +#include "config.hpp" +#include "bits2field_sha256_executor.hpp" +#include "zkassert.hpp" +#include "utils.hpp" +#include "zklog.hpp" + +/* + This SM inserts 44 bits of 44 different Keccak-f inputs/outputs in the lower bits of a field element. + The first evaluation is reserved to match the keccak-f gates topology. + The evaluations usage are: 1 (reserved) + 44 (one per bit0 of 44 inputs) + 44 + ... + + As per PIL spec: + field44' = (1-FieldLatch)*field44 + bit*Factor; + + Where FieldLatch and Factor are constant polynomials: + FieldLatch = 0, 43 zeros, 1, 43 zeros, 1, ... + Factor = 0, 1, 2, 4, ..., 1<<43, 1, 2, 4, ... + + For example, if bit_0 of the first 44 inputs were alterned ones and zeros, and bit_N=bit_N-1: + + Constant pols: Committed pols: + + Pos 0: Factor=0 FieldLatch=0 bit=0 field44=0b0 (reserved) + Pos 1: Factor=1 FieldLatch=0 bit=1 field44=0b0 + Pos 2: Factor=2 FieldLatch=0 bit=0 field44=0b1 + Pos 3: Factor=4 FieldLatch=0 bit=1 field44=0b01 + Pos 4: Factor=8 FieldLatch=0 bit=0 field44=0b101 + Pos 5: Factor=16 FieldLatch=0 bit=1 field44=0b0101 + Pos 6: Factor=32 FieldLatch=0 bit=0 field44=0b10101 + ... + Pos 44: Factor=1<<43 FieldLatch=0 bit=0 field44=0b1010101010101010101010101010101010101010101 + Pos 45: Factor=1 FieldLatch=1 bit=1 field44=0b01010101010101010101010101010101010101010101 (completed field element) + Pos 46: Factor=2 FieldLatch=0 bit=0 field44=0b1 + Pos 47: Factor=4 FieldLatch=0 bit=1 field44=0b01 + Pos 48: Factor=8 FieldLatch=0 bit=0 field44=0b101 + Pos 49: Factor=16 FieldLatch=0 bit=1 field44=0b0101 + Pos 50: Factor=32 FieldLatch=0 bit=0 field44=0b10101 + ... + Pos 88: Factor=1<<43 FieldLatch=0 bit=0 field44=0b1010101010101010101010101010101010101010101 + Pos 89: Factor=1 FieldLatch=1 bit=1 field44=0b01010101010101010101010101010101010101010101 (completed field element) + Pos 90: Factor=2 FieldLatch=0 bit=0 field44=0b1 + etc. +*/ + +inline uint64_t getBitFromState ( const uint8_t (&state)[200], uint64_t i ) +{ + return (state[i/8] >> (i%8)) & 1; +} + +void Bits2FieldSha256Executor::execute (vector &input, Bits2FieldCommitPols &pols, vector> &required) +{ + /* Check input size (the number of keccaks blocks to process) is not bigger than + the capacity of the SM (the number of slots that fit into the evaluations multiplied by the number of bits per field element) */ + if (input.size() > nSlots*44) + { + zklog.error("Bits2FieldExecutor::execute() too many entries input.size()=" + to_string(input.size()) + " > nSlots*44=" + to_string(nSlots*44)); + exitProcess(); + } + + /* Evaluation counter + The first position 0 is reserved since it will contain the Zero^One gate in Keccak-f SM, so we start at position 1 */ + uint64_t p = 1; + + /* Accumulator field element */ + Goldilocks::Element accField = fr.zero(); + + /* For every slot i */ + for (uint64_t i=0; i keccakFSlot; + + /* For every input bit */ + for (uint64_t j=0; j<1600; j++) + { + /* For every field element bit */ + for (uint64_t k=0; k<44; k++) + { + /* Get this input bit and store it in pols.bit[] */ + pols.bit[p] = getBit(input, i*44 + k, false, j); + + /* Store the accumulated field in pols.field44[] */ + pols.field44[p] = accField; + + /* Add this bit to accField, left-shifting the rest */ + if (k == 0) + { + accField = pols.bit[p]; + } + else + { + accField = fr.add( accField, fr.fromU64(fr.toU64(pols.bit[p]) << k) ); + } + + /* Increment the pol evaluation counter */ + p++; + } + + /* Store the accField in the input vector for the keccak-f SM */ + keccakFSlot.push_back(accField); + } + + /* For every output bit */ + for (uint64_t j=0; j<1600; j++) + { + /* For every field element bit */ + for (uint64_t k=0; k<44; k++) + { + /* Get this output bit and store it in pols.bit[] */ + pols.bit[p] = getBit(input, i*44 + k, true, j); + + /* Store the accumulated field in pols.field44[] */ + pols.field44[p] = accField; + + /* Add this bit to accField, left-shifting the rest */ + if (k == 0) + { + accField = pols.bit[p]; + } + else + { + accField = fr.add( accField, fr.fromU64((fr.toU64(pols.bit[p]) << k)) ); + } + + /* Increment the pol evaluation counter */ + p++; + } + } + + /* Add the accumulated field elements as a required input for the keccak-f SM */ + required.push_back(keccakFSlot); + + /* Store the accumulated field into pols.field44[] */ + pols.field44[p] = accField; + accField = fr.zero(); + p++; + + /* Skip the rest of the gates of the keccak-f SM: slot size minus the consumed evaluations */ + p += slotSize - (3200*44+1); + } + + /* Sanity check */ + zkassert(p <= N); + + zklog.info("Bits2FieldExecutor successfully processed " + to_string(input.size()) + " Keccak hashes (" + to_string((double(input.size())*slotSize*100)/(44*N)) + "%)"); +} + +Goldilocks::Element Bits2FieldSha256Executor::getBit (vector &input, uint64_t block, bool isOutput, uint64_t pos) +{ + /* If we run out of input, simply return zero */ + if (block >= input.size()) + { + return fr.zero(); + } + + /* Return the bit "pos" of the input or output part of the state */ + if (isOutput) + { + return fr.fromU64(getBitFromState(input[block].outputState, pos)); + } + else + { + return fr.fromU64(getBitFromState(input[block].inputState, pos)); + } +} diff --git a/src/sm/bits2field_sha256/bits2field_sha256_executor.hpp b/src/sm/bits2field_sha256/bits2field_sha256_executor.hpp new file mode 100644 index 000000000..4e3954955 --- /dev/null +++ b/src/sm/bits2field_sha256/bits2field_sha256_executor.hpp @@ -0,0 +1,52 @@ +#ifndef BITS2FIELD_SHA256_EXECUTOR_HPP +#define BITS2FIELD_SHA256_EXECUTOR_HPP + +#include +#include "definitions.hpp" +#include "sm/pols_generated/commit_pols.hpp" + +USING_PROVER_FORK_NAMESPACE; + +using namespace std; + +class Bits2FieldSha256ExecutorInput +{ +public: + + /* Input and output states */ + uint8_t inputState[200]; + uint8_t outputState[200]; +}; + +class Bits2FieldSha256Executor +{ +private: + + /* Goldilocks reference */ + Goldilocks &fr; + + /* Constant values */ + const uint64_t slotSize; + const uint64_t N; + const uint64_t nSlots; + +public: + + /* Constructor */ + Bits2FieldSha256Executor(Goldilocks &fr) : + fr(fr), + slotSize(155286), + N(Bits2FieldCommitPols::pilDegree()), + nSlots((N-1)/slotSize) {}; + + /* Executor */ + void execute (vector &input, Bits2FieldCommitPols &pols, vector> &required); + +private: + + /* Gets bit "pos" from input vector position "block" */ + Goldilocks::Element getBit (vector &input, uint64_t block, bool isOutput, uint64_t pos); + +}; + +#endif \ No newline at end of file From bd5f8b1397f94eeb136e44c51e183936de41f19e Mon Sep 17 00:00:00 2001 From: rickb80 Date: Mon, 20 Nov 2023 11:14:49 +0100 Subject: [PATCH 2/3] Add Bits2FieldSha256Executor --- src/executor/executor.cpp | 76 ++++++++++++------- src/executor/executor.hpp | 2 + .../fork_7/main/main_exec_required.hpp | 5 +- .../bits2field_sha256_executor.cpp | 8 +- .../bits2field_sha256_executor.hpp | 4 +- .../padding_sha256bit_executor.cpp | 2 +- .../padding_sha256bit_executor.hpp | 3 +- 7 files changed, 66 insertions(+), 34 deletions(-) diff --git a/src/executor/executor.cpp b/src/executor/executor.cpp index 317a8e061..a7ac863f2 100644 --- a/src/executor/executor.cpp +++ b/src/executor/executor.cpp @@ -340,7 +340,7 @@ void* PoseidonThread (void* arg) return NULL; } -void* KeccakSha256Thread (void* arg) +void* KeccakThread (void* arg) { // Get the context ExecutorContext * pExecutorContext = (ExecutorContext *)arg; @@ -354,18 +354,8 @@ void* KeccakSha256Thread (void* arg) TimerStart(PADDING_KK_BIT_SM_EXECUTE_THREAD); pExecutorContext->pExecutor->paddingKKBitExecutor.execute(pExecutorContext->pRequired->PaddingKKBit, pExecutorContext->pCommitPols->PaddingKKBit, pExecutorContext->pRequired->Bits2Field); TimerStopAndLog(PADDING_KK_BIT_SM_EXECUTE_THREAD); - - // Execute the Padding SHA256 State Machine - TimerStart(PADDING_SHA256_SM_EXECUTE_THREAD); - pExecutorContext->pExecutor->paddingSha256Executor.execute(pExecutorContext->pRequired->PaddingSha256, pExecutorContext->pCommitPols->PaddingSha256, pExecutorContext->pRequired->PaddingSha256Bit); - TimerStopAndLog(PADDING_SHA256_SM_EXECUTE_THREAD); - - // Execute the PaddingKKBit State Machine - TimerStart(PADDING_SHA256_BIT_SM_EXECUTE_THREAD); - pExecutorContext->pExecutor->paddingSha256BitExecutor.execute(pExecutorContext->pRequired->PaddingSha256Bit, pExecutorContext->pCommitPols->PaddingSha256Bit, pExecutorContext->pRequired->Bits2Field); - TimerStopAndLog(PADDING_SHA256_BIT_SM_EXECUTE_THREAD); - // Execute the Poseidon G State Machine + // Execute the Bits2Field State Machine TimerStart(BITS2FIELD_SM_EXECUTE_THREAD); pExecutorContext->pExecutor->bits2FieldExecutor.execute(pExecutorContext->pRequired->Bits2Field, pExecutorContext->pCommitPols->Bits2Field, pExecutorContext->pRequired->KeccakF); TimerStopAndLog(BITS2FIELD_SM_EXECUTE_THREAD); @@ -374,6 +364,29 @@ void* KeccakSha256Thread (void* arg) TimerStart(KECCAK_F_SM_EXECUTE_THREAD); pExecutorContext->pExecutor->keccakFExecutor.execute(pExecutorContext->pRequired->KeccakF, pExecutorContext->pCommitPols->KeccakF); TimerStopAndLog(KECCAK_F_SM_EXECUTE_THREAD); + + return NULL; +} + +void* Sha256Thread (void* arg) +{ + // Get the context + ExecutorContext * pExecutorContext = (ExecutorContext *)arg; + + // Execute the Padding SHA256 State Machine + TimerStart(PADDING_SHA256_SM_EXECUTE_THREAD); + pExecutorContext->pExecutor->paddingSha256Executor.execute(pExecutorContext->pRequired->PaddingSha256, pExecutorContext->pCommitPols->PaddingSha256, pExecutorContext->pRequired->PaddingSha256Bit); + TimerStopAndLog(PADDING_SHA256_SM_EXECUTE_THREAD); + + // Execute the PaddingSha256Bit State Machine + TimerStart(PADDING_SHA256_BIT_SM_EXECUTE_THREAD); + pExecutorContext->pExecutor->paddingSha256BitExecutor.execute(pExecutorContext->pRequired->PaddingSha256Bit, pExecutorContext->pCommitPols->PaddingSha256Bit, pExecutorContext->pRequired->Bits2FieldSha256); + TimerStopAndLog(PADDING_SHA256_BIT_SM_EXECUTE_THREAD); + + // Execute the Bits2FieldSha256 State Machine + TimerStart(BITS2FIELDSHA256_SM_EXECUTE_THREAD); + pExecutorContext->pExecutor->bits2FieldSha256Executor.execute(pExecutorContext->pRequired->Bits2FieldSha256, pExecutorContext->pCommitPols->Bits2FieldSha256, pExecutorContext->pRequired->Sha256F); + TimerStopAndLog(BITS2FIELDSHA256_SM_EXECUTE_THREAD); // Execute the Sha256 F State Machine TimerStart(SHA256_F_SM_EXECUTE_THREAD); @@ -464,16 +477,6 @@ void Executor::execute (ProverRequest &proverRequest, PROVER_FORK_NAMESPACE::Com paddingKKBitExecutor.execute(required.PaddingKKBit, commitPols.PaddingKKBit, required.Bits2Field); TimerStopAndLog(PADDING_KK_BIT_SM_EXECUTE); - // Execute the PaddingSha256 State Machine - TimerStart(PADDING_SHA256_SM_EXECUTE); - paddingSha256Executor.execute(required.PaddingSha256, commitPols.PaddingSha256, required.PaddingSha256Bit); - TimerStopAndLog(PADDING_SHA256_SM_EXECUTE); - - // Execute the PaddingSha256Bit State Machine - TimerStart(PADDING_SHA256_BIT_SM_EXECUTE); - paddingSha256BitExecutor.execute(required.PaddingSha256Bit, commitPols.PaddingSha256Bit, required.Bits2Field); - TimerStopAndLog(PADDING_SHA256_BIT_SM_EXECUTE); - // Execute the Bits2Field State Machine TimerStart(BITS2FIELD_SM_EXECUTE); bits2FieldExecutor.execute(required.Bits2Field, commitPols.Bits2Field, required.KeccakF); @@ -484,6 +487,21 @@ void Executor::execute (ProverRequest &proverRequest, PROVER_FORK_NAMESPACE::Com keccakFExecutor.execute(required.KeccakF, commitPols.KeccakF); TimerStopAndLog(KECCAK_F_SM_EXECUTE); + // Execute the PaddingSha256 State Machine + TimerStart(PADDING_SHA256_SM_EXECUTE); + paddingSha256Executor.execute(required.PaddingSha256, commitPols.PaddingSha256, required.PaddingSha256Bit); + TimerStopAndLog(PADDING_SHA256_SM_EXECUTE); + + // Execute the PaddingSha256Bit State Machine + TimerStart(PADDING_SHA256_BIT_SM_EXECUTE); + paddingSha256BitExecutor.execute(required.PaddingSha256Bit, commitPols.PaddingSha256Bit, required.Bits2FieldSha256); + TimerStopAndLog(PADDING_SHA256_BIT_SM_EXECUTE); + + // Execute the Bits2FieldSha256 State Machine + TimerStart(BITS2FIELDSHA256_SM_EXECUTE); + bits2FieldSha256Executor.execute(required.Bits2FieldSha256, commitPols.Bits2FieldSha256, required.Sha256F); + TimerStopAndLog(BITS2FIELDSHA256_SM_EXECUTE); + // Excute the Sha256 F State Machine TimerStart(SHA256_F_SM_EXECUTE); sha256FExecutor.execute(required.Sha256F, commitPols.Sha256F); @@ -550,9 +568,13 @@ void Executor::execute (ProverRequest &proverRequest, PROVER_FORK_NAMESPACE::Com pthread_t memoryThread; pthread_create(&memoryThread, NULL, MemoryThread, &executorContext); - // Execute the PaddingKK, PaddingKKBit, Bits2Field, Keccak F and NormGate9 State Machines - pthread_t keccakSha256Thread; - pthread_create(&keccakSha256Thread, NULL, KeccakSha256Thread, &executorContext); + // Execute the PaddingKK, PaddingKKBit, Bits2Field, Keccak F + pthread_t keccakThread; + pthread_create(&keccakThread, NULL, KeccakThread, &executorContext); + + // Execute the PaddingSha256, PaddingSha256Bit, Bits2FieldSha256, Sha256 F + pthread_t sha256Thread; + pthread_create(&sha256Thread, NULL, Sha256Thread, &executorContext); // Wait for the parallel SM threads pthread_join(binaryThread, NULL); @@ -560,6 +582,8 @@ void Executor::execute (ProverRequest &proverRequest, PROVER_FORK_NAMESPACE::Com pthread_join(memoryThread, NULL); pthread_join(arithThread, NULL); pthread_join(poseidonThread, NULL); - pthread_join(keccakSha256Thread, NULL); + pthread_join(keccakThread, NULL); + pthread_join(sha256Thread, NULL); + } } \ No newline at end of file diff --git a/src/executor/executor.hpp b/src/executor/executor.hpp index 7139082c0..a02ccf59e 100644 --- a/src/executor/executor.hpp +++ b/src/executor/executor.hpp @@ -55,6 +55,7 @@ class Executor KeccakFExecutor keccakFExecutor; PaddingSha256Executor paddingSha256Executor; PaddingSha256BitExecutor paddingSha256BitExecutor; + Bits2FieldSha256Executor bits2FieldSha256Executor; Sha256FExecutor sha256FExecutor; PaddingPGExecutor paddingPGExecutor; PoseidonGExecutor poseidonGExecutor; @@ -84,6 +85,7 @@ class Executor keccakFExecutor(fr, config), paddingSha256Executor(fr), paddingSha256BitExecutor(fr), + bits2FieldSha256Executor(fr), sha256FExecutor(fr, config), paddingPGExecutor(fr, poseidon), poseidonGExecutor(fr, poseidon), diff --git a/src/main_sm/fork_7/main/main_exec_required.hpp b/src/main_sm/fork_7/main/main_exec_required.hpp index 967a609b6..998ad2724 100644 --- a/src/main_sm/fork_7/main/main_exec_required.hpp +++ b/src/main_sm/fork_7/main/main_exec_required.hpp @@ -9,9 +9,11 @@ #include "sm/padding_kk/padding_kk_executor.hpp" #include "sm/padding_kkbit/padding_kkbit_executor.hpp" #include "sm/bits2field/bits2field_executor.hpp" +#include "sm/keccak_f/keccak_f_executor.hpp" #include "sm/padding_sha256/padding_sha256_executor.hpp" #include "sm/padding_sha256bit/padding_sha256bit_executor.hpp" -#include "sm/keccak_f/keccak_f_executor.hpp" +#include "sm/bits2field_sha256/bits2field_sha256_executor.hpp" +#include "sm/sha256_f/sha256_f_executor.hpp" #include "sm/memory/memory_executor.hpp" #include "sm/padding_pg/padding_pg_executor.hpp" #include "sm/mem_align/mem_align_executor.hpp" @@ -34,6 +36,7 @@ class MainExecRequired vector> KeccakF; vector PaddingSha256; vector PaddingSha256Bit; + vector Bits2FieldSha256; vector> Sha256F; vector PaddingPG; vector> PoseidonG; // The 17th fe is the permutation diff --git a/src/sm/bits2field_sha256/bits2field_sha256_executor.cpp b/src/sm/bits2field_sha256/bits2field_sha256_executor.cpp index 43627cba8..ef7b56f8f 100644 --- a/src/sm/bits2field_sha256/bits2field_sha256_executor.cpp +++ b/src/sm/bits2field_sha256/bits2field_sha256_executor.cpp @@ -47,13 +47,14 @@ inline uint64_t getBitFromState ( const uint8_t (&state)[200], uint64_t i ) return (state[i/8] >> (i%8)) & 1; } -void Bits2FieldSha256Executor::execute (vector &input, Bits2FieldCommitPols &pols, vector> &required) +void Bits2FieldSha256Executor::execute (vector &input, Bits2FieldSha256CommitPols &pols, vector> &required) { + #if 0 /* Check input size (the number of keccaks blocks to process) is not bigger than the capacity of the SM (the number of slots that fit into the evaluations multiplied by the number of bits per field element) */ if (input.size() > nSlots*44) { - zklog.error("Bits2FieldExecutor::execute() too many entries input.size()=" + to_string(input.size()) + " > nSlots*44=" + to_string(nSlots*44)); + zklog.error("Bits2FieldSha256Executor::execute() too many entries input.size()=" + to_string(input.size()) + " > nSlots*44=" + to_string(nSlots*44)); exitProcess(); } @@ -141,7 +142,8 @@ void Bits2FieldSha256Executor::execute (vector &i /* Sanity check */ zkassert(p <= N); - zklog.info("Bits2FieldExecutor successfully processed " + to_string(input.size()) + " Keccak hashes (" + to_string((double(input.size())*slotSize*100)/(44*N)) + "%)"); + zklog.info("Bits2FieldSha256Executor successfully processed " + to_string(input.size()) + " Keccak hashes (" + to_string((double(input.size())*slotSize*100)/(44*N)) + "%)"); +#endif } Goldilocks::Element Bits2FieldSha256Executor::getBit (vector &input, uint64_t block, bool isOutput, uint64_t pos) diff --git a/src/sm/bits2field_sha256/bits2field_sha256_executor.hpp b/src/sm/bits2field_sha256/bits2field_sha256_executor.hpp index 4e3954955..6cc73abf7 100644 --- a/src/sm/bits2field_sha256/bits2field_sha256_executor.hpp +++ b/src/sm/bits2field_sha256/bits2field_sha256_executor.hpp @@ -36,11 +36,11 @@ class Bits2FieldSha256Executor Bits2FieldSha256Executor(Goldilocks &fr) : fr(fr), slotSize(155286), - N(Bits2FieldCommitPols::pilDegree()), + N(Bits2FieldSha256CommitPols::pilDegree()), nSlots((N-1)/slotSize) {}; /* Executor */ - void execute (vector &input, Bits2FieldCommitPols &pols, vector> &required); + void execute (vector &input, Bits2FieldSha256CommitPols &pols, vector> &required); private: diff --git a/src/sm/padding_sha256bit/padding_sha256bit_executor.cpp b/src/sm/padding_sha256bit/padding_sha256bit_executor.cpp index c19e5b0b8..0356221a2 100644 --- a/src/sm/padding_sha256bit/padding_sha256bit_executor.cpp +++ b/src/sm/padding_sha256bit/padding_sha256bit_executor.cpp @@ -25,7 +25,7 @@ inline void callKeccakF (const uint8_t (&inputState)[200], uint8_t (&outputState KeccakF1600(outputState); } -void PaddingSha256BitExecutor::execute (vector &input, PaddingSha256BitCommitPols &pols, vector &required) +void PaddingSha256BitExecutor::execute (vector &input, PaddingSha256BitCommitPols &pols, vector &required) { #if 0 #ifdef LOG_TIME_STATISTICS diff --git a/src/sm/padding_sha256bit/padding_sha256bit_executor.hpp b/src/sm/padding_sha256bit/padding_sha256bit_executor.hpp index 24af0644c..12cf442e6 100644 --- a/src/sm/padding_sha256bit/padding_sha256bit_executor.hpp +++ b/src/sm/padding_sha256bit/padding_sha256bit_executor.hpp @@ -5,6 +5,7 @@ #include "definitions.hpp" #include "sm/pols_generated/commit_pols.hpp" #include "sm/bits2field/bits2field_executor.hpp" +#include "sm/bits2field_sha256/bits2field_sha256_executor.hpp" USING_PROVER_FORK_NAMESPACE; @@ -47,7 +48,7 @@ class PaddingSha256BitExecutor nSlots(44*((N-1)/slotSize)) {}; /* Executor */ - void execute (vector &input, PROVER_FORK_NAMESPACE::PaddingSha256BitCommitPols &pols, vector &required); + void execute (vector &input, PROVER_FORK_NAMESPACE::PaddingSha256BitCommitPols &pols, vector &required); }; #endif \ No newline at end of file From d110fc869f6a82f79df4a8e73694265e9d8dea7a Mon Sep 17 00:00:00 2001 From: rickb80 Date: Mon, 20 Nov 2023 19:02:15 +0100 Subject: [PATCH 3/3] Padding Sha256 executor completed --- src/sm/padding_kk/padding_kk_executor.cpp | 1 + .../padding_sha256_executor.cpp | 77 +++++++++++-------- .../padding_sha256_executor.hpp | 9 ++- 3 files changed, 50 insertions(+), 37 deletions(-) diff --git a/src/sm/padding_kk/padding_kk_executor.cpp b/src/sm/padding_kk/padding_kk_executor.cpp index 216cba0e9..2203d30da 100644 --- a/src/sm/padding_kk/padding_kk_executor.cpp +++ b/src/sm/padding_kk/padding_kk_executor.cpp @@ -13,6 +13,7 @@ uint64_t PaddingKKExecutor::prepareInput (vector &input) for (uint64_t i=0; i 0) { // Make sure we got an even number of characters diff --git a/src/sm/padding_sha256/padding_sha256_executor.cpp b/src/sm/padding_sha256/padding_sha256_executor.cpp index d44e5ee8c..293647f89 100644 --- a/src/sm/padding_sha256/padding_sha256_executor.cpp +++ b/src/sm/padding_sha256/padding_sha256_executor.cpp @@ -4,6 +4,7 @@ #include "utils.hpp" #include "goldilocks_precomputed.hpp" #include "zklog.hpp" +#include "zkassert.hpp" using namespace std; @@ -13,12 +14,13 @@ uint64_t PaddingSha256Executor::prepareInput (vector for (uint64_t i=0; i 0) { // Make sure we got an even number of characters if ((input[i].data.length()%2) != 0) { - zklog.error("PaddingKKExecutor::prepareInput() detected at entry i=" + to_string(i) + " a odd data string length=" + to_string(input[i].data.length())); + zklog.error("PaddingSha256Executor::prepareInput() detected at entry i=" + to_string(i) + " a odd data string length=" + to_string(input[i].data.length())); exitProcess(); } @@ -31,14 +33,24 @@ uint64_t PaddingSha256Executor::prepareInput (vector } } - keccak256(input[i].dataBytes, input[i].hash); + SHA256(input[i].dataBytes.data(), input[i].dataBytes.size(), input[i].hash); input[i].realLen = input[i].dataBytes.size(); + if(input[i].realLen > 1ULL<<30){ + zklog.error("PaddingSha256Executor::prepareInput() detected at entry i=" + to_string(i) + " a data string length=" + to_string(input[i].realLen) + " > 2^30"); + exitProcess(); + } // Add padding - input[i].dataBytes.push_back(0x1); - while (input[i].dataBytes.size() % bytesPerBlock) input[i].dataBytes.push_back(0); - input[i].dataBytes[ input[i].dataBytes.size() - 1] |= 0x80; + input[i].dataBytes.push_back(0x80); + while (input[i].dataBytes.size() % bytesPerBlock != 56) input[i].dataBytes.push_back(0); + for(uint64_t j=0; j<4; j++) input[i].dataBytes.push_back(0); + + uint64_t bitLen = input[i].realLen*8; + for(uint64_t e=3; e>=0; e--) + { + input[i].dataBytes.push_back(bitLen >> (8*e) && 0xFF); + } totalInputBytes += input[i].dataBytes.size(); } @@ -51,9 +63,9 @@ void PaddingSha256Executor::execute (vector &input, uint64_t totalInputBytes = prepareInput(input); // Check input size - if (totalInputBytes > (44*bytesPerBlock*(N/blockSize))) + if (totalInputBytes > (bitsPerElement*bytesPerBlock*(N/blockSize))) { - zklog.error("PaddingKKExecutor::execute() Too many entries input.size()=" + to_string(input.size()) + " totalInputBytes=" + to_string(totalInputBytes) + " > 44*bytesPerBlock*(N/blockSize)=" + to_string(44*bytesPerBlock*(N/blockSize))); + zklog.error("PaddingKKExecutor::execute() Too many entries input.size()=" + to_string(input.size()) + " totalInputBytes=" + to_string(totalInputBytes) + " > bitsPerElement*bytesPerBlock*(N/blockSize)=" + to_string(bitsPerElement*bytesPerBlock*(N/blockSize))); exitProcess(); } @@ -66,7 +78,7 @@ void PaddingSha256Executor::execute (vector &input, CommitPol crV[8] = { pols.crV0, pols.crV1, pols.crV2, pols.crV3, pols.crV4, pols.crV5, pols.crV6, pols.crV7 }; - /*for (uint64_t k=0; k<8; k++) + /*for (uint64_t k=0; k<8; k++) // polynomials already initialized to 0 { crV[k][p] = 0; }*/ @@ -81,22 +93,19 @@ void PaddingSha256Executor::execute (vector &input, { pols.freeIn[p] = fr.fromU64(input[i].dataBytes[j]); - pols.len[p] = fr.fromU64(input[i].realLen); pols.addr[p] = fr.fromU64(addr); if (j >= bytesPerBlock) pols.connected[p] = fr.one(); - pols.rem[p] = fr.sub(fr.fromU64(input[i].realLen), fr.fromU64(j)); - if (!fr.isZero(pols.rem[p])) - { - pols.remInv[p] = glp.inv(pols.rem[p]); - if (fr.toS64(pols.rem[p]) < 0) - { - pols.spare[p] = fr.one(); - } - } + pols.rem[p] = fr.sub(fr.fromU64(input[i].realLen), fr.fromU64(j)); + if (!fr.isZero(pols.rem[p])) pols.remInv[p] = glp.inv(pols.rem[p]); + if (fr.toS64(pols.rem[p]) < 0) pols.spare[p] = fr.one(); // padding bytes if rem == 0 or spare == 1 pols.incCounter[p] = fr.fromU64((j / bytesPerBlock) +1); - + + uint64_t s=input[i].dataBytes.size()-1-j; + if(s < 8) pols.lengthSection[p] = fr.one(); + if(s < 4) pols.accLength[p] = fr.fromU64((input[i].realLen*8)&&(0xFFFFFFFF<<(s*8))); //rick: ?? + bool lastBlock = (p % bytesPerBlock) == (bytesPerBlock - 1); bool lastHash = lastBlock && ((!fr.isZero(pols.spare[p])) || fr.isZero(pols.rem[p])); if (lastHash) @@ -151,7 +160,7 @@ void PaddingSha256Executor::execute (vector &input, paddingSha256BitExecutorInput.connected = (j < bytesPerBlock) ? false : true; required.push_back(paddingSha256BitExecutorInput); - if (j == input[i].dataBytes.size() - 1) + if (j == input[i].dataBytes.size() - 1) { scalar2fea(fr, input[i].hash, pols.hash0[p], @@ -185,12 +194,12 @@ void PaddingSha256Executor::execute (vector &input, pDone = p; - uint64_t nTotalBlocks = 44*(N/blockSize); + uint64_t nTotalBlocks = bitsPerElement*(N/blockSize); uint64_t nUsedBlocks = p/bytesPerBlock; if (nUsedBlocks > nTotalBlocks) { - zklog.error("PaddingKKExecutor::execute() Too many keccak blocks nUsedBlocks=" + to_string(nUsedBlocks) + " > nTotalBlocks=" + to_string(nTotalBlocks) + " BlockSize=" + to_string(blockSize)); + zklog.error("PaddingKKExecutor::execute() Too many Sha256 blocks nUsedBlocks=" + to_string(nUsedBlocks) + " > nTotalBlocks=" + to_string(nTotalBlocks) + " BlockSize=" + to_string(blockSize)); exitProcess(); } @@ -199,7 +208,7 @@ void PaddingSha256Executor::execute (vector &input, uint8_t bytes0[bytesPerBlock]; for (uint64_t i=0; i &input, pols.addr[p] = fr.fromU64(addr); if (j == 0) { - pols.freeIn[p] = fr.one(); + pols.freeIn[p] = fr.fromU64(0x80); } else { - if (j == (bytesPerBlock - 1)) pols.freeIn[p] = fr.fromU64(0x80); pols.rem[p] = fr.neg(fr.fromU64(j)); pols.remInv[p] = glp.inv(pols.rem[p]); - if (fr.toS64(pols.rem[p]) < 0) - { - pols.spare[p] = fr.one(); - } + pols.spare[p] = fr.one(); } pols.incCounter[p] = fr.one(); + if(j>=56) pols.lengthSection[p] = fr.one(); + pols.crLen[p] = fr.one(); - crF[0][p] = fr.one(); if (j % bytesPerBlock == (bytesPerBlock -1) ) @@ -267,22 +273,25 @@ void PaddingSha256Executor::execute (vector &input, uint64_t fp = p; while (p &input); /* Constructor */ PaddingSha256Executor(Goldilocks &fr) : fr(fr), - blockSize(155286), - bytesPerBlock(136), + blockSize(31487), + bytesPerBlock(64), + bitsPerElement(6), N(PROVER_FORK_NAMESPACE::PaddingSha256CommitPols::pilDegree()) { - keccak256(NULL, 0, hashZeroScalar); + SHA256(NULL, 0, hashZeroScalar); scalar2fea(fr, hashZeroScalar, hash0); };