@@ -433,14 +433,20 @@ class WildcardList:
433
433
available, so we just return a wildcard list and assume the caller knows
434
434
what they want to run"""
435
435
436
+ def __init__ (self , benchmarks = None ):
437
+ self .benchmarks = benchmarks
438
+
436
439
def __contains__ (self , x ):
437
440
return True
438
441
439
442
def __iter__ (self ):
440
- mx .abort (
441
- "Cannot iterate over benchmark names in foreign benchmark suites. "
442
- + "Leave off the benchmark name part to run all, or name the benchmarks yourself."
443
- )
443
+ if not benchmarks :
444
+ mx .abort (
445
+ "Cannot iterate over benchmark names in foreign benchmark suites. "
446
+ + "Leave off the benchmark name part to run all, or name the benchmarks yourself."
447
+ )
448
+ else :
449
+ return iter (benchmarks )
444
450
445
451
446
452
class PySuite (mx_benchmark .TemporaryWorkdirMixin , mx_benchmark .VmBenchmarkSuite ):
@@ -472,7 +478,7 @@ def subgroup(self):
472
478
return "graalpython"
473
479
474
480
def benchmarkList (self , bmSuiteArgs ):
475
- return WildcardList ()
481
+ return WildcardList (DEFAULT_PYPERFORMANCE_BENCHMARKS )
476
482
477
483
def rules (self , output , benchmarks , bmSuiteArgs ):
478
484
return [PyPerfJsonRule (output , self .name ())]
@@ -536,7 +542,7 @@ def subgroup(self):
536
542
return "graalpython"
537
543
538
544
def benchmarkList (self , bmSuiteArgs ):
539
- return WildcardList ()
545
+ return WildcardList (DEFAULT_PYPY_BENCHMARKS )
540
546
541
547
def rules (self , output , benchmarks , bmSuiteArgs ):
542
548
return [PyPyJsonRule (output , self .name ())]
@@ -619,7 +625,7 @@ def subgroup(self):
619
625
return "graalpython"
620
626
621
627
def benchmarkList (self , bmSuiteArgs ):
622
- return WildcardList ()
628
+ return WildcardList (DEFAULT_NUMPY_BENCHMARKS )
623
629
624
630
def rules (self , output , benchmarks , bmSuiteArgs ):
625
631
return [AsvJsonRule (output , self .name ())]
0 commit comments