[Openmp-commits] [openmp] r354553 - [OpenMP][OMPT] Fix locking testcases for 32 bit architectures

[Joachim Protze via Openmp-commits]

Author: jprotze
Date: Thu Feb 21 00:50:49 2019
New Revision: 354553

URL: http://llvm.org/viewvc/llvm-project?rev=354553&view=rev
Log:
[OpenMP][OMPT] Fix locking testcases for 32 bit architectures

Fix for the bug reported in:
https://bugs.llvm.org/show_bug.cgi?id=40531

The address is now casted the same way as in the runtime code.

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

Modified:
    openmp/trunk/runtime/test/CMakeLists.txt
    openmp/trunk/runtime/test/ompt/synchronization/lock.c
    openmp/trunk/runtime/test/ompt/synchronization/nest_lock.c

Modified: openmp/trunk/runtime/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/test/CMakeLists.txt?rev=354553&r1=354552&r2=354553&view=diff
==============================================================================
--- openmp/trunk/runtime/test/CMakeLists.txt (original)
+++ openmp/trunk/runtime/test/CMakeLists.txt Thu Feb 21 00:50:49 2019
@@ -31,6 +31,7 @@ pythonize_bool(LIBOMP_HAVE_LIBM)
 pythonize_bool(LIBOMP_HAVE_LIBATOMIC)
 
 add_openmp_testsuite(check-libomp "Running libomp tests" ${CMAKE_CURRENT_BINARY_DIR} DEPENDS omp)
+add_openmp_testsuite(check-ompt "Running OMPT tests" ${CMAKE_CURRENT_BINARY_DIR}/ompt DEPENDS omp)
 
 # Configure the lit.site.cfg.in file
 set(AUTO_GEN_COMMENT "## Autogenerated by libomp configuration.\n# Do not edit!")

Modified: openmp/trunk/runtime/test/ompt/synchronization/lock.c
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/test/ompt/synchronization/lock.c?rev=354553&r1=354552&r2=354553&view=diff
==============================================================================
--- openmp/trunk/runtime/test/ompt/synchronization/lock.c (original)
+++ openmp/trunk/runtime/test/ompt/synchronization/lock.c Thu Feb 21 00:50:49 2019
@@ -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) &lock);
   omp_init_lock(&lock);
   print_fuzzy_address(1);
   omp_set_lock(&lock);

Modified: openmp/trunk/runtime/test/ompt/synchronization/nest_lock.c
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/test/ompt/synchronization/nest_lock.c?rev=354553&r1=354552&r2=354553&view=diff
==============================================================================
--- openmp/trunk/runtime/test/ompt/synchronization/nest_lock.c (original)
+++ openmp/trunk/runtime/test/ompt/synchronization/nest_lock.c Thu Feb 21 00:50:49 2019
@@ -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) &nest_lock);
   omp_init_nest_lock(&nest_lock);
   print_fuzzy_address(1);
   omp_set_nest_lock(&nest_lock);