[vm/fuzzer] Added mode where kbc x64 goes directly "from source"

aartbik · commit-bot@chromium.org · commit 1f4d251aa4f1 · 2019-08-08T19:13:14.000Z
Change-Id: I88902a83d701033ab7cc47b0e0cd78bc48069478 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/112400 Reviewed-by: Ben Konyi <bkonyi@google.com> Commit-Queue: Aart Bik <ajcbik@google.com>
diff --git a/runtime/tools/dartfuzz/dartfuzz_test.dart b/runtime/tools/dartfuzz/dartfuzz_test.dart
@@ -48,8 +48,8 @@ abstract class TestRunner {
       Map<String, String> env, String fileName, Random rand) {
     String prefix = mode.substring(0, 3).toUpperCase();
     String tag = getTag(mode);
-    // Prepare extra flags.
     List<String> extraFlags = [];
+    // Required extra flags for kbc.
     if (mode.startsWith('kbc-int')) {
       prefix += '-INT';
       extraFlags += [
@@ -63,6 +63,14 @@ abstract class TestRunner {
       prefix += '-CMP';
       extraFlags += ['--use-bytecode-compiler'];
     }
+    // Every once in a while, go directly from source for kbc-*-x64.
+    bool kbcSrc = false;
+    if (mode.startsWith('kbc') &&
+        mode.endsWith('x64') &&
+        rand.nextInt(4) == 0) {
+      prefix += '-SRC';
+      kbcSrc = true;
+    }
     // Every once in a while, stress test JIT.
     if (mode.startsWith('jit') && rand.nextInt(4) == 0) {
       final r = rand.nextInt(7);
@@ -108,7 +116,7 @@ abstract class TestRunner {
           prefix, tag, top, tmp, env, fileName, extraFlags);
     } else if (mode.startsWith('kbc')) {
       return new TestRunnerKBC(
-          prefix, tag, top, tmp, env, fileName, extraFlags);
+          prefix, tag, top, tmp, env, fileName, extraFlags, kbcSrc);
     } else if (mode.startsWith('djs')) {
       return new TestRunnerDJS(prefix, tag, top, tmp, env, fileName);
     }
@@ -185,20 +193,26 @@ class TestRunnerAOT implements TestRunner {
 /// Concrete test runner of bytecode.
 class TestRunnerKBC implements TestRunner {
   TestRunnerKBC(String prefix, String tag, String top, String tmp, this.env,
-      this.fileName, List<String> extraFlags) {
+      this.fileName, List<String> extraFlags, bool kbcSrc) {
     description = '$prefix-$tag';
-    generate = '$top/pkg/vm/tool/gen_kernel';
-    platform = '--platform=$top/out/$tag/vm_platform_strong.dill';
-    dill = '$tmp/out.dill';
     dart = '$top/out/$tag/dart';
-    cmd = [dart] + extraFlags + [dill];
+    if (kbcSrc) {
+      cmd = [dart] + extraFlags + [fileName];
+    } else {
+      generate = '$top/pkg/vm/tool/gen_kernel';
+      platform = '--platform=$top/out/$tag/vm_platform_strong.dill';
+      dill = '$tmp/out.dill';
+      cmd = [dart] + extraFlags + [dill];
+    }
   }
 
   TestResult run() {
-    TestResult result = runCommand(
-        [generate, '--gen-bytecode', platform, '-o', dill, fileName], env);
-    if (result.exitCode != 0) {
-      return result;
+    if (generate != null) {
+      TestResult result = runCommand(
+          [generate, '--gen-bytecode', platform, '-o', dill, fileName], env);
+      if (result.exitCode != 0) {
+        return result;
+      }
     }
     return runCommand(cmd, env);
   }
