ChunkV for BP5Writer

ornladios · Jul 6, 2021 · 4ede7e5 · 4ede7e5
1 parent d9db7c7
commit 4ede7e5
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 7 deletions.
diff --git a/source/adios2/CMakeLists.txt b/source/adios2/CMakeLists.txt
@@ -56,7 +56,7 @@ add_library(adios2_core
   toolkit/format/buffer/Buffer.cpp
   toolkit/format/buffer/BufferV.cpp
   toolkit/format/buffer/malloc/MallocV.cpp
-#  toolkit/format/buffer/chunk/ChunkV.cpp
+  toolkit/format/buffer/chunk/ChunkV.cpp
   toolkit/format/buffer/heap/BufferSTL.cpp
 
   toolkit/format/bp/BPBase.cpp toolkit/format/bp/BPBase.tcc

diff --git a/source/adios2/common/ADIOSTypes.h b/source/adios2/common/ADIOSTypes.h
@@ -185,8 +185,12 @@ constexpr uint64_t DefaultMaxBufferSize = MaxSizeT - 1;
 constexpr float DefaultBufferGrowthFactor = 1.05f;
 
 /** default Buffer Chunk Size
- *  2Gb - 100Kb (tolerance)*/
-constexpr uint64_t DefaultBufferChunkSize = 2147381248;
+ *  16Mb */
+constexpr uint64_t DefaultBufferChunkSize = 16 * 1024 * 1024;
+
+/** default minimum size not copying deferred writes
+ *  4Mb */
+constexpr size_t DefaultMinDeferredSize = 4 * 1024 * 1024;
 
 /** default size for writing/reading files using POSIX/fstream/stdio write
  *  2Gb - 100Kb (tolerance)*/

diff --git a/source/adios2/engine/bp5/BP5Engine.cpp b/source/adios2/engine/bp5/BP5Engine.cpp
@@ -237,6 +237,32 @@ void BP5Engine::ParseParams(IO &io, struct BP5Params &Params)
         return false;
     };
 
+    auto lf_SetBufferVTypeParameter = [&](const std::string key, int &parameter,
+                                          int def) {
+        auto itKey = io.m_Parameters.find(key);
+        parameter = def;
+        if (itKey != io.m_Parameters.end())
+        {
+            std::string value = itKey->second;
+            std::transform(value.begin(), value.end(), value.begin(),
+                           ::tolower);
+            if (value == "malloc")
+            {
+                parameter = (int)BufferVType::MallocVType;
+            }
+            else if (value == "chunk")
+            {
+                parameter = (int)BufferVType::ChunkVType;
+            }
+            else
+            {
+                throw std::invalid_argument(
+                    "ERROR: Unknown BP5 BufferVType parameter \"" + value +
+                    "\" (must be \"malloc\" or \"chunk\"");
+            }
+        }
+    };
+
 #define get_params(Param, Type, Typedecl, Default)                             \
     lf_Set##Type##Parameter(#Param, Params.Param, Default);
     BP5_FOREACH_PARAMETER_TYPE_4ARGS(get_params);

diff --git a/source/adios2/engine/bp5/BP5Engine.h b/source/adios2/engine/bp5/BP5Engine.h
@@ -84,6 +84,15 @@ class BP5Engine
 
     std::string GetBPVersionFileName(const std::string &name) const noexcept;
 
+    enum class BufferVType
+    {
+        MallocVType,
+        ChunkVType,
+        Auto
+    };
+
+    BufferVType UseBufferV = BufferVType::ChunkVType;
+
 #define BP5_FOREACH_PARAMETER_TYPE_4ARGS(MACRO)                                \
     MACRO(OpenTimeoutSecs, Int, int, 3600)                                     \
     MACRO(BeginStepPollingFrequencySecs, Int, int, 0)                          \
@@ -97,7 +106,9 @@ class BP5Engine
     MACRO(AsyncTasks, Bool, bool, true)                                        \
     MACRO(GrowthFactor, Float, float, DefaultBufferGrowthFactor)               \
     MACRO(InitialBufferSize, SizeBytes, size_t, DefaultInitialBufferSize)      \
+    MACRO(MinDeferredSize, SizeBytes, size_t, DefaultMinDeferredSize)          \
     MACRO(BufferChunkSize, SizeBytes, size_t, DefaultBufferChunkSize)          \
+    MACRO(BufferVType, BufferVType, int, (int)BufferVType::ChunkVType)         \
     MACRO(ReaderShortCircuitReads, Bool, bool, false)
 
     struct BP5Params

diff --git a/source/adios2/engine/bp5/BP5Writer.cpp b/source/adios2/engine/bp5/BP5Writer.cpp
@@ -12,6 +12,7 @@
 #include "adios2/common/ADIOSMacros.h"
 #include "adios2/core/IO.h"
 #include "adios2/helper/adiosFunctions.h" //CheckIndexRange
+#include "adios2/toolkit/format/buffer/chunk/ChunkV.h"
 #include "adios2/toolkit/format/buffer/malloc/MallocV.h"
 #include "adios2/toolkit/transport/file/FileFStream.h"
 #include <adios2-perfstubs-interface.h>
@@ -44,9 +45,17 @@ BP5Writer::BP5Writer(IO &io, const std::string &name, const Mode mode,
 StepStatus BP5Writer::BeginStep(StepMode mode, const float timeoutSeconds)
 {
     m_WriterStep++;
-    m_BP5Serializer.InitStep(new MallocV("BP5Writer", false,
-                                         m_Parameters.InitialBufferSize,
-                                         m_Parameters.GrowthFactor));
+    if (m_Parameters.BufferVType == (int)BufferVType::MallocVType)
+    {
+        m_BP5Serializer.InitStep(new MallocV("BP5Writer", false,
+                                             m_Parameters.InitialBufferSize,
+                                             m_Parameters.GrowthFactor));
+    }
+    else
+    {
+        m_BP5Serializer.InitStep(new ChunkV("BP5Writer", true /* always copy */,
+                                            m_Parameters.BufferChunkSize));
+    }
     return StepStatus::OK;
 }
 

diff --git a/source/adios2/engine/bp5/BP5Writer.tcc b/source/adios2/engine/bp5/BP5Writer.tcc
@@ -48,7 +48,7 @@ void BP5Writer::PutCommon(Variable<T> &variable, const T *values, bool sync)
         /* If arrays is small, force copying to internal buffer to aggregate
          * small writes */
         size_t n = helper::GetTotalSize(variable.m_Count) * sizeof(T);
-        if (n < 4194304 /* 4MB */)
+        if (n < m_Parameters.MinDeferredSize)
         {
             sync = true;
         }