comparison mx/commands.py @ 8891:ca82d06ec93a

mx: bench command should not run dacapos with -n 0 when using a specification such as scaladacapo:specs
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 27 Mar 2013 15:31:23 +0100
parents a33b6378cb76
children 822163edb8bf
comparison
equal deleted inserted replaced
8890:a33b6378cb76 8891:ca82d06ec93a
1063 else: 1063 else:
1064 dacapos = benchmarks_in_group('dacapo') 1064 dacapos = benchmarks_in_group('dacapo')
1065 for dacapo in dacapos: 1065 for dacapo in dacapos:
1066 if dacapo not in sanitycheck.dacapoSanityWarmup.keys(): 1066 if dacapo not in sanitycheck.dacapoSanityWarmup.keys():
1067 mx.abort('Unknown DaCapo : ' + dacapo) 1067 mx.abort('Unknown DaCapo : ' + dacapo)
1068 benchmarks += [sanitycheck.getDacapo(dacapo, sanitycheck.dacapoSanityWarmup[dacapo][sanitycheck.SanityCheckLevel.Benchmark])] 1068 iterations = sanitycheck.dacapoSanityWarmup[dacapo][sanitycheck.SanityCheckLevel.Benchmark]
1069 if (iterations > 0):
1070 benchmarks += [sanitycheck.getDacapo(dacapo, iterations)]
1069 1071
1070 if ('scaladacapo' in args or 'all' in args): 1072 if ('scaladacapo' in args or 'all' in args):
1071 benchmarks += sanitycheck.getScalaDacapos(level=sanitycheck.SanityCheckLevel.Benchmark) 1073 benchmarks += sanitycheck.getScalaDacapos(level=sanitycheck.SanityCheckLevel.Benchmark)
1072 else: 1074 else:
1073 scaladacapos = benchmarks_in_group('scaladacapo') 1075 scaladacapos = benchmarks_in_group('scaladacapo')
1074 for scaladacapo in scaladacapos: 1076 for scaladacapo in scaladacapos:
1075 if scaladacapo not in sanitycheck.dacapoScalaSanityWarmup.keys(): 1077 if scaladacapo not in sanitycheck.dacapoScalaSanityWarmup.keys():
1076 mx.abort('Unknown Scala DaCapo : ' + scaladacapo) 1078 mx.abort('Unknown Scala DaCapo : ' + scaladacapo)
1077 benchmarks += [sanitycheck.getScalaDacapo(scaladacapo, sanitycheck.dacapoScalaSanityWarmup[scaladacapo][sanitycheck.SanityCheckLevel.Benchmark])] 1079 iterations = sanitycheck.dacapoScalaSanityWarmup[scaladacapo][sanitycheck.SanityCheckLevel.Benchmark]
1080 if (iterations > 0):
1081 benchmarks += [sanitycheck.getScalaDacapo(scaladacapo, iterations)]
1078 1082
1079 #Bootstrap 1083 #Bootstrap
1080 if ('bootstrap' in args or 'all' in args): 1084 if ('bootstrap' in args or 'all' in args):
1081 benchmarks += sanitycheck.getBootstraps() 1085 benchmarks += sanitycheck.getBootstraps()
1082 #SPECjvm2008 1086 #SPECjvm2008