[Openmp-commits] [PATCH] D123827: [libomptarget] [amdgpu] Hostcall offset check should consider implicit args

[Dhruva Chakrabarti via Phabricator via Openmp-commits]

dhruvachak created this revision.
dhruvachak added reviewers: JonChesterfield, ronlieb.
Herald added subscribers: kerbowa, t-tye, tpr, dstuttard, yaxunl, jvesely, kzhuravl.
Herald added a project: All.
dhruvachak requested review of this revision.
Herald added subscribers: openmp-commits, wdng.
Herald added a project: OpenMP.

Fixed hostcall offset check to compare against kernarg segment size
and implicit arguments. Improved the corresponding debug print.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D123827

Files:
  openmp/libomptarget/plugins/amdgpu/src/rtl.cpp


Index: openmp/libomptarget/plugins/amdgpu/src/rtl.cpp
===================================================================
--- openmp/libomptarget/plugins/amdgpu/src/rtl.cpp
+++ openmp/libomptarget/plugins/amdgpu/src/rtl.cpp
@@ -1240,6 +1240,8 @@
           return OFFLOAD_FAIL;
         }
 
+        DP("Implicit argument count: %d\n",
+           KernelInfoEntry.implicit_argument_count);
         if (KernelInfoEntry.implicit_argument_count >= 4) {
           // Initialise pointer for implicit_argument_count != 0 ABI
           // Guess that the right implicit argument is at offset 24 after
@@ -1247,8 +1249,10 @@
           // the offset from msgpack. Clang is not annotating it at present.
           uint64_t Offset =
               sizeof(void *) * (KernelInfoEntry.explicit_argument_count + 3);
-          if ((Offset + 8) > (ArgPool->kernarg_segment_size)) {
-            DP("Bad offset of hostcall, exceeds kernarg segment size\n");
+          if ((Offset + 8) > ArgPool->kernarg_size_including_implicit()) {
+            DP("Bad offset of hostcall: %lu, exceeds kernarg size w/ implicit "
+               "args: %d\n",
+               Offset + 8, ArgPool->kernarg_size_including_implicit());
           } else {
             memcpy(static_cast<char *>(kernarg) + Offset, &buffer, 8);
           }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D123827.422987.patch
Type: text/x-patch
Size: 1310 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20220415/ff7aaef1/attachment.bin>