[cfe,dartdev,dart2js] Add support for --verbosity option

In response to #44727

TEST=pkg/dartdev/test/commands/compile_test.dart

Change-Id: I56b67d9362a415acd721c1cce2f7e2232d2493df
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/180566
Commit-Queue: Johnni Winther <[email protected]>
Reviewed-by: Jens Johansen <[email protected]>

Author: johnniwinther

pkg/compiler/lib/src/commandline_options.dart

@@ -96,6 +96,7 @@ class Flags {
   static const String useNewSourceInfo = '--use-new-source-info';
   static const String useOldRti = '--use-old-rti';
   static const String verbose = '--verbose';
+  static const String verbosity = '--verbosity';
   static const String progress = '--show-internal-progress';
   static const String version = '--version';
   static const String reportMetrics = '--report-metrics';

pkg/compiler/lib/src/dart2js.dart

@@ -545,6 +545,7 @@ Future<api.CompilationResult> compile(List<String> argv,
     new OptionHandler(Flags.testMode, passThrough),
     new OptionHandler('${Flags.dumpSsa}=.+', passThrough),
     new OptionHandler('${Flags.cfeInvocationModes}=.+', passThrough),
+    new OptionHandler('${Flags.verbosity}=.+', passThrough),
 
     // Experimental features.
     // We don't provide documentation for these yet.

pkg/compiler/lib/src/kernel/loader.dart

@@ -138,16 +138,22 @@ class KernelLoaderTask extends CompilerTask {
         bool verbose = false;
         Target target = Dart2jsTarget(targetName, TargetFlags());
         fe.FileSystem fileSystem = CompilerFileSystem(_compilerInput);
+        fe.Verbosity verbosity = _options.verbosity;
         fe.DiagnosticMessageHandler onDiagnostic =
-            (e) => reportFrontEndMessage(_reporter, e);
+            (fe.DiagnosticMessage message) {
+          if (fe.Verbosity.shouldPrint(verbosity, message)) {
+            reportFrontEndMessage(_reporter, message);
+          }
+        };
         fe.CompilerOptions options = fe.CompilerOptions()
           ..target = target
           ..librariesSpecificationUri = _options.librariesSpecificationUri
           ..packagesFileUri = _options.packageConfig
           ..explicitExperimentalFlags = _options.explicitExperimentalFlags
           ..verbose = verbose
           ..fileSystem = fileSystem
-          ..onDiagnostic = onDiagnostic;
+          ..onDiagnostic = onDiagnostic
+          ..verbosity = verbosity;
         bool isLegacy =
             await fe.uriUsesLegacyLanguageVersion(resolvedUri, options);
         inferNullSafetyMode(_options.enableNonNullable && !isLegacy);
@@ -171,8 +177,8 @@ class KernelLoaderTask extends CompilerTask {
             nnbdMode: _options.useLegacySubtyping
                 ? fe.NnbdMode.Weak
                 : fe.NnbdMode.Strong,
-            invocationModes:
-                fe.InvocationMode.parseArguments(_options.cfeInvocationModes));
+            invocationModes: _options.cfeInvocationModes,
+            verbosity: verbosity);
         component = await fe.compile(initializedCompilerState, verbose,
             fileSystem, onDiagnostic, resolvedUri);
         if (component == null) return null;

pkg/compiler/lib/src/options.dart

@@ -433,7 +433,10 @@ class CompilerOptions implements DiagnosticOptions {
   /// See `InvocationMode` in
   /// `pkg/front_end/lib/src/api_prototype/compiler_options.dart` for all
   /// possible options.
-  String cfeInvocationModes = '';
+  Set<fe.InvocationMode> cfeInvocationModes = {};
+
+  /// Verbosity level used for filtering messages during compilation.
+  fe.Verbosity verbosity = fe.Verbosity.all;
 
   // -------------------------------------------------
   // Options for deprecated features
@@ -547,8 +550,13 @@ class CompilerOptions implements DiagnosticOptions {
       .._noSoundNullSafety = _hasOption(options, Flags.noSoundNullSafety)
       .._mergeFragmentsThreshold =
           _extractIntOption(options, '${Flags.mergeFragmentsThreshold}=')
-      ..cfeInvocationModes =
-          _extractStringOption(options, '${Flags.cfeInvocationModes}=', '');
+      ..cfeInvocationModes = fe.InvocationMode.parseArguments(
+          _extractStringOption(options, '${Flags.cfeInvocationModes}=', ''),
+          onError: onError)
+      ..verbosity = fe.Verbosity.parseArgument(
+          _extractStringOption(
+              options, '${Flags.verbosity}=', fe.Verbosity.defaultValue),
+          onError: onError);
   }
 
   void validate() {

pkg/dart2native/bin/dart2native.dart

@@ -7,6 +7,8 @@ import 'dart:io';
 
 import 'package:args/args.dart';
 import 'package:dart2native/generate.dart';
+import 'package:front_end/src/api_prototype/compiler_options.dart'
+    show Verbosity;
 
 void printUsage(final ArgParser parser) {
   print('''
@@ -65,7 +67,16 @@ Remove debugging information from the output and save it separately to the speci
 Comma separated list of experimental features.
 ''')
     ..addFlag('verbose',
-        abbr: 'v', negatable: false, help: 'Show verbose output.');
+        abbr: 'v', negatable: false, help: 'Show verbose output.')
+    ..addOption(
+      'verbosity',
+      defaultsTo: Verbosity.defaultValue,
+      help: '''
+Sets the verbosity level used for filtering messages during compilation.
+''',
+      allowed: Verbosity.allowedValues,
+      allowedHelp: Verbosity.allowedValuesHelp,
+    );
 
   ArgResults parsedArgs;
   try {
@@ -106,6 +117,7 @@ Comma separated list of experimental features.
         enableExperiment: parsedArgs['enable-experiment'],
         enableAsserts: parsedArgs['enable-asserts'],
         verbose: parsedArgs['verbose'],
+        verbosity: parsedArgs['verbosity'],
         extraOptions: parsedArgs['extra-gen-snapshot-options']);
   } catch (e) {
     stderr.writeln('Failed to generate native files:');

pkg/dart2native/lib/generate.dart

@@ -27,6 +27,7 @@ Future<void> generateNative({
   String enableExperiment = '',
   bool enableAsserts = false,
   bool verbose = false,
+  String verbosity = 'all',
   List<String> extraOptions = const [],
 }) async {
   final Directory tempDir = Directory.systemTemp.createTempSync();
@@ -58,7 +59,10 @@ Future<void> generateNative({
     final kernelResult = await generateAotKernel(Platform.executable, genKernel,
         productPlatformDill, sourcePath, kernelFile, packages, defines,
         enableExperiment: enableExperiment,
-        extraGenKernelOptions: ['--invocation-modes=compile']);
+        extraGenKernelOptions: [
+          '--invocation-modes=compile',
+          '--verbosity=$verbosity'
+        ]);
     if (kernelResult.exitCode != 0) {
       // We pipe both stdout and stderr to stderr because the CFE doesn't print
       // errors to stderr. This unfortunately does emit info-only output in

pkg/dart2native/pubspec.yaml

@@ -12,5 +12,7 @@ executables:
 dependencies:
    args: ^1.4.0
    path: any
+   front_end:
+     path: ../front_end
 
 dev_dependencies:

pkg/dartdev/lib/src/commands/compile.dart

@@ -7,6 +7,8 @@ import 'dart:io';
 
 import 'package:dart2native/generate.dart';
 import 'package:path/path.dart' as path;
+import 'package:front_end/src/api_prototype/compiler_options.dart'
+    show Verbosity;
 
 import '../core.dart';
 import '../experiments.dart';
@@ -19,8 +21,17 @@ class Option {
   final String flag;
   final String help;
   final String abbr;
-
-  Option({this.flag, this.help, this.abbr});
+  final String defaultsTo;
+  final List<String> allowed;
+  final Map<String, String> allowedHelp;
+
+  Option(
+      {this.flag,
+      this.help,
+      this.abbr,
+      this.defaultsTo,
+      this.allowed,
+      this.allowedHelp});
 }
 
 final Map<String, Option> commonOptions = {
@@ -32,6 +43,15 @@ Write the output to <file name>.
 This can be an absolute or relative path.
 ''',
   ),
+  'verbosity': Option(
+    flag: 'verbosity',
+    help: '''
+Sets the verbosity level of the compilation.
+''',
+    defaultsTo: Verbosity.defaultValue,
+    allowed: Verbosity.allowedValues,
+    allowedHelp: Verbosity.allowedValuesHelp,
+  ),
 };
 
 bool checkFile(String sourcePath) {
@@ -53,6 +73,15 @@ class CompileJSCommand extends CompileSubcommandCommand {
         commonOptions['outputFile'].flag,
         help: commonOptions['outputFile'].help,
         abbr: commonOptions['outputFile'].abbr,
+        defaultsTo: commonOptions['outputFile'].defaultsTo,
+      )
+      ..addOption(
+        commonOptions['verbosity'].flag,
+        help: commonOptions['verbosity'].help,
+        abbr: commonOptions['verbosity'].abbr,
+        defaultsTo: commonOptions['verbosity'].defaultsTo,
+        allowed: commonOptions['verbosity'].allowed,
+        allowedHelp: commonOptions['verbosity'].allowedHelp,
       )
       ..addFlag(
         'minified',
@@ -196,6 +225,14 @@ class CompileNativeCommand extends CompileSubcommandCommand {
         help: commonOptions['outputFile'].help,
         abbr: commonOptions['outputFile'].abbr,
       )
+      ..addOption(
+        commonOptions['verbosity'].flag,
+        help: commonOptions['verbosity'].help,
+        abbr: commonOptions['verbosity'].abbr,
+        defaultsTo: commonOptions['verbosity'].defaultsTo,
+        allowed: commonOptions['verbosity'].allowed,
+        allowedHelp: commonOptions['verbosity'].allowedHelp,
+      )
       ..addMultiOption('define', abbr: 'D', valueHelp: 'key=value', help: '''
 Define an environment declaration. To specify multiple declarations, use multiple options or use commas to separate key-value pairs.
 For example: dart compile $commandName -Da=1,b=2 main.dart''')
@@ -246,6 +283,7 @@ Remove debugging information from the output and save it separately to the speci
         enableExperiment: argResults.enabledExperiments.join(','),
         debugFile: argResults['save-debugging-info'],
         verbose: verbose,
+        verbosity: argResults['verbosity'],
       );
       return 0;
     } catch (e) {

pkg/dartdev/pubspec.yaml

@@ -17,6 +17,8 @@ dependencies:
   dart2native:
     path: ../dart2native
   dart_style: any
+  front_end:
+    path: ../front_end
   intl: any
   meta:
     path: ../meta

pkg/dartdev/test/commands/compile_test.dart

@@ -310,6 +310,30 @@ void main() {}
         reason: 'File not found: $outFile');
   });
 
+  test('Compile exe without info', () {
+    final p = project(mainSrc: '''void main() {}''');
+    final inFile = path.canonicalize(path.join(p.dirPath, p.relativeFilePath));
+    final outFile = path.canonicalize(path.join(p.dirPath, 'myexe'));
+
+    var result = p.runSync(
+      [
+        'compile',
+        'exe',
+        '--verbosity=warning',
+        '-o',
+        outFile,
+        inFile,
+      ],
+    );
+
+    expect(result.stdout,
+        predicate((o) => !'$o'.contains(soundNullSafetyMessage)));
+    expect(result.stderr, isEmpty);
+    expect(result.exitCode, 0);
+    expect(File(outFile).existsSync(), true,
+        reason: 'File not found: $outFile');
+  });
+
   test('Compile JS with sound null safety', () {
     final p = project(mainSrc: '''void main() {}''');
     final inFile = path.canonicalize(path.join(p.dirPath, p.relativeFilePath));
@@ -357,6 +381,30 @@ void main() {}
         reason: 'File not found: $outFile');
   });
 
+  test('Compile JS without info', () {
+    final p = project(mainSrc: '''void main() {}''');
+    final inFile = path.canonicalize(path.join(p.dirPath, p.relativeFilePath));
+    final outFile = path.canonicalize(path.join(p.dirPath, 'myjs'));
+
+    var result = p.runSync(
+      [
+        'compile',
+        'js',
+        '--verbosity=warning',
+        '-o',
+        outFile,
+        inFile,
+      ],
+    );
+
+    expect(result.stdout,
+        predicate((o) => !'$o'.contains(soundNullSafetyMessage)));
+    expect(result.stderr, isEmpty);
+    expect(result.exitCode, 0);
+    expect(File(outFile).existsSync(), true,
+        reason: 'File not found: $outFile');
+  });
+
   test('Compile AOT snapshot with sound null safety', () {
     final p = project(mainSrc: '''void main() {}''');
     final inFile = path.canonicalize(path.join(p.dirPath, p.relativeFilePath));
@@ -404,6 +452,30 @@ void main() {}
         reason: 'File not found: $outFile');
   });
 
+  test('Compile AOT snapshot without info', () {
+    final p = project(mainSrc: '''void main() {}''');
+    final inFile = path.canonicalize(path.join(p.dirPath, p.relativeFilePath));
+    final outFile = path.canonicalize(path.join(p.dirPath, 'myaot'));
+
+    var result = p.runSync(
+      [
+        'compile',
+        'aot-snapshot',
+        '--verbosity=warning',
+        '-o',
+        outFile,
+        inFile,
+      ],
+    );
+
+    expect(result.stdout,
+        predicate((o) => !'$o'.contains(soundNullSafetyMessage)));
+    expect(result.stderr, isEmpty);
+    expect(result.exitCode, 0);
+    expect(File(outFile).existsSync(), true,
+        reason: 'File not found: $outFile');
+  });
+
   test('Compile kernel with sound null safety', () {
     final p = project(mainSrc: '''void main() {}''');
     final inFile = path.canonicalize(path.join(p.dirPath, p.relativeFilePath));