[OMPT] Print two more addresses in print_fuzzy_address_block()

[sconvent]

Summary

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.

[hbae]

LGTM.

[protze.joachim]

LGTM

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

 #define print_fuzzy_address(id) \
   define_ompt_label(id) \
   print_fuzzy_address_blocks(get_ompt_label_address(id))
 
 // If you change this define you need to adapt all capture patterns in the tests
 // 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(
   ompt_mutex_kind_t kind,
   unsigned int hint,
   unsigned int impl,
   omp_wait_id_t wait_id,
   const void *codeptr_ra)