del FLAGS_custom_device_mem_record (#69274)

wanghuancoder · web-flow · commit 27b44e385503 · 2024-11-12T10:07:15.000+08:00
diff --git a/paddle/common/flags.cc b/paddle/common/flags.cc
@@ -644,10 +644,6 @@ PHI_DEFINE_EXPORTED_uint64(
     "The real chunk size is max(request_size, "
     "FLAGS_auto_growth_chunk_size_in_mb).");
 
-PHI_DEFINE_EXPORTED_bool(custom_device_mem_record,
-                         false,
-                         "Enable mem record event on custom device");
-
 #endif
 
 /**
diff --git a/paddle/phi/core/memory/allocation/custom_allocator.cc b/paddle/phi/core/memory/allocation/custom_allocator.cc
@@ -19,8 +19,6 @@
 #include "paddle/phi/core/platform/device/device_wrapper.h"
 #include "paddle/phi/core/platform/profiler.h"
 
-COMMON_DECLARE_bool(custom_device_mem_record);
-
 namespace paddle {
 namespace memory {
 namespace allocation {
@@ -37,14 +35,12 @@ void CustomAllocator::FreeImpl(phi::Allocation* allocation) {
     phi::DeviceManager::GetDeviceWithPlace(place_)->MemoryDeallocate(
         allocation->ptr(), allocation->size());
   }
-  if (FLAGS_custom_device_mem_record) {
-    DEVICE_MEMORY_STAT_UPDATE(
-        Reserved, place_.GetDeviceId(), -allocation->size());
-    platform::RecordMemEvent(allocation->ptr(),
-                             place_,
-                             allocation->size(),
-                             phi::TracerMemEventType::ReservedFree);
-  }
+  DEVICE_MEMORY_STAT_UPDATE(
+      Reserved, place_.GetDeviceId(), -allocation->size());
+  platform::RecordMemEvent(allocation->ptr(),
+                           place_,
+                           allocation->size(),
+                           phi::TracerMemEventType::ReservedFree);
   delete allocation;
 }
 
@@ -54,11 +50,9 @@ phi::Allocation* CustomAllocator::AllocateImpl(size_t size) {
   void* ptr =
       phi::DeviceManager::GetDeviceWithPlace(place_)->MemoryAllocate(size);
   if (LIKELY(ptr)) {
-    if (FLAGS_custom_device_mem_record) {
-      DEVICE_MEMORY_STAT_UPDATE(Reserved, place_.GetDeviceId(), size);
-      platform::RecordMemEvent(
-          ptr, place_, size, phi::TracerMemEventType::ReservedAllocate);
-    }
+    DEVICE_MEMORY_STAT_UPDATE(Reserved, place_.GetDeviceId(), size);
+    platform::RecordMemEvent(
+        ptr, place_, size, phi::TracerMemEventType::ReservedAllocate);
     return new Allocation(ptr, size, place_);
   }
 
diff --git a/paddle/phi/core/memory/allocation/system_allocator.cc b/paddle/phi/core/memory/allocation/system_allocator.cc
@@ -41,7 +41,6 @@ limitations under the License. */
 #include "paddle/phi/core/platform/profiler/mem_tracing.h"
 
 COMMON_DECLARE_bool(use_pinned_memory);
-COMMON_DECLARE_bool(custom_device_mem_record);
 COMMON_DECLARE_double(fraction_of_gpu_memory_to_use);
 COMMON_DECLARE_uint64(initial_gpu_memory_in_mb);
 COMMON_DECLARE_uint64(reallocate_gpu_memory_in_mb);
@@ -297,11 +296,9 @@ void* CustomAllocator::Alloc(size_t* index, size_t size) {
     VLOG(4) << "CustomAllocator::Alloc " << p << " size " << size;
     *index = 0;
     plug_alloc_size += size;
-    if (FLAGS_custom_device_mem_record) {
-      DEVICE_MEMORY_STAT_UPDATE(Reserved, dev_id_, size);
-      platform::RecordMemEvent(
-          p, place, size, phi::TracerMemEventType::ReservedAllocate);
-    }
+    DEVICE_MEMORY_STAT_UPDATE(Reserved, dev_id_, size);
+    platform::RecordMemEvent(
+        p, place, size, phi::TracerMemEventType::ReservedAllocate);
   } else {
     size_t avail, total;
 
@@ -336,11 +333,9 @@ void CustomAllocator::Free(void* p, size_t size, size_t index) {
   auto place = phi::CustomPlace(dev_type_, dev_id_);
   auto device = phi::DeviceManager::GetDeviceWithPlace(place);
   device->MemoryDeallocate(p, size);
-  if (FLAGS_custom_device_mem_record) {
-    DEVICE_MEMORY_STAT_UPDATE(Reserved, dev_id_, size);
-    platform::RecordMemEvent(
-        p, place, size, phi::TracerMemEventType::ReservedFree);
-  }
+  DEVICE_MEMORY_STAT_UPDATE(Reserved, dev_id_, size);
+  platform::RecordMemEvent(
+      p, place, size, phi::TracerMemEventType::ReservedFree);
 }
 
 bool CustomAllocator::UseGpu() const { return true; }
