Skip to content

V
V8
Commit b4dbeaa1 authored by Junliang Yan's avatar Junliang Yan Committed by Commit Bot
Browse files
Options

s390x: refactor Atomic Exchange to Macroassembler 

Change-Id: I1cd09c6743d1b94686140bf3cfe942fc87df2ee0
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2798213Reviewed-by: 's avatarMilad Fa <mfarazma@redhat.com>
Commit-Queue: Junliang Yan <junyan@redhat.com>
Cr-Commit-Position: refs/heads/master@{#73757}
parent 036525d1
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 93 deletions
src/codegen/s390/macro-assembler-s390.cc
View file @ b4dbeaa1
......@@ -4865,6 +4865,114 @@ void TurboAssembler::AtomicCmpExchangeU16(Register addr, Register output,
ATOMIC_COMP_EXCHANGE_HALFWORD(1);
bind(&done);
}
void TurboAssembler::AtomicExchangeHelper(Register addr, Register value,
Register output, int start, int end,
int shift_amount, int offset,
Register scratch) {
Label do_cs;
LoadU32(output, MemOperand(addr, offset));
bind(&do_cs);
llgfr(scratch, output);
RotateInsertSelectBits(scratch, value, Operand(start), Operand(end),
Operand(shift_amount), false);
csy(output, scratch, MemOperand(addr, offset));
bne(&do_cs, Label::kNear);
srl(output, Operand(shift_amount));
}
void TurboAssembler::AtomicExchangeU8(Register addr, Register value,
Register output, Register scratch) {
#ifdef V8_TARGET_BIG_ENDIAN
#define ATOMIC_EXCHANGE_BYTE(i) \
{ \
constexpr int idx = (i); \
static_assert(idx <= 3 && idx >= 0, "idx is out of range!"); \
constexpr int start = 32 + 8 * idx; \
constexpr int end = start + 7; \
constexpr int shift_amount = (3 - idx) * 8; \
AtomicExchangeHelper(addr, value, output, start, end, shift_amount, -idx, \
scratch); \
}
#else
#define ATOMIC_EXCHANGE_BYTE(i) \
{ \
constexpr int idx = (i); \
static_assert(idx <= 3 && idx >= 0, "idx is out of range!"); \
constexpr int start = 32 + 8 * (3 - idx); \
constexpr int end = start + 7; \
constexpr int shift_amount = idx * 8; \
AtomicExchangeHelper(addr, value, output, start, end, shift_amount, -idx, \
scratch); \
}
#endif
Label three, two, one, done;
tmll(addr, Operand(3));
b(Condition(1), &three);
b(Condition(2), &two);
b(Condition(4), &one);
// end with 0b00
ATOMIC_EXCHANGE_BYTE(0);
b(&done);
// ending with 0b01
bind(&one);
ATOMIC_EXCHANGE_BYTE(1);
b(&done);
// ending with 0b10
bind(&two);
ATOMIC_EXCHANGE_BYTE(2);
b(&done);
// ending with 0b11
bind(&three);
ATOMIC_EXCHANGE_BYTE(3);
bind(&done);
}
void TurboAssembler::AtomicExchangeU16(Register addr, Register value,
Register output, Register scratch) {
#ifdef V8_TARGET_BIG_ENDIAN
#define ATOMIC_EXCHANGE_HALFWORD(i) \
{ \
constexpr int idx = (i); \
static_assert(idx <= 1 && idx >= 0, "idx is out of range!"); \
constexpr int start = 32 + 16 * idx; \
constexpr int end = start + 15; \
constexpr int shift_amount = (1 - idx) * 16; \
AtomicExchangeHelper(addr, value, output, start, end, shift_amount, \
-idx * 2, scratch); \
}
#else
#define ATOMIC_EXCHANGE_HALFWORD(i) \
{ \
constexpr int idx = (i); \
static_assert(idx <= 1 && idx >= 0, "idx is out of range!"); \
constexpr int start = 32 + 16 * (1 - idx); \
constexpr int end = start + 15; \
constexpr int shift_amount = idx * 16; \
AtomicExchangeHelper(addr, value, output, start, end, shift_amount, \
-idx * 2, scratch); \
}
#endif
Label two, done;
tmll(addr, Operand(3));
b(Condition(2), &two);
// end with 0b00
ATOMIC_EXCHANGE_HALFWORD(0);
b(&done);
// ending with 0b10
bind(&two);
ATOMIC_EXCHANGE_HALFWORD(1);
bind(&done);
}
} // namespace internal
} // namespace v8
......
src/codegen/s390/macro-assembler-s390.h
View file @ b4dbeaa1
......@@ -54,6 +54,13 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
Register new_value, Register temp0, Register temp1);
void AtomicCmpExchangeU16(Register addr, Register output, Register old_value,
Register new_value, Register temp0, Register temp1);
void AtomicExchangeHelper(Register addr, Register value, Register output,
int start, int end, int shift_amount, int offset,
Register scratch);
void AtomicExchangeU8(Register addr, Register value, Register output,
Register scratch);
void AtomicExchangeU16(Register addr, Register value, Register output,
Register scratch);
void DoubleMax(DoubleRegister result_reg, DoubleRegister left_reg,
DoubleRegister right_reg);
......
src/compiler/backend/s390/code-generator-s390.cc
View file @ b4dbeaa1
......@@ -2309,59 +2309,6 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
case kS390_Lay:
__ lay(i.OutputRegister(), i.MemoryOperand());
break;
// 0x aa bb cc dd
// index = 3..2..1..0
#define ATOMIC_EXCHANGE(start, end, shift_amount, offset) \
{ \
Label do_cs; \
__ LoadU32(output, MemOperand(r1, offset)); \
__ bind(&do_cs); \
__ llgfr(r0, output); \
__ RotateInsertSelectBits(r0, value, Operand(start), Operand(end), \
Operand(shift_amount), false); \
__ csy(output, r0, MemOperand(r1, offset)); \
__ bne(&do_cs, Label::kNear); \
__ srl(output, Operand(shift_amount)); \
}
#ifdef V8_TARGET_BIG_ENDIAN
#define ATOMIC_EXCHANGE_BYTE(i) \
{ \
constexpr int idx = (i); \
static_assert(idx <= 3 && idx >= 0, "idx is out of range!"); \
constexpr int start = 32 + 8 * idx; \
constexpr int end = start + 7; \
constexpr int shift_amount = (3 - idx) * 8; \
ATOMIC_EXCHANGE(start, end, shift_amount, -idx); \
}
#define ATOMIC_EXCHANGE_HALFWORD(i) \
{ \
constexpr int idx = (i); \
static_assert(idx <= 1 && idx >= 0, "idx is out of range!"); \
constexpr int start = 32 + 16 * idx; \
constexpr int end = start + 15; \
constexpr int shift_amount = (1 - idx) * 16; \
ATOMIC_EXCHANGE(start, end, shift_amount, -idx * 2); \
}
#else
#define ATOMIC_EXCHANGE_BYTE(i) \
{ \
constexpr int idx = (i); \
static_assert(idx <= 3 && idx >= 0, "idx is out of range!"); \
constexpr int start = 32 + 8 * (3 - idx); \
constexpr int end = start + 7; \
constexpr int shift_amount = idx * 8; \
ATOMIC_EXCHANGE(start, end, shift_amount, -idx); \
}
#define ATOMIC_EXCHANGE_HALFWORD(i) \
{ \
constexpr int idx = (i); \
static_assert(idx <= 1 && idx >= 0, "idx is out of range!"); \
constexpr int start = 32 + 16 * (1 - idx); \
constexpr int end = start + 15; \
constexpr int shift_amount = idx * 16; \
ATOMIC_EXCHANGE(start, end, shift_amount, -idx * 2); \
}
#endif
case kS390_Word64AtomicExchangeUint8:
case kWord32AtomicExchangeInt8:
case kWord32AtomicExchangeUint8: {
......@@ -2369,36 +2316,12 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
Register index = i.InputRegister(1);
Register value = i.InputRegister(2);
Register output = i.OutputRegister();
Label three, two, one, done;
__ la(r1, MemOperand(base, index));
__ tmll(r1, Operand(3));
__ b(Condition(1), &three);
__ b(Condition(2), &two);
__ b(Condition(4), &one);
// end with 0b00
ATOMIC_EXCHANGE_BYTE(0);
__ b(&done);
// ending with 0b01
__ bind(&one);
ATOMIC_EXCHANGE_BYTE(1);
__ b(&done);
// ending with 0b10
__ bind(&two);
ATOMIC_EXCHANGE_BYTE(2);
__ b(&done);
// ending with 0b11
__ bind(&three);
ATOMIC_EXCHANGE_BYTE(3);
__ bind(&done);
__ AtomicExchangeU8(r1, value, output, r0);
if (opcode == kWord32AtomicExchangeInt8) {
__ lgbr(output, output);
__ LoadS8(output, output);
} else {
__ llgcr(output, output);
__ LoadU8(output, output);
}
break;
}
......@@ -2409,20 +2332,8 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
Register index = i.InputRegister(1);
Register value = i.InputRegister(2);
Register output = i.OutputRegister();
Label two, done;
__ la(r1, MemOperand(base, index));
__ tmll(r1, Operand(3));
__ b(Condition(2), &two);
// end with 0b00
ATOMIC_EXCHANGE_HALFWORD(0);
__ b(&done);
// ending with 0b10
__ bind(&two);
ATOMIC_EXCHANGE_HALFWORD(1);
__ bind(&done);
__ AtomicExchangeU16(r1, value, output, r0);
if (opcode == kWord32AtomicExchangeInt16) {
__ lghr(output, output);
} else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment