Merge pull request #2479 from eisenhauer/PerfMetaData

Add a tool for measuring isolated metadata performance in staging

source/adios2/toolkit/sst/cp/cp_reader.c

@@ -515,6 +515,8 @@ SstStream SstReaderOpen(const char *Name, SstParams Params, SMPI_Comm comm)
         struct _ReaderRegisterMsg ReaderRegister;
 
         memset(&ReaderRegister, 0, sizeof(ReaderRegister));
+        memset(&WriterData, 0, sizeof(WriterData));
+        WriterData.WriterCohortSize = -1;
         ReaderRegister.WriterFile = WriterFileID;
         ReaderRegister.WriterResponseCondition =
             CMCondition_get(Stream->CPInfo->SharedCM->cm, rank0_to_rank0_conn);
@@ -549,7 +551,7 @@ SstStream SstReaderOpen(const char *Name, SstParams Params, SMPI_Comm comm)
         free(pointers);
 
         /* the response value is set in the handler */
-        struct _WriterResponseMsg *response = NULL;
+        volatile struct _WriterResponseMsg *response = NULL;
         CMCondition_set_client_data(Stream->CPInfo->SharedCM->cm,
                                     ReaderRegister.WriterResponseCondition,
                                     &response);
@@ -1401,6 +1403,8 @@ extern void *SstReadRemoteMemory(SstStream Stream, int Rank, long Timestep,
                                  size_t Offset, size_t Length, void *Buffer,
                                  void *DP_TimestepInfo)
 {
+    if (Stream->ConfigParams->ReaderShortCircuitReads)
+        return NULL;
     Stream->Stats.BytesTransferred += Length;
     AddToReadStats(Stream, Rank, Timestep, Length);
     return Stream->DP_Interface->readRemoteMemory(
@@ -2124,6 +2128,8 @@ extern void SstReaderClose(SstStream Stream)
 //  needs no locking
 extern SstStatusValue SstWaitForCompletion(SstStream Stream, void *handle)
 {
+    if (Stream->ConfigParams->ReaderShortCircuitReads)
+        return SstSuccess;
     if (Stream->DP_Interface->waitForCompletion(&Svcs, handle) != 1)
     {
         return SstFatalError;

source/adios2/toolkit/sst/cp/ffs_marshal.c

@@ -923,7 +923,8 @@ static SstStatusValue WaitForReadRequests(SstStream Stream)
             if (Result == SstSuccess)
             {
                 Info->WriterInfo[i].Status = Full;
-                DecodeAndPrepareData(Stream, i);
+                if (!Stream->ConfigParams->ReaderShortCircuitReads)
+                    DecodeAndPrepareData(Stream, i);
             }
             else
             {
@@ -1378,7 +1379,8 @@ extern SstStatusValue SstFFSPerformGets(SstStream Stream)
 
     if (Ret == SstSuccess)
     {
-        FillReadRequests(Stream, Info->PendingVarRequests);
+        if (!Stream->ConfigParams->ReaderShortCircuitReads)
+            FillReadRequests(Stream, Info->PendingVarRequests);
     }
     else
     {

source/adios2/toolkit/sst/sst_data.h

@@ -67,6 +67,7 @@ typedef struct _SstStats
     MACRO(AlwaysProvideLatestTimestep, Bool, int, 0)                           \
     MACRO(SpeculativePreloadMode, SpecPreloadMode, int, SpecPreloadAuto)       \
     MACRO(SpecAutoNodeThreshold, Int, int, 1)                                  \
+    MACRO(ReaderShortCircuitReads, Bool, int, 0)                               \
     MACRO(ControlModule, String, char *, NULL)
 
 typedef enum

testing/adios2/performance/CMakeLists.txt

@@ -5,3 +5,4 @@
 
 add_subdirectory(manyvars)
 add_subdirectory(query)
+add_subdirectory(metadata)

testing/adios2/performance/metadata/CMakeLists.txt

@@ -0,0 +1,10 @@
+#------------------------------------------------------------------------------#
+# Distributed under the OSI-approved Apache License, Version 2.0.  See
+# accompanying file Copyright.txt for details.
+#------------------------------------------------------------------------------#
+
+if(ADIOS2_HAVE_MPI)
+  # just for executing manually for performance studies
+  add_executable(PerfMetaData PerfMetaData.cpp)
+  target_link_libraries(PerfMetaData adios2::cxx11_mpi MPI::MPI_C)
+endif()