Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion arm_compute/runtime/ITensorAllocator.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016-2021, 2024-2025 Arm Limited.
* Copyright (c) 2016-2021, 2024-2026 Arm Limited.
*
* SPDX-License-Identifier: MIT
*
Expand Down Expand Up @@ -110,10 +110,23 @@ class ITensorAllocator
/** Interface to be implemented by the child class to unlock the memory allocation after the CPU is done accessing it. */
virtual void unlock() = 0;

/** Returns whether allocator currently owns the TensorInfo metadata object. */
bool owns_info() const;
/** Returns whether the allocator has imported external backing memory. */
bool is_imported() const;
/** Track import state for derived allocators when ownership of backing memory changes. */
void set_imported(bool imported);
/** For external TensorInfo metadata, import state determines resizable behavior from allocator perspective. */
bool allocator_considers_resizable() const;
/** Update TensorInfo::is_resizable only if allocator owns the metadata. */
void set_resizable_if_info_owned(bool is_resizable);

private:
TensorInfo _info_owned{}; /**< Tensor's metadata. */
TensorInfo *_info_external{nullptr}; /**< External Tensor's metadata */
size_t _alignment{}; /**< Tensor's alignment in bytes */
bool _owns_info{true}; /**< True when allocator owns metadata; false for soft_init(). */
bool _is_imported{false}; /**< True when memory was imported instead of allocated by allocator. */
};
} // namespace arm_compute
#endif // ACL_ARM_COMPUTE_RUNTIME_ITENSORALLOCATOR_H
11 changes: 7 additions & 4 deletions src/runtime/CL/CLTensorAllocator.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016-2021, 2024 Arm Limited.
* Copyright (c) 2016-2021, 2024, 2026 Arm Limited.
*
* SPDX-License-Identifier: MIT
*
Expand Down Expand Up @@ -157,15 +157,17 @@ void CLTensorAllocator::allocate()
}

// Lock allocator
info().set_is_resizable(false);
set_imported(false);
set_resizable_if_info_owned(false);
}

void CLTensorAllocator::free()
{
_mapping = nullptr;
_memory.set_region(nullptr);
clear_quantization_arrays(_scale, _offset);
info().set_is_resizable(true);
set_imported(false);
set_resizable_if_info_owned(true);
}

bool CLTensorAllocator::is_allocated() const
Expand All @@ -182,7 +184,8 @@ Status CLTensorAllocator::import_memory(cl::Buffer buffer)

_memory.set_owned_region(std::make_unique<CLBufferMemoryRegion>(buffer));

info().set_is_resizable(false);
set_imported(true);
set_resizable_if_info_owned(false);
return Status{};
}

Expand Down
39 changes: 38 additions & 1 deletion src/runtime/ITensorAllocator.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016-2021 Arm Limited.
* Copyright (c) 2016-2021, 2026 Arm Limited.
*
* SPDX-License-Identifier: MIT
*
Expand Down Expand Up @@ -35,12 +35,16 @@ void ITensorAllocator::init(const TensorInfo &input, size_t alignment)
_info_owned = input;
_info_external = nullptr;
_alignment = alignment;
_owns_info = true;
_is_imported = false;
}

void ITensorAllocator::soft_init(TensorInfo &input, size_t alignment)
{
_info_external = &input;
_alignment = alignment;
_owns_info = false;
_is_imported = false;
}

TensorInfo &ITensorAllocator::info()
Expand All @@ -57,3 +61,36 @@ size_t ITensorAllocator::alignment() const
{
return _alignment;
}

bool ITensorAllocator::owns_info() const
{
return _owns_info;
}

bool ITensorAllocator::is_imported() const
{
return _is_imported;
}

void ITensorAllocator::set_imported(bool imported)
{
_is_imported = imported;
}

bool ITensorAllocator::allocator_considers_resizable() const
{
if (_owns_info)
{
const TensorInfo *info_ptr = (_info_external != nullptr) ? _info_external : &_info_owned;
return (info_ptr != nullptr) ? info_ptr->is_resizable() : true;
}
return !_is_imported;
}

