[benchmarks/ffi] Migrate benchmarks to NNBD

Change-Id: I36568f4f4d59c0a337aab82b6ca15d40495cb269
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/152850
Commit-Queue: Daco Harkes <dacoharkes@google.com>
Reviewed-by: Clement Skau <cskau@google.com>
This commit is contained in:
Daco Harkes 2020-06-30 14:44:27 +00:00 committed by commit-bot@chromium.org
parent f0851772e9
commit 585fa217a1
7 changed files with 80 additions and 76 deletions

View file

@ -79,7 +79,7 @@ const String expectedHash =
class DigestCMemory extends BenchmarkBase {
DigestCMemory() : super('FfiBoringssl.DigestCMemory');
Pointer<Data> data; // Data in C memory that we want to digest.
Pointer<Data> data = nullptr; // Data in C memory that we want to digest.
@override
void setup() {
@ -108,7 +108,7 @@ class DigestCMemory extends BenchmarkBase {
class DigestDartMemory extends BenchmarkBase {
DigestDartMemory() : super('FfiBoringssl.DigestDartMemory');
Uint8List data; // Data in C memory that we want to digest.
Uint8List data = Uint8List(0); // Data in C memory that we want to digest.
@override
void setup() {

View file

@ -33,7 +33,7 @@ String _checkRunningMode(String architecture) {
String _architecture() {
final String uname = Process.runSync('uname', ['-m']).stdout.trim();
final String architecture = _unames[uname];
final String? architecture = _unames[uname];
if (architecture == null) {
throw Exception('Unrecognized architecture: "$uname"');
}
@ -42,7 +42,7 @@ String _architecture() {
return _checkRunningMode(architecture);
}
String _platformPath(String name, {String path = ''}) {
String _platformPath(String name, String path) {
if (Platform.isMacOS || Platform.isIOS) {
return '${path}mac/${_architecture()}/lib$name.dylib';
}
@ -55,7 +55,7 @@ String _platformPath(String name, {String path = ''}) {
return '${path}linux/${_architecture()}/lib$name.so';
}
DynamicLibrary dlopenPlatformSpecific(String name, {String path}) {
final String fullPath = _platformPath(name, path: path);
DynamicLibrary dlopenPlatformSpecific(String name, {String path = ''}) {
final String fullPath = _platformPath(name, path);
return DynamicLibrary.open(fullPath);
}

View file

@ -1068,7 +1068,7 @@ class Doublex20 extends BenchmarkBase {
class PointerUint8x01 extends BenchmarkBase {
PointerUint8x01() : super('FfiCall.PointerUint8x01');
Pointer<Uint8> pointer;
Pointer<Uint8> pointer = nullptr;
@override
void setup() => pointer = allocate(count: N + 1);
@override
@ -1086,7 +1086,8 @@ class PointerUint8x01 extends BenchmarkBase {
class PointerUint8x02 extends BenchmarkBase {
PointerUint8x02() : super('FfiCall.PointerUint8x02');
Pointer<Uint8> pointer, pointer2;
Pointer<Uint8> pointer = nullptr;
Pointer<Uint8> pointer2 = nullptr;
@override
void setup() {
@ -1111,7 +1112,10 @@ class PointerUint8x02 extends BenchmarkBase {
class PointerUint8x04 extends BenchmarkBase {
PointerUint8x04() : super('FfiCall.PointerUint8x04');
Pointer<Uint8> pointer, pointer2, pointer3, pointer4;
Pointer<Uint8> pointer = nullptr;
Pointer<Uint8> pointer2 = nullptr;
Pointer<Uint8> pointer3 = nullptr;
Pointer<Uint8> pointer4 = nullptr;
@override
void setup() {
@ -1139,16 +1143,16 @@ class PointerUint8x04 extends BenchmarkBase {
class PointerUint8x10 extends BenchmarkBase {
PointerUint8x10() : super('FfiCall.PointerUint8x10');
Pointer<Uint8> pointer,
pointer2,
pointer3,
pointer4,
pointer5,
pointer6,
pointer7,
pointer8,
pointer9,
pointer10;
Pointer<Uint8> pointer = nullptr;
Pointer<Uint8> pointer2 = nullptr;
Pointer<Uint8> pointer3 = nullptr;
Pointer<Uint8> pointer4 = nullptr;
Pointer<Uint8> pointer5 = nullptr;
Pointer<Uint8> pointer6 = nullptr;
Pointer<Uint8> pointer7 = nullptr;
Pointer<Uint8> pointer8 = nullptr;
Pointer<Uint8> pointer9 = nullptr;
Pointer<Uint8> pointer10 = nullptr;
@override
void setup() {
@ -1192,26 +1196,26 @@ class PointerUint8x10 extends BenchmarkBase {
class PointerUint8x20 extends BenchmarkBase {
PointerUint8x20() : super('FfiCall.PointerUint8x20');
Pointer<Uint8> pointer,
pointer2,
pointer3,
pointer4,
pointer5,
pointer6,
pointer7,
pointer8,
pointer9,
pointer10,
pointer11,
pointer12,
pointer13,
pointer14,
pointer15,
pointer16,
pointer17,
pointer18,
pointer19,
pointer20;
Pointer<Uint8> pointer = nullptr;
Pointer<Uint8> pointer2 = nullptr;
Pointer<Uint8> pointer3 = nullptr;
Pointer<Uint8> pointer4 = nullptr;
Pointer<Uint8> pointer5 = nullptr;
Pointer<Uint8> pointer6 = nullptr;
Pointer<Uint8> pointer7 = nullptr;
Pointer<Uint8> pointer8 = nullptr;
Pointer<Uint8> pointer9 = nullptr;
Pointer<Uint8> pointer10 = nullptr;
Pointer<Uint8> pointer11 = nullptr;
Pointer<Uint8> pointer12 = nullptr;
Pointer<Uint8> pointer13 = nullptr;
Pointer<Uint8> pointer14 = nullptr;
Pointer<Uint8> pointer15 = nullptr;
Pointer<Uint8> pointer16 = nullptr;
Pointer<Uint8> pointer17 = nullptr;
Pointer<Uint8> pointer18 = nullptr;
Pointer<Uint8> pointer19 = nullptr;
Pointer<Uint8> pointer20 = nullptr;
@override
void setup() {

View file

@ -33,7 +33,7 @@ String _checkRunningMode(String architecture) {
String _architecture() {
final String uname = Process.runSync('uname', ['-m']).stdout.trim();
final String architecture = _unames[uname];
final String? architecture = _unames[uname];
if (architecture == null) {
throw Exception('Unrecognized architecture: "$uname"');
}
@ -42,7 +42,7 @@ String _architecture() {
return _checkRunningMode(architecture);
}
String _platformPath(String name, {String path = ''}) {
String _platformPath(String name, String path) {
if (Platform.isMacOS || Platform.isIOS) {
return '${path}mac/${_architecture()}/lib$name.dylib';
}
@ -55,7 +55,7 @@ String _platformPath(String name, {String path = ''}) {
return '${path}linux/${_architecture()}/lib$name.so';
}
DynamicLibrary dlopenPlatformSpecific(String name, {String path}) {
final String fullPath = _platformPath(name, path: path);
DynamicLibrary dlopenPlatformSpecific(String name, {String path = ''}) {
final String fullPath = _platformPath(name, path);
return DynamicLibrary.open(fullPath);
}

View file

@ -206,7 +206,7 @@ int doLoadInt64Mint(Pointer<Int64> pointer, int length) {
const N = 1000;
class PointerInt8 extends BenchmarkBase {
Pointer<Int8> pointer;
Pointer<Int8> pointer = nullptr;
PointerInt8() : super('FfiMemory.PointerInt8');
@override
@ -225,7 +225,7 @@ class PointerInt8 extends BenchmarkBase {
}
class PointerUint8 extends BenchmarkBase {
Pointer<Uint8> pointer;
Pointer<Uint8> pointer = nullptr;
PointerUint8() : super('FfiMemory.PointerUint8');
@override
@ -244,7 +244,7 @@ class PointerUint8 extends BenchmarkBase {
}
class PointerInt16 extends BenchmarkBase {
Pointer<Int16> pointer;
Pointer<Int16> pointer = nullptr;
PointerInt16() : super('FfiMemory.PointerInt16');
@override
@ -263,7 +263,7 @@ class PointerInt16 extends BenchmarkBase {
}
class PointerUint16 extends BenchmarkBase {
Pointer<Uint16> pointer;
Pointer<Uint16> pointer = nullptr;
PointerUint16() : super('FfiMemory.PointerUint16');
@override
@ -282,7 +282,7 @@ class PointerUint16 extends BenchmarkBase {
}
class PointerInt32 extends BenchmarkBase {
Pointer<Int32> pointer;
Pointer<Int32> pointer = nullptr;
PointerInt32() : super('FfiMemory.PointerInt32');
@override
@ -301,7 +301,7 @@ class PointerInt32 extends BenchmarkBase {
}
class PointerUint32 extends BenchmarkBase {
Pointer<Uint32> pointer;
Pointer<Uint32> pointer = nullptr;
PointerUint32() : super('FfiMemory.PointerUint32');
@override
@ -320,7 +320,7 @@ class PointerUint32 extends BenchmarkBase {
}
class PointerInt64 extends BenchmarkBase {
Pointer<Int64> pointer;
Pointer<Int64> pointer = nullptr;
PointerInt64() : super('FfiMemory.PointerInt64');
@override
@ -339,7 +339,7 @@ class PointerInt64 extends BenchmarkBase {
}
class PointerUint64 extends BenchmarkBase {
Pointer<Uint64> pointer;
Pointer<Uint64> pointer = nullptr;
PointerUint64() : super('FfiMemory.PointerUint64');
@override
@ -358,7 +358,7 @@ class PointerUint64 extends BenchmarkBase {
}
class PointerFloat extends BenchmarkBase {
Pointer<Float> pointer;
Pointer<Float> pointer = nullptr;
PointerFloat() : super('FfiMemory.PointerFloat');
@override
@ -377,7 +377,7 @@ class PointerFloat extends BenchmarkBase {
}
class PointerDouble extends BenchmarkBase {
Pointer<Double> pointer;
Pointer<Double> pointer = nullptr;
PointerDouble() : super('FfiMemory.PointerDouble');
@override
@ -396,8 +396,8 @@ class PointerDouble extends BenchmarkBase {
}
class PointerPointer extends BenchmarkBase {
Pointer<Pointer<Int8>> pointer;
Pointer<Int8> data;
Pointer<Pointer<Int8>> pointer = nullptr;
Pointer<Int8> data = nullptr;
PointerPointer() : super('FfiMemory.PointerPointer');
@override
@ -423,7 +423,7 @@ class PointerPointer extends BenchmarkBase {
}
class PointerInt64Mint extends BenchmarkBase {
Pointer<Int64> pointer;
Pointer<Int64> pointer = nullptr;
PointerInt64Mint() : super('FfiMemory.PointerInt64Mint');
@override

View file

@ -46,7 +46,7 @@ int doLoadInt32(Pointer<VeryLargeStruct> pointer, int length) {
const N = 1000;
class FieldLoadStore extends BenchmarkBase {
Pointer<VeryLargeStruct> pointer;
Pointer<VeryLargeStruct> pointer = nullptr;
FieldLoadStore() : super('FfiStruct.FieldLoadStore');
@override
@ -82,45 +82,45 @@ void main() {
//
class VeryLargeStruct extends Struct {
@Int8()
int a;
external int a;
@Int16()
int b;
external int b;
@Int32()
int c;
external int c;
@Int64()
int d;
external int d;
@Uint8()
int e;
external int e;
@Uint16()
int f;
external int f;
@Uint32()
int g;
external int g;
@Uint64()
int h;
external int h;
@IntPtr()
int i;
external int i;
@Double()
double j;
external double j;
@Float()
double k;
external double k;
Pointer<VeryLargeStruct> parent;
external Pointer<VeryLargeStruct> parent;
@IntPtr()
int numChildren;
external int numChildren;
Pointer<VeryLargeStruct> children;
external Pointer<VeryLargeStruct> children;
@Int8()
int smallLastField;
external int smallLastField;
}

View file

@ -189,13 +189,13 @@ EOF
out/ReleaseIA32/dart --profile-period=10000 --packages=.packages benchmarks/Example/dart2/Example.dart
out/ReleaseIA32/dart --null-safety --enable-experiment=non-nullable --profile-period=10000 --packages=.packages benchmarks/Example/dart/Example.dart
out/ReleaseIA32/dart benchmarks/FfiBoringssl/dart2/FfiBoringssl.dart
#out/ReleaseIA32/dart --null-safety --enable-experiment=non-nullable benchmarks/FfiBoringssl/dart/FfiBoringssl.dart
out/ReleaseIA32/dart --null-safety --enable-experiment=non-nullable benchmarks/FfiBoringssl/dart/FfiBoringssl.dart
out/ReleaseIA32/dart benchmarks/FfiCall/dart2/FfiCall.dart
#out/ReleaseIA32/dart --null-safety --enable-experiment=non-nullable benchmarks/FfiCall/dart/FfiCall.dart
out/ReleaseIA32/dart --null-safety --enable-experiment=non-nullable benchmarks/FfiCall/dart/FfiCall.dart
out/ReleaseIA32/dart benchmarks/FfiMemory/dart2/FfiMemory.dart
#out/ReleaseIA32/dart --null-safety --enable-experiment=non-nullable benchmarks/FfiMemory/dart/FfiMemory.dart
out/ReleaseIA32/dart --null-safety --enable-experiment=non-nullable benchmarks/FfiMemory/dart/FfiMemory.dart
out/ReleaseIA32/dart benchmarks/FfiStruct/dart2/FfiStruct.dart
#out/ReleaseIA32/dart --null-safety --enable-experiment=non-nullable benchmarks/FfiStruct/dart/FfiStruct.dart
out/ReleaseIA32/dart --null-safety --enable-experiment=non-nullable benchmarks/FfiStruct/dart/FfiStruct.dart
cd ..
rm -rf tmp
elif [ "$command" = linux-x64-build ]; then