Commit c2be2080 authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r361158: 

------------------------------------------------------------------------
r361158 | jprotze | 2019-05-20 07:21:42 -0700 (Mon, 20 May 2019) | 11 lines

[OpenMP][OMPT] Fix locking testcases for 32 bit architectures

https://reviews.llvm.org/D58454 did not fix the problem for a typical use
case of building LLVM with gcc or icc and then testing with the newly built
clang compiler.
The compilers do not agree on how to extend a 32-bit pointer to uint64, so
make the pointer unsigned first, before adjusting the size.

Patch by Joachim Protze

Differential Revision: https://reviews.llvm.org/D58506
------------------------------------------------------------------------

llvm-svn: 363628
parent 2fb27a25

openmp/runtime/src/kmp_atomic.h

+3 −3
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ static inline void __kmp_acquire_atomic_lock(kmp_atomic_lock_t *lck, 
#if OMPT_SUPPORT && OMPT_OPTIONAL

  if (ompt_enabled.ompt_callback_mutex_acquire) {

    ompt_callbacks.ompt_callback(ompt_callback_mutex_acquire)(

        ompt_mutex_atomic, 0, kmp_mutex_impl_queuing, (ompt_wait_id_t)lck,

        ompt_mutex_atomic, 0, kmp_mutex_impl_queuing, (ompt_wait_id_t)(uintptr_t)lck,

        OMPT_GET_RETURN_ADDRESS(0));

  }

#endif
@@ -374,7 +374,7 @@ static inline void __kmp_acquire_atomic_lock(kmp_atomic_lock_t *lck, 
#if OMPT_SUPPORT && OMPT_OPTIONAL

  if (ompt_enabled.ompt_callback_mutex_acquired) {

    ompt_callbacks.ompt_callback(ompt_callback_mutex_acquired)(

        ompt_mutex_atomic, (ompt_wait_id_t)lck, OMPT_GET_RETURN_ADDRESS(0));

        ompt_mutex_atomic, (ompt_wait_id_t)(uintptr_t)lck, OMPT_GET_RETURN_ADDRESS(0));

  }

#endif

}
@@ -390,7 +390,7 @@ static inline void __kmp_release_atomic_lock(kmp_atomic_lock_t *lck, 
#if OMPT_SUPPORT && OMPT_OPTIONAL

  if (ompt_enabled.ompt_callback_mutex_released) {

    ompt_callbacks.ompt_callback(ompt_callback_mutex_released)(

        ompt_mutex_atomic, (ompt_wait_id_t)lck, OMPT_GET_RETURN_ADDRESS(0));

        ompt_mutex_atomic, (ompt_wait_id_t)(uintptr_t)lck, OMPT_GET_RETURN_ADDRESS(0));

  }

#endif

}

openmp/runtime/src/kmp_csupport.cpp

+70 −61

File changed.

Preview size limit exceeded, changes collapsed.

openmp/runtime/src/ompt-specific.cpp

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ ompt_data_t *__ompt_get_thread_data_internal() { 
void __ompt_thread_assign_wait_id(void *variable) {

  kmp_info_t *ti = ompt_get_thread();



  ti->th.ompt_thread_info.wait_id = (ompt_wait_id_t)variable;

  ti->th.ompt_thread_info.wait_id = (ompt_wait_id_t)(uintptr_t)variable;

}



int __ompt_get_state_internal(ompt_wait_id_t *omp_wait_id) {

openmp/runtime/test/ompt/synchronization/lock.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ int main() 
    print_ids(0);



  omp_lock_t lock;

  printf("%" PRIu64 ": &lock: %" PRIu64 "\n", ompt_get_thread_data()->value, (uint64_t) &lock);

  printf("%" PRIu64 ": &lock: %" PRIu64 "\n", ompt_get_thread_data()->value, (ompt_wait_id_t)(uintptr_t) &lock);

  omp_init_lock(&lock);

  print_fuzzy_address(1);

  omp_set_lock(&lock);

openmp/runtime/test/ompt/synchronization/nest_lock.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ int main() 
    print_ids(0);



  omp_nest_lock_t nest_lock;

  printf("%" PRIu64 ": &nest_lock: %lli\n", ompt_get_thread_data()->value, (long long) &nest_lock);

  printf("%" PRIu64 ": &nest_lock: %lli\n", ompt_get_thread_data()->value, (ompt_wait_id_t)(uintptr_t) &nest_lock);

  omp_init_nest_lock(&nest_lock);

  print_fuzzy_address(1);

  omp_set_nest_lock(&nest_lock);