diff options
Diffstat (limited to 'tests/scripts/run-throughput-perf.py')
| -rw-r--r-- | tests/scripts/run-throughput-perf.py | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/tests/scripts/run-throughput-perf.py b/tests/scripts/run-throughput-perf.py index 4fa43e9b7d..c0ed43a459 100644 --- a/tests/scripts/run-throughput-perf.py +++ b/tests/scripts/run-throughput-perf.py @@ -116,6 +116,7 @@ parser.add_argument('-clr_root', dest='clr_root', default=None) parser.add_argument('-assembly_root', dest='assembly_root', default=None) parser.add_argument('-benchview_path', dest='benchview_path', default=None) parser.add_argument('-iterations', dest='iterations', default=5, type=int) +parser.add_argument('-opt_level', dest='opt_level', default='full_opt') ########################################################################## # Helper Functions @@ -141,6 +142,7 @@ def validate_args(args): assembly_root = args.assembly_root benchview_path = args.benchview_path iterations = args.iterations + opt_level = args.opt_level.lower() def validate_arg(arg, check): """ Validate an individual arg @@ -162,6 +164,7 @@ def validate_args(args): valid_build_types = ['Release'] valid_run_types = ['rolling', 'private'] valid_os = ['Windows_NT', 'Ubuntu14.04'] + valid_opt_levels = ['full_opt', 'min_opt'] arch = next((a for a in valid_archs if a.lower() == arch.lower()), arch) build_type = next((b for b in valid_build_types if b.lower() == build_type.lower()), build_type) @@ -174,6 +177,7 @@ def validate_args(args): validate_arg(build_type, lambda item: item in valid_build_types) validate_arg(run_type, lambda item: item in valid_run_types) validate_arg(iterations, lambda item: item > 0) + validate_arg(opt_level, lambda item: item in valid_opt_levels) if clr_root is None: raise Exception('--clr_root must be set') @@ -191,7 +195,7 @@ def validate_args(args): benchview_path = os.path.normpath(benchview_path) validate_arg(benchview_path, lambda item: os.path.isdir(benchview_path)) - args = (arch, operating_system, os_group, build_type, run_type, clr_root, assembly_root, benchview_path, iterations) + args = (arch, operating_system, os_group, build_type, run_type, clr_root, assembly_root, benchview_path, iterations, opt_level) # Log configuration log('Configuration:') @@ -199,6 +203,7 @@ def validate_args(args): log(' os: %s' % operating_system) log(' os_group: %s' % os_group) log(' build_type: %s' % build_type) + log(' opt_level: %s' % opt_level) log(' run_type: %s' % run_type) log(' iterations: %d' % iterations) log(' clr_root: %s' % clr_root) @@ -256,7 +261,7 @@ def generateCSV(dll_name, dll_runtimes): return csv_file_name -def runIterations(dll_name, dll_path, iterations, crossgen_path, jit_path, assemblies_path): +def runIterations(dll_name, dll_path, iterations, crossgen_path, jit_path, assemblies_path, opt_level): """ Run throughput testing for a given dll Args: dll_name: the name of the dll @@ -280,13 +285,18 @@ def runIterations(dll_name, dll_path, iterations, crossgen_path, jit_path, assem dll_path ] + my_env = os.environ + + if opt_level == 'min_opt': + my_env['COMPlus_JITMinOpts'] = '1' + log(" ".join(run_args)) # Time.clock() returns seconds, with a resolution of 0.4 microseconds, so multiply by the multiplier to get milliseconds multiplier = 1000 for iteration in range(0,iterations + 1): - proc = subprocess.Popen(run_args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + proc = subprocess.Popen(run_args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=my_env) start_time = timeit.default_timer() (out, err) = proc.communicate() @@ -312,7 +322,7 @@ def main(args): global os_group_list global python_exe_list - architecture, operating_system, os_group, build_type, run_type, clr_root, assembly_root, benchview_path, iterations = validate_args(args) + architecture, operating_system, os_group, build_type, run_type, clr_root, assembly_root, benchview_path, iterations, opt_level = validate_args(args) arch = architecture current_dir = os.getcwd() @@ -351,7 +361,7 @@ def main(args): (not dll_file_name in dll_exclude_list["All"])): dll_name = dll_file_name.replace(".dll", "") dll_path = os.path.join(assembly_root, dll_file_name) - dll_elapsed_times = runIterations(dll_file_name, dll_path, iterations, crossgen_path, jit_path, assembly_root) + dll_elapsed_times = runIterations(dll_file_name, dll_path, iterations, crossgen_path, jit_path, assembly_root, opt_level) if len(dll_elapsed_times) != 0: if not benchview_path is None: @@ -404,6 +414,9 @@ def main(args): "--config", "OS", operating_system, + "--config", + "OptLevel", + opt_level, "--arch", architecture, "--machinepool", |