[Openmp-commits] [openmp] r338144 - [OMPT] Print two more addresses in print_fuzzy_address_block()

[Joachim Protze via Openmp-commits]

Author: jprotze
Date: Fri Jul 27 11:13:15 2018
New Revision: 338144

URL: http://llvm.org/viewvc/llvm-project?rev=338144&view=rev
Log:
[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

Modified:
    openmp/trunk/runtime/test/ompt/callback.h

Modified: openmp/trunk/runtime/test/ompt/callback.h
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/test/ompt/callback.h?rev=338144&r1=338143&r2=338144&view=diff
==============================================================================
--- openmp/trunk/runtime/test/ompt/callback.h (original)
+++ openmp/trunk/runtime/test/ompt/callback.h Fri Jul 27 11:13:15 2018
@@ -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(