[GR-20753] Update white box distribution categorization

PullRequest: graal/15965
oracle · Nov 10, 2023 · 01ac2d3 · 01ac2d3
2 parents e9b962c + 6e69c4a
commit 01ac2d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/compiler/mx.compiler/mx_graal_benchmark.py b/compiler/mx.compiler/mx_graal_benchmark.py
@@ -26,7 +26,6 @@
 import re
 import os
 from tempfile import mkstemp
-import itertools
 
 import mx
 import mx_benchmark
@@ -495,8 +494,7 @@ def subgroup(self):
 
     def filter_distribution(self, dist):
         return super(JMHDistGraalCoreBenchmarkSuite, self).filter_distribution(dist) and \
-               not any(JMHDistWhiteboxBenchmarkSuite.whitebox_dependency(dist)) and \
-               not any(dep.name.startswith('com.oracle.truffle.enterprise.dispatch.jmh') for dep in dist.deps)
+               not JMHDistWhiteboxBenchmarkSuite.is_whitebox_dependency(dist)
 
 
 mx_benchmark.add_bm_suite(JMHDistGraalCoreBenchmarkSuite())
@@ -514,16 +512,12 @@ def subgroup(self):
         return "graal-compiler"
 
     @staticmethod
-    def whitebox_dependency(dist):
-        return itertools.chain(
-            (dep.name.startswith('GRAAL') for dep in dist.deps),
-            (dep.name.startswith('jdk.graal.compiler') for dep in dist.archived_deps())
-        )
+    def is_whitebox_dependency(dist):
+        return hasattr(dist, 'graalWhiteboxDistribution') and dist.graalWhiteboxDistribution
 
     def filter_distribution(self, dist):
         return super(JMHDistWhiteboxBenchmarkSuite, self).filter_distribution(dist) and \
-               any(JMHDistWhiteboxBenchmarkSuite.whitebox_dependency(dist)) and \
-               not any(dep.name.startswith('com.oracle.truffle.enterprise.jmh') for dep in dist.deps)
+               JMHDistWhiteboxBenchmarkSuite.is_whitebox_dependency(dist)
 
 
     def extraVmArgs(self):

diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
@@ -559,6 +559,7 @@
       ],
       "testDistribution" : True,
       "maven": False,
+      "graalWhiteboxDistribution": True,
     },
 
     "GRAAL_COMPILER_MICRO_BENCHMARKS" : {