WIP 2024-04-24 śro 11:52

Author: lslusarczyk

CMakeLists.txt

@@ -146,7 +146,7 @@ add_custom_target(shp-all-tests)
 add_custom_target(all-tests DEPENDS mhp-all-tests shp-all-tests)
 
 function(add_mhp_ctest_impl)
-  set(options OFFLOAD GDB SYCL DRLOGS)
+  set(options OFFLOAD GDB SYCL DRLOGS TESTLABEL)
   set(oneValueArgs NAME TEST_NAME NPROC)
   set(multiValueArgs TARGS) # Test ARGumentS
 
@@ -220,19 +220,28 @@ function(add_mhp_ctest_impl)
       ${MPIEXEC_PREFLAGS} ${extra_mpiflags} ${wrapper_script} ./${AMC_NAME}
       ${drlogs_param} ${sycl_param} ${AMC_TARGS} COMMAND_EXPAND_LISTS)
 
-  if(NOT AMC_GDB AND NOT AMC_DRLOGS)
+  if(AMC_TESTLABEL)
     set_property(TEST ${AMC_TEST_NAME} PROPERTY LABELS TESTLABEL MHP)
   endif()
   add_dependencies(mhp-all-tests ${AMC_NAME})
 endfunction()
 
-function(add_mhp_ctest)
-  add_mhp_ctest_impl(${ARGN})
+function(add_mhp_auxiliary_ctests)
   add_mhp_ctest_impl(${ARGN} GDB)
   add_mhp_ctest_impl(${ARGN} GDB DRLOGS)
   add_mhp_ctest_impl(${ARGN} DRLOGS)
 endfunction()
 
+function(add_mhp_ctest)
+  add_mhp_ctest_impl(${ARGN} TESTLABEL)
+  add_mhp_auxiliary_ctests(${ARGN})
+endfunction()
+
+function(add_mhp_disabled_ctest)
+  add_mhp_ctest_impl(${ARGN})
+  add_mhp_auxiliary_ctests(${ARGN})
+endfunction()
+
 if(ENABLE_ISHMEM)
 
   set(OFI_PROVIDER
@@ -334,12 +343,16 @@ if(ENABLE_ISHMEM)
 
 endif()
 
-function(add_shp_ctest test_name name)
+function(add_shp_disabled_ctest test_name name)
   add_test(NAME ${test_name} COMMAND ./${name} ${ARGN})
-  set_property(TEST ${test_name} PROPERTY LABELS TESTLABEL SHP)
   add_dependencies(shp-all-tests ${name})
 endfunction()
 
+function(add_shp_ctest test_name name)
+  add_shp_disabled_ctest(${test_name} ${name} ${ARGN})
+  set_property(TEST ${test_name} PROPERTY LABELS TESTLABEL SHP)
+endfunction()
+
 install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
 
 add_subdirectory(include)

benchmarks/gbench/mhp/CMakeLists.txt

@@ -61,11 +61,11 @@ if(CMAKE_BUILD_TYPE STREQUAL "Release" AND NOT MPI_IMPL STREQUAL "openmpi")
   # of static column size for stencil2D disable DPL benchmarks because we get
   # intermittent fails with: ONEAPI_DEVICE_SELECTOR=opencl:cpu mpirun -n 1
   # ./mhp-bench --vector-size 30000 --rows 100 --columns 100 --check
-  add_mhp_ctest(
+  add_mhp_disabled_ctest(
     NAME mhp-bench TARGS --vector-size 30000 --rows 100 --columns 100 --check
     --benchmark_filter=-FFT3D.*)
   if(ENABLE_SYCL)
-    add_mhp_ctest(
+    add_mhp_disabled_ctest(
       NAME mhp-bench SYCL TARGS --vector-size 30000 --rows 100 --columns 100
       --check --benchmark_filter=-.*DPL.*)
   endif()

benchmarks/gbench/mhp/stencil_2d.cpp

@@ -461,9 +461,6 @@ static void Stencil2D_Reference(benchmark::State &state) {
 
 DR_BENCHMARK(Stencil2D_Reference);
 
-/*
-// Disbled due to timeout
-
 //
 // Distributed vector of floats. Granularity ensures segments contain
 // whole rows. Explicitly process segments SPMD-style with SYCL
@@ -511,5 +508,5 @@ static void Stencil2D_SegmentedSYCL_DR(benchmark::State &state) {
 }
 
 DR_BENCHMARK(Stencil2D_SegmentedSYCL_DR);
-*/
+
 #endif // SYCL_LANGUAGE_VERSION

benchmarks/gbench/shp/CMakeLists.txt

@@ -34,7 +34,7 @@ if(NOT ENABLE_CUDA)
   target_sources(shp-bench PRIVATE ../common/black_scholes.cpp)
 endif()
 target_link_libraries(shp-bench shp-benchmark)
-add_shp_ctest(shp-bench shp-bench --vector-size 200000 --check)
+add_shp_disabled_ctest(shp-bench shp-bench --vector-size 200000 --check)
 
 # builds only 1 benchmark for quick testing. Change this to the benchmark you
 # are testing

scripts/run_command_on_compute_node.sh

@@ -12,6 +12,9 @@ cd ${PBS_O_WORKDIR:-.}
 unset SLURM_TASKS_PER_NODE
 unset SLURM_JOBID
 
+# workaround for missing libaccel-config.so.1 on jfpvc compute nodes
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/dmozog/usr/lib64/
+
 echo "Host: " $(hostname)
 echo "CWD: " $(pwd)
 module list

test/gtest/shp/CMakeLists.txt

@@ -26,9 +26,7 @@ foreach(test-exec IN ITEMS shp-tests shp-tests-3 shp-quick-test)
 endforeach()
 
 # timeout in SHP tests
-
-# add_shp_ctest(shp-tests shp-tests)
-
-# add_shp_ctest(shp-tests-3 shp-tests --devicesCount 3)
+add_shp_disabled_ctest(shp-tests shp-tests)
+add_shp_disabled_ctest(shp-tests-3 shp-tests --devicesCount 3)
 
 add_shp_ctest(shp-tests-3-only shp-tests-3 --devicesCount 3)