remove ET_TRY macros

SamGondelman · SamGondelman · commit c1c9c9203fc8 · 2025-03-04T21:40:20.000-08:00
diff --git a/backends/apple/mps/runtime/MPSBackend.mm b/backends/apple/mps/runtime/MPSBackend.mm
@@ -43,8 +43,11 @@ bool is_available() const override {
       BackendInitContext& context,
       FreeableBuffer* processed,
       ArrayRef<CompileSpec> compile_specs) const override {
-    auto executor = ET_ALLOCATE_INSTANCE_OR_RETURN_ERROR(
-        context.get_runtime_allocator(), mps::delegate::MPSExecutor);
+    auto executor = context.get_runtime_allocator()->allocateInstance<mps::delegate::MPSExecutor>();
+    if (executor == nullptr) {
+      return Error::MemoryAllocationFailed;
+    }
+
     // NOTE: Since we use placement new and since this type is not trivially
     // destructible, we must call the destructor manually in destroy().
     new (executor) mps::delegate::MPSExecutor;
diff --git a/backends/arm/runtime/EthosUBackend.cpp b/backends/arm/runtime/EthosUBackend.cpp
@@ -120,8 +120,11 @@ class EthosUBackend final : public ::executorch::runtime::BackendInterface {
     }
 
     MemoryAllocator* allocator = context.get_runtime_allocator();
-    ExecutionHandle* handle =
-        ET_ALLOCATE_INSTANCE_OR_RETURN_ERROR(allocator, ExecutionHandle);
+    ExecutionHandle* handle = allocator->allocateInstance<ExecutionHandle>();
+    if (handle == nullptr) {
+      return Error::MemoryAllocationFailed;
+    }
+
     handle->processed = processed;
 
     // Return the same buffer we were passed - this data will be
diff --git a/backends/mediatek/runtime/NeuronBackend.cpp b/backends/mediatek/runtime/NeuronBackend.cpp
@@ -68,8 +68,12 @@ Result<DelegateHandle*> NeuronBackend::init(
       processed->size());
 
   MemoryAllocator* runtime_allocator = context.get_runtime_allocator();
-  NeuronExecuTorchDelegate* delegate = ET_ALLOCATE_INSTANCE_OR_RETURN_ERROR(
-      runtime_allocator, NeuronExecuTorchDelegate);
+  NeuronExecuTorchDelegate* delegate =
+      runtime_allocator->allocateInstance<NeuronExecuTorchDelegate>();
+  if (delegate == nullptr) {
+    return Error::MemoryAllocationFailed;
+  }
+
   new (delegate) NeuronExecuTorchDelegate();
 
   if (delegate == nullptr) {
diff --git a/backends/qualcomm/runtime/QnnExecuTorchBackend.cpp b/backends/qualcomm/runtime/QnnExecuTorchBackend.cpp
@@ -66,8 +66,10 @@ Result<DelegateHandle*> QnnExecuTorchBackend::init(
 
   // Create QnnManager
   MemoryAllocator* runtime_allocator = context.get_runtime_allocator();
-  QnnManager* qnn_manager =
-      ET_ALLOCATE_INSTANCE_OR_RETURN_ERROR(runtime_allocator, QnnManager);
+  QnnManager* qnn_manager = runtime_allocator->allocateInstance<QnnManager>();
+  if (qnn_manager == nullptr) {
+    return Error::MemoryAllocationFailed;
+  }
 
   // NOTE: Since we use placement new and since this type is not trivially
   // destructible, we must call the destructor manually in destroy().
diff --git a/backends/vulkan/runtime/VulkanBackend.cpp b/backends/vulkan/runtime/VulkanBackend.cpp
@@ -510,8 +510,11 @@ class VulkanBackend final : public ::executorch::runtime::BackendInterface {
       BackendInitContext& context,
       FreeableBuffer* processed,
       ArrayRef<CompileSpec> compile_specs) const override {
-    ComputeGraph* compute_graph = ET_ALLOCATE_INSTANCE_OR_RETURN_ERROR(
-        context.get_runtime_allocator(), ComputeGraph);
+    ComputeGraph* compute_graph =
+        context.get_runtime_allocator()->allocateInstance<ComputeGraph>();
+    if (compute_graph == nullptr) {
+      return Error::MemoryAllocationFailed;
+    }
 
     new (compute_graph) ComputeGraph(get_graph_config(compile_specs));
 
diff --git a/backends/xnnpack/runtime/XNNPACKBackend.cpp b/backends/xnnpack/runtime/XNNPACKBackend.cpp
@@ -73,8 +73,11 @@ class XnnpackBackend final : public ::executorch::runtime::BackendInterface {
       BackendInitContext& context,
       FreeableBuffer* processed,
       ArrayRef<CompileSpec> compile_specs) const override {
-    auto executor = ET_ALLOCATE_INSTANCE_OR_RETURN_ERROR(
-        context.get_runtime_allocator(), xnnpack::delegate::XNNExecutor);
+    auto executor =
+        context.get_runtime_allocator()->allocateInstance<xnnpack::delegate::XNNExecutor>();
+    if (executor == nullptr) {
+      return Error::MemoryAllocationFailed;
+    }
 
 #ifdef ENABLE_XNNPACK_SHARED_WORKSPACE
     // This is needed to serialize access to xnn_create_runtime which is not
diff --git a/exir/backend/test/demos/rpc/ExecutorBackend.cpp b/exir/backend/test/demos/rpc/ExecutorBackend.cpp
@@ -72,8 +72,11 @@ class ExecutorBackend final : public ::executorch::runtime::BackendInterface {
     // `processed` contains an executorch program. Wrap it in a DataLoader that
     // will return the data directly without copying it.
     MemoryAllocator* runtime_allocator = context.get_runtime_allocator();
-    auto loader = ET_ALLOCATE_INSTANCE_OR_RETURN_ERROR(
-        runtime_allocator, BufferDataLoader);
+    auto loader = runtime_allocator->allocateInstance<BufferDataLoader>();
+    if (loader == nullptr) {
+      return Error::MemoryAllocationFailed;
+    }
+
     new (loader) BufferDataLoader(processed->data(), processed->size());
     // Can't free `processed` because the program will point into that memory.
 
@@ -84,8 +87,11 @@ class ExecutorBackend final : public ::executorch::runtime::BackendInterface {
     }
 
     // Move the Program off the stack.
-    auto client_program =
-        ET_ALLOCATE_INSTANCE_OR_RETURN_ERROR(runtime_allocator, Program);
+    auto client_program = runtime_allocator->allocateInstance<Program>();
+    if (client_program == nullptr) {
+      return Error::MemoryAllocationFailed;
+    }
+
     new (client_program) Program(std::move(program_result.get()));
 
     Result<MethodMeta> method_meta = client_program->method_meta("forward");
@@ -97,35 +103,56 @@ class ExecutorBackend final : public ::executorch::runtime::BackendInterface {
     // Building all different allocators for the client executor
     auto num_memory_planned_buffers = method_meta->num_memory_planned_buffers();
 
-    Span<uint8_t>* memory_planned_buffers = ET_ALLOCATE_LIST_OR_RETURN_ERROR(
-        runtime_allocator, Span<uint8_t>, num_memory_planned_buffers);
+    Span<uint8_t>* memory_planned_buffers =
+      runtime_allocator->allocateList<Span<uint8_t>>(num_memory_planned_buffers);
+    if (memory_planned_buffers == nullptr) {
+      return Error::MemoryAllocationFailed;
+    }
 
     for (size_t id = 0; id < num_memory_planned_buffers; ++id) {
       size_t buffer_size = static_cast<size_t>(
           method_meta->memory_planned_buffer_size(id).get());
-      uint8_t* buffer_i = ET_ALLOCATE_LIST_OR_RETURN_ERROR(
-          runtime_allocator, uint8_t, buffer_size);
+      uint8_t* buffer_i = runtime_allocator->allocateList<uint8_t>(buffer_size);
+      if (buffer_i == nullptr) {
+        return Error::MemoryAllocationFailed;
+      }
+
       memory_planned_buffers[id] = {buffer_i, buffer_size};
     }
 
-    auto client_planned_memory = ET_ALLOCATE_INSTANCE_OR_RETURN_ERROR(
-        runtime_allocator, HierarchicalAllocator);
+    auto client_planned_memory = runtime_allocator->allocateInstance<HierarchicalAllocator>();
+    if (client_planned_memory == nullptr) {
+      return Error::MemoryAllocationFailed;
+    }
+
     new (client_planned_memory) HierarchicalAllocator(
         {memory_planned_buffers, num_memory_planned_buffers});
 
     // Allocate some memory from runtime allocator for the client executor, in
     // real case, like if it's an executor in dsp, it should allocate memory
     // dedicated to this specific hardware
-    auto client_method_allocator = ET_ALLOCATE_INSTANCE_OR_RETURN_ERROR(
-        runtime_allocator, MemoryAllocator);
+    auto client_method_allocator = runtime_allocator->allocateInstance<MemoryAllocator>();
+    if (client_method_allocator == nullptr) {
+      return Error::MemoryAllocationFailed;
+    }
+
     const size_t kClientRuntimeMemorySize = 4 * 1024U;
-    auto runtime_pool = ET_ALLOCATE_OR_RETURN_ERROR(
-        runtime_allocator, kClientRuntimeMemorySize);
+    auto runtime_pool = runtime_allocator->allocate(kClientRuntimeMemorySize);
+    if (runtime_pool == nullptr) {
+      ET_LOG(
+          Error,
+          "Failed to allocate %zu bytes for client runtime memory",
+          kClientRuntimeMemorySize);
+      return Error::MemoryAllocationFailed;
+    }
     new (client_method_allocator) MemoryAllocator(
         kClientRuntimeMemorySize, static_cast<uint8_t*>(runtime_pool));
 
-    auto client_memory_manager =
-        ET_ALLOCATE_INSTANCE_OR_RETURN_ERROR(runtime_allocator, MemoryManager);
+    auto client_memory_manager = runtime_allocator->allocateInstance<MemoryManager>();
+    if (client_memory_manager == nullptr) {
+      return Error::MemoryAllocationFailed;
+    }
+
     new (client_memory_manager)
         MemoryManager(client_method_allocator, client_planned_memory);
 
@@ -140,8 +167,11 @@ class ExecutorBackend final : public ::executorch::runtime::BackendInterface {
       return method_res.error();
     }
 
-    auto client_method =
-        ET_ALLOCATE_INSTANCE_OR_RETURN_ERROR(runtime_allocator, Method);
+    auto client_method = runtime_allocator->allocateInstance<Method>();
+    if (client_method == nullptr) {
+      return Error::MemoryAllocationFailed;
+    }
+
     new (client_method) Method(std::move(method_res.get()));
 
     // Return the client method so it will be passed to `execute()` as
diff --git a/runtime/core/memory_allocator.h b/runtime/core/memory_allocator.h
@@ -198,165 +198,6 @@ class MemoryAllocator {
   int32_t prof_id_ = -1;
 };
 
-#if ET_HAVE_GNU_STATEMENT_EXPRESSIONS
-/**
- * Tries allocating from the specified MemoryAllocator*.
- *
- * - On success, returns a pointer to the allocated buffer.
- * - On failure, executes the provided code block, which must return or panic.
- *
- * Example:
- * @code
- *   char* buf = ET_TRY_ALLOCATE_OR(
- *       memory_allocator, bufsize, {
- *         *out_err = Error::MemoryAllocationFailed;
- *         return nullopt;
- *       });
- * @endcode
- */
-#define ET_TRY_ALLOCATE_OR(memory_allocator__, nbytes__, ...)              \
-  ({                                                                       \
-    void* et_try_allocate_result = memory_allocator__->allocate(nbytes__); \
-    if (et_try_allocate_result == nullptr && nbytes__ > 0) {               \
-      __VA_ARGS__                                                          \
-      /* The args must return. */                                          \
-      ET_UNREACHABLE();                                                    \
-    }                                                                      \
-    et_try_allocate_result;                                                \
-  })
-
-/**
- * Tries allocating an instance of type__ from the specified MemoryAllocator*.
- *
- * - On success, returns a pointer to the allocated buffer. Note that the memory
- *   will not be initialized.
- * - On failure, executes the provided code block, which must return or panic.
- *
- * Example:
- * @code
- *   char* buf = ET_TRY_ALLOCATE_INSTANCE_OR(
- *       memory_allocator,
- *       MyType,
- *       { *out_err = Error::MemoryAllocationFailed; return nullopt; });
- * @endcode
- */
-#define ET_TRY_ALLOCATE_INSTANCE_OR(memory_allocator__, type__, ...) \
-  ({                                                                 \
-    type__* et_try_allocate_result =                                 \
-        memory_allocator__->allocateInstance<type__>();              \
-    if (et_try_allocate_result == nullptr) {                         \
-      __VA_ARGS__                                                    \
-      /* The args must return. */                                    \
-      ET_UNREACHABLE();                                              \
-    }                                                                \
-    et_try_allocate_result;                                          \
-  })
-
-/**
- * Tries allocating multiple elements of a given type from the specified
- * MemoryAllocator*.
- *
- * - On success, returns a pointer to the allocated buffer.
- * - On failure, executes the provided code block, which must return or panic.
- *
- * Example:
- * @code
- *   Tensor* tensor_list = ET_TRY_ALLOCATE_LIST_OR(
- *       memory_allocator, Tensor, num_tensors, {
- *         *out_err = Error::MemoryAllocationFailed;
- *         return nullopt;
- *       });
- * @endcode
- */
-#define ET_TRY_ALLOCATE_LIST_OR(memory_allocator__, type__, nelem__, ...) \
-  ({                                                                      \
-    type__* et_try_allocate_result =                                      \
-        memory_allocator__->allocateList<type__>(nelem__);                \
-    if (et_try_allocate_result == nullptr && nelem__ > 0) {               \
-      __VA_ARGS__                                                         \
-      /* The args must return. */                                         \
-      ET_UNREACHABLE();                                                   \
-    }                                                                     \
-    et_try_allocate_result;                                               \
-  })
-#else // !ET_HAVE_GNU_STATEMENT_EXPRESSIONS
-/**
- * The recommended alternative for statement expression-incompatible compilers
- * is to directly allocate the memory.
- */
-#define ET_TRY_ALLOCATE_OR(memory_allocator__, nbytes__, ...) \
-  memory_allocator__->allocate(nbytes__);
-
-/**
- * The recommended alternative for statement expression-incompatible compilers
- * is to directly allocate the memory.
- */
-#define ET_TRY_ALLOCATE_INSTANCE_OR(memory_allocator__, type__, ...) \
-  memory_allocator__->allocateInstance<type__>();
-
-/**
- * The recommended alternative for statement expression-incompatible compilers
- * is to directly use allocate the memory.
- */
-#define ET_TRY_ALLOCATE_LIST_OR(memory_allocator__, type__, nelem__, ...) \
-  memory_allocator__->allocateList<type__>(nelem__);
-
-#endif // !ET_HAVE_GNU_STATEMENT_EXPRESSIONS
-
-/**
- * Tries allocating from the specified MemoryAllocator*.
- *
- * - On success, returns a pointer to the allocated buffer.
- * - On failure, returns `Error::MemoryAllocationFailed` from the calling
- *   function, which must be declared to return `executorch::runtime::Error`.
- *
- * Example:
- * @code
- *   char* buf = ET_ALLOCATE_OR_RETURN_ERROR(memory_allocator, bufsize);
- * @endcode
- */
-#define ET_ALLOCATE_OR_RETURN_ERROR(memory_allocator__, nbytes__) \
-  ET_TRY_ALLOCATE_OR(memory_allocator__, nbytes__, {              \
-    return ::executorch::runtime::Error::MemoryAllocationFailed;  \
-  })
-
-/**
- * Tries allocating an instance of type__ from the specified MemoryAllocator*.
- *
- * - On success, returns a pointer to the allocated buffer. Note that the memory
- *   will not be initialized.
- * - On failure, returns `Error::MemoryAllocationFailed` from the calling
- *   function, which must be declared to return `executorch::runtime::Error`.
- *
- * Example:
- * @code
- *   char* buf = ET_ALLOCATE_INSTANCE_OR_RETURN_ERROR(memory_allocator, MyType);
- * @endcode
- */
-#define ET_ALLOCATE_INSTANCE_OR_RETURN_ERROR(memory_allocator__, type__) \
-  ET_TRY_ALLOCATE_INSTANCE_OR(memory_allocator__, type__, {              \
-    return ::executorch::runtime::Error::MemoryAllocationFailed;         \
-  })
-
-/**
- * Tries allocating multiple elements of a given type from the specified
- * MemoryAllocator*.
- *
- * - On success, returns a pointer to the allocated buffer.
- * - On failure, returns `Error::MemoryAllocationFailed` from the calling
- *   function, which must be declared to return `executorch::runtime::Error`.
- *
- * Example:
- * @code
- *   Tensor* tensor_list = ET_ALLOCATE_LIST_OR_RETURN_ERROR(
- *       memory_allocator, Tensor, num_tensors);
- * @endcode
- */
-#define ET_ALLOCATE_LIST_OR_RETURN_ERROR(memory_allocator__, type__, nelem__) \
-  ET_TRY_ALLOCATE_LIST_OR(memory_allocator__, type__, nelem__, {              \
-    return ::executorch::runtime::Error::MemoryAllocationFailed;              \
-  })
-
 } // namespace runtime
 } // namespace executorch
 
diff --git a/runtime/core/test/memory_allocator_test.cpp b/runtime/core/test/memory_allocator_test.cpp
diff --git a/runtime/executor/tensor_parser_portable.cpp b/runtime/executor/tensor_parser_portable.cpp
diff --git a/runtime/executor/test/test_backend_compiler_lib.cpp b/runtime/executor/test/test_backend_compiler_lib.cpp
diff --git a/runtime/executor/test/test_backend_with_delegate_mapping.cpp b/runtime/executor/test/test_backend_with_delegate_mapping.cpp
