Переглянути джерело

deleted all the prints, this code still takes double the latency

avadapal 2 роки тому
батько
коміт
5e3e1ce733
1 змінених файлів з 71 додано та 69 видалено
  1. 71 69
      heap.cpp

+ 71 - 69
heap.cpp

@@ -253,8 +253,8 @@ void verify_parent_children_heaps(MPCTIO tio, yield_t & yield, RegAS parent, Reg
 RegXS MinHeap::restore_heap_property(MPCIO & mpcio, MPCTIO tio, yield_t & yield, RegXS index) {
     RegAS smallest;
     auto HeapArray = oram.flat(tio, yield);
-       mpcio.reset_stats();
-        tio.reset_lamport();
+    mpcio.reset_stats();
+    tio.reset_lamport();
 
     RegXS leftchildindex = index;
     leftchildindex = index << 1;
@@ -266,9 +266,9 @@ RegXS MinHeap::restore_heap_property(MPCIO & mpcio, MPCTIO tio, yield_t & yield,
     RegAS leftchild;  //  = HeapArray[leftchildindex];
     RegAS rightchild; // = HeapArray[rightchildindex];
  
-   std::time_t currentTime = std::time(nullptr);
-   std::string timeString = std::ctime(&currentTime);
-   std::cout << "Current time (before read): " << timeString;
+   // std::time_t currentTime = std::time(nullptr);
+   // std::string timeString = std::ctime(&currentTime);
+   // std::cout << "Current time (before read): " << timeString;
 
     std::vector<coro_t> coroutines_read;
     coroutines_read.emplace_back( 
@@ -292,27 +292,27 @@ RegXS MinHeap::restore_heap_property(MPCIO & mpcio, MPCTIO tio, yield_t & yield,
     run_coroutines(tio, coroutines_read);
 
 
-    std::cout << "=========== READS DONE =========== \n";
-   currentTime = std::time(nullptr);
-   timeString = std::ctime(&currentTime);
-   std::cout << "Current time (after read): " << timeString;
+   // std::cout << "=========== READS DONE =========== \n";
+   // currentTime = std::time(nullptr);
+   // timeString = std::ctime(&currentTime);
+   // std::cout << "Current time (after read): " << timeString;
 
-    tio.sync_lamport();
-    mpcio.dump_stats(std::cout);
+   //  tio.sync_lamport();
+   //  mpcio.dump_stats(std::cout);
 
 
     //RegAS sum = parent + leftchild + rightchild;
 
-    currentTime = std::time(nullptr);
-    timeString = std::ctime(&currentTime);
-    std::cout << "Current time (before compare): " << timeString;
+    // currentTime = std::time(nullptr);
+    // timeString = std::ctime(&currentTime);
+    // std::cout << "Current time (before compare): " << timeString;
 
     CDPF cdpf = tio.cdpf(yield);
     auto[lt_c, eq_c, gt_c] = cdpf.compare(tio, yield, leftchild - rightchild, tio.aes_ops());
     
-    currentTime = std::time(nullptr);
-    timeString = std::ctime(&currentTime);
-    std::cout << "Current time (after compare): " << timeString;
+    // currentTime = std::time(nullptr);
+    // timeString = std::ctime(&currentTime);
+    // std::cout << "Current time (after compare): " << timeString;
     auto lteq = lt_c ^ eq_c;    
     RegXS smallerindex;
     RegAS smallerchild;
@@ -323,26 +323,27 @@ RegXS MinHeap::restore_heap_property(MPCIO & mpcio, MPCTIO tio, yield_t & yield,
         std::cout << "LC_rec = " << LC_rec << std::endl;
     #endif
 
-     std::cout << "=========== Compare DONE =========== \n";   
-    tio.sync_lamport();
-    mpcio.dump_stats(std::cout);
+    // std::cout << "=========== Compare DONE =========== \n";   
+    // tio.sync_lamport();
+    // mpcio.dump_stats(std::cout);
     
 
-    // mpc_select(tio, yield, smallerindex, lteq, rightchildindex, leftchildindex, 64);
-    // mpc_select(tio, yield, smallerchild, lt_c, rightchild, leftchild, 64);
+    // // mpc_select(tio, yield, smallerindex, lteq, rightchildindex, leftchildindex, 64);
+    // // mpc_select(tio, yield, smallerchild, lt_c, rightchild, leftchild, 64);
+
+    // currentTime = std::time(nullptr);
+    // timeString = std::ctime(&currentTime);
+    // std::cout << "Current time (before mpc_select): " << timeString;
 
-    currentTime = std::time(nullptr);
-    timeString = std::ctime(&currentTime);
-    std::cout << "Current time (before mpc_select): " << timeString;
     run_coroutines(tio, [&tio, &smallerindex, lteq, rightchildindex, leftchildindex](yield_t &yield)
             { mpc_select(tio, yield, smallerindex, lteq, rightchildindex, leftchildindex, 64);},
             [&tio, &smallerchild, lteq, rightchild, leftchild](yield_t &yield)
             { mpc_select(tio, yield, smallerchild, lteq, rightchild, leftchild, 64);});
 
 
-    currentTime = std::time(nullptr);
-    timeString = std::ctime(&currentTime);
-    std::cout << "Current time (after mpc_select): " << timeString;
+    // currentTime = std::time(nullptr);
+    // timeString = std::ctime(&currentTime);
+    // std::cout << "Current time (after mpc_select): " << timeString;
 
 
 
@@ -351,48 +352,48 @@ RegXS MinHeap::restore_heap_property(MPCIO & mpcio, MPCTIO tio, yield_t & yield,
         std::cout << "smallerindex_rec = " << smallerindex_rec << std::endl; 
     #endif
 
-         std::cout << "=========== mpc_select DONE =========== \n";   
-    tio.sync_lamport();
-    mpcio.dump_stats(std::cout);
+    // std::cout << "=========== mpc_select DONE =========== \n";   
+    // tio.sync_lamport();
+    // mpcio.dump_stats(std::cout);
 
-    currentTime = std::time(nullptr);
-    timeString = std::ctime(&currentTime);
-    std::cout << "Current time (before compare): " << timeString;
+    // currentTime = std::time(nullptr);
+    // timeString = std::ctime(&currentTime);
+    // std::cout << "Current time (before compare): " << timeString;
 
     CDPF cdpf0 = tio.cdpf(yield);
 
     auto[lt_p, eq_p, gt_p] = cdpf0.compare(tio, yield, smallerchild - parent, tio.aes_ops());
     
-        currentTime = std::time(nullptr);
-    timeString = std::ctime(&currentTime);
-    std::cout << "Current time (after compare): " << timeString;
-    std::cout << "=========== Compare DONE =========== \n";   
-    tio.sync_lamport();
-    mpcio.dump_stats(std::cout);
+    // currentTime = std::time(nullptr);
+    // timeString = std::ctime(&currentTime);
+    // std::cout << "Current time (after compare): " << timeString;
+    // std::cout << "=========== Compare DONE =========== \n";   
+    // tio.sync_lamport();
+    // mpcio.dump_stats(std::cout);
 
     auto lt_p_eq_p = lt_p ^ eq_p;
 
     RegBS ltlt1;
     
-        currentTime = std::time(nullptr);
-    timeString = std::ctime(&currentTime);
-    std::cout << "Current time (before mpc_and): " << timeString;
+    // currentTime = std::time(nullptr);
+    // timeString = std::ctime(&currentTime);
+    // std::cout << "Current time (before mpc_and): " << timeString;
 
     mpc_and(tio, yield, ltlt1, lteq, lt_p_eq_p);
 
-        currentTime = std::time(nullptr);
-    timeString = std::ctime(&currentTime);
-    std::cout << "Current time (after mpc_and): " << timeString;
+    // currentTime = std::time(nullptr);
+    // timeString = std::ctime(&currentTime);
+    // std::cout << "Current time (after mpc_and): " << timeString;
 
-    std::cout << "=========== mpc_and DONE =========== \n";   
-    tio.sync_lamport();
-    mpcio.dump_stats(std::cout);
+    // std::cout << "=========== mpc_and DONE =========== \n";   
+    // tio.sync_lamport();
+    // mpcio.dump_stats(std::cout);
     
 
-    RegAS update_index_by, update_leftindex_by;
-        currentTime = std::time(nullptr);
-    timeString = std::ctime(&currentTime);
-    std::cout << "Current time (before mpc_flagmult): " << timeString;
+     RegAS update_index_by, update_leftindex_by;
+    // currentTime = std::time(nullptr);
+    // timeString = std::ctime(&currentTime);
+    // std::cout << "Current time (before mpc_flagmult): " << timeString;
 
     run_coroutines(tio, [&tio, &update_leftindex_by, ltlt1, parent, leftchild](yield_t &yield)
             { mpc_flagmult(tio, yield, update_leftindex_by, ltlt1, (parent - leftchild), 64);},
@@ -400,22 +401,23 @@ RegXS MinHeap::restore_heap_property(MPCIO & mpcio, MPCTIO tio, yield_t & yield,
             {mpc_flagmult(tio, yield, update_index_by, lt_p, smallerchild - parent, 64);}
             );
 
-    std::cout << "=========== flag mults =========== \n";  
+    // std::cout << "=========== flag mults =========== \n";  
 
-            currentTime = std::time(nullptr);
-    timeString = std::ctime(&currentTime);
-    std::cout << "Current time (after mpc_flagmult): " << timeString; 
-    tio.sync_lamport();
-    mpcio.dump_stats(std::cout);
+    // currentTime = std::time(nullptr);
+    // timeString = std::ctime(&currentTime);
+    // std::cout << "Current time (after mpc_flagmult): " << timeString; 
+    // tio.sync_lamport();
+    // mpcio.dump_stats(std::cout);
 
     std::vector<coro_t> coroutines;
 
     // HeapArray[index] += update_index_by;
     // HeapArray[leftchildindex] += update_leftindex_by;
     // HeapArray[rightchildindex] += -(update_index_by + update_leftindex_by);
-            currentTime = std::time(nullptr);
-    timeString = std::ctime(&currentTime);
-    std::cout << "Current time (before updates): " << timeString;
+    // currentTime = std::time(nullptr);
+    // timeString = std::ctime(&currentTime);
+    // std::cout << "Current time (before updates): " << timeString;
+    
     coroutines.emplace_back( 
     [&tio, &HeapArray, index, update_index_by](yield_t &yield) { 
             auto Acoro = HeapArray.context(yield); 
@@ -435,12 +437,13 @@ RegXS MinHeap::restore_heap_property(MPCIO & mpcio, MPCTIO tio, yield_t & yield,
      }); 
 
     run_coroutines(tio, coroutines);
-        currentTime = std::time(nullptr);
-    timeString = std::ctime(&currentTime);
-    std::cout << "Current time (after updates): " << timeString;
-    std::cout << "=========== updates done =========== \n";   
-    tio.sync_lamport();
-    mpcio.dump_stats(std::cout);
+    
+    // currentTime = std::time(nullptr);
+    // timeString = std::ctime(&currentTime);
+    // std::cout << "Current time (after updates): " << timeString;
+    // std::cout << "=========== updates done =========== \n";   
+    // tio.sync_lamport();
+    // mpcio.dump_stats(std::cout);
     
    // verify_parent_children_heaps(tio, yield, HeapArray[index], HeapArray[leftchildindex] , HeapArray[rightchildindex]);
 
@@ -762,7 +765,6 @@ RegAS MinHeap::extract_min(MPCIO & mpcio, MPCTIO tio, yield_t & yield, int is_op
  
         for (size_t i = 0; i < height; ++i) {
             smaller = restore_heap_property(mpcio, tio, yield, smaller);  
-            std::cout << "one iter done ... \n \n \n";  
         }
 
     }