Adjust interfaces after merge

Author: adurang

offload/plugins-nextgen/level_zero/include/L0Device.h

@@ -541,13 +541,14 @@ class L0DeviceTy final : public GenericDeviceTy {
   // Allocation related routines
 
   /// Data alloc
-  void *dataAlloc(size_t Size, size_t Align, int32_t Kind, intptr_t Offset,
-                  bool UserAlloc, bool DevMalloc = false,
-                  uint32_t MemAdvice = UINT32_MAX,
-                  AllocOptionTy AllocOpt = AllocOptionTy::ALLOC_OPT_NONE);
+  Expected<void *>
+  dataAlloc(size_t Size, size_t Align, int32_t Kind, intptr_t Offset,
+            bool UserAlloc, bool DevMalloc = false,
+            uint32_t MemAdvice = UINT32_MAX,
+            AllocOptionTy AllocOpt = AllocOptionTy::ALLOC_OPT_NONE);
 
   /// Data delete
-  int32_t dataDelete(void *Ptr);
+  Error dataDelete(void *Ptr);
 
   /// Return the memory allocation type for the specified memory location.
   uint32_t getMemAllocType(const void *Ptr) const;
@@ -575,8 +576,9 @@ class L0DeviceTy final : public GenericDeviceTy {
   loadBinaryImpl(std::unique_ptr<MemoryBuffer> &&TgtImage,
                  int32_t ImageId) override;
   Error unloadBinaryImpl(DeviceImageTy *Image) override;
-  void *allocate(size_t Size, void *HstPtr, TargetAllocTy Kind) override;
-  int free(void *TgtPtr, TargetAllocTy Kind = TARGET_ALLOC_DEFAULT) override;
+  Expected<void *> allocate(size_t Size, void *HstPtr,
+                            TargetAllocTy Kind) override;
+  Error free(void *TgtPtr, TargetAllocTy Kind = TARGET_ALLOC_DEFAULT) override;
 
   Expected<void *> dataLockImpl(void *HstPtr, int64_t Size) override {
     return Plugin::error(error::ErrorCode::UNKNOWN,

offload/plugins-nextgen/level_zero/src/L0Device.cpp

@@ -492,13 +492,14 @@ Error L0DeviceTy::queryAsyncImpl(__tgt_async_info &AsyncInfo) {
   return Plugin::success();
 }
 
-void *L0DeviceTy::allocate(size_t Size, void *HstPtr, TargetAllocTy Kind) {
+Expected<void *> L0DeviceTy::allocate(size_t Size, void *HstPtr,
+                                      TargetAllocTy Kind) {
   return dataAlloc(Size, /*Align=*/0, Kind,
                    /*Offset=*/0, /*UserAlloc=*/HstPtr == nullptr,
                    /*DevMalloc=*/false);
 }
 
-int L0DeviceTy::free(void *TgtPtr, TargetAllocTy Kind) {
+Error L0DeviceTy::free(void *TgtPtr, TargetAllocTy Kind) {
   return dataDelete(TgtPtr);
 }
 
@@ -790,9 +791,10 @@ Error L0DeviceTy::dataFillImpl(void *TgtPtr, const void *PatternPtr,
   return Plugin::error(error::ErrorCode::UNKNOWN, "%s failed\n", __func__);
 }
 
-void *L0DeviceTy::dataAlloc(size_t Size, size_t Align, int32_t Kind,
-                            intptr_t Offset, bool UserAlloc, bool DevMalloc,
-                            uint32_t MemAdvice, AllocOptionTy AllocOpt) {
+Expected<void *> L0DeviceTy::dataAlloc(size_t Size, size_t Align, int32_t Kind,
+                                       intptr_t Offset, bool UserAlloc,
+                                       bool DevMalloc, uint32_t MemAdvice,
+                                       AllocOptionTy AllocOpt) {
 
   const bool UseDedicatedPool =
       (AllocOpt == AllocOptionTy::ALLOC_OPT_REDUCTION_SCRATCH) ||
@@ -812,9 +814,9 @@ void *L0DeviceTy::dataAlloc(size_t Size, size_t Align, int32_t Kind,
                          MemAdvice, AllocOpt);
 }
 
-int32_t L0DeviceTy::dataDelete(void *Ptr) {
+Error L0DeviceTy::dataDelete(void *Ptr) {
   auto &Allocator = getMemAllocator(Ptr);
-  return Allocator.dealloc(Ptr);
+  return Plugin::check(Allocator.dealloc(Ptr), "Error deleting ptr");
 }
 
 int32_t L0DeviceTy::makeMemoryResident(void *Mem, size_t Size) {