From 83c3d07994c4cd24b9548362d03290af2a9483b0 Mon Sep 17 00:00:00 2001 From: Shilei Tian Date: Wed, 19 Aug 2020 16:07:58 -0400 Subject: [PATCH] [OpenMP] Refactored the function `DeviceTy::data_exchange` This patch contains the following changes: 1. Renamed the function `DeviceTy::data_exchange` to `DeviceTy::dataExchange`; 2. Changed the second argument `DeviceTy DstDev` to `DeviceTy &DstDev`; 3. Renamed the last argument. Reviewed By: ye-luo Differential Revision: https://reviews.llvm.org/D86238 --- openmp/libomptarget/src/api.cpp | 2 +- openmp/libomptarget/src/device.cpp | 8 ++++---- openmp/libomptarget/src/device.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/openmp/libomptarget/src/api.cpp b/openmp/libomptarget/src/api.cpp index d0f7324..2c5d7b5 100644 --- a/openmp/libomptarget/src/api.cpp +++ b/openmp/libomptarget/src/api.cpp @@ -171,7 +171,7 @@ EXTERN int omp_target_memcpy(void *dst, void *src, size_t length, // First try to use D2D memcpy which is more efficient. If fails, fall back // to unefficient way. if (SrcDev.isDataExchangable(DstDev)) { - rc = SrcDev.data_exchange(srcAddr, DstDev, dstAddr, length, nullptr); + rc = SrcDev.dataExchange(srcAddr, DstDev, dstAddr, length, nullptr); if (rc == OFFLOAD_SUCCESS) return OFFLOAD_SUCCESS; } diff --git a/openmp/libomptarget/src/device.cpp b/openmp/libomptarget/src/device.cpp index 5a01257..f848e67 100644 --- a/openmp/libomptarget/src/device.cpp +++ b/openmp/libomptarget/src/device.cpp @@ -390,15 +390,15 @@ int32_t DeviceTy::retrieveData(void *HstPtrBegin, void *TgtPtrBegin, } // Copy data from current device to destination device directly -int32_t DeviceTy::data_exchange(void *SrcPtr, DeviceTy DstDev, void *DstPtr, - int64_t Size, __tgt_async_info *AsyncInfoPtr) { - if (!AsyncInfoPtr || !RTL->data_exchange_async || !RTL->synchronize) { +int32_t DeviceTy::dataExchange(void *SrcPtr, DeviceTy &DstDev, void *DstPtr, + int64_t Size, __tgt_async_info *AsyncInfo) { + if (!AsyncInfo || !RTL->data_exchange_async || !RTL->synchronize) { assert(RTL->data_exchange && "RTL->data_exchange is nullptr"); return RTL->data_exchange(RTLDeviceID, SrcPtr, DstDev.RTLDeviceID, DstPtr, Size); } else return RTL->data_exchange_async(RTLDeviceID, SrcPtr, DstDev.RTLDeviceID, - DstPtr, Size, AsyncInfoPtr); + DstPtr, Size, AsyncInfo); } // Run region on device diff --git a/openmp/libomptarget/src/device.h b/openmp/libomptarget/src/device.h index 655cf96..098bad0 100644 --- a/openmp/libomptarget/src/device.h +++ b/openmp/libomptarget/src/device.h @@ -214,8 +214,8 @@ struct DeviceTy { int32_t retrieveData(void *HstPtrBegin, void *TgtPtrBegin, int64_t Size, __tgt_async_info *AsyncInfoPtr); // Copy data from current device to destination device directly - int32_t data_exchange(void *SrcPtr, DeviceTy DstDev, void *DstPtr, - int64_t Size, __tgt_async_info *AsyncInfoPtr); + int32_t dataExchange(void *SrcPtr, DeviceTy &DstDev, void *DstPtr, + int64_t Size, __tgt_async_info *AsyncInfo); int32_t runRegion(void *TgtEntryPtr, void **TgtVarsPtr, ptrdiff_t *TgtOffsets, int32_t TgtVarsSize, __tgt_async_info *AsyncInfoPtr); -- 2.7.4