Merge pull request #464 from lukaszstolarczuk/fix-valgrind-multi-numa

Fix valgrind multi numa tests

Author: bratpiorka

test/provider_os_memory_multiple_numa_nodes.cpp

@@ -4,12 +4,12 @@
 
 #include "base.hpp"
 #include "numa_helpers.h"
+#include "test_helpers.h"
 
 #include <numa.h>
 #include <numaif.h>
 #include <sched.h>
 
-#include "test_helpers.h"
 #include <umf/providers/provider_os_memory.h>
 
 static umf_os_memory_provider_params_t UMF_OS_MEMORY_PROVIDER_PARAMS_TEST =
@@ -138,7 +138,6 @@ TEST_P(testNumaOnEachNode, checkNumaNodesAllocations) {
         UMF_OS_MEMORY_PROVIDER_PARAMS_TEST;
 
     os_memory_provider_params.numa_list = &numa_node_number;
-    numa_bitmask_setbit(nodemask, numa_node_number);
     os_memory_provider_params.numa_list_len = 1;
     os_memory_provider_params.numa_mode = UMF_NUMA_MODE_BIND;
     initOsProvider(os_memory_provider_params);
@@ -152,7 +151,7 @@ TEST_P(testNumaOnEachNode, checkNumaNodesAllocations) {
     // 'ptr' must point to an initialized value before retrieving its numa node
     memset(ptr, 0xFF, alloc_size);
     int retrieved_numa_node_number = getNumaNodeByPtr(ptr);
-    ASSERT_EQ(retrieved_numa_node_number, numa_node_number);
+    EXPECT_EQ(retrieved_numa_node_number, numa_node_number);
 }
 
 // Test for allocations on numa nodes with mode preferred. It will be executed
@@ -177,7 +176,7 @@ TEST_P(testNumaOnEachNode, checkModePreferred) {
     // 'ptr' must point to an initialized value before retrieving its numa node
     memset(ptr, 0xFF, alloc_size);
     int retrieved_numa_node_number = getNumaNodeByPtr(ptr);
-    ASSERT_EQ(retrieved_numa_node_number, numa_node_number);
+    EXPECT_EQ(retrieved_numa_node_number, numa_node_number);
 }
 
 // Test for allocation on numa node with default mode enabled.
@@ -202,7 +201,7 @@ TEST_P(testNumaOnEachNode, checkModeDefaultSetMempolicy) {
     // 'ptr' must point to an initialized value before retrieving its numa node
     memset(ptr, 0xFF, alloc_size);
     int retrieved_numa_node_number = getNumaNodeByPtr(ptr);
-    ASSERT_EQ(retrieved_numa_node_number, numa_node_number);
+    EXPECT_EQ(retrieved_numa_node_number, numa_node_number);
 }
 
 // Test for allocations on a single numa node with interleave mode enabled.
@@ -216,7 +215,6 @@ TEST_P(testNumaOnEachNode, checkModeInterleaveSingleNode) {
         UMF_OS_MEMORY_PROVIDER_PARAMS_TEST;
 
     os_memory_provider_params.numa_list = &numa_node_number;
-    numa_bitmask_setbit(nodemask, numa_node_number);
     os_memory_provider_params.numa_list_len = 1;
     os_memory_provider_params.numa_mode = UMF_NUMA_MODE_INTERLEAVE;
     initOsProvider(os_memory_provider_params);
@@ -230,7 +228,7 @@ TEST_P(testNumaOnEachNode, checkModeInterleaveSingleNode) {
     // 'ptr' must point to an initialized value before retrieving its numa node
     memset(ptr, 0xFF, pages_num * page_size);
     int retrieved_numa_node_number = getNumaNodeByPtr(ptr);
-    ASSERT_EQ(retrieved_numa_node_number, numa_node_number);
+    EXPECT_EQ(retrieved_numa_node_number, numa_node_number);
 }
 
 // Test for allocation on numa node with mode preferred and an empty nodeset.
@@ -245,6 +243,8 @@ TEST_P(testNumaOnEachCpu, checkModePreferredEmptyNodeset) {
 
     CPU_SET(cpu, mask);
     int ret = sched_setaffinity(0, sizeof(cpu_set_t), mask);
+    CPU_FREE(mask);
+
     UT_ASSERTeq(ret, 0);
 
     umf_os_memory_provider_params_t os_memory_provider_params =
@@ -268,8 +268,7 @@ TEST_P(testNumaOnEachCpu, checkModePreferredEmptyNodeset) {
     // 'ptr' must point to an initialized value before retrieving its numa node
     memset(ptr, 0xFF, alloc_size);
     int retrieved_numa_node_number = getNumaNodeByPtr(ptr);
-    ASSERT_EQ(retrieved_numa_node_number, numa_node_number);
-    CPU_FREE(mask);
+    EXPECT_EQ(retrieved_numa_node_number, numa_node_number);
 }
 
 // Test for allocation on numa node with local mode enabled. The memory is
@@ -282,6 +281,8 @@ TEST_P(testNumaOnEachCpu, checkModeLocal) {
 
     CPU_SET(cpu, mask);
     int ret = sched_setaffinity(0, sizeof(cpu_set_t), mask);
+    CPU_FREE(mask);
+
     UT_ASSERTeq(ret, 0);
 
     umf_os_memory_provider_params_t os_memory_provider_params =
@@ -305,8 +306,7 @@ TEST_P(testNumaOnEachCpu, checkModeLocal) {
     // 'ptr' must point to an initialized value before retrieving its numa node
     memset(ptr, 0xFF, alloc_size);
     int retrieved_numa_node_number = getNumaNodeByPtr(ptr);
-    ASSERT_EQ(retrieved_numa_node_number, numa_node_number);
-    CPU_FREE(mask);
+    EXPECT_EQ(retrieved_numa_node_number, numa_node_number);
 }
 
 // Test for allocation on numa node with default mode enabled.
@@ -331,11 +331,11 @@ TEST_F(testNuma, checkModeDefault) {
     // 'ptr' must point to an initialized value before retrieving its numa node
     memset(ptr, 0xFF, alloc_size);
     int retrieved_numa_node_number = getNumaNodeByPtr(ptr);
-    ASSERT_EQ(retrieved_numa_node_number, numa_node_number);
+    EXPECT_EQ(retrieved_numa_node_number, numa_node_number);
 }
 
 // Test for allocations on numa nodes with interleave mode enabled.
-// The page allocations are interleaved across the set of nodes specified in nodemask.
+// The page allocations are interleaved across the set of all available nodes.
 TEST_F(testNuma, checkModeInterleave) {
     constexpr int pages_num = 1024;
     size_t page_size = sysconf(_SC_PAGE_SIZE);
@@ -370,8 +370,9 @@ TEST_F(testNuma, checkModeInterleave) {
 
     bitmask *retrieved_nodemask = retrieve_nodemask(ptr);
     int ret = numa_bitmask_equal(retrieved_nodemask, nodemask);
-    ASSERT_EQ(ret, 1);
     numa_bitmask_free(retrieved_nodemask);
+
+    EXPECT_EQ(ret, 1);
 }
 
 // Test for allocations on all numa nodes with BIND mode.
@@ -408,9 +409,9 @@ TEST_F(testNuma, checkModeBindOnAllNodes) {
             count++;
         }
     }
-    ASSERT_EQ(count, 1);
+    EXPECT_EQ(count, 1);
     // ... and it's the one which we expect
-    ASSERT_EQ(retrieved_numa_node_number, read_numa_node);
+    EXPECT_EQ(retrieved_numa_node_number, read_numa_node);
 }
 
 // Negative tests for policies with illegal arguments.

test/test_valgrind.sh

@@ -94,7 +94,7 @@ for test in $(ls -1 umf_test-*); do
 		FILTER='--gtest_filter="-*highestCapacityVerify*"'
 		;;
 	umf_test-provider_os_memory_multiple_numa_nodes)
-		FILTER='--gtest_filter="-testNumaNodesAllocations/testNumaOnEachNode*:testNumaNodesAllocationsAllCpus/testNumaOnEachCpu.checkModePreferredEmptyNodeset*:testNumaNodesAllocationsAllCpus/testNumaOnEachCpu.checkModeLocal*"'
+		FILTER='--gtest_filter="-testNuma.checkModeInterleave:testNumaNodesAllocations/testNumaOnEachNode.checkNumaNodesAllocations*:testNumaNodesAllocations/testNumaOnEachNode.checkModePreferred*:testNumaNodesAllocations/testNumaOnEachNode.checkModeInterleaveSingleNode*:testNumaNodesAllocationsAllCpus/testNumaOnEachCpu.checkModePreferredEmptyNodeset*:testNumaNodesAllocationsAllCpus/testNumaOnEachCpu.checkModeLocal*"'
 		;;
 	esac