#2036 Update PerfTestHarness to allow for multiple tests in a single file

tests/CMakeLists.txt

@@ -271,7 +271,7 @@ foreach(PERF_TEST ${PROJECT_PERF_TESTS})
     PROPERTIES
     PROCESSORS ${PERF_TEST_NUMPROC}
     RUN_SERIAL TRUE  # do not run in parallel with any other tests
-    TIMEOUT 300
+    TIMEOUT 500
     LABELS "perf_test"
   )
 endforeach()

tests/perf/collection_local_send.cc

@@ -67,8 +67,9 @@ struct NodeObj {
   struct ReduceMsg : vt::collective::ReduceNoneMsg { };
 
   explicit NodeObj(MyTest* test_obj) : test_obj_(test_obj) { }
-  void initialize() {
+  void initialize(bool preallocate) {
     proxy_ = global_proxy = vt::theObjGroup()->getProxy<NodeObj>(this);
+    preallocate_ = preallocate;
 
     auto range = vt::Index1D(8);
     col_proxy = vt::makeCollection<TestCol>("test")
@@ -81,6 +82,14 @@ struct NodeObj {
   void complete() {
   }
 
+  void perfMakeRunnablePreAllocate(MyMsg* in_msg) {
+    for (int i = 0; i < num_iters; i++) {
+      msgs.emplace_back(makeMessage<TestCol::ColMsg>());
+    }
+
+    perfMakeRunnable(in_msg);
+  }
+
   void perfMakeRunnable(MyMsg* in_msg) {
     theTerm()->disableTD();
 
@@ -93,7 +102,7 @@ struct NodeObj {
 
   void perfRunBenchmark() {
     for (int i = 0; i < num_iters; i++) {
-      auto m = makeMessage<TestCol::ColMsg>();
+      auto m = preallocate_ ? msgs[i] : makeMessage<TestCol::ColMsg>();
       col_proxy[0].template sendMsg<&TestCol::han>(m);
       vt::theSched()->runSchedulerOnceImpl();
     }
@@ -107,18 +116,31 @@ struct NodeObj {
   vt::CollectionProxy<TestCol> col_proxy;
   int reduce_counter_ = -1;
   int i = 0;
+  bool preallocate_ = false;
 };
 
 VT_PERF_TEST(MyTest, test_collection_local_send) {
   auto grp_proxy = vt::theObjGroup()->makeCollective<NodeObj>(
     "test_collection_local_send", this
   );
 
-  grp_proxy[my_node_].invoke<&NodeObj::initialize>();
+  grp_proxy[my_node_].invoke<&NodeObj::initialize>(false);
 
   if (theContext()->getNode() == 0) {
     grp_proxy[my_node_].send<&NodeObj::perfMakeRunnable>();
   }
 }
 
+VT_PERF_TEST(MyTest, test_collection_local_send_preallocate) {
+  auto grp_proxy = vt::theObjGroup()->makeCollective<NodeObj>(
+    "test_collection_local_send_preallocate", this
+  );
+
+  grp_proxy[my_node_].invoke<&NodeObj::initialize>(true);
+
+  if (theContext()->getNode() == 0) {
+    grp_proxy[my_node_].send<MyMsg, &NodeObj::perfMakeRunnablePreAllocate>();
+  }
+}
+
 VT_PERF_TEST_MAIN()

tests/perf/common/test_harness.h

@@ -45,6 +45,7 @@
 #define INCLUDED_PERF_COMMON_TEST_HARNESS_H
 
 #include "timers.h"
+#include "test_harness_base.h"
 #include "test_harness_macros.h"
 
 #include <vt/configs/types/types_type.h>
@@ -64,9 +65,10 @@ struct TestResultHolder {
   T max_ = {};
 };
 
-struct PerfTestHarness {
+struct PerfTestHarness : TestHarnessBase {
   using TestName = std::string;
   using TestResult = std::pair<TestName, TimeType>;
+
   using FinalTestResult = std::pair<TestName, TestResultHolder<TimeType>>;
   using TestResults = std::vector<std::vector<TestResult>>;
   using PerNodeResults =
@@ -78,8 +80,6 @@ struct PerfTestHarness {
   using CombinedMemoryUse =
     std::unordered_map<NodeType, std::vector<TestResultHolder<std::size_t>>>;
 
-  virtual ~PerfTestHarness() = default;
-
   virtual void SetUp();
   virtual void TearDown();
 

tests/perf/common/test_harness_base.h

@@ -0,0 +1,54 @@
+//@HEADER
+// *****************************************************************************
+//
+//                             test_harness_base.h
+//                       DARMA/vt => Virtual Transport
+//
+// Copyright 2019-2021 National Technology & Engineering Solutions of Sandia, LLC
+// (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.
+// Government retains certain rights in this software.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+//
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+//
+// * Neither the name of the copyright holder nor the names of its
+//   contributors may be used to endorse or promote products derived from this
+//   software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Questions? Contact darma@sandia.gov
+//
+// *****************************************************************************
+//@HEADER
+
+#if !defined INCLUDED_PERF_COMMON_TEST_HARNESS_BASE_H
+#define INCLUDED_PERF_COMMON_TEST_HARNESS_BASE_H
+
+namespace vt::tests::perf::common {
+
+struct TestHarnessBase {
+  virtual void TestFunc() {}
+  virtual ~TestHarnessBase() = default;
+};
+
+} // namespace vt::tests::perf::common
+
+#endif