From 1a415cb5b54ab7b1ec78b01c2e9d23188e91a103 Mon Sep 17 00:00:00 2001
From: Robert Cohn <robert.s.cohn@intel.com>
Date: Thu, 26 Oct 2023 09:23:47 -0400
Subject: [PATCH] mhp: enable some device memory testing (#596)

* test mhp device memory support

* update

* update
---
 CMakeLists.txt                | 14 +++++++++++++-
 test/gtest/mhp/CMakeLists.txt |  5 +++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c406caf32..67c54a1e95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -202,6 +202,17 @@ function(add_mpi_test test_name name processes)
                    ${MPIEXEC_PREFLAGS} ./${name} ${ARGN} COMMAND_EXPAND_LISTS)
 endfunction()
 
+function(add_mpi_offload_test test_name name processes)
+  # intel mpi needs I_MPI_OFFLOAD=1, mpich does not need anything but it it
+  # harmless so pass it anyway
+  add_test(
+    NAME ${test_name}
+    COMMAND
+      ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${processes}
+      ${MPIEXEC_PREFLAGS} -genv I_MPI_OFFLOAD=1 ./${name} ${ARGN}
+      COMMAND_EXPAND_LISTS)
+endfunction()
+
 install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
 
 add_subdirectory(include)
@@ -237,6 +248,8 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
     endif()
   endif()
 
+  add_subdirectory(test/gtest/mhp)
+
   if(ENABLE_SYCL)
     # disables rng::detail::box_compress::coalesce which causes rng::box to use
     # global non-const variable, which can not be used in SYCL kernels
@@ -249,7 +262,6 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
   add_subdirectory(examples/serial)
   add_subdirectory(test/gtest/serial)
   add_subdirectory(examples/mhp)
-  add_subdirectory(test/gtest/mhp)
   add_subdirectory(benchmarks/gbench)
 
   # Requires clang, icpx/llvm nightly do not support the tools
diff --git a/test/gtest/mhp/CMakeLists.txt b/test/gtest/mhp/CMakeLists.txt
index 97a3724789..ae6a8dd331 100644
--- a/test/gtest/mhp/CMakeLists.txt
+++ b/test/gtest/mhp/CMakeLists.txt
@@ -91,6 +91,11 @@ add_mpi_test(mhp-tests-4 mhp-tests 4)
 add_mpi_test(mhp-tests-3-only mhp-tests-3 3)
 
 if(ENABLE_SYCL)
+  # Excluding tests that failed in CI with segv. They work with manual runs. I
+  # have not investigated the cause.
+  add_mpi_offload_test(
+    mhp-sycl-device-tests-2 mhp-tests 2 --sycl --device-memory
+    --gtest_filter=-Exclusive*:Slide*:Sort*:ComplexSlide*)
   if(NOT MPI_IMPL STREQUAL "openmpi")
     # MPI_Win_create fails for communicator with size 1
     add_mpi_test(mhp-sycl-tests-1 mhp-tests 1 --sycl --gtest_filter=-*Slide*)