void ITensorAllocator::set_resizable_if_info_owned(bool is_resizable)
{
if (_owns_info)
{
info().set_is_resizable(is_resizable);
}
}
13 changes: 8 additions & 5 deletions src/runtime/TensorAllocator.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016-2020, 2024 Arm Limited.
* Copyright (c) 2016-2020, 2024, 2026 Arm Limited.
*
* SPDX-License-Identifier: MIT
*
Expand Down Expand Up @@ -71,7 +71,7 @@ TensorAllocator::TensorAllocator(IMemoryManageable *owner) : _owner(owner), _ass

TensorAllocator::~TensorAllocator()
{
info().set_is_resizable(true);
set_resizable_if_info_owned(true);
}

TensorAllocator::TensorAllocator(TensorAllocator &&o) noexcept
Expand Down Expand Up @@ -142,13 +142,15 @@ void TensorAllocator::allocate()
{
_associated_memory_group->finalize_memory(_owner, _memory, info().total_size(), alignment_to_use);
}
info().set_is_resizable(false);
set_imported(false);
set_resizable_if_info_owned(false);
}

void TensorAllocator::free()
{
_memory.set_region(nullptr);
info().set_is_resizable(true);
set_imported(false);
set_resizable_if_info_owned(true);
}

bool TensorAllocator::is_allocated() const
Expand All @@ -163,7 +165,8 @@ Status TensorAllocator::import_memory(void *memory)
ARM_COMPUTE_RETURN_ERROR_ON(alignment() != 0 && !arm_compute::utility::check_aligned(memory, alignment()));

_memory.set_owned_region(std::make_unique<MemoryRegion>(memory, info().total_size()));
info().set_is_resizable(false);
set_imported(true);
set_resizable_if_info_owned(false);

return Status{};
}
Expand Down
81 changes: 81 additions & 0 deletions tests/validation/UNIT/shared_import_memory_test.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
/*
* Copyright (c) 2026 Arm Limited.
*
* SPDX-License-Identifier: MIT
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#include "arm_compute/core/TensorInfo.h"
#include "arm_compute/core/TensorShape.h"
#include "arm_compute/core/Types.h"
#include "arm_compute/runtime/Tensor.h"

#include "tests/framework/Asserts.h"
#include "tests/framework/Macros.h"
#include "tests/validation/Validation.h"

namespace arm_compute
{
namespace test
{
namespace validation
{
TEST_SUITE(UNIT)
TEST_SUITE(TensorInfo)

TEST_CASE(ImportMemoryDoesNotMutateExternalInfo, framework::DatasetMode::ALL)
{
// Use F16 if available; otherwise fall back to F32.
DataType test_dt = DataType::F16;
#if !defined(ARM_COMPUTE_ENABLE_FP16)
test_dt = DataType::F32;
#endif

TensorInfo out_info(TensorShape(16U, 4U, 4U), 1, test_dt, DataLayout::NHWC);
out_info.set_is_resizable(true);

Tensor out_tensor;
out_tensor.allocator()->init(out_info);
out_tensor.allocator()->allocate();

// Simulate a shared TensorInfo used as a view wrapper.
TensorInfo shared_info(out_info);
shared_info.set_is_resizable(true);

Tensor view_tensor;
view_tensor.allocator()->soft_init(shared_info);

// Ensure it's still resizable before import.
ARM_COMPUTE_EXPECT(shared_info.is_resizable(), framework::LogLevel::ERRORS);

// Import memory into the view tensor.
ARM_COMPUTE_ASSERT(bool(view_tensor.allocator()->import_memory(out_tensor.buffer())));

// Regression assert: import_memory must NOT mutate the caller-owned shared_info.
ARM_COMPUTE_EXPECT(shared_info.is_resizable(), framework::LogLevel::ERRORS);

// extend_padding should succeed (not throw).
ARM_COMPUTE_EXPECT_NO_THROW(shared_info.extend_padding(PaddingSize(1, 1, 1, 1)), framework::LogLevel::ERRORS);
}

TEST_SUITE_END() // TensorInfo
TEST_SUITE_END() // UNIT
} // namespace validation
} // namespace test
} // namespace arm_compute