Skip to content

Perfetto plugin - Add % CPU usage to CPU scheduler view. Memory unit tests #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KyleStorck merged 7 commits into from
Sep 3, 2021
Merged

Perfetto plugin - Add % CPU usage to CPU scheduler view. Memory unit tests #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e3293f7
Working version of CPU usage % from CPU scheduling data
KyleStorck Sep 2, 2021
ab81e1a
Merge branch 'develop' into user/kylsto/cpu_sched_usage
KyleStorck Sep 2, 2021
de424ff
Added unit tests for memory cookers
KyleStorck Sep 2, 2021
ec151c1
Fix broken UT after excluding swapper
KyleStorck Sep 2, 2021
e16d249
Moved the swapper filter to the table instead of the cooker
KyleStorck Sep 2, 2021
d9dfa79
small cleanup
KyleStorck Sep 2, 2021
e7926b5
comments
KyleStorck Sep 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 117 additions & 27 deletions PerfettoCds/Pipeline/Tables/PerfettoCpuSchedTable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@
using Microsoft.Performance.SDK.Processing;
using System;
using System.Collections.Generic;
using System.Security.Cryptography;
using System.Diagnostics.CodeAnalysis;
using PerfettoCds.Pipeline.DataOutput;
using Microsoft.Performance.SDK;
using PerfettoCds.Pipeline.CompositeDataCookers;
using System.Linq;

namespace PerfettoCds.Pipeline.Tables
{
Expand Down Expand Up @@ -56,49 +53,142 @@ public class PerfettoCpuSchedTable
new ColumnMetadata(new Guid("{73984a25-99b1-43a9-8412-c57b55de5518}"), "Priority", "Priority of the event"),
new UIHints { Width = 70 });

private static readonly ColumnConfiguration PercentCpuUsageColumn = new ColumnConfiguration(
new ColumnMetadata(new Guid("{4dda5bb8-3921-4122-9dec-3b3c5c2d95b0}"), "% CPU Usage") { IsPercent = true },
new UIHints
{
IsVisible = true,
Width = 100,
TextAlignment = TextAlignment.Right,
CellFormat = ColumnFormats.PercentFormat,
AggregationMode = AggregationMode.Sum,
SortOrder = SortOrder.Descending,
SortPriority = 0,
});

public static void BuildTable(ITableBuilder tableBuilder, IDataExtensionRetrieval tableData)
{
// Get data from the cooker
var events = tableData.QueryOutput<ProcessedEventData<PerfettoCpuSchedEvent>>(
new DataOutputPath(PerfettoPluginConstants.CpuSchedEventCookerPath, nameof(PerfettoCpuSchedEventCooker.CpuSchedEvents)));

// Start construction of the column order. Pivot on process and thread
List<ColumnConfiguration> allColumns = new List<ColumnConfiguration>()
{
CpuColumn,
ProcessNameColumn,
ThreadNameColumn,
TableConfiguration.PivotColumn, // Columns before this get pivotted on
DurationColumn,
EndStateColumn,
PriorityColumn,
TableConfiguration.GraphColumn, // Columns after this get graphed
StartTimestampColumn,
EndTimestampColumn
};

var tableGenerator = tableBuilder.SetRowCount((int)events.Count);
var baseProjection = Projection.Index(events);

var startProjection = baseProjection.Compose(x => x.StartTimestamp);
var endProjection = baseProjection.Compose(x => x.EndTimestamp);

tableGenerator.AddColumn(CpuColumn, baseProjection.Compose(x => x.Cpu));
tableGenerator.AddColumn(ProcessNameColumn, baseProjection.Compose(x => x.ProcessName));
tableGenerator.AddColumn(ThreadNameColumn, baseProjection.Compose(x => x.ThreadName));
tableGenerator.AddColumn(DurationColumn, baseProjection.Compose(x => x.Duration));
tableGenerator.AddColumn(EndStateColumn, baseProjection.Compose(x => x.EndState));
tableGenerator.AddColumn(PriorityColumn, baseProjection.Compose(x => x.Priority));
tableGenerator.AddColumn(StartTimestampColumn, baseProjection.Compose(x => x.StartTimestamp));
tableGenerator.AddColumn(EndTimestampColumn, baseProjection.Compose(x => x.EndTimestamp));
tableGenerator.AddColumn(StartTimestampColumn, startProjection);
tableGenerator.AddColumn(EndTimestampColumn, endProjection);

var tableConfig = new TableConfiguration("Perfetto CPU Scheduling")
// Create projections that are used for calculating CPU usage%
var viewportClippedSwitchOutTimeForNextOnCpuColumn = Projection.ClipTimeToViewport.Create(startProjection);
var viewportClippedSwitchOutTimeForPreviousOnCpuColumn = Projection.ClipTimeToViewport.Create(endProjection);

IProjection<int, TimestampDelta> cpuUsageInViewportColumn = Projection.Select(
viewportClippedSwitchOutTimeForNextOnCpuColumn,
viewportClippedSwitchOutTimeForPreviousOnCpuColumn,
new ReduceTimeSinceLastDiff());

var percentCpuUsageColumn = Projection.ViewportRelativePercent.Create(cpuUsageInViewportColumn);
tableGenerator.AddColumn(PercentCpuUsageColumn, percentCpuUsageColumn);

// We want to exclude the idle thread ('swapper' on Android/Linux) from the display because it messes up CPU usage and clutters
// the scheduler view
const string swapperIdleFilter = "[Thread]:=\"swapper\"";

var cpuSchedConfig = new TableConfiguration("Perfetto CPU Scheduling")
{
Columns = allColumns,
Layout = TableLayoutStyle.GraphAndTable
Columns =new[]
{
CpuColumn,
ProcessNameColumn,
ThreadNameColumn,
TableConfiguration.PivotColumn, // Columns before this get pivotted on
DurationColumn,
EndStateColumn,
PriorityColumn,
TableConfiguration.GraphColumn, // Columns after this get graphed
StartTimestampColumn,
EndTimestampColumn
},
Layout = TableLayoutStyle.GraphAndTable,
InitialFilterShouldKeep = false, // This means we're not keeping what the filter matches
InitialFilterQuery = swapperIdleFilter
};
tableConfig.AddColumnRole(ColumnRole.StartTime, StartTimestampColumn.Metadata.Guid);
tableConfig.AddColumnRole(ColumnRole.EndTime, EndTimestampColumn.Metadata.Guid);
tableConfig.AddColumnRole(ColumnRole.Duration, DurationColumn.Metadata.Guid);
cpuSchedConfig.AddColumnRole(ColumnRole.StartTime, StartTimestampColumn.Metadata.Guid);
cpuSchedConfig.AddColumnRole(ColumnRole.EndTime, EndTimestampColumn.Metadata.Guid);
cpuSchedConfig.AddColumnRole(ColumnRole.Duration, DurationColumn.Metadata.Guid);

tableBuilder.AddTableConfiguration(tableConfig).SetDefaultTableConfiguration(tableConfig);
var perCpuUsageConfig = new TableConfiguration("Perfetto Utilization by CPU")
{
Columns = new[]
{
CpuColumn,
TableConfiguration.PivotColumn, // Columns before this get pivotted on
ProcessNameColumn,
ThreadNameColumn,
DurationColumn,
StartTimestampColumn,
EndTimestampColumn,
EndStateColumn,
PriorityColumn,
TableConfiguration.GraphColumn, // Columns after this get graphed
PercentCpuUsageColumn
},
Layout = TableLayoutStyle.GraphAndTable,
InitialFilterShouldKeep = false, // This means we're not keeping what the filter matches
InitialFilterQuery = swapperIdleFilter
};
perCpuUsageConfig.AddColumnRole(ColumnRole.StartTime, StartTimestampColumn.Metadata.Guid);
perCpuUsageConfig.AddColumnRole(ColumnRole.EndTime, EndTimestampColumn.Metadata.Guid);
perCpuUsageConfig.AddColumnRole(ColumnRole.Duration, DurationColumn.Metadata.Guid);

var perProcessUsageConfig = new TableConfiguration("Perfetto Utilization by Process, Thread")
{
Columns = new[]
{
ProcessNameColumn,
ThreadNameColumn,
TableConfiguration.PivotColumn, // Columns before this get pivotted on
CpuColumn,
DurationColumn,
StartTimestampColumn,
EndTimestampColumn,
EndStateColumn,
PriorityColumn,
TableConfiguration.GraphColumn, // Columns after this get graphed
PercentCpuUsageColumn
},
Layout = TableLayoutStyle.GraphAndTable,
InitialFilterShouldKeep = false, // This means we're not keeping what the filter matches
InitialFilterQuery = swapperIdleFilter
};
perProcessUsageConfig.AddColumnRole(ColumnRole.StartTime, StartTimestampColumn.Metadata.Guid);
perProcessUsageConfig.AddColumnRole(ColumnRole.EndTime, EndTimestampColumn.Metadata.Guid);
perProcessUsageConfig.AddColumnRole(ColumnRole.Duration, DurationColumn.Metadata.Guid);

tableBuilder
.AddTableConfiguration(cpuSchedConfig)
.AddTableConfiguration(perCpuUsageConfig)
.AddTableConfiguration(perProcessUsageConfig)
.SetDefaultTableConfiguration(cpuSchedConfig);
}

