Mercurial > hg > truffle

comparison mx/commands.py @ 7345:dd903cdfe708

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add possibility for -ict option to SPECjvm2008 benchmark execution.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sat, 12 Jan 2013 14:48:44 +0100
parents 57edf6b07d36
children 442668d41bc2
comparison
equal deleted inserted replaced
7344:11a9f50f34e4 7345:dd903cdfe708
942 #Bootstrap 942 #Bootstrap
943 if ('bootstrap' in args or 'all' in args): 943 if ('bootstrap' in args or 'all' in args):
944 benchmarks += sanitycheck.getBootstraps() 944 benchmarks += sanitycheck.getBootstraps()
945 #SPECjvm2008 945 #SPECjvm2008
946 if ('specjvm2008' in args or 'all' in args): 946 if ('specjvm2008' in args or 'all' in args):
947 benchmarks += [sanitycheck.getSPECjvm2008([], True, 120, 120)] 947 benchmarks += [sanitycheck.getSPECjvm2008([], False, True, 120, 120)]
948 else: 948 else:
949 specjvms = [a[12:] for a in args if a.startswith('specjvm2008:')] 949 specjvms = [a[12:] for a in args if a.startswith('specjvm2008:')]
950 for specjvm in specjvms: 950 for specjvm in specjvms:
951 benchmarks += [sanitycheck.getSPECjvm2008([specjvm], True, 120, 120)] 951 benchmarks += [sanitycheck.getSPECjvm2008([specjvm], False, True, 120, 120)]
952 952
953 if ('specjbb2005' in args or 'all' in args): 953 if ('specjbb2005' in args or 'all' in args):
954 benchmarks += [sanitycheck.getSPECjbb2005()] 954 benchmarks += [sanitycheck.getSPECjbb2005()]
955 955
956 for test in benchmarks: 956 for test in benchmarks:
964 f.write(json.dumps(results)) 964 f.write(json.dumps(results))
965 965
966 def specjvm2008(args): 966 def specjvm2008(args):
967 """run one or all SPECjvm2008 benchmarks 967 """run one or all SPECjvm2008 benchmarks
968 968
969 All options begining with - will be passed to the vm except for -ikv -wt and -it. 969 All options begining with - will be passed to the vm except for -ikv -ict -wt and -it.
970 Other options are supposed to be benchmark names and will be passed to SPECjvm2008.""" 970 Other options are supposed to be benchmark names and will be passed to SPECjvm2008."""
971 benchArgs = [a for a in args if a[0] != '-'] 971 benchArgs = [a for a in args if a[0] != '-']
972 vmArgs = [a for a in args if a[0] == '-'] 972 vmArgs = [a for a in args if a[0] == '-']
973 wt = None 973 wt = None
974 it = None 974 it = None
975 skipValid = False 975 skipValid = False
976 skipCheck = False
976 if '-v' in vmArgs: 977 if '-v' in vmArgs:
977 vmArgs.remove('-v') 978 vmArgs.remove('-v')
978 benchArgs.append('-v') 979 benchArgs.append('-v')
980 if '-ict' in vmArgs:
981 skipCheck = True
982 vmArgs.remove('-ict')
979 if '-ikv' in vmArgs: 983 if '-ikv' in vmArgs:
980 skipValid = True 984 skipValid = True
981 vmArgs.remove('-ikv') 985 vmArgs.remove('-ikv')
982 if '-wt' in vmArgs: 986 if '-wt' in vmArgs:
983 wtIdx = args.index('-wt') 987 wtIdx = args.index('-wt')
994 except: 998 except:
995 mx.abort('-it (Iteration time) needs a numeric value (seconds)') 999 mx.abort('-it (Iteration time) needs a numeric value (seconds)')
996 vmArgs.remove('-it') 1000 vmArgs.remove('-it')
997 benchArgs.remove(args[itIdx+1]) 1001 benchArgs.remove(args[itIdx+1])
998 vm = _vm; 1002 vm = _vm;
999 sanitycheck.getSPECjvm2008(benchArgs, skipValid, wt, it).bench(vm, opts=vmArgs) 1003 sanitycheck.getSPECjvm2008(benchArgs, skipCheck, skipValid, wt, it).bench(vm, opts=vmArgs)
1000 1004
1001 def hsdis(args, copyToDir=None): 1005 def hsdis(args, copyToDir=None):
1002 """download the hsdis library 1006 """download the hsdis library
1003 1007
1004 This is needed to support HotSpot's assembly dumping features. 1008 This is needed to support HotSpot's assembly dumping features.