Skip to content

Commit 2e91c7d

Browse files
jacquesqiaoQiJune
jacquesqiao
authored and
QiJune
committed
memory log level change from 3 to 10 (#5231)
1 parent 61eafbe commit 2e91c7d

File tree

3 files changed

+38
-36
lines changed

3 files changed

+38
-36
lines changed

‎paddle/memory/detail/buddy_allocator.cc

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ BuddyAllocator::BuddyAllocator(SystemAllocator* system_allocator,
2727
system_allocator_(std::move(system_allocator)) {}
2828

2929
BuddyAllocator::~BuddyAllocator() {
30-
VLOG(3) << "BuddyAllocator Disconstructor makes sure that all of these "
31-
"have actually been freed";
30+
VLOG(10) << "BuddyAllocator Disconstructor makes sure that all of these "
31+
"have actually been freed";
3232
while (!pool_.empty()) {
3333
auto block = static_cast<MemoryBlock*>(std::get<2>(*pool_.begin()));
34-
VLOG(3) << "Free from block (" << block << ", " << max_chunk_size_ << ")";
34+
VLOG(10) << "Free from block (" << block << ", " << max_chunk_size_ << ")";
3535

3636
system_allocator_->Free(block, max_chunk_size_, block->index(cache_));
3737
cache_.invalidate(block);
@@ -51,11 +51,12 @@ void* BuddyAllocator::Alloc(size_t unaligned_size) {
5151
// acquire the allocator lock
5252
std::lock_guard<std::mutex> lock(mutex_);
5353

54-
VLOG(3) << "Allocate " << unaligned_size << " bytes from chunk size " << size;
54+
VLOG(10) << "Allocate " << unaligned_size << " bytes from chunk size "
55+
<< size;
5556

5657
// if the allocation is huge, send directly to the system allocator
5758
if (size > max_chunk_size_) {
58-
VLOG(3) << "Allocate from system allocator.";
59+
VLOG(10) << "Allocate from system allocator.";
5960
return SystemAlloc(size);
6061
}
6162

@@ -70,9 +71,9 @@ void* BuddyAllocator::Alloc(size_t unaligned_size) {
7071
return nullptr;
7172
}
7273
} else {
73-
VLOG(3) << "Allocation from existing memory block " << std::get<2>(*it)
74-
<< " at address "
75-
<< reinterpret_cast<MemoryBlock*>(std::get<2>(*it))->data();
74+
VLOG(10) << "Allocation from existing memory block " << std::get<2>(*it)
75+
<< " at address "
76+
<< reinterpret_cast<MemoryBlock*>(std::get<2>(*it))->data();
7677
}
7778

7879
total_used_ += size;
@@ -89,10 +90,10 @@ void BuddyAllocator::Free(void* p) {
8990
// Acquire the allocator lock
9091
std::lock_guard<std::mutex> lock(mutex_);
9192

92-
VLOG(3) << "Free from address " << block;
93+
VLOG(10) << "Free from address " << block;
9394

9495
if (block->type(cache_) == MemoryBlock::HUGE_CHUNK) {
95-
VLOG(3) << "Free directly from system allocator";
96+
VLOG(10) << "Free directly from system allocator";
9697
system_allocator_->Free(block, block->total_size(cache_),
9798
block->index(cache_));
9899

@@ -109,8 +110,8 @@ void BuddyAllocator::Free(void* p) {
109110

110111
// Trying to merge the right buddy
111112
if (block->has_right_buddy(cache_)) {
112-
VLOG(3) << "Merging this block " << block << " with its right buddy "
113-
<< block->right_buddy(cache_);
113+
VLOG(10) << "Merging this block " << block << " with its right buddy "
114+
<< block->right_buddy(cache_);
114115

115116
auto right_buddy = block->right_buddy(cache_);
116117

@@ -127,8 +128,8 @@ void BuddyAllocator::Free(void* p) {
127128

128129
// Trying to merge the left buddy
129130
if (block->has_left_buddy(cache_)) {
130-
VLOG(3) << "Merging this block " << block << " with its left buddy "
131-
<< block->left_buddy(cache_);
131+
VLOG(10) << "Merging this block " << block << " with its left buddy "
132+
<< block->left_buddy(cache_);
132133

133134
auto left_buddy = block->left_buddy(cache_);
134135

@@ -144,8 +145,8 @@ void BuddyAllocator::Free(void* p) {
144145
}
145146

146147
// Dumping this block into pool
147-
VLOG(3) << "Inserting free block (" << block << ", "
148-
<< block->total_size(cache_) << ")";
148+
VLOG(10) << "Inserting free block (" << block << ", "
149+
<< block->total_size(cache_) << ")";
149150
pool_.insert(
150151
IndexSizeAddress(block->index(cache_), block->total_size(cache_), block));
151152

@@ -164,7 +165,7 @@ void* BuddyAllocator::SystemAlloc(size_t size) {
164165
size_t index = 0;
165166
void* p = system_allocator_->Alloc(index, size);
166167

167-
VLOG(3) << "Allocated " << p << " from system allocator.";
168+
VLOG(10) << "Allocated " << p << " from system allocator.";
168169

169170
if (p == nullptr) return nullptr;
170171

@@ -190,8 +191,8 @@ BuddyAllocator::PoolSet::iterator BuddyAllocator::RefillPool() {
190191

191192
if (p == nullptr) return pool_.end();
192193

193-
VLOG(3) << "Creating and inserting new block " << p
194-
<< " from system allocator";
194+
VLOG(10) << "Creating and inserting new block " << p
195+
<< " from system allocator";
195196

196197
static_cast<MemoryBlock*>(p)->init(cache_, MemoryBlock::FREE_CHUNK, index,
197198
max_chunk_size_, nullptr, nullptr);
@@ -235,19 +236,19 @@ void* BuddyAllocator::SplitToAlloc(BuddyAllocator::PoolSet::iterator it,
235236
auto block = static_cast<MemoryBlock*>(std::get<2>(*it));
236237
pool_.erase(it);
237238

238-
VLOG(3) << "Split block (" << block << ", " << block->total_size(cache_)
239-
<< ") into";
239+
VLOG(10) << "Split block (" << block << ", " << block->total_size(cache_)
240+
<< ") into";
240241
block->split(cache_, size);
241242

242-
VLOG(3) << "Left block (" << block << ", " << block->total_size(cache_)
243-
<< ")";
243+
VLOG(10) << "Left block (" << block << ", " << block->total_size(cache_)
244+
<< ")";
244245
block->set_type(cache_, MemoryBlock::ARENA_CHUNK);
245246

246247
// the rest of memory if exist
247248
if (block->has_right_buddy(cache_)) {
248249
if (block->right_buddy(cache_)->type(cache_) == MemoryBlock::FREE_CHUNK) {
249-
VLOG(3) << "Insert right block (" << block->right_buddy(cache_) << ", "
250-
<< block->right_buddy(cache_)->total_size(cache_) << ")";
250+
VLOG(10) << "Insert right block (" << block->right_buddy(cache_) << ", "
251+
<< block->right_buddy(cache_)->total_size(cache_) << ")";
251252

252253
pool_.insert(
253254
IndexSizeAddress(block->right_buddy(cache_)->index(cache_),
@@ -274,7 +275,7 @@ void BuddyAllocator::CleanIdleFallBackAlloc() {
274275
return;
275276
}
276277

277-
VLOG(3) << "Return block " << block << " to fallback allocator.";
278+
VLOG(10) << "Return block " << block << " to fallback allocator.";
278279

279280
system_allocator_->Free(block, max_chunk_size_, block->index(cache_));
280281
cache_.invalidate(block);
@@ -310,7 +311,7 @@ void BuddyAllocator::CleanIdleNormalAlloc() {
310311

311312
MemoryBlock* block = static_cast<MemoryBlock*>(std::get<2>(*pool));
312313

313-
VLOG(3) << "Return block " << block << " to base allocator.";
314+
VLOG(10) << "Return block " << block << " to base allocator.";
314315

315316
system_allocator_->Free(block, max_chunk_size_, block->index(cache_));
316317
cache_.invalidate(block);

‎paddle/memory/detail/meta_cache.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Metadata MetadataCache::load(const MemoryBlock* block) {
3030
return existing_metadata->second;
3131
} else {
3232
auto* meta = reinterpret_cast<const Metadata*>(block);
33-
VLOG(3) << "Load MetaData type=" << meta->type;
33+
VLOG(10) << "Load MetaData type=" << meta->type;
3434
PADDLE_ASSERT(meta->check_guards());
3535
return *reinterpret_cast<const Metadata*>(block);
3636
}

‎paddle/memory/memory.cc

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ BuddyAllocator* GetCPUBuddyAllocator() {
3939

4040
template <>
4141
void* Alloc<platform::CPUPlace>(platform::CPUPlace place, size_t size) {
42-
VLOG(3) << "Allocate " << size << " bytes on " << platform::Place(place);
42+
VLOG(10) << "Allocate " << size << " bytes on " << platform::Place(place);
4343
void* p = GetCPUBuddyAllocator()->Alloc(size);
44-
VLOG(3) << " pointer=" << p;
44+
VLOG(10) << " pointer=" << p;
4545
return p;
4646
}
4747

4848
template <>
4949
void Free<platform::CPUPlace>(platform::CPUPlace place, void* p) {
50-
VLOG(3) << "Free pointer=" << p << " on " << platform::Place(place);
50+
VLOG(10) << "Free pointer=" << p << " on " << platform::Place(place);
5151
GetCPUBuddyAllocator()->Free(p);
5252
}
5353

@@ -69,11 +69,12 @@ BuddyAllocator* GetGPUBuddyAllocator(int gpu_id) {
6969
platform::GpuMinChunkSize(),
7070
platform::GpuMaxChunkSize());
7171
}
72-
VLOG(3) << "\n\nNOTE: each GPU device use "
73-
<< FLAGS_fraction_of_gpu_memory_to_use * 100 << "% of GPU memory.\n"
74-
<< "You can set environment variable '"
75-
<< platform::kEnvFractionGpuMemoryToUse
76-
<< "' to change the fraction of GPU usage.\n\n";
72+
VLOG(10) << "\n\nNOTE: each GPU device use "
73+
<< FLAGS_fraction_of_gpu_memory_to_use * 100
74+
<< "% of GPU memory.\n"
75+
<< "You can set environment variable '"
76+
<< platform::kEnvFractionGpuMemoryToUse
77+
<< "' to change the fraction of GPU usage.\n\n";
7778
}
7879
platform::SetDeviceId(gpu_id);
7980
return as[gpu_id];

0 commit comments

Comments
 (0)