Fix incorrect benchmark dependency directory.
Also add names to dependencies for readability of the generated dart
configuration.
Change-Id: Iba6c7d37fc457c69e707791de19dd4b3de154bf6
diff --git a/src/test/java/com/android/tools/r8/benchmarks/BenchmarkCollectionPrinter.java b/src/test/java/com/android/tools/r8/benchmarks/BenchmarkCollectionPrinter.java
index ec5cd6b..6111c7e 100644
--- a/src/test/java/com/android/tools/r8/benchmarks/BenchmarkCollectionPrinter.java
+++ b/src/test/java/com/android/tools/r8/benchmarks/BenchmarkCollectionPrinter.java
@@ -141,7 +141,7 @@
for (BenchmarkDependency dependency : benchmark.getDependencies()) {
scopeBraces(
() -> {
- addGolemResource("dependency", dependency.getTarball());
+ addGolemResource(dependency.getName(), dependency.getTarball());
printSemi("options.resources.add(dependency)");
});
}
diff --git a/src/test/java/com/android/tools/r8/benchmarks/BenchmarkConfig.java b/src/test/java/com/android/tools/r8/benchmarks/BenchmarkConfig.java
index 6daaa7a..596fc05 100644
--- a/src/test/java/com/android/tools/r8/benchmarks/BenchmarkConfig.java
+++ b/src/test/java/com/android/tools/r8/benchmarks/BenchmarkConfig.java
@@ -172,6 +172,10 @@
return id.getName();
}
+ public String getDependencyDirectoryName() {
+ return getName();
+ }
+
public BenchmarkTarget getTarget() {
return id.getTarget();
}
diff --git a/src/test/java/com/android/tools/r8/benchmarks/BenchmarkDependency.java b/src/test/java/com/android/tools/r8/benchmarks/BenchmarkDependency.java
index f59ebb6..9e18997 100644
--- a/src/test/java/com/android/tools/r8/benchmarks/BenchmarkDependency.java
+++ b/src/test/java/com/android/tools/r8/benchmarks/BenchmarkDependency.java
@@ -9,13 +9,18 @@
public class BenchmarkDependency {
public static BenchmarkDependency getRuntimeJarJava8() {
- return new BenchmarkDependency("openjdk-rt-1.8", Paths.get("third_party", "openjdk"));
+ return new BenchmarkDependency(
+ "java8rtjar", "openjdk-rt-1.8", Paths.get("third_party", "openjdk"));
}
public static BenchmarkDependency getAndroidJar30() {
- return new BenchmarkDependency("lib-v30", Paths.get("third_party", "android_jar"));
+ return new BenchmarkDependency(
+ "android30jar", "lib-v30", Paths.get("third_party", "android_jar"));
}
+ // Nice name of the dependency. Must be a valid dart identifier.
+ private final String name;
+
// Directory name of the dependency.
private final String directoryName;
@@ -24,11 +29,16 @@
// See `getRoot` to obtain the actual dependency root.
private final Path location;
- public BenchmarkDependency(String directoryName, Path location) {
+ public BenchmarkDependency(String name, String directoryName, Path location) {
+ this.name = name;
this.directoryName = directoryName;
this.location = location;
}
+ public String getName() {
+ return name;
+ }
+
public Path getTarball() {
return location.resolve(directoryName + ".tar.gz");
}
diff --git a/src/test/java/com/android/tools/r8/benchmarks/BenchmarkEnvironment.java b/src/test/java/com/android/tools/r8/benchmarks/BenchmarkEnvironment.java
index aeed6f3..f558932 100644
--- a/src/test/java/com/android/tools/r8/benchmarks/BenchmarkEnvironment.java
+++ b/src/test/java/com/android/tools/r8/benchmarks/BenchmarkEnvironment.java
@@ -29,7 +29,7 @@
public Path translateDependencyPath(String directoryName, Path location) {
return isGolem
- ? Paths.get("benchmarks", config.getName() + "Group", directoryName)
+ ? Paths.get("benchmarks", config.getDependencyDirectoryName(), directoryName)
: location.resolve(directoryName);
}
}
diff --git a/src/test/java/com/android/tools/r8/benchmarks/appdumps/AppDumpBenchmarkBuilder.java b/src/test/java/com/android/tools/r8/benchmarks/appdumps/AppDumpBenchmarkBuilder.java
index cf875f8..b2a6fe0 100644
--- a/src/test/java/com/android/tools/r8/benchmarks/appdumps/AppDumpBenchmarkBuilder.java
+++ b/src/test/java/com/android/tools/r8/benchmarks/appdumps/AppDumpBenchmarkBuilder.java
@@ -48,7 +48,9 @@
public AppDumpBenchmarkBuilder setDumpDependencyPath(Path dumpDependencyPath) {
return setDumpDependency(
new BenchmarkDependency(
- dumpDependencyPath.getFileName().toString(), dumpDependencyPath.getParent()));
+ "appdump",
+ dumpDependencyPath.getFileName().toString(),
+ dumpDependencyPath.getParent()));
}
public AppDumpBenchmarkBuilder setDumpDependency(BenchmarkDependency dependency) {
diff --git a/src/test/java/com/android/tools/r8/benchmarks/desugaredlib/LegacyDesugaredLibraryBenchmark.java b/src/test/java/com/android/tools/r8/benchmarks/desugaredlib/LegacyDesugaredLibraryBenchmark.java
index e6d1d00..a047c5a 100644
--- a/src/test/java/com/android/tools/r8/benchmarks/desugaredlib/LegacyDesugaredLibraryBenchmark.java
+++ b/src/test/java/com/android/tools/r8/benchmarks/desugaredlib/LegacyDesugaredLibraryBenchmark.java
@@ -25,7 +25,8 @@
private static final BenchmarkDependency androidJar = BenchmarkDependency.getAndroidJar30();
private static final BenchmarkDependency legacyConf =
- new BenchmarkDependency("desugar_jdk_libs_legacy", Paths.get("third_party", "openjdk"));
+ new BenchmarkDependency(
+ "legacyConf", "desugar_jdk_libs_legacy", Paths.get("third_party", "openjdk"));
public LegacyDesugaredLibraryBenchmark(BenchmarkConfig config, TestParameters parameters) {
super(config, parameters);
