More simplifications and -DMINIEXPR_USE_LIBTCC_FALLBACK -> -DMINIEXPR_ENABLE_TCC_JIT

Author: FrancescAlted

.github/workflows/ci.yml

@@ -31,8 +31,7 @@ jobs:
         if [ "$RUNNER_OS" == "Windows" ]; then
           # Visual Studio generators are multi-config; select Release at build time.
           cmake -S . -B build -G "Visual Studio 17 2022" -T ClangCL \
-            -DCMAKE_C_COMPILER=clang-cl \
-            -DMINIEXPR_ENABLE_WINDOWS_LIBTCC_JIT=ON
+            -DCMAKE_C_COMPILER=clang-cl
           grep -Ei '^CMAKE_C_COMPILER:(FILEPATH|STRING|UNINITIALIZED)=.*clang-cl' build/CMakeCache.txt
         else
           cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
@@ -95,16 +94,14 @@ jobs:
           -DMINIEXPR_BUILD_BENCH=OFF \
           -DMINIEXPR_BUILD_EXAMPLES=OFF \
           -DMINIEXPR_USE_SLEEF=OFF \
-          -DMINIEXPR_ENABLE_WASM_LIBTCC_JIT=ON \
           -DMINIEXPR_BUILD_BUNDLED_LIBTCC=OFF \
           -DMINIEXPR_DSL_TRACE_DEFAULT=ON
 
     - name: Verify wasm32 CMake flags
       shell: bash
       run: |
-        grep -E '^MINIEXPR_ENABLE_WASM_LIBTCC_JIT:BOOL=ON$' build-wasm32/CMakeCache.txt
         grep -E '^MINIEXPR_BUILD_BUNDLED_LIBTCC:BOOL=OFF$' build-wasm32/CMakeCache.txt
-        grep -E '^MINIEXPR_USE_LIBTCC_FALLBACK:BOOL=ON$' build-wasm32/CMakeCache.txt
+        grep -E '^MINIEXPR_ENABLE_TCC_JIT:BOOL=ON$' build-wasm32/CMakeCache.txt
 
     - name: Build wasm32 miniexpr + tests
       shell: bash

CMakeLists.txt

@@ -21,32 +21,24 @@ option(MINIEXPR_BUILD_TESTS "Build tests" ON)
 option(MINIEXPR_BUILD_EXAMPLES "Build examples" ON)
 option(MINIEXPR_BUILD_BENCH "Build benchmarks" ON)
 option(MINIEXPR_USE_SLEEF "Enable SLEEF SIMD acceleration" ON)
-option(MINIEXPR_USE_LIBTCC_FALLBACK "Enable libtcc DSL JIT fallback" ON)
-option(MINIEXPR_BUILD_BUNDLED_LIBTCC "Build bundled libtcc from minicc sources when fallback is enabled" ON)
+option(MINIEXPR_ENABLE_TCC_JIT "Enable TCC-based JIT backends (libtcc/wasm32)" ON)
+option(MINIEXPR_BUILD_BUNDLED_LIBTCC "Build bundled libtcc from minicc sources when TCC JIT is enabled" ON)
 option(MINIEXPR_DSL_TRACE_DEFAULT "Enable DSL trace logs by default when ME_DSL_TRACE is unset" OFF)
-option(MINIEXPR_ENABLE_WASM_LIBTCC_JIT "Enable experimental libtcc DSL JIT support on Emscripten" OFF)
-option(MINIEXPR_ENABLE_WINDOWS_LIBTCC_JIT "Enable experimental libtcc DSL JIT support on Windows" OFF)
 
 if(EMSCRIPTEN)
-  if(MINIEXPR_ENABLE_WASM_LIBTCC_JIT)
-    set(MINIEXPR_USE_LIBTCC_FALLBACK ON)
-    set(MINIEXPR_BUILD_BUNDLED_LIBTCC OFF)
+  # wasm32 JIT uses a static libtcc build; bundled host shared libtcc is not used.
+  set(MINIEXPR_BUILD_BUNDLED_LIBTCC OFF)
+  if(MINIEXPR_ENABLE_TCC_JIT)
     set(MINIEXPR_USE_WASM32_JIT ON)
   else()
