Atomics: ensure all SharedArrayBuffer sizes are uniform

test/built-ins/Atomics/add/expected-return-value.js

@@ -27,7 +27,7 @@ info: |
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
-var buffer = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT);
+var buffer = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4);
 var i32a = new Int32Array(buffer);
 var newValue = 0b00000001000000001000000010000001;
 

test/built-ins/Atomics/and/expected-return-value.js

@@ -27,7 +27,7 @@ info: |
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
-var buffer = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT);
+var buffer = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4);
 var i32a = new Int32Array(buffer);
 var initial = 0b00000001000000001000000010000001;
 var other = 0b00000001111111111000000011111111;

test/built-ins/Atomics/compareExchange/expected-return-value.js

@@ -26,7 +26,7 @@ info: |
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
-var buffer = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT);
+var buffer = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4);
 var i32a = new Int32Array(buffer);
 var update = 0b00000001000000001000000010000001;
 

test/built-ins/Atomics/exchange/expected-return-value.js

@@ -27,7 +27,7 @@ info: |
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
-var buffer = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT);
+var buffer = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4);
 var i32a = new Int32Array(buffer);
 var update = 0b00000001000000001000000010000001;
 

test/built-ins/Atomics/load/expected-return-value.js

@@ -28,7 +28,7 @@ info: |
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
-var buffer = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT);
+var buffer = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4);
 var i32a = new Int32Array(buffer);
 var update = 0b00000001000000001000000010000001;
 

test/built-ins/Atomics/or/expected-return-value.js

@@ -27,7 +27,7 @@ info: |
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
-var buffer = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT);
+var buffer = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4);
 var i32a = new Int32Array(buffer);
 var update = 0b00000001000000001000000010000001;
 

test/built-ins/Atomics/store/expected-return-value.js

@@ -18,7 +18,7 @@ info: |
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
-var buffer = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT);
+var buffer = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4);
 var i32a = new Int32Array(buffer);
 var update = 0b00000001000000001000000010000001;
 

test/built-ins/Atomics/sub/expected-return-value.js

@@ -27,7 +27,7 @@ info: |
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
-var buffer = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT);
+var buffer = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4);
 var i32a = new Int32Array(buffer);
 var update = 0b00000001000000001000000010000001;
 

test/built-ins/Atomics/wait/bad-range.js

