Skip to content

Commit 95a76b9

Browse files
committed
Enable drd and helgrind in the valgrind jobs
Signed-off-by: Lukasz Dorau <[email protected]>
1 parent 8ac6d3d commit 95a76b9

11 files changed

+101
-4
lines changed

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
tool: ['memcheck'] # TODO: enable 'drd' and 'helgrind' when all issues are fixed
19+
tool: ['memcheck', 'drd', 'helgrind']
2020
runs-on: ubuntu-latest
2121

2222
steps:

.github/workflows/valgrind.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
tool: ['memcheck'] # TODO: enable 'drd' and 'helgrind' when all issues are fixed
14+
tool: ['memcheck', 'drd', 'helgrind']
1515
runs-on: ubuntu-latest
1616

1717
steps:
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
Conflicting Access in libjemalloc.so*
3+
drd:ConflictingAccess
4+
obj:/usr/lib/x86_64-linux-gnu/libjemalloc.so*
5+
...
6+
}
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
Conflicting Access in libtbbmalloc.so*
3+
drd:ConflictingAccess
4+
obj:*libtbbmalloc.so*
5+
...
6+
}
7+
8+
{
9+
Conflicting Access in memset in pow2AlignedAllocHelper
10+
drd:ConflictingAccess
11+
fun:memset
12+
fun:*pow2AlignedAllocHelper*
13+
...
14+
}
15+
16+
{
17+
ConflictingAccess in tbb_realloc in multiThreadedReallocFree test
18+
drd:ConflictingAccess
19+
fun:memmove
20+
obj:*libtbbmalloc.so*
21+
fun:tbb_realloc
22+
fun:umfPoolRealloc
23+
fun:*umfPoolTest_multiThreadedReallocFree*
24+
...
25+
}
26+
27+
{
28+
ConflictingAccess in memset in multiThreadedCallocFree test
29+
drd:ConflictingAccess
30+
fun:memset
31+
fun:tbb_calloc
32+
fun:umfPoolCalloc
33+
fun:*umfPoolTest_multiThreadedCallocFree*
34+
...
35+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
pthread_mutex_lock with a pthread_rwlock_t* argument
3+
Helgrind:Misc
4+
obj:*vgpreload_helgrind-amd64-linux.so
5+
fun:*gthread_mutex_lock*pthread_mutex_t
6+
...
7+
}
8+
9+
{
10+
pthread_mutex_unlock with a pthread_rwlock_t* argument
11+
Helgrind:Misc
12+
obj:*vgpreload_helgrind-amd64-linux.so
13+
fun:*gthread_mutex_unlock*pthread_mutex_t
14+
...
15+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
Race in libjemalloc.so*
3+
Helgrind:Race
4+
obj:/usr/lib/x86_64-linux-gnu/libjemalloc.so*
5+
...
6+
}
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
Race in libtbbmalloc.so*
3+
Helgrind:Race
4+
obj:/usr/lib/x86_64-linux-gnu/libtbbmalloc.so*
5+
...
6+
}
7+
8+
{
9+
Race Access in memset in pow2AlignedAllocHelper
10+
Helgrind:Race
11+
fun:memset
12+
fun:*pow2AlignedAllocHelper*
13+
...
14+
}
15+
16+
{
17+
Race in tbb_realloc in multiThreadedReallocFree test
18+
Helgrind:Race
19+
fun:memmove
20+
obj:*libtbbmalloc.so*
21+
fun:tbb_realloc
22+
fun:umfPoolRealloc
23+
fun:*umfPoolTest_multiThreadedReallocFree*
24+
...
25+
}
26+
27+
{
28+
Race in memset in multiThreadedCallocFree test
29+
Helgrind:Race
30+
fun:memset
31+
fun:tbb_calloc
32+
fun:umfPoolCalloc
33+
fun:*umfPoolTest_multiThreadedCallocFree*
34+
...
35+
}

test/test_valgrind.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ for test in $(ls -1 ./umf_test-*); do
7676
echo -n "$test "
7777
LOG=${test}.log
7878
ERR=${test}.err
79-
SUP="${WORKSPACE}/test/supp/${test}.supp"
79+
SUP="${WORKSPACE}/test/supp/${TOOL}-${test}.supp"
8080
OPT_SUP=""
81-
[ -f ${SUP} ] && OPT_SUP="--suppressions=${SUP}"
81+
[ -f ${SUP} ] && OPT_SUP="--suppressions=${SUP}" && echo -n "(${TOOL}-${test}.supp) "
8282

8383
# skip tests incompatible with valgrind
8484
case $test in

0 commit comments

Comments
 (0)