summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoachim Protze <protze@itc.rwth-aachen.de>2018-07-27 18:13:15 +0000
committerJoachim Protze <protze@itc.rwth-aachen.de>2018-07-27 18:13:15 +0000
commitf203109edbb11fe855f3a0748ad7ffbc403b2d72 (patch)
tree941bec9c19a10cb7f903fbbc0d3c8fb2934dafd6
parentefac39eef679e3336c4952cfb484cb80b7f60cc0 (diff)
downloadbcm5719-llvm-f203109edbb11fe855f3a0748ad7ffbc403b2d72.tar.gz
bcm5719-llvm-f203109edbb11fe855f3a0748ad7ffbc403b2d72.zip
[OMPT] Print two more addresses in print_fuzzy_address_block()
The two more outputs are needed to match the return addresses when using the Intel Compiler, as it generates more instructions between the fuzzy-printing of the address and the runtime call. Patch by Simon Convent Reviewed By: protze.joachim, hbae Differential Revision: https://reviews.llvm.org/D49373 llvm-svn: 338144
-rwxr-xr-xopenmp/runtime/test/ompt/callback.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/openmp/runtime/test/ompt/callback.h b/openmp/runtime/test/ompt/callback.h
index d62f964a1de..f1191ad8a79 100755
--- a/openmp/runtime/test/ompt/callback.h
+++ b/openmp/runtime/test/ompt/callback.h
@@ -183,11 +183,14 @@ ompt_label_##id:
// to include or discard the new number of nibbles!
#define FUZZY_ADDRESS_DISCARD_NIBBLES 2
#define FUZZY_ADDRESS_DISCARD_BYTES (1 << ((FUZZY_ADDRESS_DISCARD_NIBBLES) * 4))
-#define print_fuzzy_address_blocks(addr) \
- printf("%" PRIu64 ": fuzzy_address=0x%" PRIx64 " or 0x%" PRIx64 " (%p)\n", \
- ompt_get_thread_data()->value, \
- ((uint64_t)addr) / FUZZY_ADDRESS_DISCARD_BYTES - 1, \
- ((uint64_t)addr) / FUZZY_ADDRESS_DISCARD_BYTES, addr)
+#define print_fuzzy_address_blocks(addr) \
+ printf("%" PRIu64 ": fuzzy_address=0x%" PRIx64 " or 0x%" PRIx64 \
+ " or 0x%" PRIx64 " or 0x%" PRIx64 " (%p)\n", \
+ ompt_get_thread_data()->value, \
+ ((uint64_t)addr) / FUZZY_ADDRESS_DISCARD_BYTES - 1, \
+ ((uint64_t)addr) / FUZZY_ADDRESS_DISCARD_BYTES, \
+ ((uint64_t)addr) / FUZZY_ADDRESS_DISCARD_BYTES + 1, \
+ ((uint64_t)addr) / FUZZY_ADDRESS_DISCARD_BYTES + 2, addr)
static void
on_ompt_callback_mutex_acquire(
OpenPOWER on IntegriCloud