MIPS: Avoid unnecessary branches in array constructor stubs.

Port r18427 (4db045a)

BUG=
R=plind44@gmail.com

Review URL: https://codereview.chromium.org/107003008

Patch from Balazs Kilvady <kilvadyb@homejinni.com>.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18446 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
plind44@gmail.com 2014-01-02 16:53:51 +00:00
parent d6aabbdcc7
commit 117d9c62f6
3 changed files with 19 additions and 28 deletions

View File

@ -5683,12 +5683,9 @@ static void CreateArrayDispatch(MacroAssembler* masm,
int last_index = GetSequenceIndexFromFastElementsKind(
TERMINAL_FAST_ELEMENTS_KIND);
for (int i = 0; i <= last_index; ++i) {
Label next;
ElementsKind kind = GetFastElementsKindFromSequenceIndex(i);
__ Branch(&next, ne, a3, Operand(kind));
T stub(kind);
__ TailCallStub(&stub);
__ bind(&next);
__ TailCallStub(&stub, eq, a3, Operand(kind));
}
// If we reached this point there is a problem.
@ -5764,12 +5761,9 @@ static void CreateArrayDispatchOneArgument(MacroAssembler* masm,
int last_index = GetSequenceIndexFromFastElementsKind(
TERMINAL_FAST_ELEMENTS_KIND);
for (int i = 0; i <= last_index; ++i) {
Label next;
ElementsKind kind = GetFastElementsKindFromSequenceIndex(i);
__ Branch(&next, ne, a3, Operand(kind));
ArraySingleArgumentConstructorStub stub(kind);
__ TailCallStub(&stub);
__ bind(&next);
__ TailCallStub(&stub, eq, a3, Operand(kind));
}
// If we reached this point there is a problem.
@ -5911,34 +5905,25 @@ void ArrayConstructorStub::Generate(MacroAssembler* masm) {
void InternalArrayConstructorStub::GenerateCase(
MacroAssembler* masm, ElementsKind kind) {
Label not_zero_case, not_one_case;
Label normal_sequence;
__ Branch(&not_zero_case, ne, a0, Operand(zero_reg));
InternalArrayNoArgumentConstructorStub stub0(kind);
__ TailCallStub(&stub0);
__ TailCallStub(&stub0, lo, a0, Operand(1));
__ bind(&not_zero_case);
__ Branch(&not_one_case, gt, a0, Operand(1));
InternalArrayNArgumentsConstructorStub stubN(kind);
__ TailCallStub(&stubN, hi, a0, Operand(1));
if (IsFastPackedElementsKind(kind)) {
// We might need to create a holey array
// look at the first argument.
__ lw(at, MemOperand(sp, 0));
__ Branch(&normal_sequence, eq, at, Operand(zero_reg));
InternalArraySingleArgumentConstructorStub
stub1_holey(GetHoleyElementsKind(kind));
__ TailCallStub(&stub1_holey);
__ TailCallStub(&stub1_holey, ne, at, Operand(zero_reg));
}
__ bind(&normal_sequence);
InternalArraySingleArgumentConstructorStub stub1(kind);
__ TailCallStub(&stub1);
__ bind(&not_one_case);
InternalArrayNArgumentsConstructorStub stubN(kind);
__ TailCallStub(&stubN);
}

View File

@ -3905,8 +3905,12 @@ void MacroAssembler::CallStub(CodeStub* stub,
}
void MacroAssembler::TailCallStub(CodeStub* stub) {
Jump(stub->GetCode(isolate()), RelocInfo::CODE_TARGET);
void MacroAssembler::TailCallStub(CodeStub* stub,
Condition cond,
Register r1,
const Operand& r2,
BranchDelaySlot bd) {
Jump(stub->GetCode(isolate()), RelocInfo::CODE_TARGET, cond, r1, r2, bd);
}

View File

@ -1194,16 +1194,18 @@ class MacroAssembler: public Assembler {
li(s2, Operand(ref));
}
#define COND_ARGS Condition cond = al, Register rs = zero_reg, \
const Operand& rt = Operand(zero_reg), BranchDelaySlot bd = PROTECT
// Call a code stub.
void CallStub(CodeStub* stub,
TypeFeedbackId ast_id = TypeFeedbackId::None(),
Condition cond = cc_always,
Register r1 = zero_reg,
const Operand& r2 = Operand(zero_reg),
BranchDelaySlot bd = PROTECT);
COND_ARGS);
// Tail call a code stub (jump).
void TailCallStub(CodeStub* stub);
void TailCallStub(CodeStub* stub, COND_ARGS);
#undef COND_ARGS
void CallJSExitStub(CodeStub* stub);