[CTest] Started to use CTest. Changed ci-extra scripts.

egorshamshura · egorshamshura · commit 9986ac214c19 · 2026-03-23T11:20:51.000Z
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,6 +24,10 @@ include(cmake/CompilerOptions.cmake)
 include(cmake/CPM.cmake)
 include(cmake/dependencies.cmake)
 
+if(PROTEA_BUILD_TESTS)
+  enable_testing()
+endif()
+
 add_subdirectory(lib)
 add_subdirectory(sim_lib)
 add_subdirectory(sim_gen)
diff --git a/ci-extra/build.sh b/ci-extra/build.sh
@@ -2,7 +2,7 @@ PRESET_NAME=$1
 
 # Configure CMake
 cmake -S . \
-  --preset "${PRESET_NAME}" -DPROTEA_BUILD_TESTS=true -DQEMU_PATH=qemu-riscv32 -G Ninja
+  --preset "${PRESET_NAME}" -G Ninja
 
 # Build
-cmake --build --preset ${PRESET_NAME} --target all --parallel 12
+cmake --build --preset ${PRESET_NAME} --target install --parallel 12
diff --git a/ci-extra/test.sh b/ci-extra/test.sh
@@ -1,4 +1,11 @@
 PRESET_NAME=$1
 
+# Configure CMake
+cmake -S . \
+  --preset "${PRESET_NAME}" -DPROTEA_BUILD_TESTS=true -DQEMU_PATH=qemu-riscv32 -G Ninja
+
+# Generate tests
+cmake --build --preset ${PRESET_NAME} --target install --parallel 12
+
 # Run tests
-cmake --build --preset ${PRESET_NAME} --target simtests
+ctest -j16
diff --git a/cmake/discover_generated_tests.cmake.in b/cmake/discover_generated_tests.cmake.in
@@ -0,0 +1,23 @@
+if(NOT EXISTS "@OUTPUT_TESTS_DIR@")
+  message(STATUS "Test directory does not exist yet: @OUTPUT_TESTS_DIR@")
+  return()
+endif()
+
+file(GLOB discovered_tests "@OUTPUT_TESTS_DIR@/*")
+
+if(NOT discovered_tests)
+  message(STATUS "No generated tests found in @OUTPUT_TESTS_DIR@")
+endif()
+
+foreach(test_file IN LISTS discovered_tests)
+  if(IS_DIRECTORY "${test_file}")
+    continue()
+  endif()
+
+  get_filename_component(test_name "${test_file}" NAME)
+
+  add_test(
+    "@PROJECT_NAME@.${test_name}"
+    "@GENERATED_SIM_BIN_PATH@" --propagate-exit "${test_file}"
+  )
+endforeach()
diff --git a/test/SimTests/C/CMakeLists.txt b/test/SimTests/C/CMakeLists.txt
@@ -13,6 +13,7 @@ if(PROTEA_BUILD_TESTS)
   endif()
 
   set(TESTS_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/CImpl)
+  set(OUTPUT_TESTS_DIR ${CMAKE_CURRENT_BINARY_DIR}/CImpl/bin)
   set(GENERATED_SIM_BIN_PATH ${protea_simgen_BINARY_DIR}/sim)
 
   ExternalProject_Add(
@@ -26,8 +27,12 @@ if(PROTEA_BUILD_TESTS)
 
   set(RunTests ${tests-common_SOURCE_DIR}/RunTests.py)
 
-  add_custom_target(${PROJECT_NAME}
-    COMMAND ${Python3_EXECUTABLE} ${RunTests} ${GENERATED_SIM_BIN_PATH} ${TESTS_BINARY_DIR}/bin/
-    COMMENT "Running ${PROJECT_NAME}")
-  add_dependencies(${PROJECT_NAME} sim c-simtestsimpl)
+  set(DISCOVER_SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/discover_generated_tests.cmake")
+  configure_file(
+    "${CMAKE_SOURCE_DIR}/cmake/discover_generated_tests.cmake.in"
+    "${DISCOVER_SCRIPT}"
+    @ONLY
+  )
+
+  set_property(DIRECTORY APPEND PROPERTY TEST_INCLUDE_FILES "${DISCOVER_SCRIPT}")
 endif()
diff --git a/test/SimTests/CMakeLists.txt b/test/SimTests/CMakeLists.txt
@@ -1,9 +1,9 @@
 project(simtests)
 
-add_subdirectory(Common)
-
 add_subdirectory(C)
 add_subdirectory(SnippetBased)
 
-add_custom_target(${PROJECT_NAME})
-add_dependencies(${PROJECT_NAME} c-simtests snippetbased-simtests)
+if(PROTEA_BUILD_TESTS)
+    add_custom_target(${PROJECT_NAME})
+    add_dependencies(${PROJECT_NAME} c-simtestsimpl snippetbased-simtestsimpl)
+endif()
diff --git a/test/SimTests/Common/CMakeLists.txt b/test/SimTests/Common/CMakeLists.txt
diff --git a/test/SimTests/Common/RunTests.py b/test/SimTests/Common/RunTests.py
diff --git a/test/SimTests/SnippetBased/CMakeLists.txt b/test/SimTests/SnippetBased/CMakeLists.txt
@@ -29,9 +29,13 @@ if(PROTEA_BUILD_TESTS)
 
   add_dependencies(snippetbased-simtestsimpl protea_irgen sim)
 
-  add_custom_target(${PROJECT_NAME}
-    COMMAND ${Python3_EXECUTABLE} ${RunTests} ${GENERATED_SIM_BIN_PATH} ${OUTPUT_TESTS_DIR}
-    COMMENT "Running ${PROJECT_NAME}")
-  add_dependencies(${PROJECT_NAME} sim snippetbased-simtestsimpl)
+  set(DISCOVER_SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/discover_generated_tests.cmake")
+  configure_file(
+    "${CMAKE_SOURCE_DIR}/cmake/discover_generated_tests.cmake.in"
+    "${DISCOVER_SCRIPT}"
+    @ONLY
+  )
+
+  set_property(DIRECTORY APPEND PROPERTY TEST_INCLUDE_FILES "${DISCOVER_SCRIPT}")
 endif()
 
diff --git a/test/SimTests/SnippetBased/RunTests.sh b/test/SimTests/SnippetBased/RunTests.sh
diff --git a/test/SimTests/SnippetBased/SnippetBasedImpl/InitTestGen.rb b/test/SimTests/SnippetBased/SnippetBasedImpl/InitTestGen.rb
@@ -1,17 +1,24 @@
 # frozen_string_literal: true
 
-require 'Utility/gen_emitter'
+require 'optparse'
 require 'yaml'
+require 'etc'
+require 'parallel'
+require 'Utility/gen_emitter'
 require_relative 'Target/RISCV/Formatter'
 
 module SimTest
   class InitAsmGen
-    attr_reader :ir, :reg2value
+    attr_reader :ir, :reg2value, :rng
 
-    def initialize(ir)
+    def initialize(ir, seed: nil)
       @ir = ir
+      @seed = seed || Random.new_seed
+      @rng = Random.new(@seed)
     end
 
+    def seed; @seed; end
+
     def generate_random_values
       values = {}
       ir[:regfiles].each do |regfile|
@@ -20,7 +27,7 @@ def generate_random_values
           next if attrs.include?(:zero) || attrs.include?(:pc)
           size = reg[:size] || 32
           max = (1 << size) - 1
-          values[reg[:name]] = rand(0..max)
+          values[reg[:name]] = @rng.rand(0..max)
         end
       end
       values
@@ -44,37 +51,78 @@ def generate(formatter, snippet_content, output_file)
       emitter.increase_indent
 
       formatter.epilogue(emitter)
-      File.write(output_file + 'yaml', @reg2value.to_yaml)
-      File.write(output_file + 's', emitter.to_s)
+
+      File.write("#{output_file}yaml", @reg2value.to_yaml)
+      File.write("#{output_file}s", emitter.to_s)
     end
   end
 end
 
-if __FILE__ == $0
-  if ARGV.size < 3 || ARGV.size > 4
-    puts "Usage: #{$0} <ir_yaml_file> <snippets_directory> <output_directory> [num_tests]"
+if __FILE__ == $PROGRAM_NAME
+  options = {
+    num_tests: 4,
+    seed: 42,
+    jobs: Etc.nprocessors
+  }
+
+  parser = OptionParser.new do |opts|
+    opts.banner = "Usage: #{$PROGRAM_NAME} [options] <ir_yaml> <snippets_dir> <output_dir>"
+
+    opts.on('-n', '--num-tests NUM', Integer, 'Number of tests per snippet (default: 4)') do |n|
+      options[:num_tests] = n
+    end
+
+    opts.on('-s', '--seed SEED', Integer, 'Random seed for reproducibility') do |s|
+      options[:seed] = s
+    end
+
+    opts.on('-j', '--jobs NUM', Integer, 'Number of parallel workers (default: CPU count)') do |j|
+      options[:jobs] = j
+    end
+
+    opts.on('-h', '--help', 'Show this help message') do
+      puts opts
+      exit
+    end
+  end
+
+  parser.parse!
+
+  if ARGV.size != 3
+    puts parser
     exit 1
   end
 
-  ir_file = ARGV[0]
-  snippets_dir = ARGV[1]
-  output_directory = ARGV[2]
-  num_tests = ARGV[3] ? ARGV[3].to_i : 4
+  ir_file, snippets_dir, output_directory = ARGV
 
   ir = YAML.load_file(ir_file, symbolize_names: true)
-  generator = SimTest::InitAsmGen.new(ir)
-  formatter = SimTest::RiscVFormatter.new
 
-  Dir.glob(File.join(snippets_dir, '*')).each do |snippet_path|
-    next unless File.file?(snippet_path)
+  snippet_paths = Dir.glob(File.join(snippets_dir, '*')).select { |p| File.file?(p) }
 
+  jobs = snippet_paths.each_with_index.flat_map do |snippet_path, snippet_idx|
     snippet_content = File.read(snippet_path)
     base = File.basename(snippet_path, '.*')
 
-    num_tests.times do |i|
-      output_file = File.join(output_directory, "#{base}_#{i}.init.")
-      generator.generate(formatter, snippet_content, output_file)
-      puts "Generated: #{output_file}s (test #{i+1}/#{num_tests})"
+    options[:num_tests].times.map do |i|
+      {
+        ir: ir,
+        snippet_content: snippet_content,
+        base: base,
+        i: i,
+        num_tests: options[:num_tests],
+        seed: options[:seed] + snippet_idx * options[:num_tests] + i,
+        output_directory: output_directory
+      }
     end
   end
+
+  Parallel.each(jobs, in_processes: options[:jobs]) do |job|
+    formatter = SimTest::RiscVFormatter.new
+    generator = SimTest::InitAsmGen.new(job[:ir], seed: job[:seed])
+
+    output_file = File.join(job[:output_directory], "#{job[:base]}_#{job[:i]}.init.")
+    generator.generate(formatter, job[:snippet_content], output_file)
+
+    puts "Generated: #{output_file}s (seed: #{generator.seed}, test #{job[:i] + 1}/#{job[:num_tests]})"
+  end
 end
diff --git a/test/SimTests/SnippetBased/SnippetBasedImpl/TestGen.rb b/test/SimTests/SnippetBased/SnippetBasedImpl/TestGen.rb
