tianshilei1992 updated this revision to Diff 488391.
tianshilei1992 marked 3 inline comments as done.
tianshilei1992 added a comment.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
rebase and fix comments
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D141545/new/
https://reviews.llvm.org/D141545
Files:
clang/docs/OpenMPSupport.rst
openmp/libomptarget/src/api.cpp
openmp/libomptarget/src/exports
openmp/libomptarget/test/api/omp_get_mapped_ptr.c
Index: openmp/libomptarget/test/api/omp_get_mapped_ptr.c
===================================================================
--- /dev/null
+++ openmp/libomptarget/test/api/omp_get_mapped_ptr.c
@@ -0,0 +1,39 @@
+// RUN: %libomptarget-compile-and-run-generic
+
+#include <assert.h>
+#include <omp.h>
+#include <stdlib.h>
+
+#define N 1024
+#define OFFSET 16
+
+int main(int argc, char *argv[]) {
+ int *host_data = (int *)malloc(sizeof(int) * N);
+ void *device_ptr = omp_get_mapped_ptr(host_data, 0);
+
+ assert(device_ptr == NULL && "the pointer should not be mapped right now");
+
+#pragma omp target enter data map(to: host_data[:N])
+
+ device_ptr = omp_get_mapped_ptr(host_data, 0);
+
+ assert(device_ptr && "the pointer should be mapped now");
+
+ void *ptr = NULL;
+
+#pragma omp target map(from: ptr)
+ { ptr = host_data; }
+
+ assert(ptr == device_ptr && "wrong pointer mapping");
+
+ device_ptr = omp_get_mapped_ptr(host_data + OFFSET, 0);
+
+ assert(device_ptr && "the pointer with offset should be mapped");
+
+#pragma omp target map(from: ptr)
+ { ptr = host_data + OFFSET; }
+
+ assert(ptr == device_ptr && "wrong pointer mapping");
+
+ return 0;
+}
Index: openmp/libomptarget/src/exports
===================================================================
--- openmp/libomptarget/src/exports
+++ openmp/libomptarget/src/exports
@@ -31,6 +31,7 @@
__tgt_push_mapper_component;
__kmpc_push_target_tripcount;
__kmpc_push_target_tripcount_mapper;
+ omp_get_mapped_ptr;
omp_get_num_devices;
omp_get_device_num;
omp_get_initial_device;
Index: openmp/libomptarget/src/api.cpp
===================================================================
--- openmp/libomptarget/src/api.cpp
+++ openmp/libomptarget/src/api.cpp
@@ -18,6 +18,7 @@
#include <climits>
#include <cstdlib>
#include <cstring>
+#include <mutex>
EXTERN int omp_get_num_devices(void) {
TIMESCOPE();
@@ -318,3 +319,52 @@
DP("omp_target_disassociate_ptr returns %d\n", Rc);
return Rc;
}
+
+EXTERN void *omp_get_mapped_ptr(const void *Ptr, int DeviceNum) {
+ TIMESCOPE();
+ DP("Call to omp_get_mapped_ptr with ptr " DPxMOD ", device_num %d.\n",
+ DPxPTR(Ptr), DeviceNum);
+
+ if (!Ptr) {
+ REPORT("Call to omp_get_mapped_ptr with nullptr.\n");
+ return nullptr;
+ }
+
+ if (DeviceNum == omp_get_initial_device()) {
+ REPORT("Device %d is initial device, returning Ptr " DPxMOD ".\n",
+ DeviceNum, DPxPTR(Ptr));
+ return const_cast<void *>(Ptr);
+ }
+
+ int DevicesSize = omp_get_initial_device();
+ {
+ std::lock_guard<std::mutex> LG(PM->RTLsMtx);
+ DevicesSize = PM->Devices.size();
+ }
+ if (DevicesSize <= DeviceNum) {
+ DP("DeviceNum %d is invalid, returning nullptr.\n", DeviceNum);
+ return nullptr;
+ }
+
+ if (!deviceIsReady(DeviceNum)) {
+ REPORT("Device %d is not ready, returning nullptr.\n", DeviceNum);
+ return nullptr;
+ }
+
+ bool IsLast = false;
+ bool IsHostPtr = false;
+ auto &Device = *PM->Devices[DeviceNum];
+ TargetPointerResultTy TPR =
+ Device.getTgtPtrBegin(const_cast<void *>(Ptr), 1, IsLast,
+ /*UpdateRefCount=*/false,
+ /*UseHoldRefCount=*/false, IsHostPtr);
+ if (!TPR.isPresent()) {
+ DP("Ptr " DPxMOD "is not present on device %d, returning nullptr.\n",
+ DPxPTR(Ptr), DeviceNum);
+ return nullptr;
+ }
+
+ DP("omp_get_mapped_ptr returns " DPxMOD ".\n", DPxPTR(TPR.TargetPointer));
+
+ return TPR.TargetPointer;
+}
Index: clang/docs/OpenMPSupport.rst
===================================================================
--- clang/docs/OpenMPSupport.rst
+++ clang/docs/OpenMPSupport.rst
@@ -111,7 +111,7 @@
The following table provides a quick overview over various OpenMP 5.0 features
and their implementation status. Please post on the
-`Discourse forums (Runtimes - OpenMP category)`_ for more
+`Discourse forums (Runtimes - OpenMP category)`_ for more
information or if you want to help with the
implementation.
@@ -257,8 +257,8 @@
The following table provides a quick overview over various OpenMP 5.1 features
and their implementation status, as defined in the technical report 8 (TR8).
-Please post on the
-`Discourse forums (Runtimes - OpenMP category)`_ for more
+Please post on the
+`Discourse forums (Runtimes - OpenMP category)`_ for more
information or if you want to help with the
implementation.
@@ -283,7 +283,7 @@
+------------------------------+--------------------------------------------------------------+--------------------------+-----------------------------------------------------------------------+
| device | omp_target_is_accessible routine | :none:`unclaimed` | |
+------------------------------+--------------------------------------------------------------+--------------------------+-----------------------------------------------------------------------+
-| device | omp_get_mapped_ptr routine | :none:`unclaimed` | |
+| device | omp_get_mapped_ptr routine | :none:`done` | |
+------------------------------+--------------------------------------------------------------+--------------------------+-----------------------------------------------------------------------+
| device | new async target memory copy routines | :none:`unclaimed` | |
+------------------------------+--------------------------------------------------------------+--------------------------+-----------------------------------------------------------------------+
@@ -365,12 +365,12 @@
OpenMP Extensions
=================
-The following table provides a quick overview over various OpenMP
+The following table provides a quick overview over various OpenMP
extensions and their implementation status. These extensions are not
currently defined by any standard, so links to associated LLVM
documentation are provided. As these extensions mature, they will be
considered for standardization. Please post on the
-`Discourse forums (Runtimes - OpenMP category)`_ to provide feedback.
+`Discourse forums (Runtimes - OpenMP category)`_ to provide feedback.
+------------------------------+-----------------------------------------------------------------------------------+--------------------------+--------------------------------------------------------+
|Category | Feature | Status | Reviews |
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
