[wasm/test] Split test/mjsunit/wasm/user-properties.js into smaller tests.

Because this test uses heap verification, it is quite slow. Split it
into 4 smaller tests to avoid test timeout and allow them to be run
in parallel.

R=ahaas@chromium.org

Bug: 
Change-Id: Ie4ac841d1d8215019bb5cfcc335daea6b10ab789
Reviewed-on: https://chromium-review.googlesource.com/738146Reviewed-by: Andreas Haas <ahaas@chromium.org>
Commit-Queue: Ben Titzer <titzer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48998}

test/mjsunit/wasm/user-properties-common.js

+// Copyright 2017 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --expose-wasm --expose-gc --verify-heap
+
+load("test/mjsunit/wasm/wasm-constants.js");
+load("test/mjsunit/wasm/wasm-module-builder.js");
+
+const verifyHeap = gc;
+let globalCounter = 10000000;
+
+function testProperties(obj) {
+  for (let i = 0; i < 3; i++) {
+    obj.x = 1001;
+    assertEquals(1001, obj.x);
+
+    obj.y = "old";
+    assertEquals("old", obj.y);
+
+    delete obj.y;
+    assertEquals("undefined", typeof obj.y);
+
+    let uid = globalCounter++;
+    let fresh = "f_" + uid;
+
+    obj.z = fresh;
+    assertEquals(fresh, obj.z);
+
+    obj[fresh] = uid;
+    assertEquals(uid, obj[fresh]);
+
+    verifyHeap();
+
+    assertEquals(1001, obj.x);
+    assertEquals(fresh, obj.z);
+    assertEquals(uid, obj[fresh]);
+  }
+
+  // These properties are special for JSFunctions.
+  Object.defineProperty(obj, 'name', {value: "crazy"});
+  Object.defineProperty(obj, 'length', {value: 999});
+}
+
+function minus18(x) { return x - 18; }
+function id(x) { return x; }
+
+function printName(when, f) {
+  print("    " + when + ": name=" + f.name + ", length=" + f.length);
+}
+
+// Note that this test is a helper with common code for user-properties-*.js.

test/mjsunit/wasm/user-properties-constructed.js

+// Copyright 2017 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --expose-wasm --expose-gc --verify-heap
+
+load("test/mjsunit/wasm/user-properties-common.js");
+
+(function ConstructedTest() {
+  print("ConstructedTest");
+
+  var memory = undefined, table = undefined;
+  for (let i = 0; i < 4; i++) {
+    print("  iteration " + i);
+
+    let m = new WebAssembly.Memory({initial: 1});
+    let t = new WebAssembly.Table({element: "anyfunc", initial: 1});
+    m.old = memory;
+    t.old = table;
+
+    memory = m;
+    table = t;
+    testProperties(memory);
+    testProperties(table);
+  }
+})();

test/mjsunit/wasm/user-properties-exported.js

+// Copyright 2017 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --expose-wasm --expose-gc --verify-heap
+
+load("test/mjsunit/wasm/user-properties-common.js");
+
+(function ExportedFunctionTest() {
+  print("ExportedFunctionTest");
+
+  print("  instance 1, exporting");
+  var builder = new WasmModuleBuilder();
+  builder.addFunction("exp", kSig_i_i)
+    .addBody([
+      kExprGetLocal, 0,
+      kExprCallFunction, 0])
+    .exportAs("exp");
+  let module1 = builder.toModule();
+  let instance1 = new WebAssembly.Instance(module1);
+  let g = instance1.exports.exp;
+
+  testProperties(g);
+
+  // The WASM-internal fields of {g} are only inspected when {g} is
+  // used as an import into another instance.
+  print("  instance 2, importing");
+  var builder = new WasmModuleBuilder();
+  builder.addImport("imp", "func", kSig_i_i);
+  let module2 = builder.toModule();
+  let instance2 = new WebAssembly.Instance(module2, {imp: {func: g}});
+
+  testProperties(g);
+})();

test/mjsunit/wasm/user-properties.js → test/mjsunit/wasm/user-properties-module.js

@@ -4,102 +4,7 @@
 
 // Flags: --expose-wasm --expose-gc --verify-heap
 
