saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-24 19:43:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disable CPU EP's allocator's arena when address sanitizer is enabled (#19485)

Browse source 
### Description
Disable CPU EP's allocator's arena when address sanitizer is enabled,
because it masks problems. For example, the code in
onnxruntime/test/quantization/quantization_test.cc has a memory leak
problem: it allocated a buffer but didn't free it, but most memory leak
check tool cannot detect that because the buffer was from an arena and
the arena was finally freed.

### Motivation and Context
Provider better memory leak check coverage.
This commit is contained in:
Changming Sun 2024-02-12 09:39:49 -08:00 committed by GitHub
parent c831031ad5
commit 9cb97ee507
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
onnxruntime/core/providers/cpu/cpu_execution_provider.cc
View file

@ -2,6 +2,7 @@
// Licensed under the MIT License.
#include "core/providers/cpu/cpu_execution_provider.h"
#include <absl/base/config.h>
#include "core/framework/op_kernel.h"
#include "core/framework/kernel_registry.h"
#include "core/mlas/inc/mlas.h"
@ -29,7 +30,7 @@ CPUExecutionProvider::CPUExecutionProvider(const CPUExecutionProviderInfo& info)
std::vector<AllocatorPtr> CPUExecutionProvider::CreatePreferredAllocators() {
bool create_arena = info_.create_arena;
#if defined(USE_JEMALLOC) || defined(USE_MIMALLOC)
#if defined(USE_JEMALLOC) || defined(USE_MIMALLOC) || defined(ABSL_HAVE_ADDRESS_SANITIZER)
// JEMalloc/mimalloc already have memory pool, so just use device allocator.
create_arena = false;
#elif !(defined(__amd64__) || defined(_M_AMD64) || defined(__aarch64__) || defined(_M_ARM64))

3
onnxruntime/test/framework/allocator_test.cc
View file

@ -1,5 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
#include <absl/base/config.h>
#include "core/framework/allocator.h"
@ -15,7 +16,7 @@ TEST(AllocatorTest, CPUAllocatorTest) {
EXPECT_EQ(cpu_arena->Info().id, 0);
// arena is disabled for CPUExecutionProvider on x86 and JEMalloc
#if (defined(__amd64__) || defined(_M_AMD64) || defined(__aarch64__) || defined(_M_ARM64)) && !defined(USE_JEMALLOC) && !defined(USE_MIMALLOC)
#if (defined(__amd64__) || defined(_M_AMD64) || defined(__aarch64__) || defined(_M_ARM64)) && !defined(USE_JEMALLOC) && !defined(USE_MIMALLOC) && !defined(ABSL_HAVE_ADDRESS_SANITIZER)
EXPECT_EQ(cpu_arena->Info().alloc_type, OrtAllocatorType::OrtArenaAllocator);
#else
EXPECT_EQ(cpu_arena->Info().alloc_type, OrtAllocatorType::OrtDeviceAllocator);

3
onnxruntime/test/framework/session_state_test.cc
View file

@ -2,6 +2,7 @@
// Licensed under the MIT License.
#include <iostream>
#include <absl/base/config.h>
#include "asserts.h"
#include "core/framework/execution_providers.h"
@ -215,7 +216,7 @@ TEST_P(SessionStateTestP, TestInitializerProcessing) {
// if the relevant session option config flag is set
// For this test we need to enable the arena-based allocator which is not supported on x86 builds, so
// enable this test only on x64 builds
#if (defined(__amd64__) || defined(_M_AMD64) || defined(__aarch64__) || defined(_M_ARM64)) && !defined(USE_MIMALLOC)
#if (defined(__amd64__) || defined(_M_AMD64) || defined(__aarch64__) || defined(_M_ARM64)) && !defined(USE_MIMALLOC) && !defined(ABSL_HAVE_ADDRESS_SANITIZER)
TEST(SessionStateTest, TestInitializerMemoryAllocatedUsingNonArenaMemory) {
AllocatorPtr cpu_allocator = std::make_shared<CPUAllocator>();
// Part 1: Feature turned ON (i.e.) allocate from non-arena memory

4
onnxruntime/test/framework/tensor_test.cc
View file

@ -6,7 +6,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include <absl/base/config.h>
#include <sstream>
namespace onnxruntime {
@ -138,7 +138,7 @@ TEST(TensorTest, EmptyTensorTest) {
EXPECT_EQ(location.id, 0);
// arena is disabled for CPUExecutionProvider on x86 and JEMalloc
#if (defined(__amd64__) || defined(_M_AMD64) || defined(__aarch64__) || defined(_M_ARM64)) && !defined(USE_JEMALLOC) && !defined(USE_MIMALLOC)
#if (defined(__amd64__) || defined(_M_AMD64) || defined(__aarch64__) || defined(_M_ARM64)) && !defined(USE_JEMALLOC) && !defined(USE_MIMALLOC) && !defined(ABSL_HAVE_ADDRESS_SANITIZER)
EXPECT_EQ(location.alloc_type, OrtAllocatorType::OrtArenaAllocator);
#else
EXPECT_EQ(location.alloc_type, OrtAllocatorType::OrtDeviceAllocator);

14
onnxruntime/test/quantization/quantization_test.cc
View file

@ -99,24 +99,22 @@ void EnsureQuantizedTensorParam(const float scale, const T zero_point) {
// First, create the scale tensor:
auto alloc = TestCPUExecutionProvider()->CreatePreferredAllocators()[0];
auto num_bytes = shape.Size() * sizeof(float);
void* data = alloc->Alloc(num_bytes);
float* float_data = static_cast<float*>(data);
IAllocatorUniquePtr<float> buffer = IAllocator::MakeUniquePtr<float>(alloc, shape.Size());
float* float_data = buffer.get();
float_data[0] = scale;
Tensor scale_tensor(DataTypeImpl::GetType<float>(),
shape,
data,
float_data,
alloc->Info(),
/*offset=*/0);
// Next, create the zero_point tensor:
auto T_num_bytes = shape.Size() * sizeof(T);
void* T_data = alloc->Alloc(T_num_bytes);
T* typed_data = static_cast<T*>(T_data);
IAllocatorUniquePtr<T> buffer2 = IAllocator::MakeUniquePtr<T>(alloc, shape.Size());
T* typed_data = buffer2.get();
typed_data[0] = zero_point;
Tensor zero_point_tensor(DataTypeImpl::GetType<T>(),
shape,
T_data,
typed_data,
alloc->Info(),
/*offset=*/0);