comparison mx/commands.py @ 9157:a38d748d4130

Add support for the 'optimized' build in mx Add some CompileTheWorld benchmarks
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 16 Apr 2013 14:31:00 +0200
parents fb73538b57c6
children 43223d3f5dcd
comparison
equal deleted inserted replaced
9145:57f85e39c75f 9157:a38d748d4130
44 """ The VM that will be run by the 'vm' command and built by default by the 'build' command. 44 """ The VM that will be run by the 'vm' command and built by default by the 'build' command.
45 This can be set via the global '--vm' option. """ 45 This can be set via the global '--vm' option. """
46 _vm = _vmChoices[0] 46 _vm = _vmChoices[0]
47 47
48 """ The VM builds that will be run by the 'vm' command - default is first in list """ 48 """ The VM builds that will be run by the 'vm' command - default is first in list """
49 _vmbuildChoices = ['product', 'fastdebug', 'debug'] 49 _vmbuildChoices = ['product', 'fastdebug', 'debug', 'optimized']
50 50
51 """ The VM build that will be run by the 'vm' command. 51 """ The VM build that will be run by the 'vm' command.
52 This can be set via the global '--product', '--fastdebug' and '--debug' options. """ 52 This can be set via the global '--product', '--fastdebug' and '--debug' options. """
53 _vmbuild = _vmbuildChoices[0] 53 _vmbuild = _vmbuildChoices[0]
54 54
1165 if ('specjbb2005' in args or 'all' in args): 1165 if ('specjbb2005' in args or 'all' in args):
1166 benchmarks += [sanitycheck.getSPECjbb2005()] 1166 benchmarks += [sanitycheck.getSPECjbb2005()]
1167 1167
1168 if ('specjbb2013' in args): # or 'all' in args //currently not in default set 1168 if ('specjbb2013' in args): # or 'all' in args //currently not in default set
1169 benchmarks += [sanitycheck.getSPECjbb2013()] 1169 benchmarks += [sanitycheck.getSPECjbb2013()]
1170
1171 if ('ctw-full' in args):
1172 benchmarks.append(sanitycheck.getCTW(vm, sanitycheck.CTWMode.Full))
1173 if ('ctw-noinline' in args):
1174 benchmarks.append(sanitycheck.getCTW(vm, sanitycheck.CTWMode.NoInline))
1175 if ('ctw-nocomplex' in args):
1176 benchmarks.append(sanitycheck.getCTW(vm, sanitycheck.CTWMode.NoComplex))
1170 1177
1171 for test in benchmarks: 1178 for test in benchmarks:
1172 for (groupName, res) in test.bench(vm, opts=vmArgs).items(): 1179 for (groupName, res) in test.bench(vm, opts=vmArgs).items():
1173 group = results.setdefault(groupName, {}) 1180 group = results.setdefault(groupName, {})
1174 group.update(res) 1181 group.update(res)