Bug 1339406 - Part 7: Remove tests for tracemonkey options from jstests. r=arai
authorAndré Bargull <andre.bargull@gmail.com>
Tue, 14 Feb 2017 10:28:55 -0800
changeset 342915 9a7b08f075ac93c59484cb0613453979add5a8e2
parent 342914 8de9955bf06203b53da9a1ff4d780af21b6aefb6
child 342916 a1db7869fd0fd506e65c0a704e55d09dba6ad057
push id31366
push usercbook@mozilla.com
push dateWed, 15 Feb 2017 11:25:19 +0000
treeherdermozilla-central@c0807d6938c1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersarai
bugs1339406
milestone54.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1339406 - Part 7: Remove tests for tracemonkey options from jstests. r=arai
js/src/tests/js1_5/Regress/regress-456494.js
js/src/tests/js1_8_1/jit/math-jit-tests.js
js/src/tests/js1_8_1/jit/regress-458838.js
js/src/tests/js1_8_1/jit/regress-462459-01.js
js/src/tests/js1_8_1/jit/regress-462459-02.js
js/src/tests/js1_8_1/jit/regress-462459-03.js
js/src/tests/js1_8_1/jit/regress-462459-04.js
js/src/tests/js1_8_1/jit/regress-462459-05.js
js/src/tests/js1_8_1/jit/regress-462459-06.js
js/src/tests/js1_8_1/jit/regress-462459-07.js
js/src/tests/js1_8_1/jit/regress-462459-08.js
js/src/tests/js1_8_1/jit/regress-462459-09.js
js/src/tests/js1_8_1/jit/regress-462459-10.js
js/src/tests/js1_8_1/jit/regress-462459-11.js
js/src/tests/js1_8_1/jit/regress-462459-12.js
js/src/tests/js1_8_1/jit/regress-471635.js
js/src/tests/js1_8_1/jit/shell.js
--- a/js/src/tests/js1_5/Regress/regress-456494.js
+++ b/js/src/tests/js1_5/Regress/regress-456494.js
@@ -28,21 +28,12 @@ function test()
   {
     for (i = 0; i < 10; i++)
     {
       k.apply(this, arguments);
     }
   }
   f(1);
 
-
-  if (typeof this.tracemonkey != 'undefined')
-  {
-    for (var p in this.tracemonkey)
-    {
-      print(p + ':' + this.tracemonkey[p]);
-    }
-  }
-
   reportCompare(expect, actual, summary);
 
   exitFunc ('test');
 }
--- a/js/src/tests/js1_8_1/jit/math-jit-tests.js
+++ b/js/src/tests/js1_8_1/jit/math-jit-tests.js
@@ -5,74 +5,30 @@
 
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 'none';
 var summary = 'trace-capability math mini-testsuite';
 
 printBugNumber(BUGNUMBER);
 printStatus (summary);
 
-
-/**
- * A number of the tests in this file depend on the setting of
- * HOTLOOP.  Define some constants up front, so they're easy to grep
- * for.
- */
-// The HOTLOOP constant we depend on; only readable from our stats
-// object in debug builds.
-const haveTracemonkey = !!(this.tracemonkey)
-const HOTLOOP = haveTracemonkey ? tracemonkey.HOTLOOP : 2;
+// The loop count at which we trace
+const RECORDLOOP = 8;
+// The loop count at which we run the trace
+const RUNLOOP = RECORDLOOP + 1;
 
 var testName = null;
 if ("arguments" in this && arguments.length > 0)
   testName = arguments[0];
 var fails = [], passes=[];
 
-function jitstatHandler(f)
-{
-  if (!haveTracemonkey) 
-    return;
-
-  // XXXbz this is a nasty hack, but I can't figure out a way to
-  // just use jitstats.tbl here
-  f("recorderStarted");
-  f("recorderAborted");
-  f("traceCompleted");
-  f("sideExitIntoInterpreter");
-  f("typeMapMismatchAtEntry");
-  f("returnToDifferentLoopHeader");
-  f("traceTriggered");
-  f("globalShapeMismatchAtEntry");
-  f("treesTrashed");
-  f("slotPromoted");
-  f("unstableLoopVariable");
-  f("noCompatInnerTrees");
-  f("breakLoopExits");
-  f("returnLoopExits");
-}
-
 function test(f)
 {
   if (!testName || testName == f.name) {
-    // Collect our jit stats
-    var localJITstats = {};
-    jitstatHandler(function(prop, local, global) {
-        localJITstats[prop] = tracemonkey[prop];
-      });
-    check(f.name, f(), f.expected, localJITstats, f.jitstats);
-  }
-}
-
-function map_test(t, cases)
-{
-  for (var i = 0; i < cases.length; i++) {
-    function c() { return t(cases[i].input); }
-    c.expected = cases[i].expected;
-    c.name = t.name + "(" + uneval(cases[i].input) + ")";
-    test(c);
+    check(f.name, f(), f.expected);
   }
 }
 
 // Use this function to compare expected and actual test results.
 // Types must match.
 // For numbers, treat NaN as matching NaN, distinguish 0 and -0, and
 // tolerate a certain degree of error for other values.
 //
