[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
git-svn-id: https://llvm.org/svn/llvm-project/openmp/trunk@354553 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/runtime/test/CMakeLists.txt b/runtime/test/CMakeLists.txt
index 8f367c5..0cee793 100644
--- a/runtime/test/CMakeLists.txt
+++ b/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!")
diff --git a/runtime/test/ompt/synchronization/lock.c b/runtime/test/ompt/synchronization/lock.c
index eae1575..c62e655 100644
--- a/runtime/test/ompt/synchronization/lock.c
+++ b/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);
diff --git a/runtime/test/ompt/synchronization/nest_lock.c b/runtime/test/ompt/synchronization/nest_lock.c
index c83ceaf..60c1a01 100644
--- a/runtime/test/ompt/synchronization/nest_lock.c
+++ b/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);
