Mercurial > hg > truffle

comparison mx/mx_graal.py @ 21580:a004616f72e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added support for '--vm graal' to mx as an alias for '--vm jvmci'
author Doug Simon <doug.simon@oracle.com>
date Fri, 29 May 2015 09:08:21 +0200
parents a880844225e4
children 9bb04af58490
comparison
equal deleted inserted replaced
21579:6fffb62ccb32 21580:a004616f72e5
51 'server' : 'Normal compilation is performed with a tiered system (C1 + C2), Truffle compilation is performed with Graal. Use this for optimal Truffle performance.', 51 'server' : 'Normal compilation is performed with a tiered system (C1 + C2), Truffle compilation is performed with Graal. Use this for optimal Truffle performance.',
52 'client' : None, # normal compilation with client compiler, explicit compilation (e.g., by Truffle) with Graal 52 'client' : None, # normal compilation with client compiler, explicit compilation (e.g., by Truffle) with Graal
53 'server-nojvmci' : None, # all compilation with tiered system (i.e., client + server), JVMCI omitted 53 'server-nojvmci' : None, # all compilation with tiered system (i.e., client + server), JVMCI omitted
54 'client-nojvmci' : None, # all compilation with client compiler, JVMCI omitted 54 'client-nojvmci' : None, # all compilation with client compiler, JVMCI omitted
55 'original' : None, # default VM copied from bootstrap JDK 55 'original' : None, # default VM copied from bootstrap JDK
56 'graal' : 'Alias for jvmci',
56 } 57 }
57 58
58 """ The VM that will be run by the 'vm' command and built by default by the 'build' command. 59 """ The VM that will be run by the 'vm' command and built by default by the 'build' command.
59 This can be set via the global '--vm' option or the DEFAULT_VM environment variable. 60 This can be set via the global '--vm' option or the DEFAULT_VM environment variable.
60 It can also be temporarily set by using of a VM context manager object in a 'with' statement. """ 61 It can also be temporarily set by using of a VM context manager object in a 'with' statement. """
1092 line = vmKnown 1093 line = vmKnown
1093 found = True 1094 found = True
1094 f.write(line) 1095 f.write(line)
1095 if not found: 1096 if not found:
1096 f.write(vmKnown) 1097 f.write(vmKnown)
1098 if vm == 'jvmci':
1099 # Legacy support
1100 f.write('-graal ALIASED_TO -jvmci\n')
1097 1101
1098 if exists(timestampFile): 1102 if exists(timestampFile):
1099 os.utime(timestampFile, None) 1103 os.utime(timestampFile, None)
1100 else: 1104 else:
1101 file(timestampFile, 'a') 1105 file(timestampFile, 'a')
2668 2672
2669 if _vmSourcesAvailable: 2673 if _vmSourcesAvailable:
2670 if hasattr(opts, 'vm') and opts.vm is not None: 2674 if hasattr(opts, 'vm') and opts.vm is not None:
2671 global _vm 2675 global _vm
2672 _vm = opts.vm 2676 _vm = opts.vm
2677 if _vm == 'graal':
2678 _vm = 'jvmci'
2673 if hasattr(opts, 'vmbuild') and opts.vmbuild is not None: 2679 if hasattr(opts, 'vmbuild') and opts.vmbuild is not None:
2674 global _vmbuild 2680 global _vmbuild
2675 _vmbuild = opts.vmbuild 2681 _vmbuild = opts.vmbuild
2676 global _make_eclipse_launch 2682 global _make_eclipse_launch
2677 _make_eclipse_launch = getattr(opts, 'make_eclipse_launch', False) 2683 _make_eclipse_launch = getattr(opts, 'make_eclipse_launch', False)