Use async to calc points

Author: nixw

src/CMakeLists.txt

@@ -113,8 +113,7 @@ target_link_libraries(prover rapidsnarkStatic)
 
 add_library(rapidsnark SHARED ${LIB_SOURCES})
 
-
-if(USE_LOGGER)
+if(USE_LOGGER OR NOT USE_OPENMP)
     target_link_libraries(prover pthread)
 endif()
 

src/groth16.cpp

@@ -1,5 +1,6 @@
 #include "random_generator.hpp"
 #include "logging.hpp"
+#include <future>
 
 namespace Groth16 {
 
@@ -45,6 +46,62 @@ std::unique_ptr<Prover<Engine>> makeProver(
 template <typename Engine>
 std::unique_ptr<Proof<Engine>> Prover<Engine>::prove(typename Engine::FrElement *wtns) {
 
+#ifdef USE_OPENMP
+    LOG_TRACE("Start Multiexp A");
+    uint32_t sW = sizeof(wtns[0]);
+    typename Engine::G1Point pi_a;
+    E.g1.multiMulByScalar(pi_a, pointsA, (uint8_t *)wtns, sW, nVars);
+    std::ostringstream ss2;
+    ss2 << "pi_a: " << E.g1.toString(pi_a);
+    LOG_DEBUG(ss2);
+
+    LOG_TRACE("Start Multiexp B1");
+    typename Engine::G1Point pib1;
+    E.g1.multiMulByScalar(pib1, pointsB1, (uint8_t *)wtns, sW, nVars);
+    std::ostringstream ss3;
+    ss3 << "pib1: " << E.g1.toString(pib1);
+    LOG_DEBUG(ss3);
+
+    LOG_TRACE("Start Multiexp B2");
+    typename Engine::G2Point pi_b;
+    E.g2.multiMulByScalar(pi_b, pointsB2, (uint8_t *)wtns, sW, nVars);
+    std::ostringstream ss4;
+    ss4 << "pi_b: " << E.g2.toString(pi_b);
+    LOG_DEBUG(ss4);
+
+    LOG_TRACE("Start Multiexp C");
+    typename Engine::G1Point pi_c;
+    E.g1.multiMulByScalar(pi_c, pointsC, (uint8_t *)((uint64_t)wtns + (nPublic +1)*sW), sW, nVars-nPublic-1);
+    std::ostringstream ss5;
+    ss5 << "pi_c: " << E.g1.toString(pi_c);
+    LOG_DEBUG(ss5);
+#else
+    LOG_TRACE("Start Multiexp A");
+    uint32_t sW = sizeof(wtns[0]);
+    typename Engine::G1Point pi_a;
+    auto pA_future = std::async([&]() {
+        E.g1.multiMulByScalar(pi_a, pointsA, (uint8_t *)wtns, sW, nVars);
+    });
+
+    LOG_TRACE("Start Multiexp B1");
+    typename Engine::G1Point pib1;
+    auto pB1_future = std::async([&]() {
+        E.g1.multiMulByScalar(pib1, pointsB1, (uint8_t *)wtns, sW, nVars);
+    });
+
+    LOG_TRACE("Start Multiexp B2");
+    typename Engine::G2Point pi_b;
+    auto pB2_future = std::async([&]() {
+        E.g2.multiMulByScalar(pi_b, pointsB2, (uint8_t *)wtns, sW, nVars);
+    });
+
+    LOG_TRACE("Start Multiexp C");
+    typename Engine::G1Point pi_c;
+    auto pC_future = std::async([&]() {
+        E.g1.multiMulByScalar(pi_c, pointsC, (uint8_t *)((uint64_t)wtns + (nPublic +1)*sW), sW, nVars-nPublic-1);
+    });
+#endif
+
     LOG_TRACE("Start Initializing a b c A");
     auto a = new typename Engine::FrElement[domainSize];
     auto b = new typename Engine::FrElement[domainSize];
@@ -180,35 +237,6 @@ std::unique_ptr<Proof<Engine>> Prover<Engine>::prove(typename Engine::FrElement
 
     delete a;
 
-    LOG_TRACE("Start Multiexp A");
-    uint32_t sW = sizeof(wtns[0]);
-    typename Engine::G1Point pi_a;
-    E.g1.multiMulByScalar(pi_a, pointsA, (uint8_t *)wtns, sW, nVars);
-    std::ostringstream ss2;
-    ss2 << "pi_a: " << E.g1.toString(pi_a);
-    LOG_DEBUG(ss2);
-
-    LOG_TRACE("Start Multiexp B1");
-    typename Engine::G1Point pib1;
-    E.g1.multiMulByScalar(pib1, pointsB1, (uint8_t *)wtns, sW, nVars);
-    std::ostringstream ss3;
-    ss3 << "pib1: " << E.g1.toString(pib1);
-    LOG_DEBUG(ss3);
-
-    LOG_TRACE("Start Multiexp B2");
-    typename Engine::G2Point pi_b;
-    E.g2.multiMulByScalar(pi_b, pointsB2, (uint8_t *)wtns, sW, nVars);
-    std::ostringstream ss4;
-    ss4 << "pi_b: " << E.g2.toString(pi_b);
-    LOG_DEBUG(ss4);
-
-    LOG_TRACE("Start Multiexp C");
-    typename Engine::G1Point pi_c;
-    E.g1.multiMulByScalar(pi_c, pointsC, (uint8_t *)((uint64_t)wtns + (nPublic +1)*sW), sW, nVars-nPublic-1);
-    std::ostringstream ss5;
-    ss5 << "pi_c: " << E.g1.toString(pi_c);
-    LOG_DEBUG(ss5);
-
     typename Engine::FrElement r;
     typename Engine::FrElement s;
     typename Engine::FrElement rs;
@@ -219,6 +247,13 @@ std::unique_ptr<Proof<Engine>> Prover<Engine>::prove(typename Engine::FrElement
     randombytes_buf((void *)&(r.v[0]), sizeof(r)-1);
     randombytes_buf((void *)&(s.v[0]), sizeof(s)-1);
 
+#ifndef USE_OPENMP
+    pA_future.get();
+    pB1_future.get();
+    pB2_future.get();
+    pC_future.get();
+#endif
+
     typename Engine::G1Point p1;
     typename Engine::G2Point p2;
 

src/groth16.hpp

@@ -17,7 +17,7 @@ namespace Groth16 {
         typename Engine::G2PointAffine B;
         typename Engine::G1PointAffine C;
 
-        Proof(Engine &_E) : E(_E) { };
+        Proof(Engine &_E) : E(_E) { }
         std::string toJsonStr();
         json toJson();
     };
@@ -91,7 +91,7 @@ namespace Groth16 {
             pointsH(_pointsH)
         { 
             fft = new FFT<typename Engine::Fr>(domainSize*2);
-        };
+        }
 
         ~Prover() {
             delete fft;
@@ -118,9 +118,9 @@ namespace Groth16 {
         void *pointsC,
         void *pointsH
     );
-};
+}
 
 
 #include "groth16.cpp"
 
-#endif
+#endif