[Openmp-commits] [PATCH] D58454: [OpenMP][OMPT] Fix locking testcases for 32 bit architectures

[Joachim Protze via Phabricator via Openmp-commits]

protze.joachim created this revision.
protze.joachim added reviewers: mgorny, hbae.
protze.joachim added a project: OpenMP.
Herald added subscribers: jdoerfert, guansong.

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.


Repository:
  rOMP OpenMP

https://reviews.llvm.org/D58454

Files:
  runtime/test/CMakeLists.txt
  runtime/test/ompt/synchronization/lock.c
  runtime/test/ompt/synchronization/nest_lock.c


Index: runtime/test/ompt/synchronization/nest_lock.c
===================================================================
--- runtime/test/ompt/synchronization/nest_lock.c
+++ runtime/test/ompt/synchronization/nest_lock.c
@@ -10,7 +10,7 @@
     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);
Index: runtime/test/ompt/synchronization/lock.c
===================================================================
--- runtime/test/ompt/synchronization/lock.c
+++ runtime/test/ompt/synchronization/lock.c
@@ -10,7 +10,7 @@
     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);
Index: runtime/test/CMakeLists.txt
===================================================================
--- runtime/test/CMakeLists.txt
+++ runtime/test/CMakeLists.txt
@@ -31,6 +31,7 @@
 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!")


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D58454.187591.patch
Type: text/x-patch
Size: 1682 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20190220/8d09554e/attachment.bin>