Make all calls to new safe in HIP

Make all calls to `new` safe in HIP adapter.

Author: Hugh Delaney

source/adapters/hip/context.cpp

@@ -50,8 +50,10 @@ UR_APIEXPORT ur_result_t UR_APICALL urContextCreate(
     *phContext = ContextPtr.release();
   } catch (ur_result_t Err) {
     RetErr = Err;
+  } catch (std::bad_alloc &) {
+    return UR_RESULT_ERROR_OUT_OF_HOST_MEMORY;
   } catch (...) {
-    RetErr = UR_RESULT_ERROR_OUT_OF_RESOURCES;
+    return UR_RESULT_ERROR_UNKNOWN;
   }
   return RetErr;
 }

source/adapters/hip/kernel.cpp

@@ -46,8 +46,10 @@ urKernelCreate(ur_program_handle_t hProgram, const char *pKernelName,
                                 hProgram, hProgram->getContext()});
   } catch (ur_result_t Err) {
     Result = Err;
+  } catch (std::bad_alloc &) {
+    return UR_RESULT_ERROR_OUT_OF_HOST_MEMORY;
   } catch (...) {
-    Result = UR_RESULT_ERROR_OUT_OF_HOST_MEMORY;
+    return UR_RESULT_ERROR_UNKNOWN;
   }
 
   *phKernel = RetKernel.release();

source/adapters/hip/memory.cpp

@@ -150,7 +150,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urMemBufferCreate(
     RetMemObj = URMemObj.release();
   } catch (ur_result_t Err) {
     Result = Err;
-  } catch (std::bad_alloc &Err) {
+  } catch (std::bad_alloc &) {
     return UR_RESULT_ERROR_OUT_OF_HOST_MEMORY;
   } catch (...) {
     Result = UR_RESULT_ERROR_OUT_OF_RESOURCES;
@@ -213,9 +213,12 @@ UR_APIEXPORT ur_result_t UR_APICALL urMemBufferPartition(
   } catch (ur_result_t Err) {
     *phMem = nullptr;
     return Err;
-  } catch (...) {
+  } catch (std::bad_alloc &) {
     *phMem = nullptr;
     return UR_RESULT_ERROR_OUT_OF_HOST_MEMORY;
+  } catch (...) {
+    *phMem = nullptr;
+    return UR_RESULT_ERROR_UNKNOWN;
   }
 
   ReleaseGuard.dismiss();
@@ -391,7 +394,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urMemImageCreate(
     *phMem = URMemObj.release();
   } catch (ur_result_t Err) {
     return Err;
-  } catch (std::bad_alloc &Err) {
+  } catch (std::bad_alloc &) {
     return UR_RESULT_ERROR_OUT_OF_HOST_MEMORY;
   } catch (...) {
     return UR_RESULT_ERROR_UNKNOWN;

source/adapters/hip/program.cpp

@@ -467,35 +467,37 @@ UR_APIEXPORT ur_result_t UR_APICALL urProgramCreateWithBinary(
                       hDevice) != hContext->getDevices().end(),
             UR_RESULT_ERROR_INVALID_CONTEXT);
 
-  ur_result_t Result = UR_RESULT_SUCCESS;
-
-  std::unique_ptr<ur_program_handle_t_> RetProgram{
-      new ur_program_handle_t_{hContext, hDevice}};
-
-  if (pProperties) {
-    if (pProperties->count > 0 && pProperties->pMetadatas == nullptr) {
-      return UR_RESULT_ERROR_INVALID_NULL_POINTER;
-    } else if (pProperties->count == 0 && pProperties->pMetadatas != nullptr) {
-      return UR_RESULT_ERROR_INVALID_SIZE;
+  try {
+    std::unique_ptr<ur_program_handle_t_> RetProgram{
+        new ur_program_handle_t_{hContext, hDevice}};
+
+    if (pProperties) {
+      if (pProperties->count > 0 && pProperties->pMetadatas == nullptr) {
+        return UR_RESULT_ERROR_INVALID_NULL_POINTER;
+      } else if (pProperties->count == 0 &&
+                 pProperties->pMetadatas != nullptr) {
+        return UR_RESULT_ERROR_INVALID_SIZE;
+      }
+      UR_CHECK_ERROR(
+          RetProgram->setMetadata(pProperties->pMetadatas, pProperties->count));
     }
-    Result =
-        RetProgram->setMetadata(pProperties->pMetadatas, pProperties->count);
-    UR_ASSERT(Result == UR_RESULT_SUCCESS, Result);
-  }
 
-  auto pBinary_string = reinterpret_cast<const char *>(pBinary);
-  if (size == 0) {
-    size = strlen(pBinary_string) + 1;
-  }
-
-  UR_ASSERT(size, UR_RESULT_ERROR_INVALID_SIZE);
+    auto pBinary_string = reinterpret_cast<const char *>(pBinary);
+    if (size == 0) {
+      size = strlen(pBinary_string) + 1;
+    }
 
-  Result = RetProgram->setBinary(pBinary_string, size);
-  UR_ASSERT(Result == UR_RESULT_SUCCESS, Result);
+    UR_ASSERT(size, UR_RESULT_ERROR_INVALID_SIZE);
 
-  *phProgram = RetProgram.release();
+    UR_CHECK_ERROR(RetProgram->setBinary(pBinary_string, size));
 
-  return Result;
+    *phProgram = RetProgram.release();
+  } catch (std::bad_alloc &) {
+    return UR_RESULT_ERROR_OUT_OF_HOST_MEMORY;
+  } catch (...) {
+    return UR_RESULT_ERROR_UNKNOWN;
+  }
+  return UR_RESULT_SUCCESS;
 }
 
 // This entry point is only used for native specialization constants (SPIR-V),

source/adapters/hip/queue.cpp

@@ -155,8 +155,10 @@ urQueueCreate(ur_context_handle_t hContext, ur_device_handle_t hDevice,
     return UR_RESULT_SUCCESS;
   } catch (ur_result_t Err) {
     return Err;
+  } catch (std::bad_alloc &) {
+    return UR_RESULT_ERROR_OUT_OF_HOST_MEMORY;
   } catch (...) {
-    return UR_RESULT_ERROR_OUT_OF_RESOURCES;
+    return UR_RESULT_ERROR_UNKNOWN;
   }
 }
 

