Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable globopt for functions with try finally #2954

Merged
merged 1 commit into from
May 17, 2017
Merged

Enable globopt for functions with try finally #2954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions lib/Backend/BackwardPass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ bool
BackwardPass::DoByteCodeUpwardExposedUsed() const
{
return (this->tag == Js::DeadStorePhase && this->func->hasBailout) ||
(this->func->HasTry() && this->func->DoOptimizeTryCatch() && this->tag == Js::BackwardPhase);
(this->func->HasTry() && this->func->DoOptimizeTry() && this->tag == Js::BackwardPhase);
}

bool
Expand Down Expand Up @@ -114,7 +114,7 @@ BackwardPass::DoDeadStore(Func* func)
{
return
!PHASE_OFF(Js::DeadStorePhase, func) &&
(!func->HasTry() || func->DoOptimizeTryCatch());
(!func->HasTry() || func->DoOptimizeTry());
}

bool
Expand Down Expand Up @@ -1111,7 +1111,7 @@ BackwardPass::MergeSuccBlocksInfo(BasicBlock * block)
Assert(block->typesNeedingKnownObjectLayout == nullptr);
Assert(block->fieldHoistCandidates == nullptr);
// byteCodeUpwardExposedUsed is required to populate the writeThroughSymbolsSet for the try region in the backwards pass
Assert(block->byteCodeUpwardExposedUsed == nullptr || (this->tag == Js::BackwardPhase && this->func->HasTry() && this->func->DoOptimizeTryCatch()));
Assert(block->byteCodeUpwardExposedUsed == nullptr || (this->tag == Js::BackwardPhase && this->func->HasTry() && this->func->DoOptimizeTry()));
Assert(block->byteCodeRestoreSyms == nullptr);
Assert(block->stackSymToFinalType == nullptr);
Assert(block->stackSymToGuardedProperties == nullptr);
Expand Down Expand Up @@ -1847,7 +1847,7 @@ BackwardPass::ProcessBailOutInfo(IR::Instr * instr)
{
// We don't need to fill in the bailout instruction in backward pass
Assert(this->func->hasBailout || !instr->HasBailOutInfo());
Assert(!instr->HasBailOutInfo() || instr->GetBailOutInfo()->byteCodeUpwardExposedUsed == nullptr || (this->func->HasTry() && this->func->DoOptimizeTryCatch()));
Assert(!instr->HasBailOutInfo() || instr->GetBailOutInfo()->byteCodeUpwardExposedUsed == nullptr || (this->func->HasTry() && this->func->DoOptimizeTry()));

if (instr->IsByteCodeUsesInstr())
{
Expand Down Expand Up @@ -2298,7 +2298,7 @@ BackwardPass::ProcessBailOutInfo(IR::Instr * instr, BailOutInfo * bailOutInfo)
// The byteCodeUpwardExposedUsed should only be assigned once. The only case which would break this
// assumption is when we are optimizing a function having try-catch. In that case, we need the
// byteCodeUpwardExposedUsed analysis in the initial backward pass too.
Assert(bailOutInfo->byteCodeUpwardExposedUsed == nullptr || (this->func->HasTry() && this->func->DoOptimizeTryCatch()));
Assert(bailOutInfo->byteCodeUpwardExposedUsed == nullptr || (this->func->HasTry() && this->func->DoOptimizeTry()));

// Make a copy of the byteCodeUpwardExposedUsed so we can remove the constants
if (!this->IsPrePass())
Expand Down Expand Up @@ -2765,7 +2765,7 @@ BackwardPass::ProcessBlock(BasicBlock * block)
}
case Js::OpCode::Catch:
{
if (this->func->DoOptimizeTryCatch() && !this->IsPrePass())
if (this->func->DoOptimizeTry() && !this->IsPrePass())
{
// Execute the "Catch" in the JIT'ed code, and bailout to the next instruction. This way, the bailout will restore the exception object automatically.
IR::BailOutInstr* bailOnException = IR::BailOutInstr::New(Js::OpCode::BailOnException, IR::BailOutOnException, instr->m_next, instr->m_func);
Expand All @@ -2792,15 +2792,15 @@ BackwardPass::ProcessBlock(BasicBlock * block)
this->ProcessInlineeEnd(instr);
}

if (instr->IsLabelInstr() && instr->m_next->m_opcode == Js::OpCode::Catch)
if ((instr->IsLabelInstr() && instr->m_next->m_opcode == Js::OpCode::Catch) || (instr->IsLabelInstr() && instr->m_next->m_opcode == Js::OpCode::Finally))
{
if (!this->currentRegion)
{
Assert(!this->func->DoOptimizeTryCatch() && !(this->func->IsSimpleJit() && this->func->hasBailout));
Assert(!this->func->DoOptimizeTry() && !(this->func->IsSimpleJit() && this->func->hasBailout));
}
else
{
Assert(this->currentRegion->GetType() == RegionTypeCatch);
Assert(this->currentRegion->GetType() == RegionTypeCatch || this->currentRegion->GetType() == RegionTypeFinally);
Region * matchingTryRegion = this->currentRegion->GetMatchingTryRegion();
Assert(matchingTryRegion);

Expand All @@ -2827,10 +2827,11 @@ BackwardPass::ProcessBlock(BasicBlock * block)
#if DBG
if (instr->m_opcode == Js::OpCode::TryCatch)
{
if (!this->IsPrePass() && (this->func->DoOptimizeTryCatch() || (this->func->IsSimpleJit() && this->func->hasBailout)))
if (!this->IsPrePass() && (this->func->DoOptimizeTry() || (this->func->IsSimpleJit() && this->func->hasBailout)))
{
Assert(instr->m_next->IsLabelInstr() && (instr->m_next->AsLabelInstr()->GetRegion() != nullptr));
Region * tryRegion = instr->m_next->AsLabelInstr()->GetRegion();
Assert(tryRegion && tryRegion->GetType() == RegionType::RegionTypeTry && tryRegion->GetMatchingCatchRegion() != nullptr);
Assert(tryRegion->writeThroughSymbolsSet);
}
}
Expand Down Expand Up @@ -7496,16 +7497,16 @@ BackwardPass::FoldCmBool(IR::Instr *instr)
}

void
BackwardPass::SetWriteThroughSymbolsSetForRegion(BasicBlock * catchBlock, Region * tryRegion)
BackwardPass::SetWriteThroughSymbolsSetForRegion(BasicBlock * catchOrFinallyBlock, Region * tryRegion)
{
tryRegion->writeThroughSymbolsSet = JitAnew(this->func->m_alloc, BVSparse<JitArenaAllocator>, this->func->m_alloc);

if (this->DoByteCodeUpwardExposedUsed())
{
Assert(catchBlock->byteCodeUpwardExposedUsed);
if (!catchBlock->byteCodeUpwardExposedUsed->IsEmpty())
Assert(catchOrFinallyBlock->byteCodeUpwardExposedUsed);
if (!catchOrFinallyBlock->byteCodeUpwardExposedUsed->IsEmpty())
{
FOREACH_BITSET_IN_SPARSEBV(id, catchBlock->byteCodeUpwardExposedUsed)
FOREACH_BITSET_IN_SPARSEBV(id, catchOrFinallyBlock->byteCodeUpwardExposedUsed)
{
tryRegion->writeThroughSymbolsSet->Set(id);
}
Expand Down Expand Up @@ -7550,7 +7551,7 @@ BackwardPass::SetWriteThroughSymbolsSetForRegion(BasicBlock * catchBlock, Region
bool
BackwardPass::CheckWriteThroughSymInRegion(Region* region, StackSym* sym)
{
if (region->GetType() == RegionTypeRoot || region->GetType() == RegionTypeFinally)
if (region->GetType() == RegionTypeRoot)
{
return false;
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Backend/BailOut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1050,7 +1050,7 @@ Js::Var BailOutRecord::BailOut(BailOutRecord const * bailOutRecord)
void * argoutRestoreAddr = nullptr;
#ifdef _M_IX86
void * addressOfRetAddress = _AddressOfReturnAddress();
if (bailOutRecord->ehBailoutData && (bailOutRecord->ehBailoutData->catchOffset != 0))
if (bailOutRecord->ehBailoutData && (bailOutRecord->ehBailoutData->catchOffset != 0 || bailOutRecord->ehBailoutData->finallyOffset != 0 || bailOutRecord->ehBailoutData->ht == Js::HandlerType::HT_Finally))
{
// For a bailout in argument evaluation from an EH region, the esp is offset by the TryCatch helper's frame. So, the argouts are not at the offsets
// stored in the bailout record, which are relative to ebp. Need to restore the argouts from the actual value of esp before calling the Bailout helper
Expand Down Expand Up @@ -2708,7 +2708,7 @@ Js::Var BranchBailOutRecord::BailOut(BranchBailOutRecord const * bailOutRecord,
void * argoutRestoreAddr = nullptr;
#ifdef _M_IX86
void * addressOfRetAddress = _AddressOfReturnAddress();
if (bailOutRecord->ehBailoutData && (bailOutRecord->ehBailoutData->catchOffset != 0))
if (bailOutRecord->ehBailoutData && (bailOutRecord->ehBailoutData->catchOffset != 0 || bailOutRecord->ehBailoutData->finallyOffset != 0 || bailOutRecord->ehBailoutData->ht == Js::HandlerType::HT_Finally))
{
argoutRestoreAddr = (void *)((char*)addressOfRetAddress + ((2 + 1) * MachPtr)); // Account for the parameters and return address of this function
}
Expand Down
1 change: 1 addition & 0 deletions lib/Backend/BailOutKind.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ BAIL_OUT_KIND(LazyBailOut, 0)
BAIL_OUT_KIND(BailOutOnFailedHoistedLoopCountBasedBoundCheck, 0)
BAIL_OUT_KIND(BailOutForGeneratorYield, 0)
BAIL_OUT_KIND(BailOutOnException, 0)
BAIL_OUT_KIND(BailOutOnEarlyExit, 0)

// SIMD_JS
BAIL_OUT_KIND(BailOutSimd128F4Only, 0)
Expand Down
Loading