perf - use prof-append-heap-statistics (#19)

Author: bpasero

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vscode/vscode-perf-bot",
-    "version": "0.2.4",
+    "version": "0.2.5",
     "description": "Allows to run performance tests with Slack bot messages for VS Code.",
     "repository": {
         "type": "git",

src/index.ts

@@ -120,6 +120,7 @@ async function runPerformanceTest(opts: Opts): Promise<void> {
         Constants.RUNTIME,
         '--prof-append-timers',
         Constants.PERF_FILE,
+        '--prof-append-heap-statistics',
         '--runs',
         '10'
     ]
@@ -189,13 +190,14 @@ async function runPerformanceTest(opts: Opts): Promise<void> {
 type PerfData = {
     readonly commit: string;
     readonly appName: string;
+
     readonly bestDuration: number;
 
-    readonly avgHeapAllocated: number | undefined;
-    readonly avgHeapCollected: number | undefined;
-    readonly avgMajorGC: number | undefined;
-    readonly avgMinorGC: number | undefined;
-    readonly avgGCDuration: number | undefined;
+    readonly bestHeapUsed: number | undefined;
+    readonly bestHeapGarbage: number | undefined;
+    readonly bestMajorGCs: number | undefined;
+    readonly bestMinorGCs: number | undefined;
+    readonly bestGCDuration: number | undefined;
 
     readonly lines: string[];
 }
@@ -209,11 +211,11 @@ function parsePerfFile(): PerfData | undefined {
     let commitValue = 'unknown';
     let appNameValue = 'unknown';
     let bestDuration: number = Number.MAX_SAFE_INTEGER;
-    let heapsAllocated: number[] = [];
-    let heapsCollected: number[] = [];
-    let majorGCs: number[] = [];
-    let minorGCs: number[] = [];
-    let gcDurations: number[] = [];
+    let bestHeapUsed: number = 0;
+    let bestHeapGarbage: number = 0;
+    let bestMajorGCs: number = 0;
+    let bestMinorGCs: number = 0;
+    let bestGCDuration: number = 0;
     for (const line of rawLines) {
         if (!line) {
             continue;
@@ -226,17 +228,17 @@ function parsePerfFile(): PerfData | undefined {
         commitValue = commit;
         if (duration < bestDuration) {
             bestDuration = duration;
-        }
 
-        if (heap) { // currently only supported for web
-            const res = /Heap: (\d+)MB \(used\) (\d+)MB \(garbage\) (\d+) \(MajorGC\) (\d+) \(MinorGC\) (\d+)ms \(GC duration\)/.exec(heap);
-            if (res) {
-                const [, heapAllocated, heapCollected, majorGC, minorGC, gcDuration] = res;
-                heapsAllocated.push(Number(heapAllocated));
-                heapsCollected.push(Number(heapCollected));
-                majorGCs.push(Number(majorGC));
-                minorGCs.push(Number(minorGC));
-                gcDurations.push(Number(gcDuration));
+            if (heap) {
+                const res = /Heap: (\d+)MB \(used\) (\d+)MB \(garbage\) (\d+) \(MajorGC\) (\d+) \(MinorGC\) (\d+)ms \(GC duration\)/.exec(heap);
+                if (res) {
+                    const [, used, garbage, majorGC, minorGC, gcDuration] = res;
+                    bestHeapUsed = Number(used);
+                    bestHeapGarbage = Number(garbage);
+                    bestMajorGCs = Number(majorGC);
+                    bestMinorGCs = Number(minorGC);
+                    bestGCDuration = Number(gcDuration);
+                }
             }
         }
 
@@ -252,12 +254,12 @@ function parsePerfFile(): PerfData | undefined {
     return {
         commit: commitValue,
         appName: appNameValue,
-        bestDuration: bestDuration,
-        avgHeapAllocated: heapsAllocated.length ? Math.round(heapsAllocated.reduce((p, c) => p + c, 0) / heapsAllocated.length) : undefined,
-        avgHeapCollected: heapsCollected.length ? Math.round(heapsCollected.reduce((p, c) => p + c, 0) / heapsCollected.length) : undefined,
-        avgMajorGC: majorGCs.length ? Math.round(majorGCs.reduce((p, c) => p + c, 0) / majorGCs.length) : undefined,
-        avgMinorGC: minorGCs.length ? Math.round(minorGCs.reduce((p, c) => p + c, 0) / minorGCs.length) : undefined,
-        avgGCDuration: gcDurations.length ? Math.round(gcDurations.reduce((p, c) => p + c, 0) / gcDurations.length) : undefined,
+        bestDuration,
+        bestHeapUsed,
+        bestHeapGarbage,
+        bestMajorGCs,
+        bestMinorGCs,
+        bestGCDuration,
         lines
     }
 }
@@ -279,7 +281,7 @@ async function sendSlackMessage(data: PerfData, opts: Opts): Promise<void> {
         }
     }
 
-    const { commit, bestDuration, avgHeapAllocated, avgHeapCollected, avgMajorGC, avgMinorGC, avgGCDuration, lines } = data;
+    const { commit, bestDuration, bestHeapUsed, bestHeapGarbage, bestMajorGCs, bestMinorGCs, bestGCDuration, lines } = data;
 
     const slack = new WebClient(opts.slackToken, { logLevel: LogLevel.ERROR });
 
@@ -312,11 +314,11 @@ async function sendSlackMessage(data: PerfData, opts: Opts): Promise<void> {
     if (opts.runtime === 'web') {
         summary += `, SCENARIO \`${opts.githubToken ? 'standard remote' : 'empty window'}\``;
     }
-    if (avgHeapAllocated && avgHeapCollected) {
-        summary += `, HEAP \`${avgHeapAllocated}MB (used) ${avgHeapCollected}MB (garbage) ${Math.round(avgHeapCollected / avgHeapAllocated * 100)}% (ratio)\``;
+    if (bestHeapUsed && bestHeapGarbage) {
+        summary += `, HEAP \`${bestHeapUsed}MB (used) ${bestHeapGarbage}MB (garbage) ${Math.round(bestHeapGarbage / bestHeapUsed * 100)}% (ratio)\``;
     }
-    if (avgMajorGC && avgMinorGC && avgGCDuration) {
-        summary += `, GC \`${avgMajorGC} (MajorGC) ${avgMinorGC} (MinorGC) ${avgGCDuration}ms (duration)\``;
+    if (bestMajorGCs && bestMinorGCs && bestGCDuration) {
+        summary += `, GC \`${bestMajorGCs} (MajorGC) ${bestMinorGCs} (MinorGC) ${bestGCDuration}ms (duration)\``;
     }
 
     const detail = `\`\`\`${lines.join('\n')}\`\`\``;