improve autotuner

xspanger3770 · Apr 18, 2024 · 894b5ce · 894b5ce
1 parent 9c6d12b
commit 894b5ce
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/GQHypocenterSearch/CMakeLists.txt b/GQHypocenterSearch/CMakeLists.txt
@@ -12,9 +12,14 @@ if(NOT DEFINED TILE)
     set(TILE ${TILE_DEFAULT})
 endif()
 
+if(NOT DEFINED TESTS)
+    set(TESTS_DEFAULT 16)
+    set(TESTS ${TESTS_DEFAULT})
+endif()
+
 # Add definitions for CUDA_NVCC_FLAGS based on BLOCK_HYPOCS and TILE
-set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} $ENV{CUDA_NVCC_FLAGS} --use_fast_math -DBLOCK_HYPOCS=${BLOCK_HYPOCS} -DTILE=${TILE}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBLOCK_HYPOCS=${BLOCK_HYPOCS} -DTILE=${TILE}")
+set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} $ENV{CUDA_NVCC_FLAGS} --use_fast_math -DTESTS=${TESTS} -DBLOCK_HYPOCS=${BLOCK_HYPOCS} -DTILE=${TILE}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBLOCK_HYPOCS=${BLOCK_HYPOCS} -DTESTS=${TESTS} -DTILE=${TILE}")
 
 # Find CUDA package
 find_package(CUDA REQUIRED)

diff --git a/GQHypocenterSearch/autotune.sh b/GQHypocenterSearch/autotune.sh
@@ -4,6 +4,9 @@
 BLOCK_HYPOCS_VALUES=(32 64 128 224 256 264 280 324 360 384 442 512 1024)
 TILE_VALUES=(1 2 3 4 5 6 7 8 10 12)
 
+DEFAULT_TESTS=12
+TESTS=${1:-$DEFAULT_TESTS}
+
 filename="autotune_results.csv"
 
 # Remove the existing file if it exists
@@ -22,7 +25,7 @@ for BLOCK_HYPOCS in "${BLOCK_HYPOCS_VALUES[@]}"; do
     # Loop over TILE values
     for TILE in "${TILE_VALUES[@]}"; do
         # Run cmake with specified BLOCK_HYPOCS and TILE values
-        cmake -DBLOCK_HYPOCS=$BLOCK_HYPOCS -DTILE=$TILE ..
+        cmake -DBLOCK_HYPOCS=$BLOCK_HYPOCS -DTILE=$TILE -DTESTS=$TESTS ..
 
         # Compile the project using make
         make

diff --git a/GQHypocenterSearch/src/main.cpp b/GQHypocenterSearch/src/main.cpp
@@ -67,7 +67,7 @@ int main() {
 
     float final_result[4];
 
-    int tests = 2;
+    int tests = TESTS;
 
     double best_pps = 0;