-    # Plain wasm32 builds default to interpreter-only DSL execution.
-    set(MINIEXPR_USE_LIBTCC_FALLBACK OFF)
     set(MINIEXPR_USE_WASM32_JIT OFF)
   endif()
-elseif(WIN32)
-  if(MINIEXPR_ENABLE_WINDOWS_LIBTCC_JIT)
-    set(MINIEXPR_USE_LIBTCC_FALLBACK ON)
-  else()
-    set(MINIEXPR_USE_LIBTCC_FALLBACK OFF)
-  endif()
+elseif(NOT DEFINED MINIEXPR_USE_WASM32_JIT)
+  set(MINIEXPR_USE_WASM32_JIT OFF)
 endif()
 
 set(MINIEXPR_NEEDS_BUNDLED_TINYCC OFF)
-if(MINIEXPR_USE_LIBTCC_FALLBACK AND MINIEXPR_BUILD_BUNDLED_LIBTCC)
+if(MINIEXPR_ENABLE_TCC_JIT AND MINIEXPR_BUILD_BUNDLED_LIBTCC)
   set(MINIEXPR_NEEDS_BUNDLED_TINYCC ON)
 endif()
 set(MINIEXPR_NEEDS_TINYCC OFF)
@@ -248,7 +240,7 @@ function(miniexpr_setup_target target_name)
   else()
     target_compile_definitions(${target_name} PRIVATE ME_USE_SLEEF=0)
   endif()
-  if(MINIEXPR_USE_LIBTCC_FALLBACK)
+  if(MINIEXPR_ENABLE_TCC_JIT)
     target_compile_definitions(${target_name} PRIVATE ME_USE_LIBTCC_FALLBACK=1)
     if(DEFINED MINIEXPR_TINYCC_STAGED_SHARED_PATH)
       target_compile_definitions(${target_name}

README.md

@@ -207,11 +207,14 @@ Options:
 - `-DMINIEXPR_BUILD_EXAMPLES=ON|OFF`
 - `-DMINIEXPR_BUILD_BENCH=ON|OFF`
 - `-DMINIEXPR_USE_SLEEF=ON|OFF`
-- `-DMINIEXPR_USE_LIBTCC_FALLBACK=ON|OFF`
-- `-DMINIEXPR_BUILD_BUNDLED_LIBTCC=ON|OFF` (build bundled libtcc from minicc when fallback is enabled)
+- `-DMINIEXPR_ENABLE_TCC_JIT=ON|OFF`
+- `-DMINIEXPR_BUILD_BUNDLED_LIBTCC=ON|OFF` (build bundled libtcc from minicc when TCC JIT is enabled)
 - `-DMINIEXPR_DSL_TRACE_DEFAULT=ON|OFF` (emit DSL trace logs by default when `ME_DSL_TRACE` is unset)
-- `-DMINIEXPR_ENABLE_WASM_LIBTCC_JIT=ON|OFF` (Emscripten-only, experimental)
-- `-DMINIEXPR_ENABLE_WINDOWS_LIBTCC_JIT=ON|OFF` (Windows-only, experimental)
+
+Notes:
+- On Windows, TCC JIT is enabled by default (`MINIEXPR_ENABLE_TCC_JIT=ON`).
+- On Emscripten, setting `MINIEXPR_ENABLE_TCC_JIT=ON` enables wasm32 JIT support automatically.
+- Setting `MINIEXPR_ENABLE_TCC_JIT=OFF` disables TCC-based JIT backends; on Linux/macOS, the separate `# me:compiler=cc` runtime path may still be available.
 
 ### SLEEF SIMD acceleration
 

doc/dsl-usage.md

@@ -90,6 +90,7 @@ Notes:
 - This pragma is independent from `# me:fp=...`.
 - With `# me:compiler=cc`, runtime uses `CC` (default: `cc`) to select the compiler executable.
 - With `# me:compiler=cc`, runtime also honors `CFLAGS`.
+- Build option `MINIEXPR_ENABLE_TCC_JIT=OFF` disables TCC-based JIT backends; on Linux/macOS, the separate `# me:compiler=cc` runtime path may still be available.
 - If the selected backend is unavailable at runtime, miniexpr falls back to interpreter execution.
 
 ### Temporary Variables