From: g. economou <8426352+isildur-g@users.noreply.github.com>
Date: Wed, 24 Apr 2024 13:13:39 +0000 (+0300)
Subject: Merge branch 'develop' into wip-isildur-g-cppcheck56
X-Git-Tag: vectorscan/5.4.12^2~60^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e68780fb5280e55de18a0ec66b36a75259d0c82;p=thirdparty%2Fvectorscan.git

Merge branch 'develop' into wip-isildur-g-cppcheck56
---

2e68780fb5280e55de18a0ec66b36a75259d0c82
diff --cc benchmarks/benchmarks.cpp
index 5dc08ee4,92806321..ff6496a6
--- a/benchmarks/benchmarks.cpp
+++ b/benchmarks/benchmarks.cpp
@@@ -100,11 -102,11 +102,10 @@@ static void run_benchmarks(int size, in
          }
          avg_time /= max_matches;
          avg_bw /= max_matches;
- 	total_sec /= 1000000.0;
+         total_sec /= 1000000.0;
          /*convert average time to us*/
-         printf(KMAG "%s: %d matches, %d * %d iterations," KBLU " total elapsed time =" RST " %.3f s, " 
-                KBLU "average time per call =" RST " %.3f μs," KBLU " max bandwidth = " RST " %.3f MB/s," KBLU " average bandwidth =" RST " %.3f MB/s \n",
 -        printf("%-18s, %-12u, %-10u, %-6u, %-10.3f, %-9.3f, %-8.3f, %-7.3f\n",
 -               bench.label, max_matches, size, loops, total_sec, avg_time,
 -               max_bw, avg_bw);
++        printf("%-18s, %-12d, %-10d, %-6d, %-10.3f, %-9.3f, %-8.3f, %-7.3f\n",
 +               bench.label, max_matches, size ,loops, total_sec, avg_time, max_bw, avg_bw);
      } else {
          auto start = std::chrono::steady_clock::now();
          for (int i = 0; i < loops; i++) {
@@@ -122,9 -126,8 +125,8 @@@
          max_bw = total_size / total_sec;
          /*convert to MB/s*/
          max_bw /= 1048576.0;
-         printf(KMAG "%s: no matches, %d * %d iterations," KBLU " total elapsed time =" RST " %.3f s, " 
-                KBLU "average time per call =" RST " %.3f μs ," KBLU " bandwidth = " RST " %.3f MB/s \n",
 -        printf("%-18s, %-12s, %-10u, %-6u, %-10.3f, %-9.3f, %-8.3f, %-7s\n",
 -               bench.label, "0", size, loops, total_sec, avg_time, max_bw, "0");
++        printf("%-18s, %-12s, %-10d, %-6d, %-10.3f, %-9.3f, %-8.3f, %-7s\n",
 +               bench.label, size ,loops, total_sec, avg_time, max_bw );
      }
  }