graal-compiler: mx.graal/mx_graal

annotate mx.graal/mx_graal_9.py @ 22887:a9b332b34123

mx: added BootClasspathDist

author	Doug Simon <doug.simon@oracle.com>
date	Sun, 25 Oct 2015 11:55:50 +0100
parents	9fed99d7f32d
children	d74202a599fe

rev	line source
22882 9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	1 #
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	2 # ----------------------------------------------------------------------------------------------------
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	3 #
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	4 # Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	6 #
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	7 # This code is free software; you can redistribute it and/or modify it
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	8 # under the terms of the GNU General Public License version 2 only, as
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	9 # published by the Free Software Foundation.
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	10 #
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	11 # This code is distributed in the hope that it will be useful, but WITHOUT
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	12 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	13 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	14 # version 2 for more details (a copy is included in the LICENSE file that
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	15 # accompanied this code).
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	16 #
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	17 # You should have received a copy of the GNU General Public License version
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	18 # 2 along with this work; if not, write to the Free Software Foundation,
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	19 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	20 #
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	22 # or visit www.oracle.com if you need additional information or have any
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	23 # questions.
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	24 #
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	25 # ----------------------------------------------------------------------------------------------------
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	26
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	27 import os
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	28 from os.path import join
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	29 from argparse import ArgumentParser
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	30 import sanitycheck
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	31 import itertools
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	32 import json
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	33 import re
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	34
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	35 import mx
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	36 from mx_gate import Task
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	37 from sanitycheck import _noneAsEmptyList
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	38
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	39 from mx_unittest import unittest
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	40 import mx_gate
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	41 import mx_unittest
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	42
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	43 _suite = mx.suite('graal')
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	44
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	45 _jdk = mx.get_jdk()
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	46 assert _jdk.javaCompliance >= "1.9"
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	47
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	48 def isJVMCIEnabled(vm):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	49 return True
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	50
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	51 _jvmciModes = {
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	52 'hosted' : ['-XX:+UnlockExperimentalVMOptions', '-XX:+EnableJVMCI'],
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	53 'jit' : ['-XX:+UnlockExperimentalVMOptions', '-XX:+EnableJVMCI', '-XX:+UseJVMCICompiler'],
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	54 'disabled' : []
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	55 }
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	56
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	57 def get_vm():
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	58 """
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	59 Gets the name of the currently selected JVM variant.
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	60 """
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	61 return 'server'
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	62
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	63 class JVMCIMode:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	64 """
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	65 A context manager for setting the current JVMCI mode.
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	66 """
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	67 def __init__(self, jvmciMode=None):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	68 self.update(jvmciMode)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	69
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	70 def update(self, jvmciMode=None):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	71 assert jvmciMode is None or jvmciMode in _jvmciModes, jvmciMode
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	72 self.jvmciMode = jvmciMode or _vm.jvmciMode
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	73
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	74 def __enter__(self):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	75 global _vm
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	76 self.previousVm = _vm
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	77 _vm = self
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	78
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	79 def __exit__(self, exc_type, exc_value, traceback):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	80 global _vm
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	81 _vm = self.previousVm
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	82
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	83 _vm = JVMCIMode(jvmciMode='hosted')
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	84
22887 a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	85 class BootClasspathDist(object):
a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	86 """
a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	87 Extra info for a Distribution that must be put onto the boot class path.
a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	88 """
a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	89 def __init__(self, name):
a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	90 self._name = name
a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	91
a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	92 def dist(self):
a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	93 return mx.distribution(self._name)
a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	94
a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	95 def get_classpath_repr(self):
a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	96 return self.dist().classpath_repr()
a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	97
22882 9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	98 _compilers = ['graal-economy', 'graal']
22887 a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	99 _bootClasspathDists = [
a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	100 BootClasspathDist('GRAAL_NODEINFO'),
a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	101 BootClasspathDist('GRAAL_API'),
a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	102 BootClasspathDist('GRAAL_COMPILER'),
a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	103 BootClasspathDist('GRAAL'),
a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	104 BootClasspathDist('GRAAL_HOTSPOT'),
a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	105 BootClasspathDist('GRAAL_TRUFFLE'),
a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	106 BootClasspathDist('GRAAL_TRUFFLE_HOTSPOT'),
22882 9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	107 ]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	108
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	109 def add_compiler(compilerName):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	110 _compilers.append(compilerName)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	111
22887 a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	112 def add_boot_classpath_dist(dist):
a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	113 _bootClasspathDists.append(dist)
22882 9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	114
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	115 mx_gate.add_jacoco_includes(['com.oracle.graal.*'])
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	116 mx_gate.add_jacoco_excluded_annotations(['@Snippet', '@ClassSubstitution'])
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	117
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	118 def _run_benchmark(args, availableBenchmarks, runBenchmark):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	119
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	120 vmOpts, benchmarksAndOptions = mx.extract_VM_args(args, useDoubleDash=availableBenchmarks is None)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	121
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	122 if availableBenchmarks is None:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	123 harnessArgs = benchmarksAndOptions
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	124 return runBenchmark(None, harnessArgs, vmOpts)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	125
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	126 if len(benchmarksAndOptions) == 0:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	127 mx.abort('at least one benchmark name or "all" must be specified')
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	128 benchmarks = list(itertools.takewhile(lambda x: not x.startswith('-'), benchmarksAndOptions))
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	129 harnessArgs = benchmarksAndOptions[len(benchmarks):]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	130
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	131 if 'all' in benchmarks:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	132 benchmarks = availableBenchmarks
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	133 else:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	134 for bm in benchmarks:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	135 if bm not in availableBenchmarks:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	136 mx.abort('unknown benchmark: ' + bm + '\nselect one of: ' + str(availableBenchmarks))
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	137
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	138 failed = []
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	139 for bm in benchmarks:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	140 if not runBenchmark(bm, harnessArgs, vmOpts):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	141 failed.append(bm)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	142
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	143 if len(failed) != 0:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	144 mx.abort('Benchmark failures: ' + str(failed))
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	145
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	146 def dacapo(args):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	147 """run one or more DaCapo benchmarks"""
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	148
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	149 def launcher(bm, harnessArgs, extraVmOpts):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	150 return sanitycheck.getDacapo(bm, harnessArgs).test(get_vm(), extraVmOpts=extraVmOpts)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	151
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	152 _run_benchmark(args, sanitycheck.dacapoSanityWarmup.keys(), launcher)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	153
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	154 def scaladacapo(args):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	155 """run one or more Scala DaCapo benchmarks"""
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	156
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	157 def launcher(bm, harnessArgs, extraVmOpts):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	158 return sanitycheck.getScalaDacapo(bm, harnessArgs).test(get_vm(), extraVmOpts=extraVmOpts)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	159
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	160 _run_benchmark(args, sanitycheck.dacapoScalaSanityWarmup.keys(), launcher)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	161
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	162 # This is different than the 'jmh' commmand in that it
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	163 # looks for internal JMH benchmarks (i.e. those that
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	164 # depend on the JMH library).
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	165 def microbench(args):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	166 """run JMH microbenchmark projects"""
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	167 parser = ArgumentParser(prog='mx microbench', description=microbench.__doc__,
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	168 usage="%(prog)s [command options\|VM options] [-- [JMH options]]")
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	169 parser.add_argument('--jar', help='Explicitly specify micro-benchmark location')
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	170 known_args, args = parser.parse_known_args(args)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	171
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	172 vmArgs, jmhArgs = mx.extract_VM_args(args, useDoubleDash=True)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	173
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	174 # look for -f in JMH arguments
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	175 containsF = False
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	176 forking = True
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	177 for i in range(len(jmhArgs)):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	178 arg = jmhArgs[i]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	179 if arg.startswith('-f'):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	180 containsF = True
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	181 if arg == '-f' and (i+1) < len(jmhArgs):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	182 arg += jmhArgs[i+1]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	183 try:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	184 if int(arg[2:]) == 0:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	185 forking = False
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	186 except ValueError:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	187 pass
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	188
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	189 if known_args.jar:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	190 # use the specified jar
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	191 args = ['-jar', known_args.jar]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	192 if not forking:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	193 args += vmArgs
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	194 else:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	195 # default to -f1 if not specified otherwise
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	196 if not containsF:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	197 jmhArgs += ['-f1']
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	198
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	199 # find all projects with a direct JMH dependency
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	200 jmhProjects = []
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	201 for p in mx.projects_opt_limit_to_suites():
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	202 if 'JMH' in [x.name for x in p.deps]:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	203 jmhProjects.append(p.name)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	204 cp = mx.classpath(jmhProjects)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	205
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	206 # execute JMH runner
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	207 args = ['-cp', cp]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	208 if not forking:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	209 args += vmArgs
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	210 args += ['org.openjdk.jmh.Main']
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	211
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	212 if forking:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	213 jvm = get_vm()
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	214 def quoteSpace(s):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	215 if " " in s:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	216 return '"' + s + '"'
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	217 return s
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	218
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	219 forkedVmArgs = map(quoteSpace, _parseVmArgs(_jdk, vmArgs))
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	220 args += ['--jvmArgsPrepend', ' '.join(['-' + jvm] + forkedVmArgs)]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	221 run_vm(args + jmhArgs)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	222
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	223 def ctw(args, extraVMarguments=None):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	224 """run CompileTheWorld"""
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	225
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	226 defaultCtwopts = '-Inline'
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	227
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	228 parser = ArgumentParser(prog='mx ctw')
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	229 parser.add_argument('--ctwopts', action='store', help='space separated JVMCI options used for CTW compilations (default: --ctwopts="' + defaultCtwopts + '")', default=defaultCtwopts, metavar='<options>')
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	230 parser.add_argument('--cp', '--jar', action='store', help='jar or class path denoting classes to compile', metavar='<path>')
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	231
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	232 args, vmargs = parser.parse_known_args(args)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	233
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	234 if args.ctwopts:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	235 # Replace spaces with '#' since -G: options cannot contain spaces
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	236 # when they are collated in the "jvmci.options" system property
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	237 vmargs.append('-G:CompileTheWorldConfig=' + re.sub(r'\s+', '#', args.ctwopts))
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	238
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	239 if args.cp:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	240 cp = os.path.abspath(args.cp)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	241 else:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	242 cp = join(_jdk.home, 'lib', 'modules', 'bootmodules.jimage')
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	243 vmargs.append('-G:CompileTheWorldExcludeMethodFilter=sun.awt.X11..')
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	244
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	245 # suppress menubar and dock when running on Mac; exclude x11 classes as they may cause vm crashes (on Solaris)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	246 vmargs = ['-Djava.awt.headless=true'] + vmargs
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	247
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	248 if _vm.jvmciMode == 'disabled':
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	249 vmargs += ['-XX:+CompileTheWorld', '-Xbootclasspath/p:' + cp]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	250 else:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	251 if _vm.jvmciMode == 'jit':
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	252 vmargs += ['-XX:+BootstrapJVMCI']
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	253 vmargs += ['-G:CompileTheWorldClasspath=' + cp, 'com.oracle.graal.hotspot.CompileTheWorld']
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	254
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	255 run_vm(vmargs + _noneAsEmptyList(extraVMarguments))
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	256
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	257 class UnitTestRun:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	258 def __init__(self, name, args):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	259 self.name = name
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	260 self.args = args
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	261
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	262 def run(self, suites, tasks, extraVMarguments=None):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	263 for suite in suites:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	264 with Task(self.name + ': hosted-product ' + suite, tasks) as t:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	265 if t: unittest(['--suite', suite, '--enable-timing', '--verbose', '--fail-fast'] + self.args + _noneAsEmptyList(extraVMarguments))
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	266
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	267 class BootstrapTest:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	268 def __init__(self, name, vmbuild, args, suppress=None):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	269 self.name = name
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	270 self.args = args
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	271 self.suppress = suppress
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	272
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	273 def run(self, tasks, extraVMarguments=None):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	274 with JVMCIMode('jit'):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	275 with Task(self.name, tasks) as t:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	276 if t:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	277 if self.suppress:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	278 out = mx.DuplicateSuppressingStream(self.suppress).write
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	279 else:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	280 out = None
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	281 run_vm(self.args + _noneAsEmptyList(extraVMarguments) + ['-XX:-TieredCompilation', '-XX:+BootstrapJVMCI', '-version'], out=out)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	282
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	283 def compiler_gate_runner(suites, unit_test_runs, bootstrap_tests, tasks, extraVMarguments=None):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	284
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	285 # Run unit tests in hosted mode
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	286 with JVMCIMode('hosted'):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	287 for r in unit_test_runs:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	288 r.run(suites, tasks, extraVMarguments)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	289
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	290 # Run ctw against rt.jar on server-hosted-jvmci
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	291 with JVMCIMode('hosted'):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	292 with Task('CTW:hosted', tasks) as t:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	293 if t: ctw(['--ctwopts', '-Inline +ExitVMOnException', '-esa', '-G:+CompileTheWorldMultiThreaded', '-G:-InlineDuringParsing', '-G:-CompileTheWorldVerbose', '-XX:ReservedCodeCacheSize=300m'], _noneAsEmptyList(extraVMarguments))
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	294
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	295 # bootstrap tests
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	296 for b in bootstrap_tests:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	297 b.run(tasks, extraVMarguments)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	298
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	299 # run dacapo sanitychecks
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	300 for test in sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Gate, gateBuildLevel='release', extraVmArguments=extraVMarguments) \
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	301 + sanitycheck.getScalaDacapos(level=sanitycheck.SanityCheckLevel.Gate, gateBuildLevel='release', extraVmArguments=extraVMarguments):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	302 with Task(str(test) + ':' + 'release', tasks) as t:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	303 if t and not test.test('jvmci'):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	304 t.abort(test.name + ' Failed')
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	305
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	306 # ensure -Xbatch still works
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	307 with JVMCIMode('jit'):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	308 with Task('DaCapo_pmd:BatchMode', tasks) as t:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	309 if t: dacapo(_noneAsEmptyList(extraVMarguments) + ['-Xbatch', 'pmd'])
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	310
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	311 # ensure -Xcomp still works
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	312 with JVMCIMode('jit'):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	313 with Task('XCompMode:product', tasks) as t:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	314 if t: run_vm(_noneAsEmptyList(extraVMarguments) + ['-Xcomp', '-version'])
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	315
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	316
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	317 graal_unit_test_runs = [
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	318 UnitTestRun('UnitTests', []),
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	319 ]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	320
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	321 _registers = 'o0,o1,o2,o3,f8,f9,d32,d34' if mx.get_arch() == 'sparcv9' else 'rbx,r11,r10,r14,xmm3,xmm11,xmm14'
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	322
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	323 graal_bootstrap_tests = [
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	324 BootstrapTest('BootstrapWithSystemAssertions', 'fastdebug', ['-esa']),
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	325 BootstrapTest('BootstrapWithSystemAssertionsNoCoop', 'fastdebug', ['-esa', '-XX:-UseCompressedOops', '-G:+ExitVMOnException']),
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	326 BootstrapTest('BootstrapWithGCVecification', 'product', ['-XX:+UnlockDiagnosticVMOptions', '-XX:+VerifyBeforeGC', '-XX:+VerifyAfterGC', '-G:+ExitVMOnException'], suppress=['VerifyAfterGC:', 'VerifyBeforeGC:']),
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	327 BootstrapTest('BootstrapWithG1GCVecification', 'product', ['-XX:+UnlockDiagnosticVMOptions', '-XX:-UseSerialGC', '-XX:+UseG1GC', '-XX:+VerifyBeforeGC', '-XX:+VerifyAfterGC', '-G:+ExitVMOnException'], suppress=['VerifyAfterGC:', 'VerifyBeforeGC:']),
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	328 BootstrapTest('BootstrapEconomyWithSystemAssertions', 'fastdebug', ['-esa', '-Djvmci.compiler=graal-economy', '-G:+ExitVMOnException']),
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	329 BootstrapTest('BootstrapWithExceptionEdges', 'fastdebug', ['-esa', '-G:+StressInvokeWithExceptionNode', '-G:+ExitVMOnException']),
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	330 BootstrapTest('BootstrapWithRegisterPressure', 'product', ['-esa', '-G:RegisterPressure=' + _registers, '-G:+ExitVMOnException']),
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	331 BootstrapTest('BootstrapTraceRAWithRegisterPressure', 'product', ['-esa', '-G:+TraceRA', '-G:RegisterPressure=' + _registers, '-G:+ExitVMOnException']),
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	332 BootstrapTest('BootstrapWithImmutableCode', 'product', ['-esa', '-G:+ImmutableCode', '-G:+VerifyPhases', '-G:+ExitVMOnException']),
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	333 ]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	334
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	335 def _graal_gate_runner(args, tasks):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	336 compiler_gate_runner(['graal'], graal_unit_test_runs, graal_bootstrap_tests, tasks, args.extra_vm_argument)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	337
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	338 mx_gate.add_gate_runner(_suite, _graal_gate_runner)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	339 mx_gate.add_gate_argument('--extra-vm-argument', action='append', help='add extra vm argument to gate tasks if applicable (multiple occurrences allowed)')
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	340
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	341 def _unittest_vm_launcher(vmArgs, mainClass, mainClassArgs):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	342 run_vm(vmArgs + [mainClass] + mainClassArgs)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	343
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	344 mx_unittest.set_vm_launcher('JDK9 VM launcher', _unittest_vm_launcher)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	345
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	346 def deoptalot(args):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	347 """bootstrap a VM with DeoptimizeALot and VerifyOops on
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	348
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	349 If the first argument is a number, the process will be repeated
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	350 this number of times. All other arguments are passed to the VM."""
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	351 count = 1
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	352 if len(args) > 0 and args[0].isdigit():
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	353 count = int(args[0])
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	354 del args[0]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	355
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	356 for _ in range(count):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	357 if not run_vm(['-XX:-TieredCompilation', '-XX:+DeoptimizeALot', '-XX:+VerifyOops'] + args + ['-version']) == 0:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	358 mx.abort("Failed")
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	359
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	360 def longtests(args):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	361
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	362 deoptalot(['15', '-Xmx48m'])
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	363
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	364 dacapo(['100', 'eclipse', '-esa'])
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	365
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	366 """
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	367 Extra benchmarks to run from 'bench()'.
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	368 """
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	369 extraBenchmarks = []
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	370
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	371 def bench(args):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	372 """run benchmarks and parse their output for results
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	373
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	374 Results are JSON formated : {group : {benchmark : score}}."""
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	375 resultFile = None
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	376 if '-resultfile' in args:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	377 index = args.index('-resultfile')
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	378 if index + 1 < len(args):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	379 resultFile = args[index + 1]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	380 del args[index]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	381 del args[index]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	382 else:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	383 mx.abort('-resultfile must be followed by a file name')
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	384 resultFileCSV = None
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	385 if '-resultfilecsv' in args:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	386 index = args.index('-resultfilecsv')
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	387 if index + 1 < len(args):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	388 resultFileCSV = args[index + 1]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	389 del args[index]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	390 del args[index]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	391 else:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	392 mx.abort('-resultfilecsv must be followed by a file name')
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	393 vm = get_vm()
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	394 if len(args) is 0:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	395 args = ['all']
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	396
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	397 vmArgs = [arg for arg in args if arg.startswith('-')]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	398
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	399 def benchmarks_in_group(group):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	400 prefix = group + ':'
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	401 return [a[len(prefix):] for a in args if a.startswith(prefix)]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	402
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	403 results = {}
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	404 benchmarks = []
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	405 # DaCapo
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	406 if 'dacapo' in args or 'all' in args:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	407 benchmarks += sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Benchmark)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	408 else:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	409 dacapos = benchmarks_in_group('dacapo')
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	410 for dacapo in dacapos:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	411 if dacapo not in sanitycheck.dacapoSanityWarmup.keys():
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	412 mx.abort('Unknown DaCapo : ' + dacapo)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	413 iterations = sanitycheck.dacapoSanityWarmup[dacapo][sanitycheck.SanityCheckLevel.Benchmark]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	414 if iterations > 0:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	415 benchmarks += [sanitycheck.getDacapo(dacapo, ['-n', str(iterations)])]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	416
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	417 if 'scaladacapo' in args or 'all' in args:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	418 benchmarks += sanitycheck.getScalaDacapos(level=sanitycheck.SanityCheckLevel.Benchmark)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	419 else:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	420 scaladacapos = benchmarks_in_group('scaladacapo')
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	421 for scaladacapo in scaladacapos:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	422 if scaladacapo not in sanitycheck.dacapoScalaSanityWarmup.keys():
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	423 mx.abort('Unknown Scala DaCapo : ' + scaladacapo)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	424 iterations = sanitycheck.dacapoScalaSanityWarmup[scaladacapo][sanitycheck.SanityCheckLevel.Benchmark]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	425 if iterations > 0:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	426 benchmarks += [sanitycheck.getScalaDacapo(scaladacapo, ['-n', str(iterations)])]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	427
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	428 # Bootstrap
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	429 if 'bootstrap' in args or 'all' in args:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	430 benchmarks += sanitycheck.getBootstraps()
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	431 # SPECjvm2008
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	432 if 'specjvm2008' in args or 'all' in args:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	433 benchmarks += [sanitycheck.getSPECjvm2008(['-ikv', '-wt', '120', '-it', '120'])]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	434 else:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	435 specjvms = benchmarks_in_group('specjvm2008')
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	436 for specjvm in specjvms:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	437 benchmarks += [sanitycheck.getSPECjvm2008(['-ikv', '-wt', '120', '-it', '120', specjvm])]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	438
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	439 if 'specjbb2005' in args or 'all' in args:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	440 benchmarks += [sanitycheck.getSPECjbb2005()]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	441
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	442 if 'specjbb2013' in args: # or 'all' in args //currently not in default set
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	443 benchmarks += [sanitycheck.getSPECjbb2013()]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	444
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	445 if 'ctw-full' in args:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	446 benchmarks.append(sanitycheck.getCTW(vm, sanitycheck.CTWMode.Full))
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	447 if 'ctw-noinline' in args:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	448 benchmarks.append(sanitycheck.getCTW(vm, sanitycheck.CTWMode.NoInline))
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	449
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	450 for f in extraBenchmarks:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	451 f(args, vm, benchmarks)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	452
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	453 for test in benchmarks:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	454 for (groupName, res) in test.bench(vm, extraVmOpts=vmArgs).items():
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	455 group = results.setdefault(groupName, {})
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	456 group.update(res)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	457 mx.log(json.dumps(results))
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	458 if resultFile:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	459 with open(resultFile, 'w') as f:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	460 f.write(json.dumps(results))
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	461 if resultFileCSV:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	462 with open(resultFileCSV, 'w') as f:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	463 for key1, value1 in results.iteritems():
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	464 f.write('%s;\n' % (str(key1)))
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	465 for key2, value2 in sorted(value1.iteritems()):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	466 f.write('%s; %s;\n' % (str(key2), str(value2)))
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	467
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	468 def specjvm2008(args):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	469 """run one or more SPECjvm2008 benchmarks"""
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	470
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	471 def launcher(bm, harnessArgs, extraVmOpts):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	472 return sanitycheck.getSPECjvm2008(harnessArgs + [bm]).bench(get_vm(), extraVmOpts=extraVmOpts)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	473
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	474 availableBenchmarks = set(sanitycheck.specjvm2008Names)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	475 if "all" not in args:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	476 # only add benchmark groups if we are not running "all"
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	477 for name in sanitycheck.specjvm2008Names:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	478 parts = name.rsplit('.', 1)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	479 if len(parts) > 1:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	480 assert len(parts) == 2
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	481 group = parts[0]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	482 availableBenchmarks.add(group)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	483
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	484 _run_benchmark(args, sorted(availableBenchmarks), launcher)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	485
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	486 def specjbb2013(args):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	487 """run the composite SPECjbb2013 benchmark"""
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	488
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	489 def launcher(bm, harnessArgs, extraVmOpts):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	490 assert bm is None
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	491 return sanitycheck.getSPECjbb2013(harnessArgs).bench(get_vm(), extraVmOpts=extraVmOpts)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	492
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	493 _run_benchmark(args, None, launcher)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	494
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	495 def specjbb2005(args):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	496 """run the composite SPECjbb2005 benchmark"""
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	497
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	498 def launcher(bm, harnessArgs, extraVmOpts):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	499 assert bm is None
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	500 return sanitycheck.getSPECjbb2005(harnessArgs).bench(get_vm(), extraVmOpts=extraVmOpts)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	501
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	502 _run_benchmark(args, None, launcher)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	503
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	504 def _parseVmArgs(jdk, args, addDefaultArgs=True):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	505 args = mx.expand_project_in_args(args, insitu=False)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	506 jacocoArgs = mx_gate.get_jacoco_agent_args()
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	507 if jacocoArgs:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	508 args = jacocoArgs + args
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	509
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	510 # Support for -G: options
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	511 def translateGOption(arg):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	512 if arg.startswith('-G:+'):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	513 if '=' in arg:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	514 mx.abort('Mixing + and = in -G: option specification: ' + arg)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	515 arg = '-Djvmci.option.' + arg[len('-G:+'):] + '=true'
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	516 elif arg.startswith('-G:-'):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	517 if '=' in arg:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	518 mx.abort('Mixing - and = in -G: option specification: ' + arg)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	519 arg = '-Djvmci.option.' + arg[len('-G:+'):] + '=false'
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	520 elif arg.startswith('-G:'):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	521 arg = '-Djvmci.option.' + arg[len('-G:'):]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	522 return arg
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	523 args = map(translateGOption, args)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	524
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	525 bcp = [mx.distribution('truffle:TRUFFLE_API').classpath_repr()]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	526 if _jvmciModes[_vm.jvmciMode]:
22887 a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	527 bcp.extend([d.get_classpath_repr() for d in _bootClasspathDists])
a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	528
22882 9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	529 args = ['-Xbootclasspath/p:' + os.pathsep.join(bcp)] + args
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	530
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	531 # Set the default JVMCI compiler
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	532 jvmciCompiler = _compilers[-1]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	533 args = ['-Djvmci.compiler=' + jvmciCompiler] + args
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	534
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	535 if '-version' in args:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	536 ignoredArgs = args[args.index('-version') + 1:]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	537 if len(ignoredArgs) > 0:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	538 mx.log("Warning: The following options will be ignored by the vm because they come after the '-version' argument: " + ' '.join(ignoredArgs))
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	539 return jdk.processArgs(args, addDefaultArgs=addDefaultArgs)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	540
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	541 def run_java(jdk, args, nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=None, env=None, addDefaultArgs=True):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	542
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	543 args = _parseVmArgs(jdk, args, addDefaultArgs=addDefaultArgs)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	544
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	545 jvmciModeArgs = _jvmciModes[_vm.jvmciMode]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	546 cmd = [jdk.java] + ['-' + get_vm()] + jvmciModeArgs + args
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	547 return mx.run(cmd, nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	548
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	549 def run_vm(args, vm=None, nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=None, debugLevel=None, vmbuild=None):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	550 """run a Java program by executing the java executable in a JVMCI JDK"""
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	551
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	552 return run_java(mx.get_jdk(), args, nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd, timeout=timeout)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	553
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	554 class GraalArchiveParticipant:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	555 def __init__(self, dist):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	556 self.dist = dist
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	557
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	558 def __opened__(self, arc, srcArc, services):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	559 self.services = services
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	560 self.arc = arc
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	561
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	562 def __add__(self, arcname, contents):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	563 if arcname.startswith('META-INF/jvmci.providers/'):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	564 provider = arcname[len('META-INF/jvmci.providers/'):]
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	565 for service in contents.strip().split(os.linesep):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	566 assert service
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	567 self.services.setdefault(service, []).append(provider)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	568 return True
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	569 elif arcname.endswith('_OptionDescriptors.class'):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	570 # Need to create service files for the providers of the
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	571 # jdk.vm.ci.options.Options service created by
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	572 # jdk.vm.ci.options.processor.OptionProcessor.
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	573 provider = arcname[:-len('.class'):].replace('/', '.')
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	574 self.services.setdefault('jdk.vm.ci.options.OptionDescriptors', []).append(provider)
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	575 return False
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	576
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	577 def __addsrc__(self, arcname, contents):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	578 return False
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	579
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	580 def __closing__(self):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	581 pass
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	582
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	583 mx.update_commands(_suite, {
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	584 'vm': [run_vm, '[-options] class [args...]'],
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	585 'ctw': [ctw, '[-vmoptions\|noinline\|nocomplex\|full]'],
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	586 'dacapo': [dacapo, '[VM options] benchmarks...\|"all" [DaCapo options]'],
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	587 'scaladacapo': [scaladacapo, '[VM options] benchmarks...\|"all" [Scala DaCapo options]'],
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	588 'specjvm2008': [specjvm2008, '[VM options] benchmarks...\|"all" [SPECjvm2008 options]'],
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	589 'specjbb2013': [specjbb2013, '[VM options] [-- [SPECjbb2013 options]]'],
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	590 'specjbb2005': [specjbb2005, '[VM options] [-- [SPECjbb2005 options]]'],
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	591 'bench' : [bench, '[-resultfile file] [all(default)\|dacapo\|specjvm2008\|bootstrap]'],
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	592 'microbench' : [microbench, '[VM options] [-- [JMH options]]'],
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	593 'deoptalot' : [deoptalot, '[n]'],
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	594 'longtests' : [longtests, ''],
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	595 })
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	596
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	597 mx.add_argument('-M', '--jvmci-mode', action='store', choices=sorted(_jvmciModes.viewkeys()), help='the JVM variant type to build/run (default: ' + _vm.jvmciMode + ')')
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	598
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	599 def mx_post_parse_cmd_line(opts):
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	600 if opts.jvmci_mode is not None:
9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	601 _vm.update(opts.jvmci_mode)
22887 a9b332b34123 mx: added BootClasspathDist Doug Simon <doug.simon@oracle.com> parents: 22882 diff changeset	602 for dist in [d.dist() for d in _bootClasspathDists]:
22882 9fed99d7f32d made Graal work on a JDK9 image without needing the jvmci mx suite or extensions Doug Simon <doug.simon@oracle.com> parents: diff changeset	603 dist.set_archiveparticipant(GraalArchiveParticipant(dist))

Mercurial > hg > graal-compiler

annotate mx.graal/mx_graal_9.py @ 22887:a9b332b34123