-load("test/mjsunit/wasm/wasm-constants.js");
-load("test/mjsunit/wasm/wasm-module-builder.js");
-
-const verifyHeap = gc;
-let globalCounter = 10000000;
-
-function testProperties(obj) {
-  for (let i = 0; i < 3; i++) {
-    obj.x = 1001;
-    assertEquals(1001, obj.x);
-
-    obj.y = "old";
-    assertEquals("old", obj.y);
-
-    delete obj.y;
-    assertEquals("undefined", typeof obj.y);
-
-    let uid = globalCounter++;
-    let fresh = "f_" + uid;
-
-    obj.z = fresh;
-    assertEquals(fresh, obj.z);
-
-    obj[fresh] = uid;
-    assertEquals(uid, obj[fresh]);
-
-    verifyHeap();
-
-    assertEquals(1001, obj.x);
-    assertEquals(fresh, obj.z);
-    assertEquals(uid, obj[fresh]);
-  }
-
-  // These properties are special for JSFunctions.
-  Object.defineProperty(obj, 'name', {value: "crazy"});
-  Object.defineProperty(obj, 'length', {value: 999});
-}
-
-function minus18(x) { return x - 18; }
-function id(x) { return x; }
-
-function printName(when, f) {
-  print("    " + when + ": name=" + f.name + ", length=" + f.length);
-}
-
-(function ExportedFunctionTest() {
-  print("ExportedFunctionTest");
-
-  print("  instance 1, exporting");
-  var builder = new WasmModuleBuilder();
-  builder.addFunction("exp", kSig_i_i)
-    .addBody([
-      kExprGetLocal, 0,
-      kExprCallFunction, 0])
-    .exportAs("exp");
-  let module1 = builder.toModule();
-  let instance1 = new WebAssembly.Instance(module1);
-  let g = instance1.exports.exp;
-
-  testProperties(g);
-
-  // The WASM-internal fields of {g} are only inspected when {g} is
-  // used as an import into another instance.
-  print("  instance 2, importing");
-  var builder = new WasmModuleBuilder();
-  builder.addImport("imp", "func", kSig_i_i);
-  let module2 = builder.toModule();
-  let instance2 = new WebAssembly.Instance(module2, {imp: {func: g}});
-
-  testProperties(g);
-})();
-
-(function ImportReexportChain() {
-  print("ImportReexportChain");
-
-  var f = id;
-
-  for (let i = 0; i < 5; i++) {
-    let builder = new WasmModuleBuilder();
-    builder.addImport("imp", "func", kSig_i_i);
-    builder.addExport("exp", 0);
-    let module = builder.toModule();
-    let instance = new WebAssembly.Instance(module, {imp: {func: f}});
-    let g = instance.exports.exp;
-    assertInstanceof(g, Function);
-    printName("before", g);
-    testProperties(g);
-    printName(" after", g);
-
-    // The WASM-internal fields of {g} are only inspected when {g} is
-    // used as an import into another instance. Use {g} as the import
-    // the next time through the loop.
-    f = g;
-  }
-})();
-
+load("test/mjsunit/wasm/user-properties-common.js");
 
 (function ModuleTest() {
   for (f of [x => (x + 19 + globalCounter), minus18]) {
@@ -146,24 +51,4 @@ function printName(when, f) {
       f = g;
     }
   }
-
-})();
-
-(function ConstructedTest() {
-  print("ConstructedTest");
-
-  var memory = undefined, table = undefined;
-  for (let i = 0; i < 4; i++) {
-    print("  iteration " + i);
-
-    let m = new WebAssembly.Memory({initial: 1});
-    let t = new WebAssembly.Table({element: "anyfunc", initial: 1});
-    m.old = memory;
-    t.old = table;
-
-    memory = m;
-    table = t;
-    testProperties(memory);
-    testProperties(table);
-  }
 })();

test/mjsunit/wasm/user-properties-reexport.js

+// Copyright 2017 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --expose-wasm --expose-gc --verify-heap
+
+load("test/mjsunit/wasm/user-properties-common.js");
+
+(function ImportReexportChain() {
+  print("ImportReexportChain");
+
+  var f = id;
+
+  for (let i = 0; i < 5; i++) {
+    let builder = new WasmModuleBuilder();
+    builder.addImport("imp", "func", kSig_i_i);
+    builder.addExport("exp", 0);
+    let module = builder.toModule();
+    let instance = new WebAssembly.Instance(module, {imp: {func: f}});
+    let g = instance.exports.exp;
+    assertInstanceof(g, Function);
+    printName("before", g);
+    testProperties(g);
+    printName(" after", g);
+
+    // The WASM-internal fields of {g} are only inspected when {g} is
+    // used as an import into another instance. Use {g} as the import
+    // the next time through the loop.
+    f = g;
+  }
+})();