From 108682198a3eddce47a4d115632be00102086cb5 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 1 Jun 2026 15:34:32 -0700
Subject: [PATCH] Reduce dartfuzz's build set.

dartfuzz has been taking ~35 min to finish the build and upload steps even with 100% RBE cache hit rate, causing it to fail to finish before the first wave of nightly builders trigger.

Change-Id: I932facd77bc08f4d7236ae8c760013406a69fb0e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/507267
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Aprelev <aam@google.com>
---
 BUILD.gn                                  | 10 ++++++++++
 runtime/tools/dartfuzz/dartfuzz_test.dart |  2 +-
 runtime/tools/dartfuzz/flag_fuzzer.dart   |  6 +++---
 tools/bots/test_matrix.json               | 19 +++++++------------
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 2e112888cb2..85745cc52a9 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -233,6 +233,16 @@ group("dart2js_bot") {
   ]
 }
 
+group("dartfuzz") {
+  deps = [
+    "runtime/bin:dartaotruntime",
+    "runtime/bin:dartvm",
+    "utils/compiler:compile_dart2js_platform",
+    "utils/dart2wasm:compile_dart2wasm_platform",
+    "utils/kernel-service",
+  ]
+}
+
 if (is_fuchsia) {
   import("third_party/fuchsia/gn-sdk/src/component.gni")
   import("third_party/fuchsia/gn-sdk/src/package.gni")
diff --git a/runtime/tools/dartfuzz/dartfuzz_test.dart b/runtime/tools/dartfuzz/dartfuzz_test.dart
index 7a25a9bc9de..bdb616226a1 100644
--- a/runtime/tools/dartfuzz/dartfuzz_test.dart
+++ b/runtime/tools/dartfuzz/dartfuzz_test.dart
@@ -116,7 +116,7 @@ class TestRunnerJIT implements TestRunner {
     List<String> extraFlags,
   ) {
     description = '$prefix-$tag';
-    dart = '$top/out/$tag/dart';
+    dart = '$top/out/$tag/dartvm';
     cmd = [dart, ...extraFlags, '--old_gen_heap_size=$dartHeapSize', fileName];
   }
 
diff --git a/runtime/tools/dartfuzz/flag_fuzzer.dart b/runtime/tools/dartfuzz/flag_fuzzer.dart
index 4e01b439e9a..c90ccd1d9a8 100644
--- a/runtime/tools/dartfuzz/flag_fuzzer.dart
+++ b/runtime/tools/dartfuzz/flag_fuzzer.dart
@@ -176,7 +176,7 @@ Future<void> test(
     // JIT
     commands = [
       [
-        "$buildDir/dart",
+        "$buildDir/dartvm",
         ...someJitRuntimeFlags(),
         dartScript,
         ...dartArguments,
@@ -191,7 +191,7 @@ Future<void> test(
     // AOT
     commands = [
       [
-        "out/ReleaseX64/dart",
+        "out/ReleaseX64/dartvm",
         "pkg/vm/bin/gen_kernel.dart",
         "--platform=$buildDir/vm_platform.dill",
         "--aot",
@@ -284,7 +284,7 @@ Future<void> flagFuzz(
 
   await Directory("out/dartfuzz").create();
 
-  var executable = "out/ReleaseX64/dart";
+  var executable = "out/ReleaseX64/dartvm";
   var arguments = createDartCommand("out/dartfuzz/expected.$extension");
   var processResult = await Process.run(executable, arguments);
   if (processResult.exitCode != 0) {
diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index d0cac287ab6..f758368deb3 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -3522,10 +3522,7 @@
           "arguments": [
             "--mode=debug,release",
             "--arch=x64,x64c",
-            "runtime",
-            "dartaotruntime",
-            "dart2js_platform.dill",
-            "dart2wasm_platform.dill"
+            "dartfuzz"
           ]
         },
         {
@@ -3534,8 +3531,7 @@
           "arguments": [
             "--mode=debug,release",
             "--arch=simarm64,simarm64c",
-            "runtime",
-            "dartaotruntime"
+            "dartfuzz"
           ]
         },
         {
@@ -3544,8 +3540,7 @@
           "arguments": [
             "--mode=debug,release",
             "--arch=simriscv32,simriscv64",
-            "runtime",
-            "dartaotruntime"
+            "dartfuzz"
           ]
         },
         {
@@ -3554,12 +3549,12 @@
           "arguments": [
             "--mode=debug,release",
             "--arch=simarm",
-            "runtime"
+            "dartfuzz"
           ]
         },
         {
           "name": "dartfuzz - generated programs",
-          "script": "out/ReleaseX64/dart",
+          "script": "tools/sdks/dart-sdk/bin/dart",
           "arguments": [
             "runtime/tools/dartfuzz/dartfuzz_test.dart",
             "--isolates",
@@ -3573,7 +3568,7 @@
         },
         {
           "name": "dartfuzz - dart2js",
-          "script": "out/ReleaseX64/dart",
+          "script": "tools/sdks/dart-sdk/bin/dart",
           "arguments": [
             "runtime/tools/dartfuzz/flag_fuzzer_dart2js.dart"
           ],
@@ -3582,7 +3577,7 @@
         },
         {
           "name": "dartfuzz - dart2wasm",
-          "script": "out/ReleaseX64/dart",
+          "script": "tools/sdks/dart-sdk/bin/dart",
           "arguments": [
             "runtime/tools/dartfuzz/flag_fuzzer_dart2wasm.dart"
           ],