tmplr: Update tmplr to v1.4

Signed-off-by: Diogo Behrens <[email protected]>

Author: db7

.github/workflows/actions.yml

@@ -123,6 +123,7 @@ jobs:
         run: cmake -S . -Bbuild
              -DCMAKE_TOOLCHAIN_FILE=".github/toolchains/${{ matrix.toolchain }}.cmake"
              -DCMAKE_C_FLAGS="-${{ matrix.optimization_level }} ${{ matrix.flags }}"
+             -DVATOMIC_DEV=OFF
       - name: Build
         run: cmake --build build
       - name: Test
@@ -145,6 +146,7 @@ jobs:
         run: cmake -S . -Bbuild
              -DCMAKE_TOOLCHAIN_FILE=".github/toolchains/${{ matrix.toolchain }}.cmake"
              -DCMAKE_C_FLAGS="-${{ matrix.optimization_level }} ${{ matrix.flags }}"
+             -DVATOMIC_DEV=OFF
       - name: Build
         run: cmake --build build
       - name: Test
@@ -172,12 +174,13 @@ jobs:
         run: cmake -S . -Bbuild
              -DCMAKE_TOOLCHAIN_FILE=".github/toolchains/${{ matrix.options.toolchain }}.cmake"
              -DCMAKE_C_FLAGS="-${{ matrix.optimization_level }} ${{ matrix.options.flags }}"
+             -DVATOMIC_DEV=OFF
       - name: Build
         run: cmake --build build
       - name: Test
         run: ctest --test-dir build --output-on-failure
 
-  boogie-verification-rust-armv8:
+  verify-armv8:
     strategy:
       matrix:
         target: [ builtin, llsc, lse, lxe ]
@@ -190,13 +193,13 @@ jobs:
         with:
           fetch-depth: 0
       - name: Configure
-        run: cmake -S. -Bbuild
+        run: cmake -S. -Bbuild -DVATOMIC_DEV=OFF
       - name: Build
         run: cmake --build build --target build_boogie_armv8_${{ matrix.target }}_${{ matrix.group }}
       - name: Verify
         run: ctest -j 4 -L armv8_${{ matrix.target }}_${{ matrix.group }} --test-dir build/verify
 
-  boogie-verification-rust-riscv:
+  verify-riscv:
     strategy:
       matrix:
         group: [ vatomic8, vatomic16, vatomic32, vatomic64, vatomicsz, vatomicptr, vatomic_fence ]
@@ -208,7 +211,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Configure
-        run: cmake -S. -Bbuild
+        run: cmake -S. -Bbuild -DVATOMIC_DEV=OFF
       - name: Build
         run: cmake --build build --target build_boogie_riscv_builtin_${{ matrix.group }}
       - name: Verify

CMakeLists.txt

@@ -23,21 +23,31 @@ install(DIRECTORY include/vsync DESTINATION include)
 install(FILES vmm.cat DESTINATION share/vsync/)
 install(TARGETS vatomic EXPORT ${PROJECT_TARGETS})
 
-# Enable development targets only if this is the top level project
+# Enable development and test targets only if this is the top level project
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
     set(VATOMIC_DEV_DEFAULT ON)
+    set(VATOMIC_TESTS_DEFAULT ON)
 else()
     set(VATOMIC_DEV_DEFAULT OFF)
+    set(VATOMIC_TESTS_DEFAULT OFF)
 endif()
 
-option(VATOMIC_DEV "Enable development targets" ${VATOMIC_DEV_DEFAULT})
+option(VATOMIC_DEV
+       "Enable generating vatomic headers from templates with tmplr"
+       ${VATOMIC_DEV_DEFAULT})
+option(VATOMIC_TESTS "Enable test and verification targets"
+       ${VATOMIC_TESTS_DEFAULT})
 
 if(VATOMIC_DEV)
     # Atomic templating
+    include(cmake/tmplr.cmake)
+    set(TMPLR_PROGRAM ${TMPLR_PROGRAM} -P_tmpl -b 1000)
     add_subdirectory(template)
-    add_subdirectory(tmplr)
+
+    # Documentation generation
     include(cmake/doc.cmake)
     add_doc_targets()
+
     # Basic format sanitization
     add_custom_target(
         sanitize-vatomic
@@ -62,7 +72,9 @@ if(VATOMIC_DEV)
 
     # General diff check for pipeline
     add_custom_target(diff-check COMMAND git --no-pager diff --exit-code)
+endif()
 
+if(VATOMIC_TESTS)
     include(CTest)
     include(ProcessorCount)
     include(cmake/v_add_test.cmake)

cmake/tmplr.cmake

@@ -0,0 +1,28 @@
+# Copyright (C) Huawei Technologies Co., Ltd. 2025. All rights reserved.
+# SPDX-License-Identifier: MIT
+
+set(OPENS4C_URL "https://github.com/open-s4c")
+set(TMPLR_VERSION "1.4")
+set(TMPLR_URL "${OPENS4C_URL}/tmplr/archive/refs/tags/v${TMPLR_VERSION}.tar.gz")
+set(TMPLR_SHA256
+    "ab6b67cd9894afbd8f262a7739598902c873c89007bcddb818afe65b405294ea")
+
+if(DEFINED TMPLR_PROGRAM AND EXISTS "${TMPLR_PROGRAM}")
+    # Cached values are valid; nothing further needed.
+    return()
+endif()
+
+execute_process(
+    COMMAND
+        "${CMAKE_SOURCE_DIR}/scripts/ensure-cmd.sh" -q #
+        --workdir "${CMAKE_BINARY_DIR}" #
+        --url "${TMPLR_URL}" #
+        --sha256 "${TMPLR_SHA256}" #
+        "tmplr" "${TMPLR_VERSION}"
+    OUTPUT_VARIABLE TMPLR_PROGRAM
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    RESULT_VARIABLE ENSURE_TMPLR_RC)
+if(NOT ENSURE_TMPLR_RC EQUAL 0)
+    message(FATAL_ERROR "Failed to ensure tmplr ${TMPLR_VERSION} is available")
+endif()
+message(STATUS "tmplr v${TMPLR_VERSION}: ${TMPLR_PROGRAM}")