From 62910f293e8d8500685800dc8b9168a98c8e55bb Mon Sep 17 00:00:00 2001 From: Andy Stone Date: Mon, 1 Jul 2024 17:10:19 -0500 Subject: [PATCH] account for nondeterminism --- Signed-off-by: Andy Stone --- .../packages/ConcurrentMap/memLeaks/PREDIFF | 2 +- .../packages/ConcurrentMap/memLeaks/README | 4 - .../ConcurrentMap/memLeaks/testAddSet.good | 17 ----- .../ConcurrentMap/memLeaks/testClear.good | 16 ---- .../ConcurrentMap/memLeaks/testEquality.good | 76 ------------------- .../ConcurrentMap/memLeaks/testGetRemove.good | 18 ----- .../packages/LockFreeQueue/memLeaks/PREDIFF | 5 +- .../packages/LockFreeQueue/memLeaks/README | 4 - .../memLeaks/consistencyCheck.good | 9 ++- .../packages/LockFreeStack/memLeaks/PREDIFF | 5 +- .../packages/LockFreeStack/memLeaks/README | 4 - .../memLeaks/consistencyCheck.good | 8 +- 12 files changed, 17 insertions(+), 151 deletions(-) diff --git a/test/library/packages/ConcurrentMap/memLeaks/PREDIFF b/test/library/packages/ConcurrentMap/memLeaks/PREDIFF index 3762f3755985..c280ebc44fa4 100755 --- a/test/library/packages/ConcurrentMap/memLeaks/PREDIFF +++ b/test/library/packages/ConcurrentMap/memLeaks/PREDIFF @@ -1,4 +1,4 @@ #!/bin/bash -sed -E "s/0x[0-9a-f]*/prediffed/" <$2 >$2.predifftmp +grep -v "\.chpl:.*" < $2 >$2.predifftmp mv $2.predifftmp $2 diff --git a/test/library/packages/ConcurrentMap/memLeaks/README b/test/library/packages/ConcurrentMap/memLeaks/README index e055990e8ac8..6f1ee80cc2d6 100644 --- a/test/library/packages/ConcurrentMap/memLeaks/README +++ b/test/library/packages/ConcurrentMap/memLeaks/README @@ -1,7 +1,3 @@ This directory is locking down that we currently have a memory leak for ConcurrentMap. These tests symlink to equivalent correctness tests and can be removed once this leak is fixed. - -We only symlink to the a subset of these tests where the -allocations/deallocations are deterministic (this should be sufficient for -memory tracking purposes). diff --git a/test/library/packages/ConcurrentMap/memLeaks/testAddSet.good b/test/library/packages/ConcurrentMap/memLeaks/testAddSet.good index 1f271e0be472..2928500295d4 100644 --- a/test/library/packages/ConcurrentMap/memLeaks/testAddSet.good +++ b/test/library/packages/ConcurrentMap/memLeaks/testAddSet.good @@ -3,22 +3,5 @@ ================================================= Memory Leaks ================================================== Allocated Memory (Bytes) Number Size Total Description Address ================================================================================================================= -testAddSet.chpl:5 1 160 160 Bucket(int(64),int(64)) prediffed -testAddSet.chpl:3 1 88 88 Buckets(int(64),int(64)) prediffed -testAddSet.chpl:3 1 128 128 [domain(1,int(64),one)] AtomicObject(unmanaged Base(int(64),int(64))?,false,true)prediffed -testAddSet.chpl:3 1 24 24 _token prediffed -testAddSet.chpl:3 1 24 24 _token prediffed -testAddSet.chpl:3 1 24 24 _token prediffed -testAddSet.chpl:3 1 24 24 _token prediffed -testAddSet.chpl:3 1 24 24 _token prediffed -testAddSet.chpl:3 1 24 24 _token prediffed -testAddSet.chpl:32 1 24 24 _token prediffed -testAddSet.chpl:32 1 24 24 _token prediffed -testAddSet.chpl:32 1 24 24 _token prediffed -testAddSet.chpl:32 1 24 24 _token prediffed -testAddSet.chpl:32 1 24 24 _token prediffed -testAddSet.chpl:32 1 24 24 _token prediffed -testAddSet.chpl:3 1024 8 8192 array elements prediffed -testAddSet.chpl:3 1 72 72 domain(1,int(64),one) prediffed ================================================================================================================= diff --git a/test/library/packages/ConcurrentMap/memLeaks/testClear.good b/test/library/packages/ConcurrentMap/memLeaks/testClear.good index ec8cefb73e69..d9dea1fdb7ed 100644 --- a/test/library/packages/ConcurrentMap/memLeaks/testClear.good +++ b/test/library/packages/ConcurrentMap/memLeaks/testClear.good @@ -3,21 +3,5 @@ ================================================= Memory Leaks ================================================== Allocated Memory (Bytes) Number Size Total Description Address ================================================================================================================= -testClear.chpl:4 1 88 88 Buckets(string,int(64)) prediffed -testClear.chpl:4 1 128 128 [domain(1,int(64),one)] AtomicObject(unmanaged Base(string,int(64))?,false,true)prediffed -testClear.chpl:4 1 24 24 _token prediffed -testClear.chpl:4 1 24 24 _token prediffed -testClear.chpl:4 1 24 24 _token prediffed -testClear.chpl:4 1 24 24 _token prediffed -testClear.chpl:4 1 24 24 _token prediffed -testClear.chpl:4 1 24 24 _token prediffed -testClear.chpl:12 1 24 24 _token prediffed -testClear.chpl:12 1 24 24 _token prediffed -testClear.chpl:12 1 24 24 _token prediffed -testClear.chpl:12 1 24 24 _token prediffed -testClear.chpl:12 1 24 24 _token prediffed -testClear.chpl:12 1 24 24 _token prediffed -testClear.chpl:4 1024 8 8192 array elements prediffed -testClear.chpl:4 1 72 72 domain(1,int(64),one) prediffed ================================================================================================================= diff --git a/test/library/packages/ConcurrentMap/memLeaks/testEquality.good b/test/library/packages/ConcurrentMap/memLeaks/testEquality.good index 8d41cb3d40c7..d436507e54bf 100644 --- a/test/library/packages/ConcurrentMap/memLeaks/testEquality.good +++ b/test/library/packages/ConcurrentMap/memLeaks/testEquality.good @@ -6,81 +6,5 @@ true ================================================= Memory Leaks ================================================== Allocated Memory (Bytes) Number Size Total Description Address ================================================================================================================= -testEquality.chpl:9 1 160 160 Bucket(int(64),int(64)) prediffed -testEquality.chpl:9 1 160 160 Bucket(int(64),int(64)) prediffed -testEquality.chpl:9 1 160 160 Bucket(int(64),int(64)) prediffed -testEquality.chpl:9 1 160 160 Bucket(int(64),int(64)) prediffed -testEquality.chpl:9 1 160 160 Bucket(int(64),int(64)) prediffed -testEquality.chpl:9 1 160 160 Bucket(int(64),int(64)) prediffed -testEquality.chpl:9 1 160 160 Bucket(int(64),int(64)) prediffed -testEquality.chpl:9 1 160 160 Bucket(int(64),int(64)) prediffed -testEquality.chpl:9 1 160 160 Bucket(int(64),int(64)) prediffed -testEquality.chpl:9 1 160 160 Bucket(int(64),int(64)) prediffed -testEquality.chpl:10 1 160 160 Bucket(int(64),int(64)) prediffed -testEquality.chpl:10 1 160 160 Bucket(int(64),int(64)) prediffed -testEquality.chpl:10 1 160 160 Bucket(int(64),int(64)) prediffed -testEquality.chpl:10 1 160 160 Bucket(int(64),int(64)) prediffed -testEquality.chpl:10 1 160 160 Bucket(int(64),int(64)) prediffed -testEquality.chpl:10 1 160 160 Bucket(int(64),int(64)) prediffed -testEquality.chpl:10 1 160 160 Bucket(int(64),int(64)) prediffed -testEquality.chpl:10 1 160 160 Bucket(int(64),int(64)) prediffed -testEquality.chpl:10 1 160 160 Bucket(int(64),int(64)) prediffed -testEquality.chpl:10 1 160 160 Bucket(int(64),int(64)) prediffed -testEquality.chpl:3 1 88 88 Buckets(int(64),int(64)) prediffed -testEquality.chpl:4 1 88 88 Buckets(int(64),int(64)) prediffed -testEquality.chpl:3 1 128 128 [domain(1,int(64),one)] AtomicObject(unmanaged Base(int(64),int(64))?,false,true)prediffed -testEquality.chpl:4 1 128 128 [domain(1,int(64),one)] AtomicObject(unmanaged Base(int(64),int(64))?,false,true)prediffed -testEquality.chpl:3 1 24 24 _token prediffed -testEquality.chpl:3 1 24 24 _token prediffed -testEquality.chpl:3 1 24 24 _token prediffed -testEquality.chpl:3 1 24 24 _token prediffed -testEquality.chpl:3 1 24 24 _token prediffed -testEquality.chpl:3 1 24 24 _token prediffed -testEquality.chpl:4 1 24 24 _token prediffed -testEquality.chpl:4 1 24 24 _token prediffed -testEquality.chpl:4 1 24 24 _token prediffed -testEquality.chpl:4 1 24 24 _token prediffed -testEquality.chpl:4 1 24 24 _token prediffed -testEquality.chpl:4 1 24 24 _token prediffed -testEquality.chpl:13 1 24 24 _token prediffed -testEquality.chpl:13 1 24 24 _token prediffed -testEquality.chpl:13 1 24 24 _token prediffed -testEquality.chpl:13 1 24 24 _token prediffed -testEquality.chpl:13 1 24 24 _token prediffed -testEquality.chpl:13 1 24 24 _token prediffed -testEquality.chpl:13 1 24 24 _token prediffed -testEquality.chpl:13 1 24 24 _token prediffed -testEquality.chpl:13 1 24 24 _token prediffed -testEquality.chpl:13 1 24 24 _token prediffed -testEquality.chpl:13 1 24 24 _token prediffed -testEquality.chpl:13 1 24 24 _token prediffed -testEquality.chpl:14 1 24 24 _token prediffed -testEquality.chpl:14 1 24 24 _token prediffed -testEquality.chpl:14 1 24 24 _token prediffed -testEquality.chpl:14 1 24 24 _token prediffed -testEquality.chpl:14 1 24 24 _token prediffed -testEquality.chpl:14 1 24 24 _token prediffed -testEquality.chpl:14 1 24 24 _token prediffed -testEquality.chpl:14 1 24 24 _token prediffed -testEquality.chpl:14 1 24 24 _token prediffed -testEquality.chpl:14 1 24 24 _token prediffed -testEquality.chpl:14 1 24 24 _token prediffed -testEquality.chpl:14 1 24 24 _token prediffed -testEquality.chpl:19 1 24 24 _token prediffed -testEquality.chpl:19 1 24 24 _token prediffed -testEquality.chpl:19 1 24 24 _token prediffed -testEquality.chpl:19 1 24 24 _token prediffed -testEquality.chpl:19 1 24 24 _token prediffed -testEquality.chpl:19 1 24 24 _token prediffed -testEquality.chpl:20 1 24 24 _token prediffed -testEquality.chpl:20 1 24 24 _token prediffed -testEquality.chpl:20 1 24 24 _token prediffed -testEquality.chpl:20 1 24 24 _token prediffed -testEquality.chpl:20 1 24 24 _token prediffed -testEquality.chpl:20 1 24 24 _token prediffed -testEquality.chpl:3 1024 8 8192 array elements prediffed -testEquality.chpl:4 1024 8 8192 array elements prediffed -testEquality.chpl:3 1 72 72 domain(1,int(64),one) prediffed -testEquality.chpl:4 1 72 72 domain(1,int(64),one) prediffed ================================================================================================================= diff --git a/test/library/packages/ConcurrentMap/memLeaks/testGetRemove.good b/test/library/packages/ConcurrentMap/memLeaks/testGetRemove.good index 79064eaf2e80..d12246d4ce37 100644 --- a/test/library/packages/ConcurrentMap/memLeaks/testGetRemove.good +++ b/test/library/packages/ConcurrentMap/memLeaks/testGetRemove.good @@ -4,23 +4,5 @@ ================================================= Memory Leaks ================================================== Allocated Memory (Bytes) Number Size Total Description Address ================================================================================================================= -testGetRemove.chpl:11 1 416 416 Bucket(string,int(64)) prediffed -testGetRemove.chpl:7 1 88 88 Buckets(string,int(64)) prediffed -testGetRemove.chpl:7 1 128 128 [domain(1,int(64),one)] AtomicObject(unmanaged Base(string,int(64))?,false,true)prediffed -testGetRemove.chpl:7 1 24 24 _token prediffed -testGetRemove.chpl:7 1 24 24 _token prediffed -testGetRemove.chpl:7 1 24 24 _token prediffed -testGetRemove.chpl:7 1 24 24 _token prediffed -testGetRemove.chpl:7 1 24 24 _token prediffed -testGetRemove.chpl:7 1 24 24 _token prediffed -testGetRemove.chpl:16 1 24 24 _token prediffed -testGetRemove.chpl:16 1 24 24 _token prediffed -testGetRemove.chpl:16 1 24 24 _token prediffed -testGetRemove.chpl:16 1 24 24 _token prediffed -testGetRemove.chpl:16 1 24 24 _token prediffed -testGetRemove.chpl:16 1 24 24 _token prediffed -testGetRemove.chpl:7 1024 8 8192 array elements prediffed -testGetRemove.chpl:7 1 72 72 domain(1,int(64),one) prediffed -testGetRemove.chpl:11 1 8 8 string copy data prediffed ================================================================================================================= diff --git a/test/library/packages/LockFreeQueue/memLeaks/PREDIFF b/test/library/packages/LockFreeQueue/memLeaks/PREDIFF index 6515765f58cd..c280ebc44fa4 100755 --- a/test/library/packages/LockFreeQueue/memLeaks/PREDIFF +++ b/test/library/packages/LockFreeQueue/memLeaks/PREDIFF @@ -1,5 +1,4 @@ #!/bin/bash -sed -E "s/0x[0-9a-f]*/prediffed/" <$2 >$2.predifftmp -grep prediffed $2.predifftmp | uniq -c >$2 -rm $2.predifftmp +grep -v "\.chpl:.*" < $2 >$2.predifftmp +mv $2.predifftmp $2 diff --git a/test/library/packages/LockFreeQueue/memLeaks/README b/test/library/packages/LockFreeQueue/memLeaks/README index 3565af197078..8fc534e52e71 100644 --- a/test/library/packages/LockFreeQueue/memLeaks/README +++ b/test/library/packages/LockFreeQueue/memLeaks/README @@ -1,7 +1,3 @@ This directory is locking down that we currently have a memory leak for this module. These tests symlink to equivalent correctness tests and can be removed once this leak is fixed. - -We only symlink to the a subset of these tests where the -allocations/deallocations are deterministic (this should be sufficient for -memory tracking purposes). diff --git a/test/library/packages/LockFreeQueue/memLeaks/consistencyCheck.good b/test/library/packages/LockFreeQueue/memLeaks/consistencyCheck.good index 5897995dbfb7..8c1d835df5ab 100644 --- a/test/library/packages/LockFreeQueue/memLeaks/consistencyCheck.good +++ b/test/library/packages/LockFreeQueue/memLeaks/consistencyCheck.good @@ -1,3 +1,6 @@ -1024 consistencyCheck.chpl:20 1 24 24 Node prediffed - 1 consistencyCheck.chpl:45 1 24 24 Node(int(64)) prediffed - 6 consistencyCheck.chpl:9 1 24 24 _token prediffed + +================================================= Memory Leaks ================================================== +Allocated Memory (Bytes) Number Size Total Description Address +================================================================================================================= +================================================================================================================= + diff --git a/test/library/packages/LockFreeStack/memLeaks/PREDIFF b/test/library/packages/LockFreeStack/memLeaks/PREDIFF index 6515765f58cd..c280ebc44fa4 100755 --- a/test/library/packages/LockFreeStack/memLeaks/PREDIFF +++ b/test/library/packages/LockFreeStack/memLeaks/PREDIFF @@ -1,5 +1,4 @@ #!/bin/bash -sed -E "s/0x[0-9a-f]*/prediffed/" <$2 >$2.predifftmp -grep prediffed $2.predifftmp | uniq -c >$2 -rm $2.predifftmp +grep -v "\.chpl:.*" < $2 >$2.predifftmp +mv $2.predifftmp $2 diff --git a/test/library/packages/LockFreeStack/memLeaks/README b/test/library/packages/LockFreeStack/memLeaks/README index 3565af197078..8fc534e52e71 100644 --- a/test/library/packages/LockFreeStack/memLeaks/README +++ b/test/library/packages/LockFreeStack/memLeaks/README @@ -1,7 +1,3 @@ This directory is locking down that we currently have a memory leak for this module. These tests symlink to equivalent correctness tests and can be removed once this leak is fixed. - -We only symlink to the a subset of these tests where the -allocations/deallocations are deterministic (this should be sufficient for -memory tracking purposes). diff --git a/test/library/packages/LockFreeStack/memLeaks/consistencyCheck.good b/test/library/packages/LockFreeStack/memLeaks/consistencyCheck.good index 485ff9351f35..8c1d835df5ab 100644 --- a/test/library/packages/LockFreeStack/memLeaks/consistencyCheck.good +++ b/test/library/packages/LockFreeStack/memLeaks/consistencyCheck.good @@ -1,2 +1,6 @@ -1024 consistencyCheck.chpl:20 1 24 24 Node prediffed - 6 consistencyCheck.chpl:9 1 24 24 _token prediffed + +================================================= Memory Leaks ================================================== +Allocated Memory (Bytes) Number Size Total Description Address +================================================================================================================= +================================================================================================================= +