Talk about legacy mode, not strong mode in perf tools
Change-Id: I5a718b3db7905709caf92ca994784ee64a87b7b3
Reviewed-on: https://dart-review.googlesource.com/c/84410
Auto-Submit: Peter von der Ahé <ahe@google.com>
Reviewed-by: Jens Johansen <jensj@google.com>
Commit-Queue: Peter von der Ahé <ahe@google.com>
diff --git a/pkg/front_end/tool/fasta_perf.dart b/pkg/front_end/tool/fasta_perf.dart
index 56095b6..bd1ed2c 100644
--- a/pkg/front_end/tool/fasta_perf.dart
+++ b/pkg/front_end/tool/fasta_perf.dart
@@ -35,11 +35,11 @@
print(argParser.usage);
exit(1);
}
- bool strongMode = !options['legacy'];
+ bool legacyMode = options['legacy'];
var bench = options.rest[0];
var entryUri = Uri.base.resolve(options.rest[1]);
- await setup(entryUri, strongMode: strongMode);
+ await setup(entryUri, legacyMode: legacyMode);
Map<Uri, List<int>> files = await scanReachableFiles(entryUri);
var handlers = {
@@ -47,10 +47,10 @@
// TODO(sigmund): enable when we can run the ast-builder standalone.
// 'parse': () async => parseFiles(files),
'kernel_gen_e2e': () async {
- await generateKernel(entryUri, strongMode: strongMode);
+ await generateKernel(entryUri, legacyMode: legacyMode);
},
'kernel_gen_e2e_sum': () async {
- await generateKernel(entryUri, compileSdk: false, strongMode: strongMode);
+ await generateKernel(entryUri, compileSdk: false, legacyMode: legacyMode);
},
};
@@ -89,15 +89,15 @@
/// Preliminary set up to be able to correctly resolve URIs on the given
/// program.
-Future setup(Uri entryUri, {bool strongMode: false}) async {
+Future setup(Uri entryUri, {bool legacyMode: false}) async {
var options = new CompilerOptions()
..sdkRoot = sdkRoot
// Because this is only used to create a uriResolver, we don't allow any
// whitelisting of error messages in the error handler.
- ..onDiagnostic = onDiagnosticMessageHandler(false)
+ ..onDiagnostic = onDiagnosticMessageHandler(legacyMode: true)
..compileSdk = true
..packagesFileUri = Uri.base.resolve('.packages')
- ..target = createTarget(isFlutter: false, strongMode: strongMode);
+ ..target = createTarget(isFlutter: false, legacyMode: legacyMode);
uriResolver = await new ProcessedOptions(options: options).getUriTranslator();
}
@@ -222,7 +222,7 @@
// Invoke the fasta kernel generator for the program starting in [entryUri]
generateKernel(Uri entryUri,
- {bool compileSdk: true, bool strongMode: false}) async {
+ {bool compileSdk: true, bool legacyMode: false}) async {
// TODO(sigmund): this is here only to compute the input size,
// we should extract the input size from the frontend instead.
scanReachableFiles(entryUri);
@@ -230,9 +230,9 @@
var timer = new Stopwatch()..start();
var options = new CompilerOptions()
..sdkRoot = sdkRoot
- ..onDiagnostic = onDiagnosticMessageHandler(strongMode)
- ..legacyMode = !strongMode
- ..target = createTarget(isFlutter: false, strongMode: strongMode)
+ ..onDiagnostic = onDiagnosticMessageHandler(legacyMode: legacyMode)
+ ..legacyMode = legacyMode
+ ..target = createTarget(isFlutter: false, legacyMode: legacyMode)
..packagesFileUri = Uri.base.resolve('.packages')
..compileSdk = compileSdk;
if (!compileSdk) {
diff --git a/pkg/front_end/tool/fasta_perf_test.dart b/pkg/front_end/tool/fasta_perf_test.dart
index 6c174c0..f366e73 100644
--- a/pkg/front_end/tool/fasta_perf_test.dart
+++ b/pkg/front_end/tool/fasta_perf_test.dart
@@ -7,7 +7,7 @@
library front_end.tool.perf_test;
import 'dart:io' show Platform;
-import 'fasta_perf.dart' as m;
+import 'fasta_perf.dart' as m show main;
main() async {
var benchIds = [
diff --git a/pkg/front_end/tool/incremental_perf.dart b/pkg/front_end/tool/incremental_perf.dart
index caec1bd..5851526 100644
--- a/pkg/front_end/tool/incremental_perf.dart
+++ b/pkg/front_end/tool/incremental_perf.dart
@@ -72,7 +72,7 @@
parse(jsonDecode(new File.fromUri(editsUri).readAsStringSync()));
bool verbose = options["verbose"];
bool verboseCompilation = options["verbose-compilation"];
- bool strongMode = options["mode"] == "strong";
+ bool legacyMode = options["mode"] == "legacy";
bool isFlutter = options["target"] == "flutter";
bool useMinimalGenerator = options["implementation"] == "minimal";
TimingsCollector collector = new TimingsCollector(verbose);
@@ -81,7 +81,7 @@
await benchmark(
collector,
entryUri,
- strongMode,
+ legacyMode,
isFlutter,
useMinimalGenerator,
verbose,
@@ -98,7 +98,7 @@
Future benchmark(
TimingsCollector collector,
Uri entryUri,
- bool strongMode,
+ bool legacyMode,
bool isFlutter,
bool useMinimalGenerator,
bool verbose,
@@ -111,9 +111,9 @@
var compilerOptions = new CompilerOptions()
..verbose = verboseCompilation
..fileSystem = overlayFs
- ..legacyMode = !strongMode
- ..onDiagnostic = onDiagnosticMessageHandler(strongMode)
- ..target = createTarget(isFlutter: isFlutter, strongMode: strongMode);
+ ..legacyMode = legacyMode
+ ..onDiagnostic = onDiagnosticMessageHandler(legacyMode: legacyMode)
+ ..target = createTarget(isFlutter: isFlutter, legacyMode: legacyMode);
if (sdkSummary != null) {
compilerOptions.sdkSummary = _resolveOverlayUri(sdkSummary);
}
diff --git a/pkg/front_end/tool/incremental_perf_test.dart b/pkg/front_end/tool/incremental_perf_test.dart
index f14b847..5a97ad8 100644
--- a/pkg/front_end/tool/incremental_perf_test.dart
+++ b/pkg/front_end/tool/incremental_perf_test.dart
@@ -7,7 +7,7 @@
import 'dart:io';
import 'package:front_end/src/compute_platform_binaries_location.dart'
show computePlatformBinariesLocation;
-import 'incremental_perf.dart' as m;
+import 'incremental_perf.dart' as m show main;
main() async {
var sdkOutline = computePlatformBinariesLocation(forceBuildDir: true).resolve(
diff --git a/pkg/front_end/tool/perf_common.dart b/pkg/front_end/tool/perf_common.dart
index 24a4525..a6054cc 100644
--- a/pkg/front_end/tool/perf_common.dart
+++ b/pkg/front_end/tool/perf_common.dart
@@ -48,12 +48,12 @@
fastaCodes.codeUndefinedMethod,
]);
-DiagnosticMessageHandler onDiagnosticMessageHandler(bool isStrong) {
+DiagnosticMessageHandler onDiagnosticMessageHandler({bool legacyMode: false}) {
bool messageReported = false;
return (DiagnosticMessage m) {
if (m.severity == Severity.internalProblem ||
m.severity == Severity.error) {
- if (!isStrong ||
+ if (legacyMode ||
!whitelistMessageCode.contains(getMessageCodeObject(m))) {
printDiagnosticMessage(m, stderr.writeln);
exitCode = 1;
@@ -65,19 +65,19 @@
};
}
-/// Creates a [VmTarget] or [FlutterTarget] with strong-mode enabled or
+/// Creates a [VmTarget] or [FlutterTarget] with legacy mode enabled or
/// disabled.
// TODO(sigmund): delete as soon as the disableTypeInference flag and the
-// strongMode flag get merged, and we have a single way of specifying the
-// strong-mode flag to the FE.
-Target createTarget({bool isFlutter: false, bool strongMode: true}) {
- var flags = new TargetFlags(legacyMode: !strongMode);
+// legacyMode flag get merged, and we have a single way of specifying the
+// legacy-mode flag to the FE.
+Target createTarget({bool isFlutter: false, bool legacyMode: false}) {
+ var flags = new TargetFlags(legacyMode: legacyMode);
if (isFlutter) {
- return strongMode
- ? new FlutterTarget(flags)
- : new LegacyFlutterTarget(flags);
+ return legacyMode
+ ? new LegacyFlutterTarget(flags)
+ : new FlutterTarget(flags);
} else {
- return strongMode ? new VmTarget(flags) : new LegacyVmTarget(flags);
+ return legacyMode ? new LegacyVmTarget(flags) : new VmTarget(flags);
}
}