@@ -16,7 +16,7 @@ features: [ArrayBuffer, arrow-function, Atomics, DataView, for-of, let, SharedAr
 ---*/
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 8)
 );
 
 testWithAtomicsOutOfBoundsIndices(function(IdxGen) {

test/built-ins/Atomics/wait/bigint/bad-range.js

@@ -16,7 +16,7 @@ features: [ArrayBuffer, arrow-function, Atomics, BigInt, DataView, for-of, let,
 ---*/
 
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 
 testWithAtomicsOutOfBoundsIndices(function(IdxGen) {

test/built-ins/Atomics/wait/bigint/cannot-suspend-throws.js

@@ -19,7 +19,7 @@ flags: [CanBlockIsFalse]
 ---*/
 
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 
 assert.throws(TypeError, function() {

test/built-ins/Atomics/wait/bigint/false-for-timeout-agent.js

@@ -41,7 +41,7 @@ $262.agent.start(`
 `);
 
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 
 $262.agent.broadcast(i64a.buffer);

test/built-ins/Atomics/wait/bigint/false-for-timeout.js

@@ -17,7 +17,7 @@ flags: [CanBlockIsFalse]
 ---*/
 
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 
 const valueOf = {

test/built-ins/Atomics/wait/bigint/nan-for-timeout.js

@@ -26,7 +26,7 @@ $262.agent.start(`
 `);
 
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 
 $262.agent.broadcast(i64a.buffer);

test/built-ins/Atomics/wait/bigint/negative-index-throws.js

@@ -17,7 +17,7 @@ features: [Atomics, BigInt, SharedArrayBuffer, TypedArray]
 ---*/
 
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 const poisoned = {
   valueOf: function() {

test/built-ins/Atomics/wait/bigint/negative-timeout-agent.js

@@ -18,7 +18,7 @@ $262.agent.start(`
 `);
 
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 
 $262.agent.broadcast(i64a.buffer);

test/built-ins/Atomics/wait/bigint/negative-timeout.js

@@ -10,7 +10,7 @@ flags: [CanBlockIsFalse]
 ---*/
 
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 
 assert.sameValue(Atomics.wait(i64a, 0, 0, -1), "timed-out");

test/built-ins/Atomics/wait/bigint/no-spurious-wakeup-no-operation.js

@@ -29,11 +29,11 @@ $262.agent.start(`
 `);
 
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 
 $262.agent.broadcast(i64a.buffer);
-$262.agent.sleep(100);
+$262.agent.sleep(10);
 
 // NO OPERATION OCCURS HERE!
 

test/built-ins/Atomics/wait/bigint/no-spurious-wakeup-on-add.js

@@ -9,9 +9,9 @@ includes: [atomicsHelper.js]
 features: [ArrayBuffer, DataView, let, arrow-function, for-of, Atomics, BigInt, SharedArrayBuffer, TypedArray]
 ---*/
 
-const TIMEOUT = 2000;
+const TIMEOUT = 200;
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 
 $262.agent.start(`
@@ -26,7 +26,7 @@ $262.agent.start(`
 `);
 
 $262.agent.broadcast(i64a.buffer);
-$262.agent.sleep(100);
+$262.agent.sleep(10);
 
 Atomics.add(i64a, 0, 1);
 

test/built-ins/Atomics/wait/bigint/no-spurious-wakeup-on-and.js

@@ -8,9 +8,9 @@ description: >
 includes: [testAtomics.js]
 features: [ArrayBuffer, DataView, let, arrow-function, for-of, Atomics, BigInt, SharedArrayBuffer, TypedArray]
 ---*/
-const TIMEOUT = 2000;
+const TIMEOUT = 200;
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 
 $262.agent.start(`
@@ -25,7 +25,7 @@ $262.agent.start(`
 `);
 
 $262.agent.broadcast(i64a.buffer);
-$262.agent.sleep(100);
+$262.agent.sleep(10);
 
 Atomics.and(i64a, 0, 1);
 

test/built-ins/Atomics/wait/bigint/no-spurious-wakeup-on-compareExchange.js

@@ -8,9 +8,9 @@ description: >
 includes: [testAtomics.js]
 features: [Atomics, BigInt, SharedArrayBuffer, TypedArray, ArrayBuffer, DataView, let, arrow-function, for-of]
 ---*/
-const TIMEOUT = 2000;
+const TIMEOUT = 200;
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 
 $262.agent.start(`
@@ -25,7 +25,7 @@ $262.agent.start(`
 `);
 
 $262.agent.broadcast(i64a.buffer);
-$262.agent.sleep(100);
+$262.agent.sleep(10);
 
 Atomics.compareExchange(i64a, 0, 0, 1);
 

test/built-ins/Atomics/wait/bigint/no-spurious-wakeup-on-exchange.js

@@ -8,9 +8,9 @@ description: >
 includes: [testAtomics.js]
 features: [Atomics, BigInt, SharedArrayBuffer, TypedArray, ArrayBuffer, DataView, let, arrow-function, for-of]
 ---*/
-const TIMEOUT = 2000;
+const TIMEOUT = 200;
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 
 $262.agent.start(`
@@ -25,7 +25,7 @@ $262.agent.start(`
 `);
 
 $262.agent.broadcast(i64a.buffer);
-$262.agent.sleep(100);
+$262.agent.sleep(10);
 
 Atomics.exchange(i64a, 0, 1);
 

test/built-ins/Atomics/wait/bigint/no-spurious-wakeup-on-or.js

@@ -8,9 +8,9 @@ description: >
 includes: [testAtomics.js]
 features: [Atomics, BigInt, SharedArrayBuffer, TypedArray, ArrayBuffer, DataView, let, arrow-function, for-of, Atomics, BigInt, SharedArrayBuffer, TypedArray]
 ---*/
-const TIMEOUT = 2000;
+const TIMEOUT = 200;
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 
 $262.agent.start(`
@@ -25,7 +25,7 @@ $262.agent.start(`
 `);
 
 $262.agent.broadcast(i64a.buffer);
-$262.agent.sleep(100);
+$262.agent.sleep(10);
 
 Atomics.or(i64a, 0, 1);
 

test/built-ins/Atomics/wait/bigint/no-spurious-wakeup-on-store.js

@@ -8,9 +8,9 @@ description: >
 includes: [testAtomics.js]
 features: [Atomics, BigInt, SharedArrayBuffer, TypedArray, ArrayBuffer, DataView, let, arrow-function, for-of, Atomics, BigInt, SharedArrayBuffer, TypedArray]
 ---*/
-const TIMEOUT = 2000;
+const TIMEOUT = 200;
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 
 $262.agent.start(`
@@ -25,7 +25,7 @@ $262.agent.start(`
 `);
 
 $262.agent.broadcast(i64a.buffer);
-$262.agent.sleep(100);
+$262.agent.sleep(10);
 
 Atomics.store(i64a, 0, 0x111111);
 

test/built-ins/Atomics/wait/bigint/no-spurious-wakeup-on-sub.js

@@ -8,9 +8,9 @@ description: >
 includes: [testAtomics.js]
 features: [Atomics, BigInt, SharedArrayBuffer, TypedArray, ArrayBuffer, DataView, let, arrow-function, for-of, Atomics, BigInt, SharedArrayBuffer, TypedArray]
 ---*/
-const TIMEOUT = 2000;
+const TIMEOUT = 200;
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 
 $262.agent.start(`
@@ -25,7 +25,7 @@ $262.agent.start(`
 `);
 
 $262.agent.broadcast(i64a.buffer);
-$262.agent.sleep(100);
+$262.agent.sleep(10);
 
 Atomics.sub(i64a, 0, 1);
 

test/built-ins/Atomics/wait/bigint/no-spurious-wakeup-on-xor.js

@@ -8,9 +8,9 @@ description: >
 includes: [testAtomics.js]
 features: [Atomics, BigInt, SharedArrayBuffer, TypedArray, ArrayBuffer, DataView, let, arrow-function, for-of, Atomics, BigInt, SharedArrayBuffer, TypedArray]
 ---*/
-const TIMEOUT = 2000;
+const TIMEOUT = 200;
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 
 $262.agent.start(`
@@ -25,7 +25,7 @@ $262.agent.start(`
 `);
 
 $262.agent.broadcast(i64a.buffer);
-$262.agent.sleep(100);
+$262.agent.sleep(10);
 
 Atomics.xor(i64a, 0, 1);
 

test/built-ins/Atomics/wait/bigint/null-bufferdata-throws.js

@@ -26,7 +26,7 @@ features: [ArrayBuffer, Atomics, BigInt, TypedArray]
 ---*/
 
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 const poisoned = {
   valueOf: function() {

test/built-ins/Atomics/wait/bigint/out-of-range-index-throws.js

@@ -17,7 +17,7 @@ features: [Atomics, BigInt, SharedArrayBuffer, TypedArray]
 ---*/
 
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 
 const poisoned = {

test/built-ins/Atomics/wait/bigint/value-not-equal.js

@@ -31,7 +31,7 @@ $262.agent.start(`
 `);
 
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 
 $262.agent.broadcast(i64a.buffer);

test/built-ins/Atomics/wait/bigint/waiterlist-block-indexedposition-wake.js

@@ -27,8 +27,7 @@ $262.agent.start(`
     const i64a = new BigInt64Array(sab);
 
     // Wait on index 0
-    Atomics.wait(i64a, 0, 0, 200);
-    $262.agent.report(0);
+    $262.agent.report(Atomics.wait(i64a, 0, 0, Infinity));
     $262.agent.leaving();
   });
 `);
@@ -37,25 +36,32 @@ $262.agent.start(`
   $262.agent.receiveBroadcast(function(sab) {
     const i64a = new BigInt64Array(sab);
 
-    // Wait on index 2
-    Atomics.wait(i64a, 2, 0, 200);
-    $262.agent.report(2);
+    // Wait on index 7
+    $262.agent.report(Atomics.wait(i64a, 7, 0, Infinity));
     $262.agent.leaving();
   });
 `);
 
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(4 * BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 
 $262.agent.broadcast(i64a.buffer);
 $262.agent.sleep(10);
 
-// Wake index 2
-Atomics.wake(i64a, 2, 1);
-assert.sameValue(getReport(), '2');
+// Wake index 1, wakes nothing
+assert.sameValue(Atomics.wake(i64a, 1), 0, 'Atomics.wake(i64a, 1) returns 0');
+// Wake index 3, wakes nothing
+assert.sameValue(Atomics.wake(i64a, 3), 0, 'Atomics.wake(i64a, 3) returns 0');
+// Wake index 4, wakes nothing
+assert.sameValue(Atomics.wake(i64a, 4), 0, 'Atomics.wake(i64a, 4) returns 0');
+// Wake index 5, wakes nothing
+assert.sameValue(Atomics.wake(i64a, 5), 0, 'Atomics.wake(i64a, 5) returns 0');
 
-// Wake index 0
-Atomics.wake(i64a, 0, 1);
-assert.sameValue(getReport(), '0');
+// Wake index 7, wakes 1
+assert.sameValue(Atomics.wake(i64a, 7), 1, 'Atomics.wake(i64a, 7) returns 1');
+assert.sameValue(getReport(), 'ok', 'getReport() returns "ok"');
 
+// Wake index 0, wakes 1
+assert.sameValue(Atomics.wake(i64a, 0), 1, 'Atomics.wake(i64a, 0) returns 1');
+assert.sameValue(getReport(), 'ok', 'getReport() returns "ok"');

test/built-ins/Atomics/wait/bigint/waiterlist-order-of-operations-is-fifo.js

@@ -54,7 +54,7 @@ $262.agent.start(`
 
 
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(4 * BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 
 $262.agent.broadcast(i64a.buffer);

test/built-ins/Atomics/wait/bigint/was-woken-before-timeout.js

@@ -37,7 +37,7 @@ $262.agent.start(`
 `);
 
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 
 $262.agent.broadcast(i64a.buffer);

test/built-ins/Atomics/wait/cannot-suspend-throws.js

@@ -19,7 +19,7 @@ flags: [CanBlockIsFalse]
 ---*/
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 assert.throws(TypeError, function() {

test/built-ins/Atomics/wait/false-for-timeout-agent.js

@@ -41,7 +41,7 @@ $262.agent.start(`
 `);
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.broadcast(i32a.buffer);

test/built-ins/Atomics/wait/false-for-timeout.js

@@ -17,7 +17,7 @@ flags: [CanBlockIsFalse]
 ---*/
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 const valueOf = {

test/built-ins/Atomics/wait/nan-for-timeout.js

@@ -26,7 +26,7 @@ $262.agent.start(`
 `);
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.broadcast(i32a.buffer);

test/built-ins/Atomics/wait/negative-index-throws.js

@@ -19,7 +19,7 @@ features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 const poisoned = {

test/built-ins/Atomics/wait/negative-timeout-agent.js

@@ -18,7 +18,7 @@ $262.agent.start(`
 `);
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.broadcast(i32a.buffer);

test/built-ins/Atomics/wait/negative-timeout.js

@@ -10,7 +10,7 @@ flags: [CanBlockIsFalse]
 ---*/
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 assert.sameValue(Atomics.wait(i32a, 0, 0, -1), "timed-out");

test/built-ins/Atomics/wait/no-spurious-wakeup-on-add.js

@@ -9,9 +9,9 @@ includes: [atomicsHelper.js]
 features: [ArrayBuffer, DataView, let, arrow-function, for-of, Atomics, BigInt, SharedArrayBuffer, TypedArray]
 ---*/
 
-const TIMEOUT = 2000;
+const TIMEOUT = 200;
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.start(`
@@ -26,7 +26,7 @@ $262.agent.start(`
 `);
 
 $262.agent.broadcast(i32a.buffer);
-$262.agent.sleep(100);
+$262.agent.sleep(10);
 
 Atomics.add(i32a, 0, 1);
 

test/built-ins/Atomics/wait/no-spurious-wakeup-on-and.js

@@ -9,9 +9,9 @@ includes: [atomicsHelper.js]
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
-const TIMEOUT = 2000;
+const TIMEOUT = 200;
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.start(`
@@ -26,7 +26,7 @@ $262.agent.start(`
 `);
 
 $262.agent.broadcast(i32a.buffer);
-$262.agent.sleep(100);
+$262.agent.sleep(10);
 
 Atomics.and(i32a, 0, 1);
 

test/built-ins/Atomics/wait/no-spurious-wakeup-on-compareExchange.js

@@ -9,9 +9,9 @@ includes: [atomicsHelper.js]
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
-const TIMEOUT = 2000;
+const TIMEOUT = 200;
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.start(`
@@ -26,7 +26,7 @@ $262.agent.start(`
 `);
 
 $262.agent.broadcast(i32a.buffer);
-$262.agent.sleep(100);
+$262.agent.sleep(10);
 
 Atomics.compareExchange(i32a, 0, 0, 1);
 

test/built-ins/Atomics/wait/no-spurious-wakeup-on-exchange.js

@@ -9,9 +9,9 @@ includes: [atomicsHelper.js]
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
-const TIMEOUT = 2000;
+const TIMEOUT = 200;
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.start(`
@@ -26,7 +26,7 @@ $262.agent.start(`
 `);
 
 $262.agent.broadcast(i32a.buffer);
-$262.agent.sleep(100);
+$262.agent.sleep(10);
 
 Atomics.exchange(i32a, 0, 1);
 

test/built-ins/Atomics/wait/no-spurious-wakeup-on-or.js

@@ -9,9 +9,9 @@ includes: [atomicsHelper.js]
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
-const TIMEOUT = 2000;
+const TIMEOUT = 200;
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.start(`
@@ -26,7 +26,7 @@ $262.agent.start(`
 `);
 
 $262.agent.broadcast(i32a.buffer);
-$262.agent.sleep(100);
+$262.agent.sleep(10);
 
 Atomics.or(i32a, 0, 1);
 

test/built-ins/Atomics/wait/no-spurious-wakeup-on-store.js

@@ -9,9 +9,9 @@ includes: [atomicsHelper.js]
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
-const TIMEOUT = 2000;
+const TIMEOUT = 200;
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.start(`
@@ -26,7 +26,7 @@ $262.agent.start(`
 `);
 
 $262.agent.broadcast(i32a.buffer);
-$262.agent.sleep(100);
+$262.agent.sleep(10);
 
 Atomics.store(i32a, 0, 0x111111);
 

test/built-ins/Atomics/wait/no-spurious-wakeup-on-sub.js

@@ -9,9 +9,9 @@ includes: [atomicsHelper.js]
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
-const TIMEOUT = 2000;
+const TIMEOUT = 200;
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.start(`
@@ -26,7 +26,7 @@ $262.agent.start(`
 `);
 
 $262.agent.broadcast(i32a.buffer);
-$262.agent.sleep(100);
+$262.agent.sleep(10);
 
 Atomics.sub(i32a, 0, 1);
 

test/built-ins/Atomics/wait/no-spurious-wakeup-on-xor.js

@@ -9,9 +9,9 @@ includes: [atomicsHelper.js]
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
-const TIMEOUT = 2000;
+const TIMEOUT = 200;
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.start(`
@@ -26,7 +26,7 @@ $262.agent.start(`
 `);
 
 $262.agent.broadcast(i32a.buffer);
-$262.agent.sleep(100);
+$262.agent.sleep(10);
 
 Atomics.xor(i32a, 0, 1);
 

test/built-ins/Atomics/wait/null-bufferdata-throws.js

@@ -17,7 +17,7 @@ features: [ArrayBuffer, Atomics, TypedArray]
 ---*/
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 const poisoned = {

test/built-ins/Atomics/wait/null-for-timeout-agent.js

@@ -41,7 +41,7 @@ $262.agent.start(`
 `);
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.broadcast(i32a.buffer);

test/built-ins/Atomics/wait/null-for-timeout.js

@@ -17,7 +17,7 @@ flags: [CanBlockIsFalse]
 ---*/
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 const valueOf = {

test/built-ins/Atomics/wait/object-for-timeout-agent.js

@@ -46,7 +46,7 @@ $262.agent.start(`
 `);
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.broadcast(i32a.buffer);

test/built-ins/Atomics/wait/object-for-timeout.js

@@ -21,7 +21,7 @@ flags: [CanBlockIsFalse]
 ---*/
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 const valueOf = {

test/built-ins/Atomics/wait/out-of-range-index-throws.js

@@ -17,7 +17,7 @@ features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 const poisoned = {
@@ -30,7 +30,10 @@ assert.throws(RangeError, function() {
   Atomics.wait(i32a, Infinity, poisoned, poisoned);
 });
 assert.throws(RangeError, function() {
-  Atomics.wait(i32a, 2, poisoned, poisoned);
+  Atomics.wait(i32a, -1, poisoned, poisoned);
+});
+assert.throws(RangeError, function() {
+  Atomics.wait(i32a, 4, poisoned, poisoned);
 });
 assert.throws(RangeError, function() {
   Atomics.wait(i32a, 200, poisoned, poisoned);

test/built-ins/Atomics/wait/poisoned-object-for-timeout-throws-agent.js

@@ -48,7 +48,7 @@ $262.agent.start(`
 `);
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.broadcast(i32a.buffer);

test/built-ins/Atomics/wait/poisoned-object-for-timeout-throws.js

@@ -19,7 +19,7 @@ features: [Atomics, SharedArrayBuffer, Symbol, Symbol.toPrimitive, TypedArray]
 ---*/
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 const poisonedValueOf = {

test/built-ins/Atomics/wait/symbol-for-index-throws-agent.js

@@ -61,7 +61,7 @@ $262.agent.start(`
 `);
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.broadcast(i32a.buffer);

test/built-ins/Atomics/wait/symbol-for-index-throws.js

@@ -29,7 +29,7 @@ features: [Atomics, SharedArrayBuffer, Symbol, Symbol.toPrimitive, TypedArray]
 ---*/
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 const poisonedValueOf = {

test/built-ins/Atomics/wait/symbol-for-timeout-throws-agent.js

@@ -35,7 +35,7 @@ $262.agent.start(`
 `);
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.broadcast(i32a.buffer);

test/built-ins/Atomics/wait/symbol-for-value-throws-agent.js

@@ -52,7 +52,7 @@ $262.agent.start(`
 `);
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.broadcast(i32a.buffer);

test/built-ins/Atomics/wait/symbol-for-value-throws.js

@@ -20,7 +20,7 @@ features: [Atomics, SharedArrayBuffer, Symbol, Symbol.toPrimitive, TypedArray]
 ---*/
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 const poisonedValueOf = {

test/built-ins/Atomics/wait/true-for-timeout-agent.js

@@ -41,7 +41,7 @@ $262.agent.start(`
 `);
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.broadcast(i32a.buffer);

test/built-ins/Atomics/wait/true-for-timeout.js

@@ -17,7 +17,7 @@ flags: [CanBlockIsFalse]
 ---*/
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 const valueOf = {

test/built-ins/Atomics/wait/undefined-for-timeout.js

@@ -29,8 +29,7 @@ $262.agent.start(`
   });
 `);
 
-$262.agent.start(
-  `
+$262.agent.start(`
   $262.agent.receiveBroadcast(function(sab) {
     var i32a = new Int32Array(sab);
     $262.agent.report("B " + Atomics.wait(i32a, 0, 0));  // undefined timeout arg => NaN => +Infinity
@@ -39,7 +38,7 @@ $262.agent.start(
 `);
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.broadcast(i32a.buffer);

test/built-ins/Atomics/wait/undefined-index-defaults-to-zero.js

@@ -31,7 +31,7 @@ $262.agent.start(`
 `);
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.broadcast(i32a.buffer);

test/built-ins/Atomics/wait/value-not-equal.js

@@ -31,7 +31,7 @@ $262.agent.start(`
 `);
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.broadcast(i32a.buffer);

test/built-ins/Atomics/wait/wait-index-value-not-equal.js

@@ -27,7 +27,7 @@ $262.agent.start(`
 `);
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.broadcast(i32a.buffer);

test/built-ins/Atomics/wait/waiterlist-order-of-operations-is-fifo.js

@@ -55,7 +55,7 @@ $262.agent.start(`
 
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(4 * Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.broadcast(i32a.buffer);

test/built-ins/Atomics/wait/was-woken-before-timeout.js

@@ -37,7 +37,7 @@ $262.agent.start(`
 `);
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.broadcast(i32a.buffer);

test/built-ins/Atomics/wake/bad-range.js

@@ -16,7 +16,7 @@ features: [ArrayBuffer, arrow-function, Atomics, DataView, for-of, let, SharedAr
 ---*/
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 testWithAtomicsOutOfBoundsIndices(function(IdxGen) {

test/built-ins/Atomics/wake/bigint/bad-range.js

@@ -16,7 +16,7 @@ features: [ArrayBuffer, arrow-function, Atomics, BigInt, DataView, for-of, let,
 ---*/
 
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 
 testWithAtomicsOutOfBoundsIndices(function(IdxGen) {

test/built-ins/Atomics/wake/bigint/null-bufferdata-throws.js

@@ -17,7 +17,7 @@ features: [ArrayBuffer, Atomics, BigInt, TypedArray]
 ---*/
 
 const i64a = new BigInt64Array(
-  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 8)
 );
 const poisoned = {
   valueOf: function() {

test/built-ins/Atomics/wake/count-boundary-cases.js

@@ -26,7 +26,7 @@ features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 assert.sameValue(

test/built-ins/Atomics/wake/count-defaults-to-infinity-missing.js

@@ -52,7 +52,7 @@ $262.agent.start(`
 `);
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.broadcast(i32a.buffer);

test/built-ins/Atomics/wake/count-defaults-to-infinity-undefined.js

@@ -50,7 +50,7 @@ $262.agent.start(`
 `);
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.broadcast(i32a.buffer);

test/built-ins/Atomics/wake/count-from-nans.js

@@ -25,7 +25,7 @@ features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 NaNs.forEach(nan => {

test/built-ins/Atomics/wake/count-symbol-throws.js

@@ -18,7 +18,7 @@ features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 assert.throws(TypeError, function() {

test/built-ins/Atomics/wake/count-tointeger-throws-then-wake-throws.js

@@ -18,7 +18,7 @@ features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 const poisoned = {

test/built-ins/Atomics/wake/negative-count.js

@@ -18,7 +18,7 @@ $262.agent.start(`
 `);
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.broadcast(i32a.buffer);

test/built-ins/Atomics/wake/negative-index-throws.js

@@ -17,7 +17,7 @@ features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 const poisoned = {

test/built-ins/Atomics/wake/null-bufferdata-throws.js

@@ -17,7 +17,7 @@ features: [ArrayBuffer, Atomics, TypedArray]
 ---*/
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 const poisoned = {

test/built-ins/Atomics/wake/out-of-range-index-throws.js

@@ -17,7 +17,7 @@ features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 var poisoned = {

test/built-ins/Atomics/wake/symbol-for-index-throws.js

@@ -29,7 +29,7 @@ features: [Atomics, SharedArrayBuffer, Symbol, Symbol.toPrimitive, TypedArray]
 ---*/
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 const poisonedValueOf = {

test/built-ins/Atomics/wake/undefined-index-defaults-to-zero.js

@@ -39,7 +39,7 @@ $262.agent.start(`
 `);
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.broadcast(i32a.buffer);

test/built-ins/Atomics/wake/wake-nan.js

@@ -18,7 +18,7 @@ $262.agent.start(`
 `);
 
 const i32a = new Int32Array(
-  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)
+  new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
 );
 
 $262.agent.broadcast(i32a.buffer);

test/built-ins/Atomics/xor/expected-return-value.js

@@ -27,7 +27,7 @@ info: |
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
-var buffer = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT);
+var buffer = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4);
 var i32a = new Int32Array(buffer);
 var initial = 0b00000001000000001000000010000001;
 var update = 0b00000001111111111000000011111111;