commit 28f5ebd9fa15e1148aa86a74b6493b5a11d875f3
author Christoffer Adamsen <christofferqa@google.com> Wed Sep 10 09:57:41 2025 +0200
committer Christoffer Adamsen <christofferqa@google.com> Wed Sep 10 02:59:05 2025 -0700
tree 21c78056a6223505f511f4802643669c425bb8a9
parent c5a5b8df56a0a725eb972ae69d6bf696681f7445

Default enable memory tracking in perfetto traces

Change-Id: I3b3cf4ab9f61b1ad534285e567dbf349636f3d91

src/main/java/com/android/tools/r8/utils/InternalOptions.java

diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index c868b7d..8fadcd8 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -389,9 +389,6 @@
   public boolean printTimes = System.getProperty("com.android.tools.r8.printtimes") != null;
   public String perfettoTraceDumpDirectory =
       System.getProperty("com.android.tools.r8.dumptracetodirectory");
-  public boolean enablePerfettoTraceMemoryTrack =
-      SystemPropertyUtils.parseSystemPropertyOrDefault(
-          "com.android.tools.r8.perfetto.memory", false);
   // To print memory one also have to enable printtimes.
   public boolean printMemory = System.getProperty("com.android.tools.r8.printmemory") != null;
 

src/main/java/com/android/tools/r8/utils/timing/PerfettoTiming.java

diff --git a/src/main/java/com/android/tools/r8/utils/timing/PerfettoTiming.java b/src/main/java/com/android/tools/r8/utils/timing/PerfettoTiming.java
index 3d8b3fc..c76be34 100644
--- a/src/main/java/com/android/tools/r8/utils/timing/PerfettoTiming.java
+++ b/src/main/java/com/android/tools/r8/utils/timing/PerfettoTiming.java
@@ -40,10 +40,8 @@
     int mainThreadId = (int) Thread.currentThread().getId();
     threadTrack = processTrack.getOrCreateThreadTrack(mainThreadId, "Main thread");
     begin(title);
-    if (options.enablePerfettoTraceMemoryTrack) {
-      if (executorService == null) {
-        throw new IllegalArgumentException("Memory tracking requires an executor service.");
-      }
+    // Memory tracking requires an executor service.
+    if (executorService != null) {
       memoryTrack = processTrack.getOrCreateCounterTrack("Memory");
       memoryTracker =
           executorService.submit(

tools/compiledump.py

diff --git a/tools/compiledump.py b/tools/compiledump.py
index 0637e32..3af9671 100755
--- a/tools/compiledump.py
+++ b/tools/compiledump.py
@@ -56,11 +56,6 @@
                         ' (defaults to app proguard config)',
                         choices=['default', 'force-enable', 'force-disable'],
                         default='default')
-    parser.add_argument('--perfetto-memory',
-                        '--perfetto_memory',
-                        help='Include memory usage in perfetto trace',
-                        default=False,
-                        action='store_true')
     parser.add_argument('--shrink',
                         help='Force enable/disable shrinking'
                         ' (defaults to app proguard config)',
@@ -654,8 +649,6 @@
         if args.dump_trace_to_directory is not None:
             cmd.append('-Dcom.android.tools.r8.dumptracetodirectory=' +
                        args.dump_trace_to_directory)
-            if args.perfetto_memory:
-                cmd.append('-Dcom.android.tools.r8.perfetto.memory=1')
         if args.print_times:
             cmd.append('-Dcom.android.tools.r8.printtimes=1')
         if args.r8_flags:

tools/run_benchmark.py

diff --git a/tools/run_benchmark.py b/tools/run_benchmark.py
index 120d1bf..61d9e83 100755
--- a/tools/run_benchmark.py
+++ b/tools/run_benchmark.py
@@ -81,11 +81,6 @@
                         type=int)
     result.add_argument('--output',
                         help='Output path where to write the result')
-    result.add_argument('--perfetto-memory',
-                        '--perfetto_memory',
-                        help='Include memory usage in perfetto trace',
-                        default=False,
-                        action='store_true')
     result.add_argument('--print-times',
                         help='Print timing information from r8',
                         default=False,
@@ -200,8 +195,6 @@
     if options.dump_trace_to_directory is not None:
         cmd.append('-Dcom.android.tools.r8.dumptracetodirectory=' +
                    options.dump_trace_to_directory)
-        if options.perfetto_memory:
-            cmd.append('-Dcom.android.tools.r8.perfetto.memory=1')
     if options.print_times:
         cmd.append('-Dcom.android.tools.r8.printtimes=1')
     if not options.golem: