From 906e6b88496670611dcb9c6deb6482952a310acb Mon Sep 17 00:00:00 2001 From: Lalit Maganti Date: Mon, 28 Oct 2024 17:25:01 +0000 Subject: [PATCH] tp: outline gpufreq name Change-Id: Ia7b252abb4d0f7aa89a51f3b250e206b1029d84f --- src/trace_processor/importers/common/track_tracker.cc | 5 ++--- src/trace_processor/importers/ftrace/ftrace_parser.cc | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/trace_processor/importers/common/track_tracker.cc b/src/trace_processor/importers/common/track_tracker.cc index 894b0ad6be..8b3b00c0b5 100644 --- a/src/trace_processor/importers/common/track_tracker.cc +++ b/src/trace_processor/importers/common/track_tracker.cc @@ -99,7 +99,8 @@ bool IsLegacyCharArrayNameAllowed(tracks::TrackClassification classification) { classification == tracks::cpu_capacity || classification == tracks::cpu_nr_running || classification == tracks::cpu_max_frequency_limit || - classification == tracks::cpu_min_frequency_limit; + classification == tracks::cpu_min_frequency_limit || + classification == tracks::gpu_frequency; } } // namespace @@ -522,8 +523,6 @@ TrackId TrackTracker::InternGpuCounterTrack( row.dimension_arg_set_id = dims_id.arg_set_id; row.classification = context_->storage->InternString(tracks::ToString(classification)); - if (classification == tracks::gpu_frequency) - row.name = context_->storage->InternString("gpufreq"); TrackId track_id = context_->storage->mutable_gpu_counter_track_table()->Insert(row).id; diff --git a/src/trace_processor/importers/ftrace/ftrace_parser.cc b/src/trace_processor/importers/ftrace/ftrace_parser.cc index 6c1bd96ed1..e644f2faec 100644 --- a/src/trace_processor/importers/ftrace/ftrace_parser.cc +++ b/src/trace_processor/importers/ftrace/ftrace_parser.cc @@ -1699,7 +1699,7 @@ void FtraceParser::ParseGpuFreq(int64_t timestamp, ConstBytes blob) { uint32_t gpu = freq.gpu_id(); uint32_t new_freq = freq.state(); TrackId track = context_->track_tracker->InternGpuCounterTrack( - tracks::gpu_frequency, gpu); + tracks::gpu_frequency, gpu, TrackTracker::LegacyCharArrayName{"gpufreq"}); context_->event_tracker->PushCounter(timestamp, new_freq, track); } @@ -1710,7 +1710,7 @@ void FtraceParser::ParseKgslGpuFreq(int64_t timestamp, ConstBytes blob) { // Source data is frequency / 1000, so we correct that here: double new_freq = static_cast(freq.gpu_freq()) * 1000.0; TrackId track = context_->track_tracker->InternGpuCounterTrack( - tracks::gpu_frequency, gpu); + tracks::gpu_frequency, gpu, TrackTracker::LegacyCharArrayName{"gpufreq"}); context_->event_tracker->PushCounter(timestamp, new_freq, track); }