@@ -98,91 +54,47 @@ function close_enough(expected, actual)
 
   // Distinguish 0 and -0.
   if (actual == 0)
     return (1 / actual > 0) == (1 / expected > 0);
 
   return true;
 }
 
-function check(desc, actual, expected, oldJITstats, expectedJITstats)
+function check(desc, actual, expected,  expectedJITstats)
 {
-  var pass = false;
   if (close_enough(expected, actual)) {
-    pass = true;
-    jitstatHandler(function(prop) {
-        if (expectedJITstats && prop in expectedJITstats &&
-            expectedJITstats[prop] !=
-            tracemonkey[prop] - oldJITstats[prop]) {
-          pass = false;
-        }
-      });
-    if (pass) {
-      reportCompare(expected, actual, desc);
-      passes.push(desc);
-      return print(desc, ": passed");
-    }
+    reportCompare(expected, actual, desc);
+    passes.push(desc);
+    return print(desc, ": passed");
   }
 
   if (expected instanceof RegExp) {
-    pass = reportMatch(expected, actual + '', desc);
-    if (pass) {
-      jitstatHandler(function(prop) {
-          if (expectedJITstats && prop in expectedJITstats &&
-              expectedJITstats[prop] !=
-              tracemonkey[prop] - oldJITstats[prop]) {
-            pass = false;
-          }
-        });
-    }
-    if (pass) {
+    if (reportMatch(expected, actual + '', desc)) {
       passes.push(desc);
       return print(desc, ": passed");
     }
   }
 
   reportCompare(expected, actual, desc);
 
   fails.push(desc);
-  var expectedStats = "";
-  if (expectedJITstats) {
-    jitstatHandler(function(prop) {
-        if (prop in expectedJITstats) {
-          if (expectedStats)
-            expectedStats += " ";
-          expectedStats +=
-            prop + ": " + expectedJITstats[prop];
-        }
-      });
-  }
-  var actualStats = "";
-  if (expectedJITstats) {
-    jitstatHandler(function(prop) {
-        if (prop in expectedJITstats) {
-          if (actualStats)
-            actualStats += " ";
-          actualStats += prop + ": " + (tracemonkey[prop]-oldJITstats[prop]);
-        }
-      });
-  }
+
   print(desc, ": FAILED: expected", typeof(expected), 
         "(", uneval(expected), ")",
-        (expectedStats ? " [" + expectedStats + "] " : ""),
         "!= actual",
-        typeof(actual), "(", uneval(actual), ")",
-        (actualStats ? " [" + actualStats + "] " : ""));
+        typeof(actual), "(", uneval(actual), ")");
 }
 
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 // Apply FUNCNAME to ARGS, and check against EXPECTED.
 // Expect a loop containing such a call to be traced.
 // FUNCNAME and ARGS are both strings.
 // ARGS has the form of an argument list: a comma-separated list of expressions.
-// Certain Tracemonkey limitations require us to pass FUNCNAME as a string.
 // Passing ARGS as a string allows us to assign better test names:
 // expressions like Math.PI/4 haven't been evaluated to big hairy numbers.
 function testmath(funcname, args, expected) {
     var i, j;
 
     var arg_value_list = eval("[" + args + "]");
     var arity = arg_value_list.length;
 
@@ -217,26 +129,16 @@ function testmath(funcname, args, expect
     function testfunc() {
         // Map the function across the dummy values and the test input.
         mapfunc(dummies_and_input);
         return dummies_and_input[RUNLOOP];
     }
     testfunc.name = funcname + "(" + args + ")";
     testfunc.expected = expected;
 
-    // Disable jitstats check. This never worked right. The actual part of the
-    // loop we cared about was never traced. We traced the filler parts early
-    // and then took a mismatch side exit on every subequent array read with
-    // a different type (gal, discovered when fixing bug 479110).
-    // testfunc.jitstats = {
-    //   recorderStarted: 1,
-    //   recorderAborted: 0,
-    //   traceTriggered: 1
-    // };
-
     test(testfunc);
 }
 
 testmath("Math.abs", "void 0", Number.NaN)
 testmath("Math.abs", "null", 0)
 testmath("Math.abs", "true", 1)
 testmath("Math.abs", "false", 0)
 testmath("Math.abs", "\"a string primitive\"", Number.NaN)
--- a/js/src/tests/js1_8_1/jit/regress-458838.js
+++ b/js/src/tests/js1_8_1/jit/regress-458838.js
@@ -31,33 +31,12 @@ function test()
     }
 
     return g();
   }
 
   expect = 10;
   actual  = f();
 
-  var recorderStarted;
-  var recorderAborted;
-  var traceCompleted;
-  var skip = true;
-  
-  if (this.tracemonkey && !this.tracemonkey.adaptive)
-  {
-    recorderStarted = this.tracemonkey.recorderStarted;
-    recorderAborted = this.tracemonkey.recorderAborted;
-    traceCompleted  = this.tracemonkey.traceCompleted;
-    skip = false;
-  }
-
-
   reportCompare(expect, actual, summary + ': return value 10');
 
