Re-enable mhp-bench (#746)

* re-enable mhp bench

* disable not working mhp benchmarks

* add timeout for the mhp-bench and add jira issue IDs`

Author: haichangsi

benchmarks/gbench/common/distributed_vector.cpp

@@ -163,7 +163,8 @@ void check_reduce(T actual) {
   }
 }
 
-template <class... BackendT> static void Reduce_DR(benchmark::State &state) {
+template <class... BackendT>
+[[maybe_unused]] static void Reduce_DR(benchmark::State &state) {
   T actual{};
   xhp::distributed_vector<T, BackendT...> src(default_vector_size, fill);
   Stats stats(state, sizeof(T) * src.size(), 0);
@@ -175,7 +176,8 @@ template <class... BackendT> static void Reduce_DR(benchmark::State &state) {
   }
   check_reduce(actual);
 }
-DR_BENCHMARK(Reduce_DR);
+// disabled due to DRA-134
+// DR_BENCHMARK(Reduce_DR);
 
 #ifdef DRISHMEM
 DR_BENCHMARK(Reduce_DR<dr::mhp::IshmemBackend>)->Name("Reduce_DR_ishmem");

benchmarks/gbench/mhp/CMakeLists.txt

@@ -18,10 +18,15 @@ add_executable(
   stencil_1d.cpp
   stencil_2d.cpp
   chunk.cpp
-  mdspan.cpp
+  # mdspan.cpp
   mpi.cpp)
 # cmake-format: on
 
+# disabled with SYCL due to DRA-135
+if(NOT ENABLE_SYCL)
+  target_sources(mhp-bench PRIVATE mdspan.cpp)
+endif()
+
 if(ENABLE_SYCL)
   target_sources(mhp-bench PRIVATE fft3d.cpp)
 endif()
@@ -61,13 +66,13 @@ 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_disabled_ctest(
-    NAME mhp-bench TARGS --vector-size 30000 --rows 100 --columns 100 --check
-    --benchmark_filter=-FFT3D.*)
+  add_mhp_ctest(
+    NAME mhp-bench TIMEOUT 200 TARGS --vector-size 30000 --rows 100 --columns
+    100 --check --benchmark_filter=-FFT3D.*)
   if(ENABLE_SYCL)
-    add_mhp_disabled_ctest(
-      NAME mhp-bench SYCL TARGS --vector-size 30000 --rows 100 --columns 100
-      --check --benchmark_filter=-.*DPL.*)
+    add_mhp_ctest(
+      NAME mhp-bench TIMEOUT 200 SYCL TARGS --vector-size 30000 --rows 100
+      --columns 100 --check --benchmark_filter=-.*DPL.*)
   endif()
 endif()
 

benchmarks/gbench/mhp/shallow_water.cpp

@@ -1286,7 +1286,8 @@ int main(int argc, char *argv[]) {
 
 static void ShallowWater_DR(benchmark::State &state) {
 
-  int n = 1400;
+  // changed from 1400 to reduce CI time
+  int n = 140;
   std::size_t nread, nwrite, nflop;
   ShallowWater::calculate_complexity(n, n, nread, nwrite, nflop);
   Stats stats(state, nread, nwrite, nflop);

benchmarks/gbench/mhp/stencil_2d.cpp

@@ -465,7 +465,8 @@ DR_BENCHMARK(Stencil2D_Reference);
 // Distributed vector of floats. Granularity ensures segments contain
 // whole rows. Explicitly process segments SPMD-style with SYCL
 //
-static void Stencil2D_SegmentedSYCL_DR(benchmark::State &state) {
+[[maybe_unused]] static void
+Stencil2D_SegmentedSYCL_DR(benchmark::State &state) {
   auto s = default_shape();
   auto rows = s[0];
   auto cols = s[1];
@@ -506,7 +507,7 @@ static void Stencil2D_SegmentedSYCL_DR(benchmark::State &state) {
     // checker.check(stencil_steps % 2 ? b : a);
   }
 }
-
-DR_BENCHMARK(Stencil2D_SegmentedSYCL_DR);
+// disabled due to DRA-136
+// DR_BENCHMARK(Stencil2D_SegmentedSYCL_DR);
 
 #endif // SYCL_LANGUAGE_VERSION