From 41d4cffe18df52c5b4b085d6000ab90a418fcaae Mon Sep 17 00:00:00 2001 From: Andy Stone Date: Fri, 28 Jun 2024 11:58:10 -0700 Subject: [PATCH 1/2] turn concurrentMap test futures into nightly tests Previously, we were locking down the expected memleak behavior for these tests. Not all of our nightly jobs run futures but we would still like to run these as correctness tests. We also have infrastructure for detecting tests that leak memory so it's better to leverage that rather than having these as futures anyway. So, I've rewritten these to not pass `--memLeaks` and then added some separate "memLeak" only tests. --- Signed-off-by: Andy Stone --- .../ConcurrentMap/{ => memLeakTests}/EXECOPTS | 0 .../ConcurrentMap/memLeakTests/PREDIFF | 4 + .../ConcurrentMap/memLeakTests/README | 7 ++ .../memLeakTests/testAddSet.chpl | 1 + .../memLeakTests/testAddSet.good | 24 ++++++ .../ConcurrentMap/memLeakTests/testClear.chpl | 1 + .../ConcurrentMap/memLeakTests/testClear.good | 23 +++++ .../memLeakTests/testEquality.chpl | 1 + .../memLeakTests/testEquality.good | 86 +++++++++++++++++++ .../memLeakTests/testGetRemove.chpl | 1 + .../memLeakTests/testGetRemove.good | 26 ++++++ .../memLeakTests/utilFunctions.chpl | 1 + .../memLeakTests/utilFunctions.good | 0 .../packages/ConcurrentMap/testAddSet.future | 1 - .../packages/ConcurrentMap/testClear.future | 1 - .../ConcurrentMap/testContains.future | 1 - .../ConcurrentMap/testEquality.future | 1 - .../packages/ConcurrentMap/testExtend.future | 1 - .../ConcurrentMap/testGetRemove.future | 1 - 19 files changed, 175 insertions(+), 6 deletions(-) rename test/library/packages/ConcurrentMap/{ => memLeakTests}/EXECOPTS (100%) create mode 100755 test/library/packages/ConcurrentMap/memLeakTests/PREDIFF create mode 100644 test/library/packages/ConcurrentMap/memLeakTests/README create mode 120000 test/library/packages/ConcurrentMap/memLeakTests/testAddSet.chpl create mode 100644 test/library/packages/ConcurrentMap/memLeakTests/testAddSet.good create mode 120000 test/library/packages/ConcurrentMap/memLeakTests/testClear.chpl create mode 100644 test/library/packages/ConcurrentMap/memLeakTests/testClear.good create mode 120000 test/library/packages/ConcurrentMap/memLeakTests/testEquality.chpl create mode 100644 test/library/packages/ConcurrentMap/memLeakTests/testEquality.good create mode 120000 test/library/packages/ConcurrentMap/memLeakTests/testGetRemove.chpl create mode 100644 test/library/packages/ConcurrentMap/memLeakTests/testGetRemove.good create mode 120000 test/library/packages/ConcurrentMap/memLeakTests/utilFunctions.chpl create mode 100644 test/library/packages/ConcurrentMap/memLeakTests/utilFunctions.good delete mode 100644 test/library/packages/ConcurrentMap/testAddSet.future delete mode 100644 test/library/packages/ConcurrentMap/testClear.future delete mode 100644 test/library/packages/ConcurrentMap/testContains.future delete mode 100644 test/library/packages/ConcurrentMap/testEquality.future delete mode 100644 test/library/packages/ConcurrentMap/testExtend.future delete mode 100644 test/library/packages/ConcurrentMap/testGetRemove.future diff --git a/test/library/packages/ConcurrentMap/EXECOPTS b/test/library/packages/ConcurrentMap/memLeakTests/EXECOPTS similarity index 100% rename from test/library/packages/ConcurrentMap/EXECOPTS rename to test/library/packages/ConcurrentMap/memLeakTests/EXECOPTS diff --git a/test/library/packages/ConcurrentMap/memLeakTests/PREDIFF b/test/library/packages/ConcurrentMap/memLeakTests/PREDIFF new file mode 100755 index 000000000000..3762f3755985 --- /dev/null +++ b/test/library/packages/ConcurrentMap/memLeakTests/PREDIFF @@ -0,0 +1,4 @@ +#!/bin/bash + +sed -E "s/0x[0-9a-f]*/prediffed/" <$2 >$2.predifftmp +mv $2.predifftmp $2 diff --git a/test/library/packages/ConcurrentMap/memLeakTests/README b/test/library/packages/ConcurrentMap/memLeakTests/README new file mode 100644 index 000000000000..e055990e8ac8 --- /dev/null +++ b/test/library/packages/ConcurrentMap/memLeakTests/README @@ -0,0 +1,7 @@ +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/memLeakTests/testAddSet.chpl b/test/library/packages/ConcurrentMap/memLeakTests/testAddSet.chpl new file mode 120000 index 000000000000..8e0a14cc9f70 --- /dev/null +++ b/test/library/packages/ConcurrentMap/memLeakTests/testAddSet.chpl @@ -0,0 +1 @@ +../testAddSet.chpl \ No newline at end of file diff --git a/test/library/packages/ConcurrentMap/memLeakTests/testAddSet.good b/test/library/packages/ConcurrentMap/memLeakTests/testAddSet.good new file mode 100644 index 000000000000..1f271e0be472 --- /dev/null +++ b/test/library/packages/ConcurrentMap/memLeakTests/testAddSet.good @@ -0,0 +1,24 @@ +{1: -1} + +================================================= 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/memLeakTests/testClear.chpl b/test/library/packages/ConcurrentMap/memLeakTests/testClear.chpl new file mode 120000 index 000000000000..94d96fdc965c --- /dev/null +++ b/test/library/packages/ConcurrentMap/memLeakTests/testClear.chpl @@ -0,0 +1 @@ +../testClear.chpl \ No newline at end of file diff --git a/test/library/packages/ConcurrentMap/memLeakTests/testClear.good b/test/library/packages/ConcurrentMap/memLeakTests/testClear.good new file mode 100644 index 000000000000..ec8cefb73e69 --- /dev/null +++ b/test/library/packages/ConcurrentMap/memLeakTests/testClear.good @@ -0,0 +1,23 @@ +{} + +================================================= 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/memLeakTests/testEquality.chpl b/test/library/packages/ConcurrentMap/memLeakTests/testEquality.chpl new file mode 120000 index 000000000000..57d5974d2997 --- /dev/null +++ b/test/library/packages/ConcurrentMap/memLeakTests/testEquality.chpl @@ -0,0 +1 @@ +../testEquality.chpl \ No newline at end of file diff --git a/test/library/packages/ConcurrentMap/memLeakTests/testEquality.good b/test/library/packages/ConcurrentMap/memLeakTests/testEquality.good new file mode 100644 index 000000000000..8d41cb3d40c7 --- /dev/null +++ b/test/library/packages/ConcurrentMap/memLeakTests/testEquality.good @@ -0,0 +1,86 @@ +true +false +false +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/memLeakTests/testGetRemove.chpl b/test/library/packages/ConcurrentMap/memLeakTests/testGetRemove.chpl new file mode 120000 index 000000000000..d103c14f2eea --- /dev/null +++ b/test/library/packages/ConcurrentMap/memLeakTests/testGetRemove.chpl @@ -0,0 +1 @@ +../testGetRemove.chpl \ No newline at end of file diff --git a/test/library/packages/ConcurrentMap/memLeakTests/testGetRemove.good b/test/library/packages/ConcurrentMap/memLeakTests/testGetRemove.good new file mode 100644 index 000000000000..79064eaf2e80 --- /dev/null +++ b/test/library/packages/ConcurrentMap/memLeakTests/testGetRemove.good @@ -0,0 +1,26 @@ +1 +{two: 2} + +================================================= 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/ConcurrentMap/memLeakTests/utilFunctions.chpl b/test/library/packages/ConcurrentMap/memLeakTests/utilFunctions.chpl new file mode 120000 index 000000000000..3e9526589b0d --- /dev/null +++ b/test/library/packages/ConcurrentMap/memLeakTests/utilFunctions.chpl @@ -0,0 +1 @@ +../utilFunctions.chpl \ No newline at end of file diff --git a/test/library/packages/ConcurrentMap/memLeakTests/utilFunctions.good b/test/library/packages/ConcurrentMap/memLeakTests/utilFunctions.good new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/test/library/packages/ConcurrentMap/testAddSet.future b/test/library/packages/ConcurrentMap/testAddSet.future deleted file mode 100644 index 8c8863fbae7a..000000000000 --- a/test/library/packages/ConcurrentMap/testAddSet.future +++ /dev/null @@ -1 +0,0 @@ -bug: this test leaks memory diff --git a/test/library/packages/ConcurrentMap/testClear.future b/test/library/packages/ConcurrentMap/testClear.future deleted file mode 100644 index 8c8863fbae7a..000000000000 --- a/test/library/packages/ConcurrentMap/testClear.future +++ /dev/null @@ -1 +0,0 @@ -bug: this test leaks memory diff --git a/test/library/packages/ConcurrentMap/testContains.future b/test/library/packages/ConcurrentMap/testContains.future deleted file mode 100644 index 8c8863fbae7a..000000000000 --- a/test/library/packages/ConcurrentMap/testContains.future +++ /dev/null @@ -1 +0,0 @@ -bug: this test leaks memory diff --git a/test/library/packages/ConcurrentMap/testEquality.future b/test/library/packages/ConcurrentMap/testEquality.future deleted file mode 100644 index 8c8863fbae7a..000000000000 --- a/test/library/packages/ConcurrentMap/testEquality.future +++ /dev/null @@ -1 +0,0 @@ -bug: this test leaks memory diff --git a/test/library/packages/ConcurrentMap/testExtend.future b/test/library/packages/ConcurrentMap/testExtend.future deleted file mode 100644 index 8c8863fbae7a..000000000000 --- a/test/library/packages/ConcurrentMap/testExtend.future +++ /dev/null @@ -1 +0,0 @@ -bug: this test leaks memory diff --git a/test/library/packages/ConcurrentMap/testGetRemove.future b/test/library/packages/ConcurrentMap/testGetRemove.future deleted file mode 100644 index 8c8863fbae7a..000000000000 --- a/test/library/packages/ConcurrentMap/testGetRemove.future +++ /dev/null @@ -1 +0,0 @@ -bug: this test leaks memory From 4e48dd0c6029bca96d8ad73910000582ec96d53c Mon Sep 17 00:00:00 2001 From: Andy Stone Date: Mon, 1 Jul 2024 17:10:19 -0500 Subject: [PATCH 2/2] account for nondeterminism --- Signed-off-by: Andy Stone --- .../ConcurrentMap/memLeakTests/PREDIFF | 2 +- .../ConcurrentMap/memLeakTests/README | 4 - .../memLeakTests/testAddSet.good | 17 ----- .../ConcurrentMap/memLeakTests/testClear.good | 16 ---- .../memLeakTests/testEquality.good | 76 ------------------- .../memLeakTests/testGetRemove.good | 18 ----- test/library/packages/LockFreeQueue/PREDIFF | 5 +- .../packages/LockFreeQueue/memLeaks/README | 3 + .../memLeaks/consistencyCheck.good | 6 ++ test/library/packages/LockFreeStack/PREDIFF | 5 +- .../packages/LockFreeStack/memLeaks/README | 3 + .../memLeaks/consistencyCheck.good | 6 ++ 12 files changed, 23 insertions(+), 138 deletions(-) create mode 100644 test/library/packages/LockFreeQueue/memLeaks/README create mode 100644 test/library/packages/LockFreeQueue/memLeaks/consistencyCheck.good create mode 100644 test/library/packages/LockFreeStack/memLeaks/README create mode 100644 test/library/packages/LockFreeStack/memLeaks/consistencyCheck.good diff --git a/test/library/packages/ConcurrentMap/memLeakTests/PREDIFF b/test/library/packages/ConcurrentMap/memLeakTests/PREDIFF index 3762f3755985..c280ebc44fa4 100755 --- a/test/library/packages/ConcurrentMap/memLeakTests/PREDIFF +++ b/test/library/packages/ConcurrentMap/memLeakTests/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/memLeakTests/README b/test/library/packages/ConcurrentMap/memLeakTests/README index e055990e8ac8..6f1ee80cc2d6 100644 --- a/test/library/packages/ConcurrentMap/memLeakTests/README +++ b/test/library/packages/ConcurrentMap/memLeakTests/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/memLeakTests/testAddSet.good b/test/library/packages/ConcurrentMap/memLeakTests/testAddSet.good index 1f271e0be472..2928500295d4 100644 --- a/test/library/packages/ConcurrentMap/memLeakTests/testAddSet.good +++ b/test/library/packages/ConcurrentMap/memLeakTests/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/memLeakTests/testClear.good b/test/library/packages/ConcurrentMap/memLeakTests/testClear.good index ec8cefb73e69..d9dea1fdb7ed 100644 --- a/test/library/packages/ConcurrentMap/memLeakTests/testClear.good +++ b/test/library/packages/ConcurrentMap/memLeakTests/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/memLeakTests/testEquality.good b/test/library/packages/ConcurrentMap/memLeakTests/testEquality.good index 8d41cb3d40c7..d436507e54bf 100644 --- a/test/library/packages/ConcurrentMap/memLeakTests/testEquality.good +++ b/test/library/packages/ConcurrentMap/memLeakTests/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/memLeakTests/testGetRemove.good b/test/library/packages/ConcurrentMap/memLeakTests/testGetRemove.good index 79064eaf2e80..d12246d4ce37 100644 --- a/test/library/packages/ConcurrentMap/memLeakTests/testGetRemove.good +++ b/test/library/packages/ConcurrentMap/memLeakTests/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/PREDIFF b/test/library/packages/LockFreeQueue/PREDIFF index 6515765f58cd..c280ebc44fa4 100755 --- a/test/library/packages/LockFreeQueue/PREDIFF +++ b/test/library/packages/LockFreeQueue/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 new file mode 100644 index 000000000000..8fc534e52e71 --- /dev/null +++ b/test/library/packages/LockFreeQueue/memLeaks/README @@ -0,0 +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. diff --git a/test/library/packages/LockFreeQueue/memLeaks/consistencyCheck.good b/test/library/packages/LockFreeQueue/memLeaks/consistencyCheck.good new file mode 100644 index 000000000000..8c1d835df5ab --- /dev/null +++ b/test/library/packages/LockFreeQueue/memLeaks/consistencyCheck.good @@ -0,0 +1,6 @@ + +================================================= Memory Leaks ================================================== +Allocated Memory (Bytes) Number Size Total Description Address +================================================================================================================= +================================================================================================================= + diff --git a/test/library/packages/LockFreeStack/PREDIFF b/test/library/packages/LockFreeStack/PREDIFF index 6515765f58cd..c280ebc44fa4 100755 --- a/test/library/packages/LockFreeStack/PREDIFF +++ b/test/library/packages/LockFreeStack/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 new file mode 100644 index 000000000000..8fc534e52e71 --- /dev/null +++ b/test/library/packages/LockFreeStack/memLeaks/README @@ -0,0 +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. diff --git a/test/library/packages/LockFreeStack/memLeaks/consistencyCheck.good b/test/library/packages/LockFreeStack/memLeaks/consistencyCheck.good new file mode 100644 index 000000000000..8c1d835df5ab --- /dev/null +++ b/test/library/packages/LockFreeStack/memLeaks/consistencyCheck.good @@ -0,0 +1,6 @@ + +================================================= Memory Leaks ================================================== +Allocated Memory (Bytes) Number Size Total Description Address +================================================================================================================= +================================================================================================================= +