Changeset 197994 in webkit


Ignore:
Timestamp:
Mar 10, 2016 10:04:49 PM (8 years ago)
Author:
commit-queue@webkit.org
Message:

[JSC] Add register reuse for ArithAdd of an Int32 and constant in DFG
https://bugs.webkit.org/show_bug.cgi?id=155164

Patch by Benjamin Poulain <bpoulain@apple.com> on 2016-03-10
Reviewed by Geoffrey Garen.

Every "inc" in loop was looking like this:

move rX, rY
inc rY
jo 0x230f4a200580

This patch add register Reuse to that case to remove
the extra "move".

  • dfg/DFGOSRExit.h:

(JSC::DFG::SpeculationRecovery::SpeculationRecovery):
(JSC::DFG::SpeculationRecovery::immediate):

  • dfg/DFGOSRExitCompiler32_64.cpp:

(JSC::DFG::OSRExitCompiler::compileExit):

  • dfg/DFGOSRExitCompiler64.cpp:

(JSC::DFG::OSRExitCompiler::compileExit):

  • dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::compileArithAdd):

  • tests/stress/arith-add-with-constant-overflow.js: Added.

(opaqueAdd):

Location:
trunk/Source/JavaScriptCore
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r197985 r197994  
     12016-03-10  Benjamin Poulain  <bpoulain@apple.com>
     2
     3        [JSC] Add register reuse for ArithAdd of an Int32 and constant in DFG
     4        https://bugs.webkit.org/show_bug.cgi?id=155164
     5
     6        Reviewed by Geoffrey Garen.
     7
     8        Every "inc" in loop was looking like this:
     9            move rX, rY
     10            inc rY
     11            jo 0x230f4a200580
     12
     13        This patch add register Reuse to that case to remove
     14        the extra "move".
     15
     16        * dfg/DFGOSRExit.h:
     17        (JSC::DFG::SpeculationRecovery::SpeculationRecovery):
     18        (JSC::DFG::SpeculationRecovery::immediate):
     19        * dfg/DFGOSRExitCompiler32_64.cpp:
     20        (JSC::DFG::OSRExitCompiler::compileExit):
     21        * dfg/DFGOSRExitCompiler64.cpp:
     22        (JSC::DFG::OSRExitCompiler::compileExit):
     23        * dfg/DFGSpeculativeJIT.cpp:
     24        (JSC::DFG::SpeculativeJIT::compileArithAdd):
     25        * tests/stress/arith-add-with-constant-overflow.js: Added.
     26        (opaqueAdd):
     27
    1282016-03-10  Keith Miller  <keith_miller@apple.com>
    229
  • trunk/Source/JavaScriptCore/dfg/DFGOSRExit.h

    r195831 r197994  
    4949// This enum describes the types of additional recovery that
    5050// may need be performed should a speculation check fail.
    51 enum SpeculationRecoveryType {
     51enum SpeculationRecoveryType : uint8_t {
    5252    SpeculativeAdd,
     53    SpeculativeAddImmediate,
    5354    BooleanSpeculationCheck
    5455};
     
    6162public:
    6263    SpeculationRecovery(SpeculationRecoveryType type, GPRReg dest, GPRReg src)
    63         : m_type(type)
     64        : m_src(src)
    6465        , m_dest(dest)
    65         , m_src(src)
     66        , m_type(type)
     67    {
     68    }
     69
     70    SpeculationRecovery(SpeculationRecoveryType type, GPRReg dest, int32_t immediate)
     71        : m_immediate(immediate)
     72        , m_dest(dest)
     73        , m_type(type)
    6674    {
    6775    }
     
    7078    GPRReg dest() { return m_dest; }
    7179    GPRReg src() { return m_src; }
     80    int32_t immediate() { return m_immediate; }
    7281
    7382private:
     83    // different recovery types may required different additional information here.
     84    union {
     85        GPRReg m_src;
     86        int32_t m_immediate;
     87    };
     88    GPRReg m_dest;
     89
    7490    // Indicates the type of additional recovery to be performed.
    7591    SpeculationRecoveryType m_type;
    76     // different recovery types may required different additional information here.
    77     GPRReg m_dest;
    78     GPRReg m_src;
    7992};
    8093
  • trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompiler32_64.cpp

    r195831 r197994  
    5656        case SpeculativeAdd:
    5757            m_jit.sub32(recovery->src(), recovery->dest());
     58            break;
     59
     60        case SpeculativeAddImmediate:
     61            m_jit.sub32(AssemblyHelpers::Imm32(recovery->immediate()), recovery->dest());
    5862            break;
    5963           
  • trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompiler64.cpp

    r195831 r197994  
    6060        case SpeculativeAdd:
    6161            m_jit.sub32(recovery->src(), recovery->dest());
     62            m_jit.or64(GPRInfo::tagTypeNumberRegister, recovery->dest());
     63            break;
     64
     65        case SpeculativeAddImmediate:
     66            m_jit.sub32(AssemblyHelpers::Imm32(recovery->immediate()), recovery->dest());
    6267            m_jit.or64(GPRInfo::tagTypeNumberRegister, recovery->dest());
    6368            break;
  • trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

    r197833 r197994  
    32573257        if (node->child2()->isInt32Constant()) {
    32583258            SpeculateInt32Operand op1(this, node->child1());
     3259            GPRTemporary result(this, Reuse, op1);
     3260
     3261            GPRReg gpr1 = op1.gpr();
    32593262            int32_t imm2 = node->child2()->asInt32();
     3263            GPRReg gprResult = result.gpr();
    32603264
    32613265            if (!shouldCheckOverflow(node->arithMode())) {
    3262                 GPRTemporary result(this, Reuse, op1);
    3263                 m_jit.add32(Imm32(imm2), op1.gpr(), result.gpr());
    3264                 int32Result(result.gpr(), node);
     3266                m_jit.add32(Imm32(imm2), gpr1, gprResult);
     3267                int32Result(gprResult, node);
    32653268                return;
    32663269            }
    32673270
    3268             GPRTemporary result(this);
    3269             speculationCheck(Overflow, JSValueRegs(), 0, m_jit.branchAdd32(MacroAssembler::Overflow, op1.gpr(), Imm32(imm2), result.gpr()));
    3270 
    3271             int32Result(result.gpr(), node);
     3271            MacroAssembler::Jump check = m_jit.branchAdd32(MacroAssembler::Overflow, gpr1, Imm32(imm2), gprResult);
     3272            if (gpr1 == gprResult) {
     3273                speculationCheck(Overflow, JSValueRegs(), 0, check,
     3274                    SpeculationRecovery(SpeculativeAddImmediate, gpr1, imm2));
     3275            } else
     3276                speculationCheck(Overflow, JSValueRegs(), 0, check);
     3277
     3278            int32Result(gprResult, node);
    32723279            return;
    32733280        }
Note: See TracChangeset for help on using the changeset viewer.