From 235ff47a079793c7ac1443b464bafabadb941e04 Mon Sep 17 00:00:00 2001 From: Stephen Adams Date: Fri, 23 Apr 2021 20:11:52 +0000 Subject: [PATCH] [benchmarks] Fix lints in Omnibus benchmarks Change-Id: I08dd527bcfd3b4ed97d0c57a877c64ff0ec49ade Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/196460 Reviewed-by: Stephen Adams Commit-Queue: Stephen Adams --- benchmarks/Omnibus/dart/Omnibus.dart | 10 +++--- benchmarks/Omnibus/dart2/Omnibus.dart | 30 ++++++++-------- .../OmnibusDeferred/dart/OmnibusDeferred.dart | 16 +++++---- .../dart2/OmnibusDeferred.dart | 36 ++++++++++--------- 4 files changed, 52 insertions(+), 40 deletions(-) diff --git a/benchmarks/Omnibus/dart/Omnibus.dart b/benchmarks/Omnibus/dart/Omnibus.dart index a59342a5821..9965376d844 100644 --- a/benchmarks/Omnibus/dart/Omnibus.dart +++ b/benchmarks/Omnibus/dart/Omnibus.dart @@ -9,9 +9,11 @@ // // -N: run benchmarks N times, defaults to once. -import '../../ListCopy/dart/ListCopy.dart' as lib_ListCopy; +// ignore_for_file: library_prefixes + import '../../BigIntParsePrint/dart/BigIntParsePrint.dart' as lib_BigIntParsePrint; +import '../../ListCopy/dart/ListCopy.dart' as lib_ListCopy; import '../../MD5/dart/md5.dart' as lib_MD5; import '../../RuntimeType/dart/RuntimeType.dart' as lib_RuntimeType; import '../../SHA1/dart/sha1.dart' as lib_SHA1; @@ -39,13 +41,13 @@ final Map benchmarks = { 'Utf8Encode': () => lib_Utf8Encode.main([]), }; -main(List originalArguments) { - List args = List.of(originalArguments); +void main(List originalArguments) { + final List args = List.of(originalArguments); int repeats = 1; for (final arg in args.toList()) { - int? count = int.tryParse(arg); + final int? count = int.tryParse(arg); if (count != null && count < 0) { repeats = 0 - count; args.remove(arg); diff --git a/benchmarks/Omnibus/dart2/Omnibus.dart b/benchmarks/Omnibus/dart2/Omnibus.dart index 72587cd95c7..3224fd2000e 100644 --- a/benchmarks/Omnibus/dart2/Omnibus.dart +++ b/benchmarks/Omnibus/dart2/Omnibus.dart @@ -11,21 +11,23 @@ // // -N: run benchmarks N times, defaults to once. -import '../../ListCopy/dart/ListCopy.dart' as lib_ListCopy; -import '../../BigIntParsePrint/dart/BigIntParsePrint.dart' +// ignore_for_file: library_prefixes + +import '../../BigIntParsePrint/dart2/BigIntParsePrint.dart' as lib_BigIntParsePrint; -import '../../MD5/dart/md5.dart' as lib_MD5; -import '../../RuntimeType/dart/RuntimeType.dart' as lib_RuntimeType; -import '../../SHA1/dart/sha1.dart' as lib_SHA1; -import '../../SHA256/dart/sha256.dart' as lib_SHA256; -import '../../SkeletalAnimation/dart/SkeletalAnimation.dart' +import '../../ListCopy/dart2/ListCopy.dart' as lib_ListCopy; +import '../../MD5/dart2/md5.dart' as lib_MD5; +import '../../RuntimeType/dart2/RuntimeType.dart' as lib_RuntimeType; +import '../../SHA1/dart2/sha1.dart' as lib_SHA1; +import '../../SHA256/dart2/sha256.dart' as lib_SHA256; +import '../../SkeletalAnimation/dart2/SkeletalAnimation.dart' as lib_SkeletalAnimation; -import '../../SkeletalAnimationSIMD/dart/SkeletalAnimationSIMD.dart' +import '../../SkeletalAnimationSIMD/dart2/SkeletalAnimationSIMD.dart' as lib_SkeletalAnimationSIMD; -import '../../TypedDataDuplicate/dart/TypedDataDuplicate.dart' +import '../../TypedDataDuplicate/dart2/TypedDataDuplicate.dart' as lib_TypedDataDuplicate; -import '../../Utf8Decode/dart/Utf8Decode.dart' as lib_Utf8Decode; -import '../../Utf8Encode/dart/Utf8Encode.dart' as lib_Utf8Encode; +import '../../Utf8Decode/dart2/Utf8Decode.dart' as lib_Utf8Decode; +import '../../Utf8Encode/dart2/Utf8Encode.dart' as lib_Utf8Encode; final Map benchmarks = { 'ListCopy': lib_ListCopy.main, @@ -41,13 +43,13 @@ final Map benchmarks = { 'Utf8Encode': () => lib_Utf8Encode.main([]), }; -main(List originalArguments) { - List args = List.of(originalArguments); +void main(List originalArguments) { + final List args = List.of(originalArguments); int repeats = 1; for (final arg in args.toList()) { - int count = int.tryParse(arg); + final int count = int.tryParse(arg); if (count != null && count < 0) { repeats = 0 - count; args.remove(arg); diff --git a/benchmarks/OmnibusDeferred/dart/OmnibusDeferred.dart b/benchmarks/OmnibusDeferred/dart/OmnibusDeferred.dart index e31cfb60396..3dc12f548a6 100644 --- a/benchmarks/OmnibusDeferred/dart/OmnibusDeferred.dart +++ b/benchmarks/OmnibusDeferred/dart/OmnibusDeferred.dart @@ -9,9 +9,11 @@ // // -N: run benchmarks N times, defaults to once. -import '../../ListCopy/dart/ListCopy.dart' deferred as lib_ListCopy; +// ignore_for_file: library_prefixes + import '../../BigIntParsePrint/dart/BigIntParsePrint.dart' deferred as lib_BigIntParsePrint; +import '../../ListCopy/dart/ListCopy.dart' deferred as lib_ListCopy; import '../../MD5/dart/md5.dart' deferred as lib_MD5; import '../../RuntimeType/dart/RuntimeType.dart' deferred as lib_RuntimeType; import '../../SHA1/dart/sha1.dart' deferred as lib_SHA1; @@ -78,20 +80,20 @@ final Map benchmarks = { ), }; -main(List originalArguments) async { - List args = List.of(originalArguments); +void main(List originalArguments) async { + final List args = List.of(originalArguments); int repeats = 1; for (final arg in args.toList()) { - int? count = int.tryParse(arg); + final int? count = int.tryParse(arg); if (count != null && count < 0) { repeats = 0 - count; args.remove(arg); } } - bool preload = args.remove('--preload'); + final preload = args.remove('--preload'); List libs = []; @@ -109,7 +111,9 @@ main(List originalArguments) async { if (libs.isEmpty) libs = benchmarks.values.toList(); if (preload) { - for (final lib in libs) await lib.load(); + for (final lib in libs) { + await lib.load(); + } } for (var i = 0; i < repeats; i++) { diff --git a/benchmarks/OmnibusDeferred/dart2/OmnibusDeferred.dart b/benchmarks/OmnibusDeferred/dart2/OmnibusDeferred.dart index 20a28bf3978..9e743ea5956 100644 --- a/benchmarks/OmnibusDeferred/dart2/OmnibusDeferred.dart +++ b/benchmarks/OmnibusDeferred/dart2/OmnibusDeferred.dart @@ -11,21 +11,23 @@ // // -N: run benchmarks N times, defaults to once. -import '../../ListCopy/dart/ListCopy.dart' deferred as lib_ListCopy; -import '../../BigIntParsePrint/dart/BigIntParsePrint.dart' +// ignore_for_file: library_prefixes + +import '../../BigIntParsePrint/dart2/BigIntParsePrint.dart' deferred as lib_BigIntParsePrint; -import '../../MD5/dart/md5.dart' deferred as lib_MD5; -import '../../RuntimeType/dart/RuntimeType.dart' deferred as lib_RuntimeType; -import '../../SHA1/dart/sha1.dart' deferred as lib_SHA1; -import '../../SHA256/dart/sha256.dart' deferred as lib_SHA256; -import '../../SkeletalAnimation/dart/SkeletalAnimation.dart' +import '../../ListCopy/dart2/ListCopy.dart' deferred as lib_ListCopy; +import '../../MD5/dart2/md5.dart' deferred as lib_MD5; +import '../../RuntimeType/dart2/RuntimeType.dart' deferred as lib_RuntimeType; +import '../../SHA1/dart2/sha1.dart' deferred as lib_SHA1; +import '../../SHA256/dart2/sha256.dart' deferred as lib_SHA256; +import '../../SkeletalAnimation/dart2/SkeletalAnimation.dart' deferred as lib_SkeletalAnimation; -import '../../SkeletalAnimationSIMD/dart/SkeletalAnimationSIMD.dart' +import '../../SkeletalAnimationSIMD/dart2/SkeletalAnimationSIMD.dart' deferred as lib_SkeletalAnimationSIMD; -import '../../TypedDataDuplicate/dart/TypedDataDuplicate.dart' +import '../../TypedDataDuplicate/dart2/TypedDataDuplicate.dart' deferred as lib_TypedDataDuplicate; -import '../../Utf8Decode/dart/Utf8Decode.dart' deferred as lib_Utf8Decode; -import '../../Utf8Encode/dart/Utf8Encode.dart' deferred as lib_Utf8Encode; +import '../../Utf8Decode/dart2/Utf8Decode.dart' deferred as lib_Utf8Decode; +import '../../Utf8Encode/dart2/Utf8Encode.dart' deferred as lib_Utf8Encode; class Lib { final Future Function() load; @@ -80,20 +82,20 @@ final Map benchmarks = { ), }; -main(List originalArguments) async { - List args = List.of(originalArguments); +void main(List originalArguments) async { + final List args = List.of(originalArguments); int repeats = 1; for (final arg in args.toList()) { - int count = int.tryParse(arg); + final int count = int.tryParse(arg); if (count != null && count < 0) { repeats = 0 - count; args.remove(arg); } } - bool preload = args.remove('--preload'); + final preload = args.remove('--preload'); List libs = []; @@ -111,7 +113,9 @@ main(List originalArguments) async { if (libs.isEmpty) libs = benchmarks.values.toList(); if (preload) { - for (final lib in libs) await lib.load(); + for (final lib in libs) { + await lib.load(); + } } for (var i = 0; i < repeats; i++) {