Merge branch 'develop' into add_multi_gpu_support

SC-SGS · Aug 24, 2023 · 161a92a · 161a92a
2 parents 6bb7fd0 + 83f99bb
commit 161a92a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 24 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -398,15 +398,10 @@ if (CPPUDDLE_WITH_TESTS)
     )
   endif()
   if (NOT CMAKE_BUILD_TYPE MATCHES "Debug") # Performance tests only make sense with optimizations on
-    add_test(allocator_test.performance.analyse_recycle_performance cat allocator_test.out)
-    set_tests_properties(allocator_test.performance.analyse_recycle_performance PROPERTIES
-      FIXTURES_REQUIRED allocator_test_output
-      PASS_REGULAR_EXPRESSION "Test information: Recycler was faster than default allocator!"
-    )
     add_test(allocator_test.performance.analyse_aggressive_performance cat allocator_test.out)
     set_tests_properties(allocator_test.performance.analyse_aggressive_performance PROPERTIES
       FIXTURES_REQUIRED allocator_test_output
-      PASS_REGULAR_EXPRESSION "Test information: Recycler was faster than default allocator!"
+      PASS_REGULAR_EXPRESSION "Test information: Aggressive recycler was faster than default allocator!"
     )
   endif()
   add_test(allocator_test.fixture_cleanup ${CMAKE_COMMAND} -E remove allocator_test.out)
@@ -465,15 +460,10 @@ if (CPPUDDLE_WITH_TESTS)
     )
   endif()
   if (NOT CMAKE_BUILD_TYPE MATCHES "Debug") # Performance tests only make sense with optimizations on
-    add_test(allocator_aligned_test.performance.analyse_recycle_performance cat allocator_aligned_test.out)
-    set_tests_properties(allocator_aligned_test.performance.analyse_recycle_performance PROPERTIES
-      FIXTURES_REQUIRED allocator_aligned_test_output
-      PASS_REGULAR_EXPRESSION "Test information: Recycler was faster than default allocator!"
-    )
     add_test(allocator_aligned_test.performance.analyse_aggressive_performance cat allocator_aligned_test.out)
     set_tests_properties(allocator_aligned_test.performance.analyse_aggressive_performance PROPERTIES
       FIXTURES_REQUIRED allocator_aligned_test_output
-      PASS_REGULAR_EXPRESSION "Test information: Recycler was faster than default allocator!"
+      PASS_REGULAR_EXPRESSION "Test information: Aggressive recycler was faster than default allocator!"
     )
   endif()
   add_test(allocator_aligned_test.fixture_cleanup ${CMAKE_COMMAND} -E remove allocator_aligned_test.out)
@@ -521,15 +511,10 @@ if (CPPUDDLE_WITH_TESTS)
       )
     endif()
     if (NOT CMAKE_BUILD_TYPE MATCHES "Debug") # Performance tests only make sense with optimizations on
-      add_test(allocator_concurrency_test.performance.analyse_recycle_performance cat allocator_concurrency_test.out)
-      set_tests_properties(allocator_concurrency_test.performance.analyse_recycle_performance PROPERTIES
-        FIXTURES_REQUIRED allocator_concurrency_output
-        PASS_REGULAR_EXPRESSION "Test information: Recycler was faster than default allocator!"
-      )
       add_test(allocator_concurrency_test.performance.analyse_aggressive_performance cat allocator_concurrency_test.out)
       set_tests_properties(allocator_concurrency_test.performance.analyse_aggressive_performance PROPERTIES
         FIXTURES_REQUIRED allocator_concurrency_output
-        PASS_REGULAR_EXPRESSION "Test information: Recycler was faster than default allocator!"
+        PASS_REGULAR_EXPRESSION "Test information: Aggressive recycler was faster than default allocator!"
       )
     endif()
     add_test(allocator_concurrency_test.fixture_cleanup ${CMAKE_COMMAND} -E remove allocator_concurrency_test.out)

diff --git a/tests/allocator_aligned_test.cpp b/tests/allocator_aligned_test.cpp
@@ -142,8 +142,8 @@ int main(int argc, char *argv[]) {
                  "recycler!"
               << std::endl;
   }
-  if (recycle_duration < default_duration) {
-    std::cout << "Test information: Recycler was faster than default allocator!"
+  if (aggressive_duration < default_duration) {
+    std::cout << "Test information: Aggressive recycler was faster than default allocator!"
               << std::endl;
   }
   recycler::print_performance_counters();

diff --git a/tests/allocator_hpx_test.cpp b/tests/allocator_hpx_test.cpp
@@ -177,8 +177,8 @@ int hpx_main(int argc, char *argv[]) {
                    "recycler!"
                 << std::endl;
     }
-    if (recycle_duration < default_duration) {
-      std::cout << "Test information: Recycler was faster than default allocator!"
+    if (aggressive_duration < default_duration) {
+      std::cout << "Test information: Aggressive recycler was faster than default allocator!"
                 << std::endl;
     }
   }

diff --git a/tests/allocator_test.cpp b/tests/allocator_test.cpp
@@ -134,8 +134,8 @@ int main(int argc, char *argv[]) {
                  "recycler!"
               << std::endl;
   }
-  if (recycle_duration < default_duration) {
-    std::cout << "Test information: Recycler was faster than default allocator!"
+  if (aggressive_duration < default_duration) {
+    std::cout << "Test information: Aggressive recycler was faster than default allocator!"
               << std::endl;
   }
   recycler::print_performance_counters();