Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > nashorn
changeset 993:5d41c7482d54
8059236: Memory leak when executing octane pdfjs with optimistic typing
Reviewed-by: jlaskey, attila
| author | hannesw |
|---|---|
| date | Thu, 09 Oct 2014 11:55:52 +0200 |
| parents | bcc569328dfa |
| children | e2d164f9d7d8 |
| files | test/script/basic/octane-payload.js test/script/basic/run-octane.js |
| diffstat | 2 files changed, 115 insertions(+), 110 deletions(-) [+] |
line wrap: on
line diff
--- a/test/script/basic/octane-payload.js Wed Oct 08 11:28:13 2014 +0200 +++ b/test/script/basic/octane-payload.js Thu Oct 09 11:55:52 2014 +0200 @@ -40,7 +40,7 @@ {name:"gbemu", files:["gbemu-part1.js", "gbemu-part2.js"], suite:"GameboyBenchmark"}, {name:"mandreel", files:["mandreel.js"], suite:"MandreelBenchmark"}, {name:"navier-stokes", files:["navier-stokes.js"], suite:"NavierStokes"}, - {name:"pdfjs", files:["pdfjs.js"], suite:"PdfJS"}, + {name:"pdfjs", files:["pdfjs.js"], suite:"PdfJS", cleanUpIteration: function() { canvas_logs = []; }}, {name:"raytrace", files:["raytrace.js"], suite:"RayTrace"}, {name:"regexp", files:["regexp.js"], suite:"RegExpSuite"}, {name:"richards", files:["richards.js"], suite:"Richards"},
--- a/test/script/basic/run-octane.js Wed Oct 08 11:28:13 2014 +0200 +++ b/test/script/basic/run-octane.js Thu Oct 09 11:55:52 2014 +0200 @@ -24,8 +24,8 @@ /** * @subtest */ -var payload = __DIR__ + "octane-payload.js"; -load(payload); +var dir = typeof(__DIR__) == 'undefined' ? "test/script/basic/" : __DIR__; +load(dir + "octane-payload.js"); var runtime = undefined; var verbose = false; @@ -43,27 +43,27 @@ function load_bench(arg) { for (var idx = 0; idx < arg.files.length; idx++) { - var f = arg.files[idx]; - var file = f.split('/'); - var file_name = path + file[file.length - 1]; + var f = arg.files[idx]; + var file = f.split('/'); + var file_name = path + file[file.length - 1]; - var compile_and_return = should_compile_only(file_name); - if (compile_and_return) { - if (typeof compile_only === 'undefined') { //for a run, skip compile onlies, don't even compile them - return true; + var compile_and_return = should_compile_only(file_name); + if (compile_and_return) { + if (typeof compile_only === 'undefined') { //for a run, skip compile onlies, don't even compile them + return true; + } } - } - print_verbose(arg, "loading '" + arg.name + "' [" + f + "]... " + file_name); - load(file_name); + print_verbose(arg, "loading '" + arg.name + "' [" + f + "]... " + file_name); + load(file_name); } if (typeof arg.before !== 'undefined') { - arg.before(); + arg.before(); } if (compile_and_return) { - print_always(arg, "Compiled OK"); + print_always(arg, "Compiled OK"); } return !compile_and_return; @@ -73,16 +73,16 @@ function run_one_benchmark(arg, iters) { if (!load_bench(arg)) { - return; + return; } var success = true; var current_name; if (iters == undefined) { - iters = numberOfIterations; + iters = numberOfIterations; } else { - numberOfIterations = iters; + numberOfIterations = iters; } var benchmarks = eval(arg.suite + ".benchmarks"); @@ -91,64 +91,69 @@ var mean_score = 0; try { - for (var x = 0; x < benchmarks.length ; x++) { - //do warmup run - //reset random number generator needed as of octane 9 before each run - BenchmarkSuite.ResetRNG(); - benchmarks[x].Setup(); - } - BenchmarkSuite.ResetRNG(); - print_verbose(arg, "running '" + arg.name + "' for " + iters + " iterations of no less than " + min_time + " seconds"); - - var scores = []; - - var min_time_ms = min_time * 1000; - var len = benchmarks.length; - - for (var it = 0; it < iters + 1; it++) { - //every iteration must take a minimum of 10 secs - var ops = 0; - var elapsed = 0; - var start = new Date; - do { - for (var i = 0; i < len; i++) { - benchmarks[i].run(); - //important - no timing here like elapsed = new Date() - start, as in the - //original harness. This will make timing very non-deterministic. - //NOTHING else must live in this loop + for (var x = 0; x < benchmarks.length ; x++) { + //do warmup run + //reset random number generator needed as of octane 9 before each run + BenchmarkSuite.ResetRNG(); + benchmarks[x].Setup(); } - ops += len; - elapsed = new Date - start; - } while (elapsed < min_time * 1000); + BenchmarkSuite.ResetRNG(); + print_verbose(arg, "running '" + arg.name + "' for " + iters + " iterations of no less than " + min_time + " seconds"); + + var scores = []; + + var min_time_ms = min_time * 1000; + var len = benchmarks.length; - var score = ops / elapsed * 1000 * 60; - scores.push(score); - var name = it == 0 ? "warmup" : "iteration " + it; - print_verbose(arg, name + " finished " + score.toFixed(0) + " ops/minute"); - } - - for (var x = 0; x < benchmarks.length ; x++) { - benchmarks[x].TearDown(); - } + for (var it = 0; it < iters + 1; it++) { + //every iteration must take a minimum of 10 secs + var ops = 0; + var elapsed = 0; + var start = new Date; + do { + for (var i = 0; i < len; i++) { + benchmarks[i].run(); + //important - no timing here like elapsed = new Date() - start, as in the + //original harness. This will make timing very non-deterministic. + //NOTHING else must live in this loop + } + ops += len; + elapsed = new Date - start; + } while (elapsed < min_time * 1000); - for (var x = 1; x < iters + 1 ; x++) { - mean_score += scores[x]; - min_score = Math.min(min_score, scores[x]); - max_score = Math.max(max_score, scores[x]); - } - mean_score /= iters; + var score = ops / elapsed * 1000 * 60; + scores.push(score); + var name = it == 0 ? "warmup" : "iteration " + it; + print_verbose(arg, name + " finished " + score.toFixed(0) + " ops/minute"); + + // optional per-iteration cleanup hook + if (typeof arg.cleanUpIteration == "function") { + arg.cleanUpIteration(); + } + } + + for (var x = 0; x < benchmarks.length ; x++) { + benchmarks[x].TearDown(); + } + + for (var x = 1; x < iters + 1 ; x++) { + mean_score += scores[x]; + min_score = Math.min(min_score, scores[x]); + max_score = Math.max(max_score, scores[x]); + } + mean_score /= iters; } catch (e) { - print_always(arg, "*** Aborted and setting score to zero. Reason: " + e); - if (is_this_nashorn() && e instanceof java.lang.Throwable) { - e.printStackTrace(); - } - mean_score = min_score = max_score = 0; - scores = [0]; + print_always(arg, "*** Aborted and setting score to zero. Reason: " + e); + if (is_this_nashorn() && e instanceof java.lang.Throwable) { + e.printStackTrace(); + } + mean_score = min_score = max_score = 0; + scores = [0]; } var res = mean_score.toFixed(0); if (verbose) { - res += " ops/minute (" + min_score.toFixed(0) + "-" + max_score.toFixed(0) + "), warmup=" + scores[0].toFixed(0); + res += " ops/minute (" + min_score.toFixed(0) + "-" + max_score.toFixed(0) + "), warmup=" + scores[0].toFixed(0); } print_always(arg, res); } @@ -163,13 +168,13 @@ function print_verbose(arg, x) { if (verbose) { - print_always(arg, x) + print_always(arg, x) } } function run_suite(tests, iters) { for (var idx = 0; idx < tests.length; idx++) { - run_one_benchmark(tests[idx], iters); + run_one_benchmark(tests[idx], iters); } } @@ -184,13 +189,13 @@ var new_args = []; for (i in args) { if (args[i].toString().indexOf(' ') != -1) { - args[i] = args[i].replace(/\/$/, ''); - var s = args[i].split(' '); - for (j in s) { - new_args.push(s[j]); - } + args[i] = args[i].replace(/\/$/, ''); + var s = args[i].split(' '); + for (j in s) { + new_args.push(s[j]); + } } else { - new_args.push(args[i]); + new_args.push(args[i]); } } @@ -205,46 +210,46 @@ for (var i = 0; i < args.length; i++) { arg = args[i]; if (arg == "--iterations") { - iters = +args[++i]; - if (isNaN(iters)) { - throw "'--iterations' must be followed by integer"; - } + iters = +args[++i]; + if (isNaN(iters)) { + throw "'--iterations' must be followed by integer"; + } } else if (arg == "--runtime") { - runtime = args[++i]; + runtime = args[++i]; } else if (arg == "--verbose") { - verbose = true; + verbose = true; } else if (arg == "--min-time") { - min_time = +args[++i]; - if (isNaN(iters)) { - throw "'--min-time' must be followed by integer"; - } + min_time = +args[++i]; + if (isNaN(iters)) { + throw "'--min-time' must be followed by integer"; + } } else if (arg == "") { - continue; //skip + continue; //skip } else { - var found = false; - for (j in tests) { - if (tests[j].name === arg) { - tests_found.push(tests[j]); - found = true; - break; + var found = false; + for (j in tests) { + if (tests[j].name === arg) { + tests_found.push(tests[j]); + found = true; + break; + } } - } - if (!found) { - var str = "unknown test name: '" + arg + "' -- valid names are: "; - for (j in tests) { - if (j != 0) { - str += ", "; + if (!found) { + var str = "unknown test name: '" + arg + "' -- valid names are: "; + for (j in tests) { + if (j != 0) { + str += ", "; + } + str += "'" + tests[j].name + "'"; + } + throw str; } - str += "'" + tests[j].name + "'"; - } - throw str; - } } } if (tests_found.length == 0) { for (i in tests) { - tests_found.push(tests[i]); + tests_found.push(tests[i]); } } @@ -255,21 +260,21 @@ if (is_this_nashorn()) { try { - read = readFully; + read = readFully; } catch (e) { - print("ABORTING: Cannot find 'readFully'. You must have scripting enabled to use this test harness. (-scripting)"); - throw e; + print("ABORTING: Cannot find 'readFully'. You must have scripting enabled to use this test harness. (-scripting)"); + throw e; } } // run tests in alphabetical order by name tests_found.sort(function(a, b) { if (a.name < b.name) { - return -1; + return -1; } else if (a.name > b.name) { - return 1; + return 1; } else { - return 0; + return 0; } });