Add --use-cfe and --analyzer-use-fasta-parser flags to smith:configuration

Use them in test_matrix.json for the analyzer builders.

Bug: https://github.com/dart-lang/sdk/issues/34151
Change-Id: I4abe0bcc8b62ee372df32c0402fad3cd9042cb27
Reviewed-on: https://dart-review.googlesource.com/70282
Reviewed-by: Bob Nystrom <rnystrom@google.com>

pkg/smith/lib/configuration.dart

@@ -256,6 +256,8 @@ class Configuration {
         isHostChecked: boolOption("host-checked"),
         isMinified: boolOption("minified"),
         previewDart2: boolOption("preview-dart-2"),
+        useAnalyzerCfe: boolOption("use-cfe"),
+        useAnalyzerFastaParser: boolOption("analyzer-use-fasta-parser"),
         useBlobs: boolOption("use-blobs"),
         useDart2JSWithKernel: boolOption("dart2js-with-kernel"),
         useDart2JSOldFrontEnd: boolOption("dart2js-old-frontend"),
@@ -305,6 +307,10 @@ class Configuration {
   // TODO(rnystrom): Remove this when Dart 1.0 is no longer supported.
   final bool previewDart2;
 
+  // TODO(whesse): Remove these when only fasta front end is in analyzer.
+  final bool useAnalyzerCfe;
+  final bool useAnalyzerFastaParser;
+
   // TODO(rnystrom): What is this?
   final bool useBlobs;
 
@@ -330,6 +336,8 @@ class Configuration {
       bool isHostChecked,
       bool isMinified,
       bool previewDart2,
+      bool useAnalyzerCfe,
+      bool useAnalyzerFastaParser,
       bool useBlobs,
       bool useDart2JSWithKernel,
       bool useDart2JSOldFrontEnd,
@@ -346,6 +354,8 @@ class Configuration {
         isHostChecked = isHostChecked ?? false,
         isMinified = isMinified ?? false,
         previewDart2 = previewDart2 ?? true,
+        useAnalyzerCfe = useAnalyzerCfe ?? false,
+        useAnalyzerFastaParser = useAnalyzerFastaParser ?? false,
         useBlobs = useBlobs ?? false,
         useDart2JSWithKernel = useDart2JSWithKernel ?? false,
         useDart2JSOldFrontEnd = useDart2JSOldFrontEnd ?? false,
@@ -371,6 +381,8 @@ class Configuration {
       isHostChecked == other.isHostChecked &&
       isMinified == other.isMinified &&
       previewDart2 == other.previewDart2 &&
+      useAnalyzerCfe == other.useAnalyzerCfe &&
+      useAnalyzerFastaParser == other.useAnalyzerFastaParser &&
       useBlobs == other.useBlobs &&
       useDart2JSWithKernel == other.useDart2JSWithKernel &&
       useDart2JSOldFrontEnd == other.useDart2JSOldFrontEnd &&
@@ -398,13 +410,15 @@ class Configuration {
       (isHostChecked ? 8 : 0) ^
       (isMinified ? 16 : 0) ^
       (previewDart2 ? 32 : 0) ^
-      (useBlobs ? 64 : 0) ^
-      (useDart2JSWithKernel ? 128 : 0) ^
-      (useDart2JSOldFrontEnd ? 256 : 0) ^
-      (useFastStartup ? 512 : 0) ^
-      (useHotReload ? 1024 : 0) ^
-      (useHotReloadRollback ? 2048 : 0) ^
-      (useSdk ? 4096 : 0);
+      (useAnalyzerCfe ? 64 : 0) ^
+      (useAnalyzerFastaParser ? 128 : 0) ^
+      (useBlobs ? 256 : 0) ^
+      (useDart2JSWithKernel ? 512 : 0) ^
+      (useDart2JSOldFrontEnd ? 1024 : 0) ^
+      (useFastStartup ? 2048 : 0) ^
+      (useHotReload ? 4096 : 0) ^
+      (useHotReloadRollback ? 8192 : 0) ^
+      (useSdk ? 16384 : 0);
 
   String toString() {
     var buffer = new StringBuffer();
@@ -427,6 +441,8 @@ class Configuration {
     if (isHostChecked) fields.add("host-checked");
     if (isMinified) fields.add("minified");
     if (previewDart2) fields.add("preview-dart-2");
+    if (useAnalyzerCfe) fields.add("use-cfe");
+    if (useAnalyzerFastaParser) fields.add("analyzer-use-fasta-parser");
     if (useBlobs) fields.add("use-blobs");
     if (useDart2JSWithKernel) fields.add("dart2js-with-kernel");
     if (useDart2JSOldFrontEnd) fields.add("dart2js-old-frontend");
@@ -481,6 +497,13 @@ class Configuration {
     if (previewDart2 || other.previewDart2) {
       fields.add("previewDart2 $previewDart2 ${other.previewDart2}");
     }
+    if (useAnalyzerCfe || other.useAnalyzerCfe) {
+      fields.add("useAnalyzerCfe $useAnalyzerCfe ${other.useAnalyzerCfe}");
+    }
+    if (useAnalyzerFastaParser || other.useAnalyzerFastaParser) {
+      fields.add("useAnalyzerFastaParser "
+          "$useAnalyzerFastaParser ${other.useAnalyzerFastaParser}");
+    }
     if (useBlobs || other.useBlobs) {
       fields.add("useBlobs $useBlobs ${other.useBlobs}");
     }

tools/bots/test_matrix.json

@@ -430,6 +430,18 @@
         "compiler": "dart2analyzer",
         "enable-asserts": true,
         "use-sdk": true
+      }},
+    "analyzer-cfe-(linux|mac|win)": {
+      "options": {
+        "compiler": "dart2analyzer",
+        "use-cfe": true,
+        "use-sdk": true
+      }},
+    "analyzer-fasta_parser-linux": {
+      "options": {
+        "compiler": "dart2analyzer",
+        "analyzer-use-fasta-parser": true,
+        "use-sdk": true
       }}
   },
   "builder_configurations": [
@@ -1637,18 +1649,14 @@
         {
           "name": "dartanalyzer --batch --use-cfe pkg tests",
           "arguments": [
-            "--compiler=dart2analyzer",
-            "--use-cfe",
-            "--use-sdk",
+            "-nanalyzer-cfe-${system}",
             "pkg"
           ]
         },
         {
           "name": "run language2 tests",
           "arguments": [
-            "--compiler=dart2analyzer",
-            "--use-cfe",
-            "--use-sdk",
+            "-nanalyzer-cfe-${system}",
             "language_2"
           ]
         },
@@ -1874,9 +1882,7 @@
         {
           "name": "run language2 tests",
           "arguments": [
-            "--analyzer-use-fasta-parser",
-            "--compiler=dart2analyzer",
-            "--use-sdk",
+            "-nanalyzer-fasta_parser-linux",
             "language_2"
           ]
         },

tools/testing/dart/configuration.dart

@@ -37,8 +37,6 @@ class TestConfiguration {
       this.reportInJson,
       this.resetBrowser,
       this.skipCompilation,
-      this.useAnalyzerCfe,
-      this.useAnalyzerFastaParser,
       this.useKernelBytecode,
       this.writeDebugLog,
       this.writeTestOutcomeLog,
@@ -89,8 +87,6 @@ class TestConfiguration {
   final bool reportInJson;
   final bool resetBrowser;
   final bool skipCompilation;
-  final bool useAnalyzerCfe;
-  final bool useAnalyzerFastaParser;
   final bool useKernelBytecode;
   final bool writeDebugLog;
   final bool writeTestOutcomeLog;
@@ -111,6 +107,8 @@ class TestConfiguration {
   bool get isCsp => configuration.isCsp;
   bool get isMinified => configuration.isMinified;
   bool get noPreviewDart2 => !configuration.previewDart2;
+  bool get useAnalyzerCfe => configuration.useAnalyzerCfe;
+  bool get useAnalyzerFastaParser => configuration.useAnalyzerFastaParser;
   bool get useBlobs => configuration.useBlobs;
   bool get useSdk => configuration.useSdk;
   bool get useFastStartup => configuration.useFastStartup;

tools/testing/dart/options.dart

@@ -638,6 +638,9 @@ compiler.''',
                     compiler, mode, runtime, system,
                     timeout: data["timeout"] as int,
                     enableAsserts: data["enable_asserts"] as bool,
+                    useAnalyzerCfe: data["use_cfe"] as bool,
+                    useAnalyzerFastaParser:
+                        data["analyzer_use_fasta_parser"] as bool,
                     useBlobs: data["use_blobs"] as bool,
                     useSdk: data["use_sdk"] as bool,
                     useFastStartup: data["fast_startup"] as bool,
@@ -668,9 +671,6 @@ compiler.''',
                 reportInJson: data["report_in_json"] as bool,
                 resetBrowser: data["reset_browser_configuration"] as bool,
                 skipCompilation: data["skip_compilation"] as bool,
-                useAnalyzerCfe: data["use_cfe"] as bool,
-                useAnalyzerFastaParser:
-                    data["analyzer_use_fasta_parser"] as bool,
                 useKernelBytecode: compiler == Compiler.dartkb,
                 writeDebugLog: data["write_debug_log"] as bool,
                 writeTestOutcomeLog: data["write_test_outcome_log"] as bool,