From: apostolos <apostolos.tapsas@vectorcamp.gr>
Date: Thu, 9 Sep 2021 09:02:33 +0000 (+0300)
Subject: size output fixed
X-Git-Tag: v5.4.3+vectorscan~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e6c75c895a25a50e6b8685c0841bb6955fc1060;p=thirdparty%2Fvectorscan.git

size output fixed
---

diff --git a/benchmarks/benchmarks.cpp b/benchmarks/benchmarks.cpp
index 7d669cc0..6ff20b8b 100644
--- a/benchmarks/benchmarks.cpp
+++ b/benchmarks/benchmarks.cpp
@@ -4,6 +4,8 @@
 #include <string.h>
 #include <time.h>
 #include <functional>
+#include "nfa/shufticompile.h"
+
 int main(){
     int sizes[]=   { 16000, 32000, 64000, 120000, 1600000, 2000000, 2500000, 3500000, 150000000, 250000000, 350000000, 500000000};
     int loops[]=   {  6000,  6000,  6000,   6000,    1000,    1000,    1000,    1000,        50,        50,        25,        25};
diff --git a/benchmarks/shufti.cpp b/benchmarks/shufti.cpp
index 7e57d3a9..3e5011eb 100644
--- a/benchmarks/shufti.cpp
+++ b/benchmarks/shufti.cpp
@@ -20,6 +20,7 @@
 
 
 void shufti_benchmarks(int size, int loops, int M, bool has_match) { 
+    size_t real_size = size;
     m128 lo, hi;
     ue2::CharReach chars;
     chars.set('a');
@@ -53,7 +54,7 @@ void shufti_benchmarks(int size, int loops, int M, bool has_match) {
         }
         total_sec /= M;
         bw /= M;
-        std::cout << "\x1B[35m Case with match in random pos and size: " << size << " for " << loops <<" loops ("
+        std::cout << "\x1B[35m Case with match in random pos and size: " << real_size << " for " << loops <<" loops ("
                   << M << " random possisions checked): \x1B[36m shuftiExec elapsetime: \x1B[0m" << (total_sec)
                   << " (μs) \x1B[36m bandwidth: \x1B[0m" << bw <<" (MB/μs)"<<std::endl;
     } else {
@@ -70,13 +71,14 @@ void shufti_benchmarks(int size, int loops, int M, bool has_match) {
         double mb_size = (double) size / 1048576;
         mb_size /= loops;
         bw = mb_size / total_sec;
-        std::cout<<"\x1B[35m Case with no match in random pos and size: "<<size<<" for "<<loops<<" loops:"
+        std::cout<<"\x1B[35m Case with no match in random pos and size: "<<real_size<<" for "<<loops<<" loops:"
                  <<"\x1B[36m shuftiExec elapsetime: \x1B[0m"<<(total_sec)<<" (μs) \x1B[36m bandwidth: \x1B[0m"<< bw <<" (MB/μs)"<<std::endl;
     }
     delete [] kt1;
 }
 
 void rshufti_benchmarks(int size, int loops, int M, bool has_match) {
+    size_t real_size = size;
     m128 lo, hi;
     ue2::CharReach chars;
     chars.set('a');
@@ -110,7 +112,7 @@ void rshufti_benchmarks(int size, int loops, int M, bool has_match) {
         }
         total_sec /= M;
         bw /= M;
-        std::cout << "\x1B[35m Case with match in random pos and size: " << size << " for " << loops<<" loops ("
+        std::cout << "\x1B[35m Case with match in random pos and size: " << real_size << " for " << loops<<" loops ("
                   << M << " random possisions checked): \x1B[36m rshuftiExec elapsetime: \x1B[0m" << total_sec
                   <<" (μs) \x1B[36m bandwidth: \x1B[0m" << bw <<" (MB/μs)"<<std::endl;
     } else {
@@ -126,7 +128,7 @@ void rshufti_benchmarks(int size, int loops, int M, bool has_match) {
         size /=loops;
         double mb_size = (double) size / 1048576;
         bw = mb_size / total_sec;
-        std::cout<<"\x1B[35m Case with no match in random pos and size: "<< size <<" for "<< loops <<" loops:"
+        std::cout<<"\x1B[35m Case with no match in random pos and size: "<< real_size <<" for "<< loops <<" loops:"
                  <<"\x1B[36m rshuftiExec elapsetime: \x1B[0m"<< total_sec <<" (μs) \x1B[36m bandwidth: \x1B[0m"<< bw <<" (MB/μs)"<<std::endl;
     }
     delete [] kt1;
diff --git a/benchmarks/truffle.cpp b/benchmarks/truffle.cpp
index a0d1b0ff..b48cbfe3 100644
--- a/benchmarks/truffle.cpp
+++ b/benchmarks/truffle.cpp
@@ -19,6 +19,7 @@
 
 
 void truffle_benchmarks(int size, int loops, int M, bool has_match) {
+    size_t real_size = size;
     m128 lo, hi;
     ue2::CharReach chars;
     chars.set('a');
@@ -52,7 +53,7 @@ void truffle_benchmarks(int size, int loops, int M, bool has_match) {
         }
         total_sec /= M;
         bw /= M;
-        std::cout << "\x1B[35m Case with match in random pos and size: " << size << " for "<< loops <<" loops ("
+        std::cout << "\x1B[35m Case with match in random pos and size: " << real_size << " for "<< loops <<" loops ("
                   << M <<" random possisions checked): \x1B[36m truffleExec elapsetime: \x1B[0m" << total_sec 
                   << "(μs) \x1B[36m bandwidth: \x1B[0m"<< bw << "(MB/μs)" <<std::endl;
     } else {
@@ -68,7 +69,7 @@ void truffle_benchmarks(int size, int loops, int M, bool has_match) {
         size /= loops;
         double mb_size = (double) size / 1048576;
         bw = mb_size / total_sec;
-        std::cout<<"\x1B[35m Case with no match in random pos and size: "<< size <<" for "<< loops <<" loops:"
+        std::cout<<"\x1B[35m Case with no match in random pos and size: "<< real_size <<" for "<< loops <<" loops:"
                  <<"\x1B[36m truffleExec elapsetime: \x1B[0m" << total_sec << " μs \x1B[36m bandwidth: \x1B[0m"<< bw <<" (MB/μs)"<<std::endl;
     }
     delete [] kt1;
@@ -76,6 +77,7 @@ void truffle_benchmarks(int size, int loops, int M, bool has_match) {
 
 
 void rtruffle_benchmarks(int size, int loops, int M, bool has_match) {  
+    size_t real_size = size;
     m128 lo, hi;
     ue2::CharReach chars;
     chars.set('a');
@@ -109,7 +111,7 @@ void rtruffle_benchmarks(int size, int loops, int M, bool has_match) {
         }
         total_sec /= M;
         bw /= M;
-        std::cout<<"\x1B[35m Case with match in random pos and size: "<<size<<" for "<<loops<<" loops ("
+        std::cout<<"\x1B[35m Case with match in random pos and size: "<< real_size <<" for "<<loops<<" loops ("
                  << M <<" random possisions checked):"<<"\x1B[36m rtruffleExec elapsetime: \x1B[0m" 
                  << total_sec <<" (μs) \x1B[36m bandwidth: \x1B[0m"<< bw <<"(ΜΒ/μs)"<<std::endl;
     } else {
@@ -125,7 +127,7 @@ void rtruffle_benchmarks(int size, int loops, int M, bool has_match) {
         size /=loops;
         double mb_size = (double) size / 1048576;
         bw = mb_size / total_sec;
-        std::cout<<"\x1B[35m Case with no match in random pos and size: "<< size <<" for "<< loops <<" loops:"
+        std::cout<<"\x1B[35m Case with no match in random pos and size: "<< real_size <<" for "<< loops <<" loops:"
                  <<"\x1B[36m rtruffleExec elapsetime: \x1B[0m" << total_sec <<" (μs) \x1B[36m bandwidth: \x1B[0m"<< bw <<" (MB/μs)"<<std::endl;
     }
     delete [] kt1;