struct ReduceTimeSinceLastDiff
: IFunc<int, Timestamp, Timestamp, TimestampDelta>
{
public TimestampDelta Invoke(int value, Timestamp timeSinceLast1, Timestamp timeSinceLast2)
{
return timeSinceLast1 - timeSinceLast2;
}
}

}
}
24 changes: 24 additions & 0 deletions PerfettoUnitTest/PerfettoUnitTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ public static void LoadTrace(string traceFilename)
runtime.EnableCooker(PerfettoPluginConstants.RawCookerPath);
runtime.EnableCooker(PerfettoPluginConstants.CounterCookerPath);
runtime.EnableCooker(PerfettoPluginConstants.CpuCounterTrackCookerPath);
runtime.EnableCooker(PerfettoPluginConstants.ProcessCounterTrackCookerPath);
runtime.EnableCooker(PerfettoPluginConstants.CounterTrackCookerPath);

// Enable the composite data cookers
runtime.EnableCooker(PerfettoPluginConstants.GenericEventCookerPath);
Expand Down Expand Up @@ -89,6 +91,28 @@ public void TestAndroidTrace()
Assert.IsTrue(cpuFreqEventData[1].Name == "cpuidle");
}

[TestMethod]
public void TestAndroidMemoryTrace()
{
LoadTrace(@"..\..\..\..\TestData\Perfetto\androidBasicMemory.pftrace");

var systemMemoryEventData = RuntimeExecutionResults.QueryOutput<ProcessedEventData<PerfettoSystemMemoryEvent>>(
new DataOutputPath(
PerfettoPluginConstants.SystemMemoryEventCookerPath,
nameof(PerfettoSystemMemoryEventCooker.SystemMemoryEvents)));
Assert.IsTrue(systemMemoryEventData.Count == 810);
Assert.IsTrue(systemMemoryEventData[0].Value == 4008026112);
Assert.IsTrue(systemMemoryEventData[1].Duration.ToNanoseconds == 249555208);

var processMemoryEventData = RuntimeExecutionResults.QueryOutput<ProcessedEventData<PerfettoProcessMemoryEvent>>(
new DataOutputPath(
PerfettoPluginConstants.ProcessMemoryEventCookerPath,
nameof(PerfettoProcessMemoryEventCooker.ProcessMemoryEvents)));
Assert.IsTrue(processMemoryEventData.Count == 10811);
Assert.IsTrue(processMemoryEventData[0].RssFile == 2822144);
Assert.IsTrue(processMemoryEventData[1].ProcessName == "/system/bin/init 1");
}

[TestMethod]
public void TestChromeTrace()
{
Expand Down
Binary file added TestData/Perfetto/androidBasicMemory.pftrace
View file
Open in desktop
Binary file not shown.