diff options
| author | Joachim Protze <protze@itc.rwth-aachen.de> | 2019-02-21 08:50:49 +0000 |
|---|---|---|
| committer | Joachim Protze <protze@itc.rwth-aachen.de> | 2019-02-21 08:50:49 +0000 |
| commit | 8b96fad85cba7d021eca2f0cc04f7e9dec76d441 (patch) | |
| tree | 4afeff22a540b6b774ff443f57e33ec68688c136 /openmp/runtime/test | |
| parent | 76dda218a06e491200c920d945f7decd3b671066 (diff) | |
| download | bcm5719-llvm-8b96fad85cba7d021eca2f0cc04f7e9dec76d441.tar.gz bcm5719-llvm-8b96fad85cba7d021eca2f0cc04f7e9dec76d441.zip | |
[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
llvm-svn: 354553
Diffstat (limited to 'openmp/runtime/test')
| -rw-r--r-- | openmp/runtime/test/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | openmp/runtime/test/ompt/synchronization/lock.c | 2 | ||||
| -rw-r--r-- | openmp/runtime/test/ompt/synchronization/nest_lock.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/openmp/runtime/test/CMakeLists.txt b/openmp/runtime/test/CMakeLists.txt index 8f367c56b9d..0cee793554c 100644 --- a/openmp/runtime/test/CMakeLists.txt +++ b/openmp/runtime/test/CMakeLists.txt @@ -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!") diff --git a/openmp/runtime/test/ompt/synchronization/lock.c b/openmp/runtime/test/ompt/synchronization/lock.c index eae15757d6f..c62e65520ab 100644 --- a/openmp/runtime/test/ompt/synchronization/lock.c +++ b/openmp/runtime/test/ompt/synchronization/lock.c @@ -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); diff --git a/openmp/runtime/test/ompt/synchronization/nest_lock.c b/openmp/runtime/test/ompt/synchronization/nest_lock.c index c83ceaf5d0d..60c1a014918 100644 --- a/openmp/runtime/test/ompt/synchronization/nest_lock.c +++ b/openmp/runtime/test/ompt/synchronization/nest_lock.c @@ -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); |
