From 50033a59c78adc05891050e4ed57569525345c51 Mon Sep 17 00:00:00 2001 From: Mohammad Reza Zakerinasab Date: Thu, 5 Dec 2019 11:26:45 -0500 Subject: [PATCH 1/2] Update VMT counter names --- src/trace_processor/vulkan_memory_tracker.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/trace_processor/vulkan_memory_tracker.cc b/src/trace_processor/vulkan_memory_tracker.cc index 310f73efc1..02c9787d81 100644 --- a/src/trace_processor/vulkan_memory_tracker.cc +++ b/src/trace_processor/vulkan_memory_tracker.cc @@ -28,8 +28,8 @@ namespace trace_processor { VulkanMemoryTracker::VulkanMemoryTracker(TraceProcessorContext* context) : context_(context), - vulkan_driver_memory_counter_str_("vulkan.mem.driver.scope."), - vulkan_device_memory_counter_str_("vulkan.mem.device.memory.type.") { + vulkan_driver_memory_counter_str_("Driver, scope = "), + vulkan_device_memory_counter_str_("Device, memory type = ") { SetupSourceAndTypeInternedStrings(); } @@ -95,7 +95,7 @@ StringId VulkanMemoryTracker::FindMemoryTypeCounterString( it = memory_type_allocation_counter_string_map_.find(memory_type); if (it == memory_type_allocation_counter_string_map_.end()) { type_counter_str = vulkan_device_memory_counter_str_ + - std::to_string(memory_type) + ".allocation"; + std::to_string(memory_type) + ", allocated"; res = context_->storage->InternString(base::StringView( type_counter_str.c_str(), type_counter_str.length())); memory_type_allocation_counter_string_map_.emplace(memory_type, res); @@ -107,7 +107,7 @@ StringId VulkanMemoryTracker::FindMemoryTypeCounterString( it = memory_type_bind_counter_string_map_.find(memory_type); if (it == memory_type_bind_counter_string_map_.end()) { type_counter_str = vulkan_device_memory_counter_str_ + - std::to_string(memory_type) + ".bind"; + std::to_string(memory_type) + ", bound"; res = context_->storage->InternString(base::StringView( type_counter_str.c_str(), type_counter_str.length())); memory_type_bind_counter_string_map_.emplace(memory_type, res); From dd93b84778f49ed5e1996f08b796f6c47fd9747d Mon Sep 17 00:00:00 2001 From: Mohammad Reza Zakerinasab Date: Thu, 5 Dec 2019 12:27:34 -0500 Subject: [PATCH 2/2] Update VMT counters name 2 --- src/trace_processor/vulkan_memory_tracker.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/trace_processor/vulkan_memory_tracker.cc b/src/trace_processor/vulkan_memory_tracker.cc index 02c9787d81..4860b64a60 100644 --- a/src/trace_processor/vulkan_memory_tracker.cc +++ b/src/trace_processor/vulkan_memory_tracker.cc @@ -28,8 +28,8 @@ namespace trace_processor { VulkanMemoryTracker::VulkanMemoryTracker(TraceProcessorContext* context) : context_(context), - vulkan_driver_memory_counter_str_("Driver, scope = "), - vulkan_device_memory_counter_str_("Device, memory type = ") { + vulkan_driver_memory_counter_str_("Driver_Scope_"), + vulkan_device_memory_counter_str_("Device_MemoryType_") { SetupSourceAndTypeInternedStrings(); } @@ -95,7 +95,7 @@ StringId VulkanMemoryTracker::FindMemoryTypeCounterString( it = memory_type_allocation_counter_string_map_.find(memory_type); if (it == memory_type_allocation_counter_string_map_.end()) { type_counter_str = vulkan_device_memory_counter_str_ + - std::to_string(memory_type) + ", allocated"; + std::to_string(memory_type) + "_Allocated"; res = context_->storage->InternString(base::StringView( type_counter_str.c_str(), type_counter_str.length())); memory_type_allocation_counter_string_map_.emplace(memory_type, res); @@ -107,7 +107,7 @@ StringId VulkanMemoryTracker::FindMemoryTypeCounterString( it = memory_type_bind_counter_string_map_.find(memory_type); if (it == memory_type_bind_counter_string_map_.end()) { type_counter_str = vulkan_device_memory_counter_str_ + - std::to_string(memory_type) + ", bound"; + std::to_string(memory_type) + "_Bound"; res = context_->storage->InternString(base::StringView( type_counter_str.c_str(), type_counter_str.length())); memory_type_bind_counter_string_map_.emplace(memory_type, res);