commit 0ce27ae413f867ad5b41b7956611499491b41c06
author adonovan <adonovan@google.com> Wed Nov 18 19:15:55 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Nov 18 19:17:05 2020 -0800
tree 3707ef5fcc9d78bc798127275df3d125dd4586ba
parent 2860f31386c97bf75495320fb1107e54a5c5ddc2

starlark benchmark: allow filtering on filename and function

PiperOrigin-RevId: 343204476

src/test/java/net/starlark/java/eval/Benchmarks.java

diff --git a/src/test/java/net/starlark/java/eval/Benchmarks.java b/src/test/java/net/starlark/java/eval/Benchmarks.java
index 3b130e7..f705278 100644
--- a/src/test/java/net/starlark/java/eval/Benchmarks.java
+++ b/src/test/java/net/starlark/java/eval/Benchmarks.java
@@ -63,7 +63,10 @@
   private static final String HELP =
       "Usage: Benchmarks [--help] [--filter regex] [--seconds float]\n"
           + "Runs Starlark benchmarks matching the filter for the specified (approximate) time,\n"
-          + "and reports various performance measures.";
+          + "and reports various performance measures.\n"
+          + "The optional filter is a regular expression applied to the string FILE:FUNC,\n"
+          + "where FILE is the base name of the file and FUNC is the name of the function,\n"
+          + "for example 'bench_int.star:bench_add32'.\n";
 
   private static boolean ok = true;
 
@@ -120,7 +123,8 @@
     }
     File testdata = new File(src, "test/java/net/starlark/java/eval/testdata");
     for (File file : testdata.listFiles()) {
-      if (!(file.getName().startsWith("bench_") && file.getName().endsWith(".star"))) {
+      String basename = file.getName();
+      if (!(basename.startsWith("bench_") && basename.endsWith(".star"))) {
         continue;
       }
 
@@ -159,8 +163,9 @@
       TreeMap<String, StarlarkFunction> benchmarks = new TreeMap<>();
       for (Map.Entry<String, Object> e : module.getExportedGlobals().entrySet()) {
         if (e.getKey().startsWith("bench_") && e.getValue() instanceof StarlarkFunction) {
-          if (filter == null || filter.matcher(e.getKey()).find()) {
-            benchmarks.put(e.getKey(), (StarlarkFunction) e.getValue());
+          String name = e.getKey();
+          if (filter == null || filter.matcher(basename + ":" + name).find()) {
+            benchmarks.put(name, (StarlarkFunction) e.getValue());
           }
         }
       }

src/test/java/net/starlark/java/eval/testdata/bench_sorted.star

diff --git a/src/test/java/net/starlark/java/eval/testdata/bench_sorted.star b/src/test/java/net/starlark/java/eval/testdata/bench_sorted.star
index 2c55735..35de675 100644
--- a/src/test/java/net/starlark/java/eval/testdata/bench_sorted.star
+++ b/src/test/java/net/starlark/java/eval/testdata/bench_sorted.star
@@ -12,10 +12,10 @@
         copy = orig[:]  # TODO(adonovan): move allocation outside loop
         sorted(copy)
 
-def bench_sort_large(b):
+def bench_large(b):
     "Sort an array of a million ints."
     _bench_sort(b, 1000000)
 
-def bench_sort_small(b):
+def bench_small(b):
     "Sort an array of ten ints."
     _bench_sort(b, 10)