source/adapters/hip/sampler.cpp

@@ -14,20 +14,26 @@
 ur_result_t urSamplerCreate(ur_context_handle_t hContext,
                             const ur_sampler_desc_t *pDesc,
                             ur_sampler_handle_t *phSampler) {
-  std::unique_ptr<ur_sampler_handle_t_> RetImplSampl{
-      new ur_sampler_handle_t_(hContext)};
+  try {
+    std::unique_ptr<ur_sampler_handle_t_> RetImplSampl{
+        new ur_sampler_handle_t_(hContext)};
 
-  if (pDesc && pDesc->stype == UR_STRUCTURE_TYPE_SAMPLER_DESC) {
-    RetImplSampl->Props |= pDesc->normalizedCoords;
-    RetImplSampl->Props |= pDesc->filterMode << 1;
-    RetImplSampl->Props |= pDesc->addressingMode << 2;
-  } else {
-    // Set default values
-    RetImplSampl->Props |= true; // Normalized Coords
-    RetImplSampl->Props |= UR_SAMPLER_ADDRESSING_MODE_CLAMP << 2;
-  }
+    if (pDesc && pDesc->stype == UR_STRUCTURE_TYPE_SAMPLER_DESC) {
+      RetImplSampl->Props |= pDesc->normalizedCoords;
+      RetImplSampl->Props |= pDesc->filterMode << 1;
+      RetImplSampl->Props |= pDesc->addressingMode << 2;
+    } else {
+      // Set default values
+      RetImplSampl->Props |= true; // Normalized Coords
+      RetImplSampl->Props |= UR_SAMPLER_ADDRESSING_MODE_CLAMP << 2;
+    }
 
-  *phSampler = RetImplSampl.release();
+    *phSampler = RetImplSampl.release();
+  } catch (std::bad_alloc &) {
+    return UR_RESULT_ERROR_OUT_OF_HOST_MEMORY;
+  } catch (...) {
+    return UR_RESULT_ERROR_UNKNOWN;
+  }
   return UR_RESULT_SUCCESS;
 }