Restructured benchmark layout (preparing to add new benchmarks).

.github/workflows/benchmarks.yml

@@ -88,20 +88,20 @@ jobs:
         run: cmake --build .build
 
       - name: Run submatch DFA AOT benchmark
-        working-directory: .build/benchmarks/submatch_dfa_aot
+        working-directory: .build/benchmarks/c/submatch
         run: |
           ./run.py --quickverify \
             && ./run.py --repetitions 5 --output results.json \
             && cat results.json
 
       - name: Run submatch DFA JIT benchmark
-        working-directory: .build/benchmarks/submatch_dfa_jit
-        run: ./bench_submatch_dfa_jit
+        working-directory: .build/benchmarks/c/submatch_libre2c/jit
+        run: ./bench_submatch_jit
 
       - name: Run submatch Java benchmark (ReTdfa)
-        working-directory: .build/benchmarks/submatch_java
+        working-directory: .build/benchmarks/c/submatch_libre2c/java
         run: ./run.py
 
       - name: Run submatch NFA benchmark
-        working-directory: .build/benchmarks/submatch_nfa
+        working-directory: .build/benchmarks/c/submatch_libre2c/nfa
         run: ./bench_submatch_nfa

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "benchmarks/submatch_java/REgen"]
-	path = benchmarks/submatch_java/REgen
+[submodule "benchmarks/c/submatch_libre2c/java/REgen"]
+	path = benchmarks/c/submatch_libre2c/java/REgen
 	url = https://github.com/skvadrik/REgen.git

CMakeLists.txt

@@ -633,9 +633,9 @@ if (RE2C_BUILD_LIBS)
     endif()
 
     if(RE2C_BUILD_BENCHMARKS)
-        add_subdirectory(benchmarks/submatch_nfa)
-        add_subdirectory(benchmarks/submatch_dfa_jit)
-        add_subdirectory(benchmarks/submatch_java)
+        add_subdirectory(benchmarks/c/submatch_libre2c/nfa)
+        add_subdirectory(benchmarks/c/submatch_libre2c/jit)
+        add_subdirectory(benchmarks/c/submatch_libre2c/java)
     endif()
 else()
     # empty check target
@@ -645,7 +645,7 @@ else()
 endif()
 
 if(RE2C_BUILD_BENCHMARKS)
-    add_subdirectory(benchmarks/submatch_dfa_aot)
+    add_subdirectory(benchmarks/c/submatch)
 endif()
 
 if(RE2C_BUILD_TESTS)

Makefile.am

@@ -761,8 +761,8 @@ TESTS = \
 
 # benchmarks
 if WITH_BENCHMARKS
-SUBDIRS += benchmarks/submatch_dfa_aot
-EXTRA_DIST += benchmarks/submatch_dfa_aot
+SUBDIRS += benchmarks/c/submatch
+EXTRA_DIST += benchmarks/c
 endif
 
 # libre2c

Makefile.lib.am

@@ -169,12 +169,12 @@ check_PROGRAMS += test_libre2c
 
 # benchmarks
 if WITH_BENCHMARKS
-SUBDIRS += benchmarks/submatch_nfa
-SUBDIRS += benchmarks/submatch_dfa_jit
-EXTRA_DIST += benchmarks/submatch_nfa
-EXTRA_DIST += benchmarks/submatch_dfa_jit
+SUBDIRS += benchmarks/c/submatch_libre2c/nfa
+SUBDIRS += benchmarks/c/submatch_libre2c/jit
+EXTRA_DIST += benchmarks/c/submatch_libre2c/nfa
+EXTRA_DIST += benchmarks/c/submatch_libre2c/jit
 if WITH_JAVA
-SUBDIRS += benchmarks/submatch_java
-EXTRA_DIST += benchmarks/submatch_java
+SUBDIRS += benchmarks/c/submatch_libre2c/java
+EXTRA_DIST += benchmarks/c/submatch_libre2c/java
 endif # WITH_JAVA
 endif # WITH_BENCHMARKS

benchmarks/common/common.cc → benchmarks/c/common/common.cc

@@ -1,6 +1,6 @@
 #include <string.h>
 
-#include "benchmarks/common/common.h"
+#include "benchmarks/c/common/common.h"
 #include "lib/regex.h"
 
 #ifdef HAVE_RE2_RE2_H