diff options
| author | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2019-01-15 19:14:00 +0000 |
|---|---|---|
| committer | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2019-01-15 19:14:00 +0000 |
| commit | cd0378791072fd34488b02686b2e13a09607efb1 (patch) | |
| tree | 3a242f1edd34bf3007d37eb2b0e047540618cbe8 | |
| parent | cba4d27f094bc44c30b44ef43dae609ea1c1e0b5 (diff) | |
[OpenMP] Add lock function definitions to fix Bug 40042
This change fixes the sanity issue reported in Bug 40042.
Lock function definitions for the three lock kinds were added
to disambiguate calls to the lock functions done directly and indirectly.
Bugzilla: https://bugs.llvm.org/show_bug.cgi?id=40042
Patch by Hansang Bae
Differential Revision: https://reviews.llvm.org/D56103
| -rw-r--r-- | openmp/runtime/src/kmp_lock.cpp | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/openmp/runtime/src/kmp_lock.cpp b/openmp/runtime/src/kmp_lock.cpp index 5c2eeed9b8c..c0f228ea421 100644 --- a/openmp/runtime/src/kmp_lock.cpp +++ b/openmp/runtime/src/kmp_lock.cpp @@ -2874,6 +2874,47 @@ static int __kmp_unset_indirect_lock_with_checks(kmp_dyna_lock_t *lock, static int __kmp_test_indirect_lock_with_checks(kmp_dyna_lock_t *lock, kmp_int32); +// Lock function definitions for the union parameter type +#define KMP_FOREACH_LOCK_KIND(m, a) m(ticket, a) m(queuing, a) m(drdpa, a) + +#define expand1(lk, op) \ + static void __kmp_##op##_##lk##_##lock(kmp_user_lock_p lock) { \ + __kmp_##op##_##lk##_##lock(&lock->lk); \ + } +#define expand2(lk, op) \ + static int __kmp_##op##_##lk##_##lock(kmp_user_lock_p lock, \ + kmp_int32 gtid) { \ + return __kmp_##op##_##lk##_##lock(&lock->lk, gtid); \ + } +#define expand3(lk, op) \ + static void __kmp_set_##lk##_##lock_flags(kmp_user_lock_p lock, \ + kmp_lock_flags_t flags) { \ + __kmp_set_##lk##_lock_flags(&lock->lk, flags); \ + } +#define expand4(lk, op) \ + static void __kmp_set_##lk##_##lock_location(kmp_user_lock_p lock, \ + const ident_t *loc) { \ + __kmp_set_##lk##_lock_location(&lock->lk, loc); \ + } + +KMP_FOREACH_LOCK_KIND(expand1, init) +KMP_FOREACH_LOCK_KIND(expand1, init_nested) +KMP_FOREACH_LOCK_KIND(expand1, destroy) +KMP_FOREACH_LOCK_KIND(expand1, destroy_nested) +KMP_FOREACH_LOCK_KIND(expand2, acquire) +KMP_FOREACH_LOCK_KIND(expand2, acquire_nested) +KMP_FOREACH_LOCK_KIND(expand2, release) +KMP_FOREACH_LOCK_KIND(expand2, release_nested) +KMP_FOREACH_LOCK_KIND(expand2, test) +KMP_FOREACH_LOCK_KIND(expand2, test_nested) +KMP_FOREACH_LOCK_KIND(expand3, ) +KMP_FOREACH_LOCK_KIND(expand4, ) + +#undef expand1 +#undef expand2 +#undef expand3 +#undef expand4 + // Jump tables for the indirect lock functions // Only fill in the odd entries, that avoids the need to shift out the low bit |