Skip to content
/ v8 Public
forked from v8/v8

Commit

Permalink
[wasm, atomic] support atomic binary operations for i64 on riscv32.
Browse files Browse the repository at this point in the history 
Bug: v8:14118
Change-Id: I32da7f6a80c207aff7606aeb2f8b4136ff4d7552
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4663419
Commit-Queue: Thibaud Michaud <[email protected]>
Auto-Submit: 杨文明 <[email protected]>
Reviewed-by: Thibaud Michaud <[email protected]>
Cr-Commit-Position: refs/heads/main@{#89005}
  • Loading branch information
@YoungWenMing
YoungWenMing authored and V8 LUCI CQ committed Jul 18, 2023
1 parent 5a26dd5 commit 7f22404
Show file tree
Hide file tree
Showing 2 changed files with 122 additions and 7 deletions.
71 changes: 64 additions & 7 deletions src/wasm/baseline/riscv/liftoff-assembler-riscv32.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,52 @@ inline Register CalculateActualAddress(LiftoffAssembler* lasm,
}

enum class Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange };
inline void AtomicBinop64(LiftoffAssembler* lasm, Register dst_addr,
Register offset_reg, uintptr_t offset_imm,
LiftoffRegister value, LiftoffRegister result,
StoreType type, Binop op) {
FrameScope scope(lasm, StackFrame::MANUAL);
RegList c_params = {arg_reg_1, arg_reg_2, arg_reg_3};
RegList result_list = {result.low_gp(), result.high_gp()};

// Result registers does not need to be pushed.
__ MultiPush(c_params - result_list);
liftoff::CalculateActualAddress(lasm, dst_addr, offset_reg, offset_imm,
arg_reg_1);
__ Mv(arg_reg_2, value.low_gp());
__ Mv(arg_reg_3, value.high_gp());
__ MultiPush(kJSCallerSaved - c_params - result_list);
__ PrepareCallCFunction(3, 0, kScratchReg);
ExternalReference extern_func_ref;
switch (op) {
case Binop::kAdd:
extern_func_ref = ExternalReference::atomic_pair_add_function();
break;
case Binop::kSub:
extern_func_ref = ExternalReference::atomic_pair_sub_function();
break;
case Binop::kAnd:
extern_func_ref = ExternalReference::atomic_pair_and_function();
break;
case Binop::kOr:
extern_func_ref = ExternalReference::atomic_pair_or_function();
break;
case Binop::kXor:
extern_func_ref = ExternalReference::atomic_pair_xor_function();
break;
case Binop::kExchange:
extern_func_ref = ExternalReference::atomic_pair_exchange_function();
break;
default:
UNREACHABLE();
}
__ CallCFunction(extern_func_ref, 3, 0);
__ MultiPop(kJSCallerSaved - c_params - result_list);
__ Mv(result.low_gp(), kReturnRegister0);
__ Mv(result.high_gp(), kReturnRegister1);
__ MultiPop(c_params - result_list);
return;
}

