2017-08-02 21:40:45 +00:00
|
|
|
// 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.
|
|
|
|
|
2017-09-13 10:56:20 +00:00
|
|
|
#include "src/objects-inl.h"
|
2017-08-02 21:40:45 +00:00
|
|
|
#include "test/cctest/cctest.h"
|
|
|
|
#include "test/cctest/compiler/value-helper.h"
|
|
|
|
#include "test/cctest/wasm/wasm-run-utils.h"
|
|
|
|
#include "test/common/wasm/wasm-macro-gen.h"
|
|
|
|
|
2017-09-01 12:57:34 +00:00
|
|
|
namespace v8 {
|
|
|
|
namespace internal {
|
|
|
|
namespace wasm {
|
|
|
|
|
2017-08-02 21:40:45 +00:00
|
|
|
#define WASM_ATOMICS_OP(op) kAtomicPrefix, static_cast<byte>(op)
|
|
|
|
#define WASM_ATOMICS_BINOP(op, x, y) x, y, WASM_ATOMICS_OP(op)
|
2017-08-25 21:30:35 +00:00
|
|
|
#define WASM_ATOMICS_TERNARY_OP(op, x, y, z) x, y, z, WASM_ATOMICS_OP(op)
|
2017-08-02 21:40:45 +00:00
|
|
|
|
|
|
|
typedef uint32_t (*Uint32BinOp)(uint32_t, uint32_t);
|
|
|
|
typedef uint16_t (*Uint16BinOp)(uint16_t, uint16_t);
|
|
|
|
typedef uint8_t (*Uint8BinOp)(uint8_t, uint8_t);
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
T Add(T a, T b) {
|
|
|
|
return a + b;
|
|
|
|
}
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
T Sub(T a, T b) {
|
|
|
|
return a - b;
|
|
|
|
}
|
|
|
|
|
[wasm] Implement atomic logical BinOps
- Implemented ops: I32AtomicAnd, I32AtomicAnd8U, I32AtomicAnd16U, I32AtomicOr,
I32AtomicOr8U, I32AtomicOr16U, I32AtomicXor, I32AtomicXor8U, I32AtomicXor16U
- Refactor wasm-compiler AtomicOp to use macros
- Tests
Bug:V8:6532
R=binji@chromium.org, bbudge@chromium.org, bradnelson@chromium.org
Change-Id: I7e4dc8ad8cf3e211c3aef721a02778f2a4621322
Reviewed-on: https://chromium-review.googlesource.com/600539
Reviewed-by: Bill Budge <bbudge@chromium.org>
Commit-Queue: Deepti Gandluri <gdeepti@chromium.org>
Cr-Commit-Position: refs/heads/master@{#47172}
2017-08-03 19:54:41 +00:00
|
|
|
template <typename T>
|
|
|
|
T And(T a, T b) {
|
|
|
|
return a & b;
|
|
|
|
}
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
T Or(T a, T b) {
|
|
|
|
return a | b;
|
|
|
|
}
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
T Xor(T a, T b) {
|
|
|
|
return a ^ b;
|
|
|
|
}
|
|
|
|
|
2017-08-25 21:30:35 +00:00
|
|
|
template <typename T>
|
|
|
|
T Exchange(T a, T b) {
|
|
|
|
return b;
|
|
|
|
}
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
T CompareExchange(T initial, T a, T b) {
|
|
|
|
if (initial == a) return b;
|
|
|
|
return a;
|
|
|
|
}
|
|
|
|
|
2017-08-02 21:40:45 +00:00
|
|
|
void RunU32BinOp(WasmOpcode wasm_op, Uint32BinOp expected_op) {
|
|
|
|
EXPERIMENTAL_FLAG_SCOPE(threads);
|
|
|
|
WasmRunner<uint32_t, uint32_t> r(kExecuteCompiled);
|
2017-08-19 16:34:11 +00:00
|
|
|
uint32_t* memory = r.builder().AddMemoryElems<uint32_t>(8);
|
2017-08-02 21:40:45 +00:00
|
|
|
|
|
|
|
BUILD(r, WASM_ATOMICS_BINOP(wasm_op, WASM_I32V_1(0), WASM_GET_LOCAL(0)));
|
|
|
|
|
|
|
|
FOR_UINT32_INPUTS(i) {
|
|
|
|
uint32_t initial = *i;
|
|
|
|
FOR_UINT32_INPUTS(j) {
|
2017-08-19 16:34:11 +00:00
|
|
|
r.builder().WriteMemory(&memory[0], initial);
|
2017-08-02 21:40:45 +00:00
|
|
|
CHECK_EQ(initial, r.Call(*j));
|
|
|
|
uint32_t expected = expected_op(*i, *j);
|
2017-08-19 16:34:11 +00:00
|
|
|
CHECK_EQ(expected, r.builder().ReadMemory(&memory[0]));
|
2017-08-02 21:40:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
WASM_EXEC_TEST(I32Add) { RunU32BinOp(kExprI32AtomicAdd, Add); }
|
|
|
|
WASM_EXEC_TEST(I32Sub) { RunU32BinOp(kExprI32AtomicSub, Sub); }
|
[wasm] Implement atomic logical BinOps
- Implemented ops: I32AtomicAnd, I32AtomicAnd8U, I32AtomicAnd16U, I32AtomicOr,
I32AtomicOr8U, I32AtomicOr16U, I32AtomicXor, I32AtomicXor8U, I32AtomicXor16U
- Refactor wasm-compiler AtomicOp to use macros
- Tests
Bug:V8:6532
R=binji@chromium.org, bbudge@chromium.org, bradnelson@chromium.org
Change-Id: I7e4dc8ad8cf3e211c3aef721a02778f2a4621322
Reviewed-on: https://chromium-review.googlesource.com/600539
Reviewed-by: Bill Budge <bbudge@chromium.org>
Commit-Queue: Deepti Gandluri <gdeepti@chromium.org>
Cr-Commit-Position: refs/heads/master@{#47172}
2017-08-03 19:54:41 +00:00
|
|
|
WASM_EXEC_TEST(I32And) { RunU32BinOp(kExprI32AtomicAnd, And); }
|
|
|
|
WASM_EXEC_TEST(I32Or) { RunU32BinOp(kExprI32AtomicOr, Or); }
|
|
|
|
WASM_EXEC_TEST(I32Xor) { RunU32BinOp(kExprI32AtomicXor, Xor); }
|
2017-08-25 21:30:35 +00:00
|
|
|
WASM_EXEC_TEST(I32Exchange) { RunU32BinOp(kExprI32AtomicExchange, Exchange); }
|
2017-08-02 21:40:45 +00:00
|
|
|
|
|
|
|
void RunU16BinOp(WasmOpcode wasm_op, Uint16BinOp expected_op) {
|
|
|
|
EXPERIMENTAL_FLAG_SCOPE(threads);
|
|
|
|
WasmRunner<uint32_t, uint32_t> r(kExecuteCompiled);
|
2017-08-19 16:34:11 +00:00
|
|
|
uint16_t* memory = r.builder().AddMemoryElems<uint16_t>(8);
|
2017-08-02 21:40:45 +00:00
|
|
|
|
|
|
|
BUILD(r, WASM_ATOMICS_BINOP(wasm_op, WASM_I32V_1(0), WASM_GET_LOCAL(0)));
|
|
|
|
|
|
|
|
FOR_UINT16_INPUTS(i) {
|
|
|
|
uint16_t initial = *i;
|
|
|
|
FOR_UINT16_INPUTS(j) {
|
2017-08-19 16:34:11 +00:00
|
|
|
r.builder().WriteMemory(&memory[0], initial);
|
2017-08-02 21:40:45 +00:00
|
|
|
CHECK_EQ(initial, r.Call(*j));
|
|
|
|
uint16_t expected = expected_op(*i, *j);
|
2017-08-19 16:34:11 +00:00
|
|
|
CHECK_EQ(expected, r.builder().ReadMemory(&memory[0]));
|
2017-08-02 21:40:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
WASM_EXEC_TEST(I32Add16U) { RunU16BinOp(kExprI32AtomicAdd16U, Add); }
|
|
|
|
WASM_EXEC_TEST(I32Sub16U) { RunU16BinOp(kExprI32AtomicSub16U, Sub); }
|
[wasm] Implement atomic logical BinOps
- Implemented ops: I32AtomicAnd, I32AtomicAnd8U, I32AtomicAnd16U, I32AtomicOr,
I32AtomicOr8U, I32AtomicOr16U, I32AtomicXor, I32AtomicXor8U, I32AtomicXor16U
- Refactor wasm-compiler AtomicOp to use macros
- Tests
Bug:V8:6532
R=binji@chromium.org, bbudge@chromium.org, bradnelson@chromium.org
Change-Id: I7e4dc8ad8cf3e211c3aef721a02778f2a4621322
Reviewed-on: https://chromium-review.googlesource.com/600539
Reviewed-by: Bill Budge <bbudge@chromium.org>
Commit-Queue: Deepti Gandluri <gdeepti@chromium.org>
Cr-Commit-Position: refs/heads/master@{#47172}
2017-08-03 19:54:41 +00:00
|
|
|
WASM_EXEC_TEST(I32And16U) { RunU16BinOp(kExprI32AtomicAnd16U, And); }
|
|
|
|
WASM_EXEC_TEST(I32Or16U) { RunU16BinOp(kExprI32AtomicOr16U, Or); }
|
|
|
|
WASM_EXEC_TEST(I32Xor16U) { RunU16BinOp(kExprI32AtomicXor16U, Xor); }
|
2017-08-25 21:30:35 +00:00
|
|
|
WASM_EXEC_TEST(I32Exchange16U) {
|
|
|
|
RunU16BinOp(kExprI32AtomicExchange16U, Exchange);
|
|
|
|
}
|
2017-08-02 21:40:45 +00:00
|
|
|
|
|
|
|
void RunU8BinOp(WasmOpcode wasm_op, Uint8BinOp expected_op) {
|
|
|
|
EXPERIMENTAL_FLAG_SCOPE(threads);
|
|
|
|
WasmRunner<uint32_t, uint32_t> r(kExecuteCompiled);
|
2017-08-19 16:34:11 +00:00
|
|
|
uint8_t* memory = r.builder().AddMemoryElems<uint8_t>(8);
|
2017-08-02 21:40:45 +00:00
|
|
|
|
|
|
|
BUILD(r, WASM_ATOMICS_BINOP(wasm_op, WASM_I32V_1(0), WASM_GET_LOCAL(0)));
|
|
|
|
|
|
|
|
FOR_UINT8_INPUTS(i) {
|
|
|
|
uint8_t initial = *i;
|
|
|
|
FOR_UINT8_INPUTS(j) {
|
2017-08-19 16:34:11 +00:00
|
|
|
r.builder().WriteMemory(&memory[0], initial);
|
2017-08-02 21:40:45 +00:00
|
|
|
CHECK_EQ(initial, r.Call(*j));
|
|
|
|
uint8_t expected = expected_op(*i, *j);
|
2017-08-19 16:34:11 +00:00
|
|
|
CHECK_EQ(expected, r.builder().ReadMemory(&memory[0]));
|
2017-08-02 21:40:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
WASM_EXEC_TEST(I32Add8U) { RunU8BinOp(kExprI32AtomicAdd8U, Add); }
|
|
|
|
WASM_EXEC_TEST(I32Sub8U) { RunU8BinOp(kExprI32AtomicSub8U, Sub); }
|
[wasm] Implement atomic logical BinOps
- Implemented ops: I32AtomicAnd, I32AtomicAnd8U, I32AtomicAnd16U, I32AtomicOr,
I32AtomicOr8U, I32AtomicOr16U, I32AtomicXor, I32AtomicXor8U, I32AtomicXor16U
- Refactor wasm-compiler AtomicOp to use macros
- Tests
Bug:V8:6532
R=binji@chromium.org, bbudge@chromium.org, bradnelson@chromium.org
Change-Id: I7e4dc8ad8cf3e211c3aef721a02778f2a4621322
Reviewed-on: https://chromium-review.googlesource.com/600539
Reviewed-by: Bill Budge <bbudge@chromium.org>
Commit-Queue: Deepti Gandluri <gdeepti@chromium.org>
Cr-Commit-Position: refs/heads/master@{#47172}
2017-08-03 19:54:41 +00:00
|
|
|
WASM_EXEC_TEST(I32And8U) { RunU8BinOp(kExprI32AtomicAnd8U, And); }
|
|
|
|
WASM_EXEC_TEST(I32Or8U) { RunU8BinOp(kExprI32AtomicOr8U, Or); }
|
|
|
|
WASM_EXEC_TEST(I32Xor8U) { RunU8BinOp(kExprI32AtomicXor8U, Xor); }
|
2017-08-25 21:30:35 +00:00
|
|
|
WASM_EXEC_TEST(I32Exchange8U) {
|
|
|
|
RunU8BinOp(kExprI32AtomicExchange8U, Exchange);
|
|
|
|
}
|
|
|
|
|
|
|
|
WASM_EXEC_TEST(I32CompareExchange) {
|
|
|
|
EXPERIMENTAL_FLAG_SCOPE(threads);
|
|
|
|
WasmRunner<uint32_t, uint32_t, uint32_t> r(kExecuteCompiled);
|
|
|
|
uint32_t* memory = r.builder().AddMemoryElems<uint32_t>(8);
|
|
|
|
BUILD(r,
|
|
|
|
WASM_ATOMICS_TERNARY_OP(kExprI32AtomicCompareExchange, WASM_I32V_1(0),
|
|
|
|
WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
|
|
|
|
|
|
|
|
FOR_UINT32_INPUTS(i) {
|
|
|
|
uint32_t initial = *i;
|
|
|
|
FOR_UINT32_INPUTS(j) {
|
|
|
|
r.builder().WriteMemory(&memory[0], initial);
|
|
|
|
CHECK_EQ(initial, r.Call(*i, *j));
|
|
|
|
uint32_t expected = CompareExchange(initial, *i, *j);
|
|
|
|
CHECK_EQ(expected, r.builder().ReadMemory(&memory[0]));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
WASM_EXEC_TEST(I32CompareExchange16U) {
|
|
|
|
EXPERIMENTAL_FLAG_SCOPE(threads);
|
|
|
|
WasmRunner<uint32_t, uint32_t, uint32_t> r(kExecuteCompiled);
|
|
|
|
uint16_t* memory = r.builder().AddMemoryElems<uint16_t>(8);
|
|
|
|
BUILD(r, WASM_ATOMICS_TERNARY_OP(kExprI32AtomicCompareExchange16U,
|
|
|
|
WASM_I32V_1(0), WASM_GET_LOCAL(0),
|
|
|
|
WASM_GET_LOCAL(1)));
|
|
|
|
|
|
|
|
FOR_UINT16_INPUTS(i) {
|
|
|
|
uint16_t initial = *i;
|
|
|
|
FOR_UINT16_INPUTS(j) {
|
|
|
|
r.builder().WriteMemory(&memory[0], initial);
|
|
|
|
CHECK_EQ(initial, r.Call(*i, *j));
|
|
|
|
uint16_t expected = CompareExchange(initial, *i, *j);
|
|
|
|
CHECK_EQ(expected, r.builder().ReadMemory(&memory[0]));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
WASM_EXEC_TEST(I32CompareExchange8U) {
|
|
|
|
EXPERIMENTAL_FLAG_SCOPE(threads);
|
|
|
|
WasmRunner<uint32_t, uint32_t, uint32_t> r(kExecuteCompiled);
|
|
|
|
uint8_t* memory = r.builder().AddMemoryElems<uint8_t>(8);
|
|
|
|
BUILD(r,
|
|
|
|
WASM_ATOMICS_TERNARY_OP(kExprI32AtomicCompareExchange8U, WASM_I32V_1(0),
|
|
|
|
WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
|
|
|
|
|
|
|
|
FOR_UINT8_INPUTS(i) {
|
|
|
|
uint8_t initial = *i;
|
|
|
|
FOR_UINT8_INPUTS(j) {
|
|
|
|
r.builder().WriteMemory(&memory[0], initial);
|
|
|
|
CHECK_EQ(initial, r.Call(*i, *j));
|
|
|
|
uint8_t expected = CompareExchange(initial, *i, *j);
|
|
|
|
CHECK_EQ(expected, r.builder().ReadMemory(&memory[0]));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2017-09-01 12:57:34 +00:00
|
|
|
|
2017-09-08 13:59:05 +00:00
|
|
|
#undef WASM_ATOMICS_OP
|
|
|
|
#undef WASM_ATOMICS_BINOP
|
|
|
|
#undef WASM_ATOMICS_TERNARY_OP
|
|
|
|
|
2017-09-01 12:57:34 +00:00
|
|
|
} // namespace wasm
|
|
|
|
} // namespace internal
|
|
|
|
} // namespace v8
|