[Openmp-commits] [openmp] 4e19543 - FIX some OMPT tests that fail on RISC-V (#156914)

[via Openmp-commits]

Author: julianmorillo
Date: 2026-07-24T11:24:36+02:00
New Revision: 4e19543b1a85e635a8c663081bfdf42488795623

URL: https://github.com/llvm/llvm-project/commit/4e19543b1a85e635a8c663081bfdf42488795623
DIFF: https://github.com/llvm/llvm-project/commit/4e19543b1a85e635a8c663081bfdf42488795623.diff

LOG: FIX some OMPT tests that fail on RISC-V (#156914)

There is a known issue with these tests (see
https://github.com/llvm/llvm-project/issues/35661).
It looks that the behaviour is very architecture specific and it was
somehow solved for aarch64 but no mention to riscv64.

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/openmp/runtime/test/ompt/callback.h b/openmp/runtime/test/ompt/callback.h
index c0305c0daf606..689e5455ea604 100644
--- a/openmp/runtime/test/ompt/callback.h
+++ b/openmp/runtime/test/ompt/callback.h
@@ -296,8 +296,8 @@ static void print_ids(int level) {
 // another branch).
 #define print_possible_return_addresses(addr)                                  \
   printf("%" PRIu64 ": current_address=%p or %p\n",                            \
-         ompt_get_thread_data()->value, ((char *)addr) - 6,                    \
-         ((char *)addr) - 10)
+         ompt_get_thread_data()->value, ((char *)addr) - 4,                    \
+         ((char *)addr) - 6, ((char *)addr) - 10)
 #else
 // On RV64G the NOP instruction is 4 byte long. In addition, the compiler
 // inserts a J instruction (targeting the successor basic block), which