From: g. economou <8426352+isildur-g@users.noreply.github.com>
Date: Wed, 1 May 2024 07:59:59 +0000 (+0300)
Subject: Merge branch 'develop' into wip-isildur-g-cppcheck-47-48-58
X-Git-Tag: vectorscan/5.4.12^2~55^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=727cff362178e7a7b6bdcafd9780f9c4b83c8006;p=thirdparty%2Fvectorscan.git

Merge branch 'develop' into wip-isildur-g-cppcheck-47-48-58
---

727cff362178e7a7b6bdcafd9780f9c4b83c8006
diff --cc benchmarks/benchmarks.cpp
index 489dfeb5,1cf31c5f..b9f8d8cb
--- a/benchmarks/benchmarks.cpp
+++ b/benchmarks/benchmarks.cpp
@@@ -128,12 -129,15 +129,15 @@@ static void run_benchmarks(int size, in
      }
  }
  
 -int main() {
 -    int matches[] = {0, MAX_MATCHES};
 +int main(){
 +    const int matches[] = {0, MAX_MATCHES};
      std::vector<size_t> sizes;
-     for (size_t i = 0; i < N; i++) sizes.push_back(16000 << i*2);
-     const char charset[] = "aAaAaAaAAAaaaaAAAAaaaaAAAAAAaaaAAaaa"; 
-   
+     for (size_t i = 0; i < N; i++)
+         sizes.push_back(16000 << i * 2);
+     const char charset[] = "aAaAaAaAAAaaaaAAAAaaaaAAAAAAaaaAAaaa";
+     printf("%-18s, %-12s, %-10s, %-6s, %-10s, %-9s, %-8s, %-7s\n", "Matcher",
+            "max_matches", "size", "loops", "total_sec", "avg_time", "max_bw",
+            "avg_bw");
      for (int m = 0; m < 2; m++) {
          for (size_t i = 0; i < std::size(sizes); i++) {
              MicroBenchmark bench("Shufti", sizes[i]);
diff --cc src/rose/rose_build_bytecode.cpp
index 0283b4d1,639edddc..0d3d0352
--- a/src/rose/rose_build_bytecode.cpp
+++ b/src/rose/rose_build_bytecode.cpp
@@@ -2973,9 -2972,10 +2972,10 @@@ void buildFragmentPrograms(const RoseBu
                                              pfrag.lit_ids, lit_edge_map);
          if (pfrag.included_frag_id != INVALID_FRAG_ID &&
              !lit_prog.empty()) {
 -            auto &cfrag = fragments[pfrag.included_frag_id];
 +            const auto &cfrag = fragments[pfrag.included_frag_id];
              assert(pfrag.s.length() >= cfrag.s.length() &&
-                    !pfrag.s.any_nocase() >= !cfrag.s.any_nocase());
+                    !pfrag.s.any_nocase() == !cfrag.s.any_nocase());
+                    /** !pfrag.s.any_nocase() >= !cfrag.s.any_nocase()); **/
              u32 child_offset = cfrag.lit_program_offset;
              DEBUG_PRINTF("child %u offset %u\n", cfrag.fragment_id,
                           child_offset);
@@@ -2992,8 -2992,9 +2992,8 @@@
                                                      pfrag.lit_ids);
          if (pfrag.included_delay_frag_id != INVALID_FRAG_ID &&
              !rebuild_prog.empty()) {
-             const auto &cfrag = fragments[pfrag.included_delay_frag_id];
-             assert(pfrag.s.length() >= cfrag.s.length() &&
 -            auto &cfrag = fragments[pfrag.included_delay_frag_id];
+             /** assert(pfrag.s.length() >= cfrag.s.length() && **/
+             assert(pfrag.s.length() == cfrag.s.length() &&
                     !pfrag.s.any_nocase() >= !cfrag.s.any_nocase());
              u32 child_offset = cfrag.delay_program_offset;
              DEBUG_PRINTF("child %u offset %u\n", cfrag.fragment_id,