[benchmark] Fix oversights from the benchmark fork.
The shared libraries for the FfiBoringssl benchmark had been moved up a
level but unfortunately the same change wasn't made for the FfiCall
benchmark.
The IsolateJson benchmark had a typo in the path and broke.
Change-Id: Iec2fec1d5508022d9cfbfb040d80c74b078a0640
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/150024
Reviewed-by: William Hesse <whesse@google.com>
diff --git a/DEPS b/DEPS
index dd69128..4754e30 100644
--- a/DEPS
+++ b/DEPS
@@ -501,7 +501,7 @@
],
"dep_type": "cipd",
},
- Var("dart_root") + "/benchmarks/FfiCall/dart/native/out/": {
+ Var("dart_root") + "/benchmarks/FfiCall/native/out/": {
"packages": [
{
"package": "dart/benchmarks/fficall",
diff --git a/benchmarks/FfiCall/dart/FfiCall.dart b/benchmarks/FfiCall/dart/FfiCall.dart
index a2857e4..b790a85 100644
--- a/benchmarks/FfiCall/dart/FfiCall.dart
+++ b/benchmarks/FfiCall/dart/FfiCall.dart
@@ -20,7 +20,7 @@
//
DynamicLibrary ffiTestFunctions = dlopenPlatformSpecific("native_functions",
- path: Platform.script.resolve("native/out/").path);
+ path: Platform.script.resolve("../native/out/").path);
typedef NativeFunction1Uint8 = Uint8 Function(Uint8);
typedef Function1int = int Function(int);
diff --git a/benchmarks/FfiCall/dart2/FfiCall.dart b/benchmarks/FfiCall/dart2/FfiCall.dart
index a2857e4..b790a85 100644
--- a/benchmarks/FfiCall/dart2/FfiCall.dart
+++ b/benchmarks/FfiCall/dart2/FfiCall.dart
@@ -20,7 +20,7 @@
//
DynamicLibrary ffiTestFunctions = dlopenPlatformSpecific("native_functions",
- path: Platform.script.resolve("native/out/").path);
+ path: Platform.script.resolve("../native/out/").path);
typedef NativeFunction1Uint8 = Uint8 Function(Uint8);
typedef Function1int = int Function(int);
diff --git a/benchmarks/FfiCall/dart/native/.gitignore b/benchmarks/FfiCall/native/.gitignore
similarity index 100%
rename from benchmarks/FfiCall/dart/native/.gitignore
rename to benchmarks/FfiCall/native/.gitignore
diff --git a/benchmarks/FfiCall/dart/native/Makefile b/benchmarks/FfiCall/native/Makefile
similarity index 100%
rename from benchmarks/FfiCall/dart/native/Makefile
rename to benchmarks/FfiCall/native/Makefile
diff --git a/benchmarks/FfiCall/dart/native/native_functions.c b/benchmarks/FfiCall/native/native_functions.c
similarity index 100%
rename from benchmarks/FfiCall/dart/native/native_functions.c
rename to benchmarks/FfiCall/native/native_functions.c
diff --git a/benchmarks/IsolateJson/dart2/IsolateJson.dart b/benchmarks/IsolateJson/dart2/IsolateJson.dart
index 6d11738..459c133 100644
--- a/benchmarks/IsolateJson/dart2/IsolateJson.dart
+++ b/benchmarks/IsolateJson/dart2/IsolateJson.dart
@@ -115,7 +115,7 @@
Future<void> main() async {
final jsonString =
- File('benchmarks/IsolateJson2/dart/sample.json').readAsStringSync();
+ File('benchmarks/IsolateJson/dart2/sample.json').readAsStringSync();
final json250KB = utf8.encode(jsonString); // 294356 bytes
final decoded = json.decode(utf8.decode(json250KB));
final decoded1MB = <dynamic, dynamic>{