-  if (!skip)
-  {
-    expect = 'recorderStarted=1, recorderAborted=0, traceCompleted=1';
-    actual = 'recorderStarted=' + recorderStarted + ', recorderAborted=' + recorderAborted + ', traceCompleted=' + traceCompleted;
-    reportCompare(expect, actual, summary + ': trace');
-  }
-
   exitFunc ('test');
 }
deleted file mode 100644
--- a/js/src/tests/js1_8_1/jit/regress-462459-01.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace Array()';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-
-if (!this.tracemonkey || this.tracemonkey.adaptive)
-{
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    Array();
-  }
-
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
deleted file mode 100644
--- a/js/src/tests/js1_8_1/jit/regress-462459-02.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace Array(1)';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-
-if (!this.tracemonkey || this.tracemonkey.adaptive)
-{
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    Array(1);
-  }
-
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
deleted file mode 100644
--- a/js/src/tests/js1_8_1/jit/regress-462459-03.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace Array(1, 2)';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-
-if (!this.tracemonkey || this.tracemonkey.adaptive)
-{
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    Array(1, 2);
-  }
-
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
deleted file mode 100644
--- a/js/src/tests/js1_8_1/jit/regress-462459-04.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace Array(1, 2, 3)';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-
-if (!this.tracemonkey || this.tracemonkey.adaptive)
-{
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    Array(1, 2, 3);
-  }
-
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
deleted file mode 100644
--- a/js/src/tests/js1_8_1/jit/regress-462459-05.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace new Array()';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-
-if (!this.tracemonkey || this.tracemonkey.adaptive)
-{
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    new Array();
-  }
-
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
deleted file mode 100644
--- a/js/src/tests/js1_8_1/jit/regress-462459-06.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace new Array(1)';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-
-if (!this.tracemonkey || this.tracemonkey.adaptive)
-{
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    new Array(1);
-  }
-
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
deleted file mode 100644
--- a/js/src/tests/js1_8_1/jit/regress-462459-07.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace new Array(1, 2)';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-
-if (!this.tracemonkey || this.tracemonkey.adaptive)
-{
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    new Array(1, 2);
-  }
-
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
deleted file mode 100644
--- a/js/src/tests/js1_8_1/jit/regress-462459-08.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace new Array(1, 2, 3)';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-
-if (!this.tracemonkey || this.tracemonkey.adaptive)
-{
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    new Array(1, 2, 3);
-  }
-
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
deleted file mode 100644
--- a/js/src/tests/js1_8_1/jit/regress-462459-09.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace []';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-
-if (!this.tracemonkey || this.tracemonkey.adaptive)
-{
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    [];
-  }
-
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
deleted file mode 100644
--- a/js/src/tests/js1_8_1/jit/regress-462459-10.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace [1]';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-
-if (!this.tracemonkey || this.tracemonkey.adaptive)
-{
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    [1];
-  }
-
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
deleted file mode 100644
--- a/js/src/tests/js1_8_1/jit/regress-462459-11.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace [1, 2]';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-
-if (!this.tracemonkey || this.tracemonkey.adaptive)
-{
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    [1, 2];
-  }
-
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
deleted file mode 100644
--- a/js/src/tests/js1_8_1/jit/regress-462459-12.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace [1, 2, 3]';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-
-if (!this.tracemonkey || this.tracemonkey.adaptive)
-{
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    [1, 2, 3];
-  }
-
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
deleted file mode 100644
--- a/js/src/tests/js1_8_1/jit/regress-471635.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 471635;
-var summary = 'TM: trace js shell print()';
-var actual = '';
-var expect = '';
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
-
-
-  (function(){
-    for (var i = 1; i < 20; ++i) {
-      print("#");
-    }
-  })();
-
-  var recorderStarted;
-  var recorderAborted;
-  var traceCompleted;
-  var skip = true;
-
-  if (this.tracemonkey && !this.tracemonkey.adaptive)
-  {
-    recorderStarted = this.tracemonkey.recorderStarted;
-    recorderAborted = this.tracemonkey.recorderAborted;
-    traceCompleted  = this.tracemonkey.traceCompleted;
-    skip = false;
-  }
-
-
-  if (!skip)
-  {
-    expect = 'recorderStarted=1, recorderAborted=0, traceCompleted=1';
-    actual = 'recorderStarted=' + recorderStarted + ', recorderAborted=' + recorderAborted + ', traceCompleted=' + traceCompleted;
-  }
-  else
-  {
-    expect = actual = 'Test skipped due to lack of tracemonkey jitstats object.';
-  }
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
--- a/js/src/tests/js1_8_1/jit/shell.js
+++ b/js/src/tests/js1_8_1/jit/shell.js
@@ -1,4 +0,0 @@
-// The loop count at which we trace
-const RECORDLOOP = this.tracemonkey ? tracemonkey.HOTLOOP : 8;
-// The loop count at which we run the trace
-const RUNLOOP = RECORDLOOP + 1;