changeset 23095:cfb4dae8d566

gate: add check for verifying the jmh-runner setup.
author Josef Eisl <josef.eisl@jku.at>
date Thu, 26 Nov 2015 15:25:09 +0100
parents 28cc1d5e9da2
children 624aa2dc2331
files mx.graal/mx_graal_8.py mx.graal/mx_graal_9.py
diffstat 2 files changed, 28 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mx.graal/mx_graal_8.py	Thu Nov 26 14:45:07 2015 +0100
+++ b/mx.graal/mx_graal_8.py	Thu Nov 26 15:25:09 2015 +0100
@@ -231,6 +231,15 @@
                         out = None
                     run_vm(self.args + _noneAsEmptyList(extraVMarguments) + ['-XX:-TieredCompilation', '-XX:+BootstrapJVMCI', '-version'], out=out)
 
+class MicrobenchRun:
+    def __init__(self, name, args):
+        self.name = name
+        self.args = args
+
+    def run(self, tasks, extraVMarguments=None):
+        with Task(self.name + ': hosted-product ', tasks) as t:
+            if t: microbench(_noneAsEmptyList(extraVMarguments) + ['--'] + self.args)
+
 def compiler_gate_runner(suites, unit_test_runs, bootstrap_tests, tasks, extraVMarguments=None):
 
     # Build server-hosted-jvmci now so we can run the unit tests
@@ -242,6 +251,11 @@
         for r in unit_test_runs:
             r.run(suites, tasks, extraVMarguments)
 
+    # Run microbench on server-hosted-jvmci (only for testing the JMH setup)
+    with VM('server', 'product'):
+        for r in [MicrobenchRun('Microbench', ['TestJMH'])]:
+            r.run(tasks, extraVMarguments)
+
     # Run ctw against rt.jar on server-hosted-jvmci
     with VM('server', 'product'):
         with Task('CTW:hosted-product', tasks) as t:
--- a/mx.graal/mx_graal_9.py	Thu Nov 26 14:45:07 2015 +0100
+++ b/mx.graal/mx_graal_9.py	Thu Nov 26 15:25:09 2015 +0100
@@ -229,6 +229,15 @@
                         out = None
                     run_vm(self.args + _noneAsEmptyList(extraVMarguments) + ['-XX:-TieredCompilation', '-XX:+BootstrapJVMCI', '-version'], out=out)
 
+class MicrobenchRun:
+    def __init__(self, name, args):
+        self.name = name
+        self.args = args
+
+    def run(self, tasks, extraVMarguments=None):
+        with Task(self.name + ': hosted-product ', tasks) as t:
+            if t: microbench(_noneAsEmptyList(extraVMarguments) + ['--'] + self.args)
+
 def compiler_gate_runner(suites, unit_test_runs, bootstrap_tests, tasks, extraVMarguments=None):
 
     # Run unit tests in hosted mode
@@ -236,6 +245,11 @@
         for r in unit_test_runs:
             r.run(suites, tasks, extraVMarguments)
 
+    # Run microbench in hosted mode (only for testing the JMH setup)
+    with JVMCIMode('hosted'):
+        for r in [MicrobenchRun('Microbench', ['TestJMH'])]:
+            r.run(tasks, extraVMarguments)
+
     # Run ctw against rt.jar on server-hosted-jvmci
     with JVMCIMode('hosted'):
         with Task('CTW:hosted', tasks) as t: