1 files changed, 0 insertions, 28 deletions
diff --git a/openmp/libomptarget/src/device.cpp b/openmp/libomptarget/src/device.cpp
index 2a40591..a5409e2 100644
--- a/openmp/libomptarget/src/device.cpp
+++ b/openmp/libomptarget/src/device.cpp
@@ -11,8 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "device.h"
-#include "OmptCallback.h"
-#include "OmptInterface.h"
 #include "omptarget.h"
 #include "private.h"
 #include "rtl.h"
@@ -25,8 +23,6 @@
 #include <string>
 #include <thread>
 
-using namespace llvm::omp::target::ompt;
-
 int HostDataToTargetTy::addEventIfNecessary(DeviceTy &Device,
                                             AsyncInfoTy &AsyncInfo) const {
   // First, check if the user disabled atomic map transfer/malloc/dealloc.
@@ -558,22 +554,10 @@ __tgt_target_table *DeviceTy::loadBinary(void *Img) {
 }
 
 void *DeviceTy::allocData(int64_t Size, void *HstPtr, int32_t Kind) {
-  /// RAII to establish tool anchors before and after data allocation
-  InterfaceRAII TargetDataAllocRAII(
-      RegionInterface.getCallbacks<ompt_target_data_alloc>(), RTLDeviceID,
-      HstPtr, Size,
-      /* CodePtr */ OMPT_GET_RETURN_ADDRESS(0));
-
   return RTL->data_alloc(RTLDeviceID, Size, HstPtr, Kind);
 }
 
 int32_t DeviceTy::deleteData(void *TgtAllocBegin, int32_t Kind) {
-  /// RAII to establish tool anchors before and after data deletion
-  InterfaceRAII TargetDataDeleteRAII(
-      RegionInterface.getCallbacks<ompt_target_data_delete>(), RTLDeviceID,
-      TgtAllocBegin,
-      /* CodePtr */ OMPT_GET_RETURN_ADDRESS(0));
-
   return RTL->data_delete(RTLDeviceID, TgtAllocBegin, Kind);
 }
 
@@ -605,12 +589,6 @@ int32_t DeviceTy::submitData(void *TgtPtrBegin, void *HstPtrBegin, int64_t Size,
                   Entry);
   }
 
-  /// RAII to establish tool anchors before and after data submit
-  InterfaceRAII TargetDataSubmitRAII(
-      RegionInterface.getCallbacks<ompt_target_data_transfer_to_device>(),
-      RTLDeviceID, TgtPtrBegin, HstPtrBegin, Size,
-      /* CodePtr */ OMPT_GET_RETURN_ADDRESS(0));
-
   if (!AsyncInfo || !RTL->data_submit_async || !RTL->synchronize)
     return RTL->data_submit(RTLDeviceID, TgtPtrBegin, HstPtrBegin, Size);
   return RTL->data_submit_async(RTLDeviceID, TgtPtrBegin, HstPtrBegin, Size,
@@ -632,12 +610,6 @@ int32_t DeviceTy::retrieveData(void *HstPtrBegin, void *TgtPtrBegin,
                   Entry);
   }
 
-  /// RAII to establish tool anchors before and after data retrieval
-  InterfaceRAII TargetDataRetrieveRAII(
-      RegionInterface.getCallbacks<ompt_target_data_transfer_from_device>(),
-      RTLDeviceID, HstPtrBegin, TgtPtrBegin, Size,
-      /* CodePtr */ OMPT_GET_RETURN_ADDRESS(0));
-
   if (!RTL->data_retrieve_async || !RTL->synchronize)
     return RTL->data_retrieve(RTLDeviceID, HstPtrBegin, TgtPtrBegin, Size);
   return RTL->data_retrieve_async(RTLDeviceID, HstPtrBegin, TgtPtrBegin, Size,