Skip to content

Commit

Permalink
[OpenMP] Rename ompt_mutex_impl_unknown to ompt_mutex_impl_none
Browse files Browse the repository at this point in the history
This change renames ompt_mutex_impl_unknown to ompt_mutex_impl_none,
following the name change in the specification.

Patch by Hansang Bae

Differential Revision: https://reviews.llvm.org/D54347

llvm-svn: 347802
  • Loading branch information
jpeyton52 committed Nov 28, 2018
1 parent 1ce776e commit 1742ece
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion openmp/runtime/src/include/50/ompt.h.var
Expand Up @@ -96,7 +96,7 @@


#define FOREACH_KMP_MUTEX_IMPL(macro) \
macro (ompt_mutex_impl_unknown, 0) /* unknown implementation */ \
macro (ompt_mutex_impl_none, 0) /* unknown implementation */ \
macro (kmp_mutex_impl_spin, 1) /* based on spin */ \
macro (kmp_mutex_impl_queuing, 2) /* based on some fair policy */ \
macro (kmp_mutex_impl_speculative, 3) /* based on HW-supported speculation */
Expand Down
6 changes: 3 additions & 3 deletions openmp/runtime/src/kmp_csupport.cpp
Expand Up @@ -1292,7 +1292,7 @@ __ompt_get_mutex_impl_type(void *user_lock, kmp_indirect_lock_t *ilock = 0) {
return kmp_mutex_impl_speculative;
#endif
default:
return ompt_mutex_impl_unknown;
return ompt_mutex_impl_none;
}
ilock = KMP_LOOKUP_I_LOCK(user_lock);
}
Expand All @@ -1316,7 +1316,7 @@ __ompt_get_mutex_impl_type(void *user_lock, kmp_indirect_lock_t *ilock = 0) {
case locktag_nested_drdpa:
return kmp_mutex_impl_queuing;
default:
return ompt_mutex_impl_unknown;
return ompt_mutex_impl_none;
}
}
#else
Expand All @@ -1339,7 +1339,7 @@ static kmp_mutex_impl_t __ompt_get_mutex_impl_type() {
return kmp_mutex_impl_speculative;
#endif
default:
return ompt_mutex_impl_unknown;
return ompt_mutex_impl_none;
}
}
#endif // KMP_USE_DYNAMIC_LOCK
Expand Down
Expand Up @@ -36,7 +36,7 @@ void f() {
printf("%" PRIu64 ": ompt_enumerate_states()=%d\n", tvalue,
ompt_enumerate_states(state, &state, &state_name));

int impl = ompt_mutex_impl_unknown;
int impl = ompt_mutex_impl_none;
const char *impl_name;
printf("%" PRIu64 ": ompt_enumerate_mutex_impls()=%d\n", tvalue,
ompt_enumerate_mutex_impls(impl, &impl, &impl_name));
Expand Down
2 changes: 1 addition & 1 deletion openmp/runtime/test/ompt/misc/api_calls_misc.c
Expand Up @@ -35,7 +35,7 @@ int main() {
}

// ompt_enumerate_mutex_impls()
int impl = ompt_mutex_impl_unknown;
int impl = ompt_mutex_impl_none;
const char *impl_name;
steps = 0;
while (ompt_enumerate_mutex_impls(impl, &impl, &impl_name) &&
Expand Down

0 comments on commit 1742ece

Please sign in to comment.