inline void AtomicBinop(LiftoffAssembler* lasm, Register dst_addr,
Register offset_reg, uintptr_t offset_imm,
Expand Down Expand Up @@ -646,7 +692,9 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg,
LiftoffRegister result, StoreType type,
bool i64_offset) {
if (type.value() == StoreType::kI64Store) {
bailout(kAtomics, "Atomic64");
liftoff::AtomicBinop64(this, dst_addr, offset_reg, offset_imm, value,
result, type, liftoff::Binop::kAdd);
return;
}
if (type.value() == StoreType::kI32Store ||
type.value() == StoreType::kI64Store32) {
Expand All @@ -670,7 +718,9 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg,
LiftoffRegister result, StoreType type,
bool i64_offset) {
if (type.value() == StoreType::kI64Store) {
bailout(kAtomics, "Atomic64");
liftoff::AtomicBinop64(this, dst_addr, offset_reg, offset_imm, value,
result, type, liftoff::Binop::kSub);
return;
}
if (type.value() == StoreType::kI32Store ||
type.value() == StoreType::kI64Store32) {
Expand All @@ -694,7 +744,9 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg,
LiftoffRegister result, StoreType type,
bool i64_offset) {
if (type.value() == StoreType::kI64Store) {
bailout(kAtomics, "Atomic64");
liftoff::AtomicBinop64(this, dst_addr, offset_reg, offset_imm, value,
result, type, liftoff::Binop::kAnd);
return;
}
if (type.value() == StoreType::kI32Store ||
type.value() == StoreType::kI64Store32) {
Expand All @@ -717,7 +769,9 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg,
LiftoffRegister result, StoreType type,
bool i64_offset) {
if (type.value() == StoreType::kI64Store) {
bailout(kAtomics, "Atomic64");
liftoff::AtomicBinop64(this, dst_addr, offset_reg, offset_imm, value,
result, type, liftoff::Binop::kOr);
return;
}
if (type.value() == StoreType::kI32Store ||
type.value() == StoreType::kI64Store32) {
Expand All @@ -740,7 +794,9 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg,
LiftoffRegister result, StoreType type,
bool i64_offset) {
if (type.value() == StoreType::kI64Store) {
bailout(kAtomics, "Atomic64");
liftoff::AtomicBinop64(this, dst_addr, offset_reg, offset_imm, value,
result, type, liftoff::Binop::kXor);
return;
}
if (type.value() == StoreType::kI32Store ||
type.value() == StoreType::kI64Store32) {
Expand All @@ -764,7 +820,9 @@ void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg,
LiftoffRegister result, StoreType type,
bool i64_offset) {
if (type.value() == StoreType::kI64Store) {
bailout(kAtomics, "Atomic64");
liftoff::AtomicBinop64(this, dst_addr, offset_reg, offset_imm, value,
result, type, liftoff::Binop::kExchange);
return;
}
if (type.value() == StoreType::kI32Store ||
type.value() == StoreType::kI64Store32) {
Expand Down Expand Up @@ -803,7 +861,6 @@ void LiftoffAssembler::AtomicCompareExchange(
Mv(result.high_gp(), a1);
return;
}

// Make sure that {result} is unique.
switch (type.value()) {
case StoreType::kI64Store8:
Expand Down
58 changes: 58 additions & 0 deletions test/mjsunit/regress/wasm/regress-14118.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
// Copyright 2023 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: --liftoff --no-wasm-tier-up

d8.file.execute('test/mjsunit/wasm/wasm-module-builder.js');

const I64AtomicOps = [
kExprI64AtomicAdd,
kExprI64AtomicSub,
kExprI64AtomicAnd,
kExprI64AtomicOr,
kExprI64AtomicXor,
kExprI64AtomicExchange,
];

const Inputs = [
[0x1ffffffffn, 1n, 0x200000000n],
[0x200000000n, 1n, 0x1ffffffffn],
[0x1ffffffffn, 1n, 0x1n],
[0x1ffffffffn, 1n, 0x1ffffffffn],
[0x1ffffffffn, 0x10ffffffffn, 0x1100000000n],
[0x1ffffffffn, 0x10ffffffffn, 0x10ffffffffn],
];

function TestBinOp64(index, memory) {
const Op = I64AtomicOps[index];
const sample = Inputs[index];

const builder = new WasmModuleBuilder();
builder.addImportedMemory("imports", "mem", 1);
builder.addType(makeSig([kWasmI32, kWasmI64], [kWasmI64]));
// Generate function 1 (out of 1).
builder.addFunction(undefined, 0 /* sig */).addBodyWithEnd([
kExprLocalGet, 0,
kExprLocalGet, 1,
kAtomicPrefix, Op, 0x03, 0x00,
kExprEnd
]);
builder.addExport('run', 0);
const instance = builder.instantiate({ imports: { mem: memory } });

let i64arr = new BigUint64Array(memory.buffer);
new DataView(memory.buffer).setBigUint64(index * 8, sample[0], true);
assertEquals(sample[0], instance.exports.run(index * 8, sample[1]));
assertEquals(sample[2], i64arr[index]);
}

(function () {
var mem = new WebAssembly.Memory({ initial: 1 });
TestBinOp64(0, mem, "i64.atomic.rmw.add");
TestBinOp64(1, mem, "i64.atomic.rmw.sub");
TestBinOp64(2, mem, "i64.atomic.rmw.and");
TestBinOp64(3, mem, "i64.atomic.rmw.or");
TestBinOp64(4, mem, "i64.atomic.rmw.xor");
TestBinOp64(5, mem, "i64.atomic.rmw.xchg");
})();

0 comments on commit 7f22404

Please sign in to comment.