HDFFV-10845, 10529 and CMake changes from develop

3 files changed, 70 insertions, 25 deletions

diff --git a/tools/test/perform/CMakeLists.txt b/tools/test/perform/CMakeLists.txt
index 77b154a..d6a25d5 100644
--- a/tools/test/perform/CMakeLists.txt
+++ b/tools/test/perform/CMakeLists.txt
@@ -118,6 +118,23 @@ endif ()
 set_target_properties (zip_perf PROPERTIES FOLDER perform)
 
 if (H5_HAVE_PARALLEL AND BUILD_TESTING)
+  if (UNIX)
+      #-- Adding test for perf - only on unix systems
+      set (perf_SOURCES
+          ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/perf.c
+      )
+      add_executable (perf ${perf_SOURCES})
+      target_include_directories (perf PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+      if (NOT BUILD_SHARED_LIBS)
+        TARGET_C_PROPERTIES (perf STATIC)
+        target_link_libraries (perf PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
+      else ()
+        TARGET_C_PROPERTIES (perf SHARED)
+        target_link_libraries (perf PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+      endif ()
+      set_target_properties (perf PROPERTIES FOLDER perform)
+  endif ()
+
   #-- Adding test for h5perf
   set (h5perf_SOURCES
       ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/pio_perf.c
diff --git a/tools/test/perform/CMakeTests.cmake b/tools/test/perform/CMakeTests.cmake
index 36172d1..f0ae416 100644
--- a/tools/test/perform/CMakeTests.cmake
+++ b/tools/test/perform/CMakeTests.cmake
@@ -53,9 +53,10 @@ add_test (
 )
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_h5perf_serial COMMAND $<TARGET_FILE:h5perf_serial>)
+  add_test (NAME PERFORM_h5perf_serial COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5perf_serial>)
 else ()
   add_test (NAME PERFORM_h5perf_serial COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:h5perf_serial>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
@@ -66,17 +67,20 @@ else ()
       -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
   )
 endif ()
-set_tests_properties (PERFORM_h5perf_serial PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
-set_tests_properties (PERFORM_h5perf_serial PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
+set_tests_properties (PERFORM_h5perf_serial PROPERTIES
+    TIMEOUT ${CTEST_VERY_LONG_TIMEOUT}
+    DEPENDS "PERFORM_h5perform-clearall-objects"
+)
 
 if (HDF5_BUILD_PERFORM_STANDALONE)
-  add_test (NAME PERFORM_h5perf_serial_alone COMMAND $<TARGET_FILE:h5perf_serial_alone>)
+  add_test (NAME PERFORM_h5perf_serial_alone COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5perf_serial_alone>)
 endif ()
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_chunk COMMAND $<TARGET_FILE:chunk>)
+  add_test (NAME PERFORM_chunk COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:chunk>)
 else ()
   add_test (NAME PERFORM_chunk COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:chunk>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
@@ -87,12 +91,15 @@ else ()
       -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
   )
 endif ()
-set_tests_properties (PERFORM_chunk PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
+set_tests_properties (PERFORM_chunk PROPERTIES
+    DEPENDS "PERFORM_h5perform-clearall-objects"
+)
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_iopipe COMMAND $<TARGET_FILE:iopipe>)
+  add_test (NAME PERFORM_iopipe COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:iopipe>)
 else ()
   add_test (NAME PERFORM_iopipe COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:iopipe>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
@@ -103,12 +110,15 @@ else ()
       -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
   )
 endif ()
-set_tests_properties (PERFORM_iopipe PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
+set_tests_properties (PERFORM_iopipe PROPERTIES
+    DEPENDS "PERFORM_h5perform-clearall-objects"
+)
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_overhead COMMAND $<TARGET_FILE:overhead>)
+  add_test (NAME PERFORM_overhead COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:overhead>)
 else ()
   add_test (NAME PERFORM_overhead COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:overhead>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
@@ -119,12 +129,15 @@ else ()
       -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
   )
 endif ()
-set_tests_properties (PERFORM_overhead PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
+set_tests_properties (PERFORM_overhead PROPERTIES
+    DEPENDS "PERFORM_h5perform-clearall-objects"
+)
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_perf_meta COMMAND $<TARGET_FILE:perf_meta>)
+  add_test (NAME PERFORM_perf_meta COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:perf_meta>)
 else ()
   add_test (NAME PERFORM_perf_meta COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:perf_meta>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
@@ -135,12 +148,15 @@ else ()
       -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
   )
 endif ()
-set_tests_properties (PERFORM_perf_meta PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
+set_tests_properties (PERFORM_perf_meta PROPERTIES
+    DEPENDS "PERFORM_h5perform-clearall-objects"
+)
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_zip_perf_help COMMAND $<TARGET_FILE:zip_perf> "-h")
+  add_test (NAME PERFORM_zip_perf_help COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:zip_perf> "-h")
 else ()
   add_test (NAME PERFORM_zip_perf_help COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:zip_perf>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
@@ -151,12 +167,15 @@ else ()
       -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
   )
 endif ()
-set_tests_properties (PERFORM_zip_perf_help PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
+set_tests_properties (PERFORM_zip_perf_help PROPERTIES
+    DEPENDS "PERFORM_h5perform-clearall-objects"
+)
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  add_test (NAME PERFORM_zip_perf COMMAND $<TARGET_FILE:zip_perf> tfilters.h5)
+  add_test (NAME PERFORM_zip_perf COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:zip_perf> tfilters.h5)
 else ()
   add_test (NAME PERFORM_zip_perf COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
       -D "TEST_PROGRAM=$<TARGET_FILE:zip_perf>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
@@ -167,9 +186,15 @@ else ()
       -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
   )
 endif ()
-set_tests_properties (PERFORM_zip_perf PROPERTIES DEPENDS "PERFORM_zip_perf_help;PERFORM_h5perform-clearall-objects")
+set_tests_properties (PERFORM_zip_perf PROPERTIES
+    DEPENDS "PERFORM_zip_perf_help;PERFORM_h5perform-clearall-objects"
+)
 
 if (H5_HAVE_PARALLEL)
+  if (UNIX)
+    add_test (NAME MPI_TEST_PERFORM_perf COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:perf> ${MPIEXEC_POSTFLAGS})
+  endif ()
+
   add_test (NAME MPI_TEST_PERFORM_h5perf COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:h5perf> ${MPIEXEC_POSTFLAGS})
 
   if (HDF5_BUILD_PERFORM_STANDALONE)
diff --git a/tools/test/perform/perf.c b/tools/test/perform/perf.c
index c6e62d5..1d52471 100644
--- a/tools/test/perform/perf.c
+++ b/tools/test/perform/perf.c
@@ -22,6 +22,7 @@
 
 #include "hdf5.h"
 #include "H5private.h"
+#include "h5test.h"
 
 #ifdef H5_HAVE_PARALLEL
 
@@ -77,7 +78,7 @@
 
 hsize_t dims[RANK];     /* dataset dim sizes */
 hsize_t block[RANK], stride[RANK], count[RANK];
-hssize_t start[RANK];
+hsize_t start[RANK];
 hid_t fid;                  /* HDF5 file ID */
 hid_t acc_tpl;    /* File access templates */
 hid_t sid;       /* Dataspace ID */
@@ -240,7 +241,7 @@ int main(int argc, char **argv)
      */
     for(j=0; j < opt_iter; j++) {
         /* setup a file dataspace selection */
-        start[0] = (j*iter_jump)+(mynod*opt_block);
+        start[0] = (hsize_t)((j * iter_jump) + (mynod * opt_block));
         stride[0] = block[0] = opt_block;
         count[0]= 1;
         ret=H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, block);
@@ -293,7 +294,7 @@ int main(int argc, char **argv)
     /* we are going to repeat the read the same pattern the write used */
     for (j=0; j < opt_iter; j++) {
         /* setup a file dataspace selection */
-        start[0] = (j*iter_jump)+(mynod*opt_block);
+        start[0] = (hsize_t)((j * iter_jump) + (mynod * opt_block));
         stride[0] = block[0] = opt_block;
         count[0]= 1;
         ret=H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, block);
@@ -320,13 +321,13 @@ int main(int argc, char **argv)
         VRFY((ret >= 0), "H5Dwrite dataset1 succeeded", !H5FATAL);
 
 
-       if (ret < 0) fprintf(stderr, "node %d, read error, loc = %Ld: %s\n",
+       if (ret < 0) HDfprintf(stderr, "node %d, read error, loc = %Ld: %s\n",
                     mynod, mynod*opt_block, strerror(myerrno));
 
         /* if the user wanted to check correctness, compare the write
          * buffer to the read buffer */
         if (opt_correct && memcmp(buf, buf2, opt_block)) {
-                fprintf(stderr, "node %d, correctness test failed\n", mynod);
+                HDfprintf(stderr, "node %d, correctness test failed\n", mynod);
                 my_correct = 0;
                 MPI_Allreduce(&my_correct, &correct, 1, MPI_INT, MPI_MIN,
                         MPI_COMM_WORLD);
@@ -435,10 +436,12 @@ parse_args(int argc, char **argv)
                        * e.g., -a4096/512  allocate at 4096 bytes
                        * boundary if request size >= 512.
                        */
-                {char *p;
-                opt_alignment = atoi(optarg);
-                if (p=(char*)strchr(optarg, '/'))
-                    opt_threshold = atoi(p+1);
+                {
+                    char *p;
+
+                    opt_alignment = HDatoi(optarg);
+                    if(NULL != (p = (char*)HDstrchr(optarg, '/')))
+                        opt_threshold = HDatoi(p + 1);
                 }
                 HDfprintf(stdout,
                     "alignment/threshold=%Hu/%Hu\n",