Skip to content

F
Front-End
Commit d92d175b authored by Ryan Macnak's avatar Ryan Macnak
Browse files
Options

Opt into deterministic snapshots. 

Also, remove old flags.
parent 4bb62b43
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 71 deletions
packages/flutter_tools/lib/src/base/build.dart
View file @ d92d175b
...@@ -122,14 +122,8 @@ class AOTSnapshotter { ...@@ -122,14 +122,8 @@ class AOTSnapshotter {
final String depfilePath = fs.path.join(outputDir.path, 'snapshot.d'); final String depfilePath = fs.path.join(outputDir.path, 'snapshot.d');
final List<String> genSnapshotArgs = <String>[ final List<String> genSnapshotArgs = <String>[
'--url_mapping=dart:ui,$uiPath', '--deterministic',
'--url_mapping=dart:vmservice_io,$vmServicePath',
]; ];
genSnapshotArgs.addAll(<String>[
'--reify-generic-functions',
'--strong',
'--sync-async',
]);
if (extraGenSnapshotOptions != null && extraGenSnapshotOptions.isNotEmpty) { if (extraGenSnapshotOptions != null && extraGenSnapshotOptions.isNotEmpty) {
printTrace('Extra gen_snapshot options: $extraGenSnapshotOptions'); printTrace('Extra gen_snapshot options: $extraGenSnapshotOptions');
genSnapshotArgs.addAll(extraGenSnapshotOptions); genSnapshotArgs.addAll(extraGenSnapshotOptions);
...@@ -379,9 +373,7 @@ class JITSnapshotter { ...@@ -379,9 +373,7 @@ class JITSnapshotter {
final String depfilePath = fs.path.join(outputDir.path, 'snapshot.d'); final String depfilePath = fs.path.join(outputDir.path, 'snapshot.d');
final List<String> genSnapshotArgs = <String>[ final List<String> genSnapshotArgs = <String>[
'--reify-generic-functions', '--deterministic',
'--strong',
'--sync-async',
]; ];
if (buildMode == BuildMode.debug) { if (buildMode == BuildMode.debug) {
genSnapshotArgs.add('--enable_asserts'); genSnapshotArgs.add('--enable_asserts');
......
packages/flutter_tools/test/base/build_test.dart
View file @ d92d175b
...@@ -191,11 +191,7 @@ void main() { ...@@ -191,11 +191,7 @@ void main() {
expect(genSnapshot.snapshotType.mode, BuildMode.profile); expect(genSnapshot.snapshotType.mode, BuildMode.profile);
expect(genSnapshot.packagesPath, '.packages'); expect(genSnapshot.packagesPath, '.packages');
expect(genSnapshot.additionalArgs, <String>[ expect(genSnapshot.additionalArgs, <String>[
'--url_mapping=dart:ui,${fs.path.join(skyEnginePath, 'lib', 'ui', 'ui.dart')}', '--deterministic',
'--url_mapping=dart:vmservice_io,${fs.path.join(skyEnginePath, 'sdk_ext', 'vmservice_io.dart')}',
'--reify-generic-functions',
'--strong',
'--sync-async',
'--snapshot_kind=app-aot-assembly', '--snapshot_kind=app-aot-assembly',
'--assembly=${fs.path.join(outputPath, 'snapshot_assembly.S')}', '--assembly=${fs.path.join(outputPath, 'snapshot_assembly.S')}',
'--no-sim-use-hardfp', '--no-sim-use-hardfp',
...@@ -234,11 +230,7 @@ void main() { ...@@ -234,11 +230,7 @@ void main() {
expect(genSnapshot.snapshotType.mode, BuildMode.profile); expect(genSnapshot.snapshotType.mode, BuildMode.profile);
expect(genSnapshot.packagesPath, '.packages'); expect(genSnapshot.packagesPath, '.packages');
expect(genSnapshot.additionalArgs, <String>[ expect(genSnapshot.additionalArgs, <String>[
'--url_mapping=dart:ui,${fs.path.join(skyEnginePath, 'lib', 'ui', 'ui.dart')}', '--deterministic',
'--url_mapping=dart:vmservice_io,${fs.path.join(skyEnginePath, 'sdk_ext', 'vmservice_io.dart')}',
'--reify-generic-functions',
'--strong',
'--sync-async',
'--snapshot_kind=app-aot-assembly', '--snapshot_kind=app-aot-assembly',
'--assembly=${fs.path.join(outputPath, 'snapshot_assembly.S')}', '--assembly=${fs.path.join(outputPath, 'snapshot_assembly.S')}',
'main.dill', 'main.dill',
...@@ -277,11 +269,7 @@ void main() { ...@@ -277,11 +269,7 @@ void main() {
expect(genSnapshot.snapshotType.mode, BuildMode.profile); expect(genSnapshot.snapshotType.mode, BuildMode.profile);
expect(genSnapshot.packagesPath, '.packages'); expect(genSnapshot.packagesPath, '.packages');
expect(genSnapshot.additionalArgs, <String>[ expect(genSnapshot.additionalArgs, <String>[
'--url_mapping=dart:ui,${fs.path.join(skyEnginePath, 'lib', 'ui', 'ui.dart')}', '--deterministic',
'--url_mapping=dart:vmservice_io,${fs.path.join(skyEnginePath, 'sdk_ext', 'vmservice_io.dart')}',
'--reify-generic-functions',
'--strong',
'--sync-async',
'--snapshot_kind=app-aot-blobs', '--snapshot_kind=app-aot-blobs',
'--vm_snapshot_data=build/foo/vm_snapshot_data', '--vm_snapshot_data=build/foo/vm_snapshot_data',
'--isolate_snapshot_data=build/foo/isolate_snapshot_data', '--isolate_snapshot_data=build/foo/isolate_snapshot_data',
...@@ -325,11 +313,7 @@ void main() { ...@@ -325,11 +313,7 @@ void main() {
expect(genSnapshot.snapshotType.mode, BuildMode.profile); expect(genSnapshot.snapshotType.mode, BuildMode.profile);
expect(genSnapshot.packagesPath, '.packages'); expect(genSnapshot.packagesPath, '.packages');
expect(genSnapshot.additionalArgs, <String>[ expect(genSnapshot.additionalArgs, <String>[
'--url_mapping=dart:ui,${fs.path.join(skyEnginePath, 'lib', 'ui', 'ui.dart')}', '--deterministic',
'--url_mapping=dart:vmservice_io,${fs.path.join(skyEnginePath, 'sdk_ext', 'vmservice_io.dart')}',
'--reify-generic-functions',
'--strong',
'--sync-async',
'--snapshot_kind=app-aot-blobs', '--snapshot_kind=app-aot-blobs',
'--vm_snapshot_data=build/foo/vm_snapshot_data', '--vm_snapshot_data=build/foo/vm_snapshot_data',
'--isolate_snapshot_data=build/foo/isolate_snapshot_data', '--isolate_snapshot_data=build/foo/isolate_snapshot_data',
...@@ -369,11 +353,7 @@ void main() { ...@@ -369,11 +353,7 @@ void main() {
expect(genSnapshot.snapshotType.mode, BuildMode.release); expect(genSnapshot.snapshotType.mode, BuildMode.release);
expect(genSnapshot.packagesPath, '.packages'); expect(genSnapshot.packagesPath, '.packages');
expect(genSnapshot.additionalArgs, <String>[ expect(genSnapshot.additionalArgs, <String>[
'--url_mapping=dart:ui,${fs.path.join(skyEnginePath, 'lib', 'ui', 'ui.dart')}', '--deterministic',
'--url_mapping=dart:vmservice_io,${fs.path.join(skyEnginePath, 'sdk_ext', 'vmservice_io.dart')}',
'--reify-generic-functions',
'--strong',
'--sync-async',
'--snapshot_kind=app-aot-assembly', '--snapshot_kind=app-aot-assembly',
'--assembly=${fs.path.join(outputPath, 'snapshot_assembly.S')}', '--assembly=${fs.path.join(outputPath, 'snapshot_assembly.S')}',
'--no-sim-use-hardfp', '--no-sim-use-hardfp',
...@@ -412,11 +392,7 @@ void main() { ...@@ -412,11 +392,7 @@ void main() {
expect(genSnapshot.snapshotType.mode, BuildMode.release); expect(genSnapshot.snapshotType.mode, BuildMode.release);
expect(genSnapshot.packagesPath, '.packages'); expect(genSnapshot.packagesPath, '.packages');
expect(genSnapshot.additionalArgs, <String>[ expect(genSnapshot.additionalArgs, <String>[
'--url_mapping=dart:ui,${fs.path.join(skyEnginePath, 'lib', 'ui', 'ui.dart')}', '--deterministic',
'--url_mapping=dart:vmservice_io,${fs.path.join(skyEnginePath, 'sdk_ext', 'vmservice_io.dart')}',
'--reify-generic-functions',
'--strong',
'--sync-async',
'--snapshot_kind=app-aot-assembly', '--snapshot_kind=app-aot-assembly',
'--assembly=${fs.path.join(outputPath, 'snapshot_assembly.S')}', '--assembly=${fs.path.join(outputPath, 'snapshot_assembly.S')}',
'main.dill', 'main.dill',
...@@ -473,11 +449,7 @@ void main() { ...@@ -473,11 +449,7 @@ void main() {
expect(genSnapshot.snapshotType.mode, BuildMode.release); expect(genSnapshot.snapshotType.mode, BuildMode.release);
expect(genSnapshot.packagesPath, '.packages'); expect(genSnapshot.packagesPath, '.packages');
expect(genSnapshot.additionalArgs, <String>[ expect(genSnapshot.additionalArgs, <String>[
'--url_mapping=dart:ui,${fs.path.join(skyEnginePath, 'lib', 'ui', 'ui.dart')}', '--deterministic',
'--url_mapping=dart:vmservice_io,${fs.path.join(skyEnginePath, 'sdk_ext', 'vmservice_io.dart')}',
'--reify-generic-functions',
'--strong',
'--sync-async',
'--snapshot_kind=app-aot-blobs', '--snapshot_kind=app-aot-blobs',
'--vm_snapshot_data=build/foo/vm_snapshot_data', '--vm_snapshot_data=build/foo/vm_snapshot_data',
'--isolate_snapshot_data=build/foo/isolate_snapshot_data', '--isolate_snapshot_data=build/foo/isolate_snapshot_data',
...@@ -521,11 +493,7 @@ void main() { ...@@ -521,11 +493,7 @@ void main() {
expect(genSnapshot.snapshotType.mode, BuildMode.release); expect(genSnapshot.snapshotType.mode, BuildMode.release);
expect(genSnapshot.packagesPath, '.packages'); expect(genSnapshot.packagesPath, '.packages');
expect(genSnapshot.additionalArgs, <String>[ expect(genSnapshot.additionalArgs, <String>[
'--url_mapping=dart:ui,${fs.path.join(skyEnginePath, 'lib', 'ui', 'ui.dart')}', '--deterministic',
'--url_mapping=dart:vmservice_io,${fs.path.join(skyEnginePath, 'sdk_ext', 'vmservice_io.dart')}',
'--reify-generic-functions',
'--strong',
'--sync-async',
'--snapshot_kind=app-aot-blobs', '--snapshot_kind=app-aot-blobs',
'--vm_snapshot_data=build/foo/vm_snapshot_data', '--vm_snapshot_data=build/foo/vm_snapshot_data',
'--isolate_snapshot_data=build/foo/isolate_snapshot_data', '--isolate_snapshot_data=build/foo/isolate_snapshot_data',
...@@ -609,9 +577,7 @@ void main() { ...@@ -609,9 +577,7 @@ void main() {
expect(genSnapshot.snapshotType.mode, BuildMode.debug); expect(genSnapshot.snapshotType.mode, BuildMode.debug);
expect(genSnapshot.packagesPath, '.packages'); expect(genSnapshot.packagesPath, '.packages');
expect(genSnapshot.additionalArgs, <String>[ expect(genSnapshot.additionalArgs, <String>[
'--reify-generic-functions', '--deterministic',
'--strong',
'--sync-async',
'--enable_asserts', '--enable_asserts',
'--snapshot_kind=app-jit', '--snapshot_kind=app-jit',
'--load_compilation_trace=$kTrace', '--load_compilation_trace=$kTrace',
...@@ -652,9 +618,7 @@ void main() { ...@@ -652,9 +618,7 @@ void main() {
expect(genSnapshot.snapshotType.mode, BuildMode.debug); expect(genSnapshot.snapshotType.mode, BuildMode.debug);
expect(genSnapshot.packagesPath, '.packages'); expect(genSnapshot.packagesPath, '.packages');
expect(genSnapshot.additionalArgs, <String>[ expect(genSnapshot.additionalArgs, <String>[
'--reify-generic-functions', '--deterministic',
'--strong',
'--sync-async',
'--enable_asserts', '--enable_asserts',
'--snapshot_kind=app-jit', '--snapshot_kind=app-jit',
'--load_compilation_trace=$kTrace', '--load_compilation_trace=$kTrace',
...@@ -706,9 +670,7 @@ void main() { ...@@ -706,9 +670,7 @@ void main() {
expect(genSnapshot.snapshotType.mode, BuildMode.profile); expect(genSnapshot.snapshotType.mode, BuildMode.profile);
expect(genSnapshot.packagesPath, '.packages'); expect(genSnapshot.packagesPath, '.packages');
expect(genSnapshot.additionalArgs, <String>[ expect(genSnapshot.additionalArgs, <String>[
'--reify-generic-functions', '--deterministic',
'--strong',
'--sync-async',
'--snapshot_kind=app-jit', '--snapshot_kind=app-jit',
'--load_compilation_trace=$kTrace', '--load_compilation_trace=$kTrace',
'--load_vm_snapshot_data=$kEngineVmSnapshotData', '--load_vm_snapshot_data=$kEngineVmSnapshotData',
...@@ -748,9 +710,7 @@ void main() { ...@@ -748,9 +710,7 @@ void main() {
expect(genSnapshot.snapshotType.mode, BuildMode.profile); expect(genSnapshot.snapshotType.mode, BuildMode.profile);
expect(genSnapshot.packagesPath, '.packages'); expect(genSnapshot.packagesPath, '.packages');
expect(genSnapshot.additionalArgs, <String>[ expect(genSnapshot.additionalArgs, <String>[
'--reify-generic-functions', '--deterministic',
'--strong',
'--sync-async',
'--snapshot_kind=app-jit', '--snapshot_kind=app-jit',
'--load_compilation_trace=$kTrace', '--load_compilation_trace=$kTrace',
'--load_vm_snapshot_data=$kEngineVmSnapshotData', '--load_vm_snapshot_data=$kEngineVmSnapshotData',
...@@ -801,9 +761,7 @@ void main() { ...@@ -801,9 +761,7 @@ void main() {
expect(genSnapshot.snapshotType.mode, BuildMode.release); expect(genSnapshot.snapshotType.mode, BuildMode.release);
expect(genSnapshot.packagesPath, '.packages'); expect(genSnapshot.packagesPath, '.packages');
expect(genSnapshot.additionalArgs, <String>[ expect(genSnapshot.additionalArgs, <String>[
'--reify-generic-functions', '--deterministic',
'--strong',
'--sync-async',
'--snapshot_kind=app-jit', '--snapshot_kind=app-jit',
'--load_compilation_trace=$kTrace', '--load_compilation_trace=$kTrace',
'--load_vm_snapshot_data=$kEngineVmSnapshotData', '--load_vm_snapshot_data=$kEngineVmSnapshotData',
...@@ -843,9 +801,7 @@ void main() { ...@@ -843,9 +801,7 @@ void main() {
expect(genSnapshot.snapshotType.mode, BuildMode.release); expect(genSnapshot.snapshotType.mode, BuildMode.release);
expect(genSnapshot.packagesPath, '.packages'); expect(genSnapshot.packagesPath, '.packages');
expect(genSnapshot.additionalArgs, <String>[ expect(genSnapshot.additionalArgs, <String>[
'--reify-generic-functions', '--deterministic',
'--strong',
'--sync-async',
'--snapshot_kind=app-jit', '--snapshot_kind=app-jit',
'--load_compilation_trace=$kTrace', '--load_compilation_trace=$kTrace',
'--load_vm_snapshot_data=$kEngineVmSnapshotData', '--load_vm_snapshot_data=$kEngineVmSnapshotData',
...@@ -884,9 +840,7 @@ void main() { ...@@ -884,9 +840,7 @@ void main() {
expect(genSnapshot.snapshotType.mode, BuildMode.release); expect(genSnapshot.snapshotType.mode, BuildMode.release);
expect(genSnapshot.packagesPath, '.packages'); expect(genSnapshot.packagesPath, '.packages');
expect(genSnapshot.additionalArgs, <String>[ expect(genSnapshot.additionalArgs, <String>[
'--reify-generic-functions', '--deterministic',
'--strong',
'--sync-async',
'--snapshot_kind=app-jit', '--snapshot_kind=app-jit',
'--load_compilation_trace=$kTrace', '--load_compilation_trace=$kTrace',
'--load_vm_snapshot_data=$kEngineVmSnapshotData', '--load_vm_snapshot_data=$kEngineVmSnapshotData',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab