| Index: test/cctest/wasm/test-run-wasm-64.cc
|
| diff --git a/test/cctest/wasm/test-run-wasm-64.cc b/test/cctest/wasm/test-run-wasm-64.cc
|
| index 9921c00bd736dbc1755f27883ea6c7fbae2c104c..62107bda2f91a53c4a8fad7401e7e55bb21284b0 100644
|
| --- a/test/cctest/wasm/test-run-wasm-64.cc
|
| +++ b/test/cctest/wasm/test-run-wasm-64.cc
|
| @@ -132,7 +132,7 @@ TEST(Run_WasmI64GeU) {
|
| TEST(Run_WasmI32ConvertI64) {
|
| FOR_INT64_INPUTS(i) {
|
| WasmRunner<int32_t> r;
|
| - BUILD(r, WASM_I32_CONVERT_I64(WASM_I64(*i)));
|
| + BUILD(r, WASM_I32_CONVERT_I64(WASM_I64V(*i)));
|
| CHECK_EQ(static_cast<int32_t>(*i), r.Call());
|
| }
|
| }
|
| @@ -147,194 +147,9 @@ TEST(Run_WasmI32ConvertI64) {
|
| // kExprI64Popcnt:
|
|
|
| // kExprF32SConvertI64:
|
| -TEST(Run_Wasm_F32SConvertI64) {
|
| - WasmRunner<float> r(MachineType::Int64());
|
| - BUILD(r, WASM_F32_SCONVERT_I64(WASM_GET_LOCAL(0)));
|
| - FOR_INT64_INPUTS(i) { CHECK_EQ(static_cast<float>(*i), r.Call(*i)); }
|
| -}
|
| -
|
| // kExprF32UConvertI64:
|
| -TEST(Run_Wasm_F32UConvertI64) {
|
| - struct {
|
| - uint64_t input;
|
| - uint32_t expected;
|
| - } values[] = {{0x0, 0x0},
|
| - {0x1, 0x3f800000},
|
| - {0xffffffff, 0x4f800000},
|
| - {0x1b09788b, 0x4dd84bc4},
|
| - {0x4c5fce8, 0x4c98bf9d},
|
| - {0xcc0de5bf, 0x4f4c0de6},
|
| - {0x2, 0x40000000},
|
| - {0x3, 0x40400000},
|
| - {0x4, 0x40800000},
|
| - {0x5, 0x40a00000},
|
| - {0x8, 0x41000000},
|
| - {0x9, 0x41100000},
|
| - {0xffffffffffffffff, 0x5f800000},
|
| - {0xfffffffffffffffe, 0x5f800000},
|
| - {0xfffffffffffffffd, 0x5f800000},
|
| - {0x0, 0x0},
|
| - {0x100000000, 0x4f800000},
|
| - {0xffffffff00000000, 0x5f800000},
|
| - {0x1b09788b00000000, 0x5dd84bc4},
|
| - {0x4c5fce800000000, 0x5c98bf9d},
|
| - {0xcc0de5bf00000000, 0x5f4c0de6},
|
| - {0x200000000, 0x50000000},
|
| - {0x300000000, 0x50400000},
|
| - {0x400000000, 0x50800000},
|
| - {0x500000000, 0x50a00000},
|
| - {0x800000000, 0x51000000},
|
| - {0x900000000, 0x51100000},
|
| - {0x273a798e187937a3, 0x5e1ce9e6},
|
| - {0xece3af835495a16b, 0x5f6ce3b0},
|
| - {0xb668ecc11223344, 0x5d3668ed},
|
| - {0x9e, 0x431e0000},
|
| - {0x43, 0x42860000},
|
| - {0xaf73, 0x472f7300},
|
| - {0x116b, 0x458b5800},
|
| - {0x658ecc, 0x4acb1d98},
|
| - {0x2b3b4c, 0x4a2ced30},
|
| - {0x88776655, 0x4f087766},
|
| - {0x70000000, 0x4ee00000},
|
| - {0x7200000, 0x4ce40000},
|
| - {0x7fffffff, 0x4f000000},
|
| - {0x56123761, 0x4eac246f},
|
| - {0x7fffff00, 0x4efffffe},
|
| - {0x761c4761eeeeeeee, 0x5eec388f},
|
| - {0x80000000eeeeeeee, 0x5f000000},
|
| - {0x88888888dddddddd, 0x5f088889},
|
| - {0xa0000000dddddddd, 0x5f200000},
|
| - {0xddddddddaaaaaaaa, 0x5f5dddde},
|
| - {0xe0000000aaaaaaaa, 0x5f600000},
|
| - {0xeeeeeeeeeeeeeeee, 0x5f6eeeef},
|
| - {0xfffffffdeeeeeeee, 0x5f800000},
|
| - {0xf0000000dddddddd, 0x5f700000},
|
| - {0x7fffffdddddddd, 0x5b000000},
|
| - {0x3fffffaaaaaaaa, 0x5a7fffff},
|
| - {0x1fffffaaaaaaaa, 0x59fffffd},
|
| - {0xfffff, 0x497ffff0},
|
| - {0x7ffff, 0x48ffffe0},
|
| - {0x3ffff, 0x487fffc0},
|
| - {0x1ffff, 0x47ffff80},
|
| - {0xffff, 0x477fff00},
|
| - {0x7fff, 0x46fffe00},
|
| - {0x3fff, 0x467ffc00},
|
| - {0x1fff, 0x45fff800},
|
| - {0xfff, 0x457ff000},
|
| - {0x7ff, 0x44ffe000},
|
| - {0x3ff, 0x447fc000},
|
| - {0x1ff, 0x43ff8000},
|
| - {0x3fffffffffff, 0x56800000},
|
| - {0x1fffffffffff, 0x56000000},
|
| - {0xfffffffffff, 0x55800000},
|
| - {0x7ffffffffff, 0x55000000},
|
| - {0x3ffffffffff, 0x54800000},
|
| - {0x1ffffffffff, 0x54000000},
|
| - {0x8000008000000000, 0x5f000000},
|
| - {0x8000008000000001, 0x5f000001},
|
| - {0x8000000000000400, 0x5f000000},
|
| - {0x8000000000000401, 0x5f000000}};
|
| - WasmRunner<float> r(MachineType::Uint64());
|
| - BUILD(r, WASM_F32_UCONVERT_I64(WASM_GET_LOCAL(0)));
|
| - for (size_t i = 0; i < arraysize(values); i++) {
|
| - CHECK_EQ(bit_cast<float>(values[i].expected), r.Call(values[i].input));
|
| - }
|
| -}
|
| -
|
| // kExprF64SConvertI64:
|
| -TEST(Run_WasmF64SConvertI64) {
|
| - WasmRunner<double> r(MachineType::Int64());
|
| - BUILD(r, WASM_F64_SCONVERT_I64(WASM_GET_LOCAL(0)));
|
| - FOR_INT64_INPUTS(i) { CHECK_EQ(static_cast<double>(*i), r.Call(*i)); }
|
| -}
|
| -
|
| // kExprF64UConvertI64:
|
| -TEST(Run_Wasm_F64UConvertI64) {
|
| - struct {
|
| - uint64_t input;
|
| - uint64_t expected;
|
| - } values[] = {{0x0, 0x0},
|
| - {0x1, 0x3ff0000000000000},
|
| - {0xffffffff, 0x41efffffffe00000},
|
| - {0x1b09788b, 0x41bb09788b000000},
|
| - {0x4c5fce8, 0x419317f3a0000000},
|
| - {0xcc0de5bf, 0x41e981bcb7e00000},
|
| - {0x2, 0x4000000000000000},
|
| - {0x3, 0x4008000000000000},
|
| - {0x4, 0x4010000000000000},
|
| - {0x5, 0x4014000000000000},
|
| - {0x8, 0x4020000000000000},
|
| - {0x9, 0x4022000000000000},
|
| - {0xffffffffffffffff, 0x43f0000000000000},
|
| - {0xfffffffffffffffe, 0x43f0000000000000},
|
| - {0xfffffffffffffffd, 0x43f0000000000000},
|
| - {0x100000000, 0x41f0000000000000},
|
| - {0xffffffff00000000, 0x43efffffffe00000},
|
| - {0x1b09788b00000000, 0x43bb09788b000000},
|
| - {0x4c5fce800000000, 0x439317f3a0000000},
|
| - {0xcc0de5bf00000000, 0x43e981bcb7e00000},
|
| - {0x200000000, 0x4200000000000000},
|
| - {0x300000000, 0x4208000000000000},
|
| - {0x400000000, 0x4210000000000000},
|
| - {0x500000000, 0x4214000000000000},
|
| - {0x800000000, 0x4220000000000000},
|
| - {0x900000000, 0x4222000000000000},
|
| - {0x273a798e187937a3, 0x43c39d3cc70c3c9c},
|
| - {0xece3af835495a16b, 0x43ed9c75f06a92b4},
|
| - {0xb668ecc11223344, 0x43a6cd1d98224467},
|
| - {0x9e, 0x4063c00000000000},
|
| - {0x43, 0x4050c00000000000},
|
| - {0xaf73, 0x40e5ee6000000000},
|
| - {0x116b, 0x40b16b0000000000},
|
| - {0x658ecc, 0x415963b300000000},
|
| - {0x2b3b4c, 0x41459da600000000},
|
| - {0x88776655, 0x41e10eeccaa00000},
|
| - {0x70000000, 0x41dc000000000000},
|
| - {0x7200000, 0x419c800000000000},
|
| - {0x7fffffff, 0x41dfffffffc00000},
|
| - {0x56123761, 0x41d5848dd8400000},
|
| - {0x7fffff00, 0x41dfffffc0000000},
|
| - {0x761c4761eeeeeeee, 0x43dd8711d87bbbbc},
|
| - {0x80000000eeeeeeee, 0x43e00000001dddde},
|
| - {0x88888888dddddddd, 0x43e11111111bbbbc},
|
| - {0xa0000000dddddddd, 0x43e40000001bbbbc},
|
| - {0xddddddddaaaaaaaa, 0x43ebbbbbbbb55555},
|
| - {0xe0000000aaaaaaaa, 0x43ec000000155555},
|
| - {0xeeeeeeeeeeeeeeee, 0x43edddddddddddde},
|
| - {0xfffffffdeeeeeeee, 0x43efffffffbdddde},
|
| - {0xf0000000dddddddd, 0x43ee0000001bbbbc},
|
| - {0x7fffffdddddddd, 0x435ffffff7777777},
|
| - {0x3fffffaaaaaaaa, 0x434fffffd5555555},
|
| - {0x1fffffaaaaaaaa, 0x433fffffaaaaaaaa},
|
| - {0xfffff, 0x412ffffe00000000},
|
| - {0x7ffff, 0x411ffffc00000000},
|
| - {0x3ffff, 0x410ffff800000000},
|
| - {0x1ffff, 0x40fffff000000000},
|
| - {0xffff, 0x40efffe000000000},
|
| - {0x7fff, 0x40dfffc000000000},
|
| - {0x3fff, 0x40cfff8000000000},
|
| - {0x1fff, 0x40bfff0000000000},
|
| - {0xfff, 0x40affe0000000000},
|
| - {0x7ff, 0x409ffc0000000000},
|
| - {0x3ff, 0x408ff80000000000},
|
| - {0x1ff, 0x407ff00000000000},
|
| - {0x3fffffffffff, 0x42cfffffffffff80},
|
| - {0x1fffffffffff, 0x42bfffffffffff00},
|
| - {0xfffffffffff, 0x42affffffffffe00},
|
| - {0x7ffffffffff, 0x429ffffffffffc00},
|
| - {0x3ffffffffff, 0x428ffffffffff800},
|
| - {0x1ffffffffff, 0x427ffffffffff000},
|
| - {0x8000008000000000, 0x43e0000010000000},
|
| - {0x8000008000000001, 0x43e0000010000000},
|
| - {0x8000000000000400, 0x43e0000000000000},
|
| - {0x8000000000000401, 0x43e0000000000001}};
|
| - WasmRunner<double> r(MachineType::Uint64());
|
| - BUILD(r, WASM_F64_UCONVERT_I64(WASM_GET_LOCAL(0)));
|
| - for (size_t i = 0; i < arraysize(values); i++) {
|
| - CHECK_EQ(bit_cast<double>(values[i].expected), r.Call(values[i].input));
|
| - }
|
| -}
|
| -
|
| // kExprI64SConvertF32:
|
| // kExprI64SConvertF64:
|
| // kExprI64UConvertF32:
|
| @@ -360,18 +175,20 @@ TEST(Run_WasmCallI64Parameter) {
|
| // Build the calling function.
|
| WasmRunner<int32_t> r;
|
| r.env()->module = &module;
|
| - BUILD(r,
|
| - WASM_I32_CONVERT_I64(WASM_CALL_FUNCTION(
|
| - index, WASM_I64(0xbcd12340000000b), WASM_I64(0xbcd12340000000c),
|
| - WASM_I32(0xd), WASM_I32_CONVERT_I64(WASM_I64(0xbcd12340000000e)),
|
| - WASM_I64(0xbcd12340000000f), WASM_I64(0xbcd1234000000010),
|
| - WASM_I64(0xbcd1234000000011), WASM_I64(0xbcd1234000000012),
|
| - WASM_I64(0xbcd1234000000013), WASM_I64(0xbcd1234000000014),
|
| - WASM_I64(0xbcd1234000000015), WASM_I64(0xbcd1234000000016),
|
| - WASM_I64(0xbcd1234000000017), WASM_I64(0xbcd1234000000018),
|
| - WASM_I64(0xbcd1234000000019), WASM_I64(0xbcd123400000001a),
|
| - WASM_I64(0xbcd123400000001b), WASM_I64(0xbcd123400000001c),
|
| - WASM_I64(0xbcd123400000001d))));
|
| + BUILD(
|
| + r,
|
| + WASM_I32_CONVERT_I64(WASM_CALL_FUNCTION(
|
| + index, WASM_I64V_9(0xbcd12340000000b),
|
| + WASM_I64V_9(0xbcd12340000000c), WASM_I32V_1(0xd),
|
| + WASM_I32_CONVERT_I64(WASM_I64V_9(0xbcd12340000000e)),
|
| + WASM_I64V_9(0xbcd12340000000f), WASM_I64V_10(0xbcd1234000000010),
|
| + WASM_I64V_10(0xbcd1234000000011), WASM_I64V_10(0xbcd1234000000012),
|
| + WASM_I64V_10(0xbcd1234000000013), WASM_I64V_10(0xbcd1234000000014),
|
| + WASM_I64V_10(0xbcd1234000000015), WASM_I64V_10(0xbcd1234000000016),
|
| + WASM_I64V_10(0xbcd1234000000017), WASM_I64V_10(0xbcd1234000000018),
|
| + WASM_I64V_10(0xbcd1234000000019), WASM_I64V_10(0xbcd123400000001a),
|
| + WASM_I64V_10(0xbcd123400000001b), WASM_I64V_10(0xbcd123400000001c),
|
| + WASM_I64V_10(0xbcd123400000001d))));
|
|
|
| CHECK_EQ(i + 0xb, r.Call());
|
| }
|
|
|