Skip to content

Commit

Permalink
Revert of PPC/s390: Reland: [TypeFeedbackVector] Store optimized code…
Browse files Browse the repository at this point in the history 
… in the vector (patchset #1 id:1 of https://codereview.chromium.org/2861863003/ )

Reason for revert:
Original CL reverted.
Crashing on Canary
BUG=chromium:718891

Original issue's description:
> PPC/s390: Reland: [TypeFeedbackVector] Store optimized code in the vector
>
> Port 662aa42
>
> Original Commit Message:
>
>     Since the feedback vector is itself a native context structure, why
>     not store optimized code for a function in there rather than in
>     a map from native context to code? This allows us to get rid of
>     the optimized code map in the SharedFunctionInfo, saving a pointer,
>     and making lookup of any optimized code quicker.
>
>     Original patch by Michael Stanton <mvstanton@chromium.org>
>
> R=rmcilroy@chromium.org, joransiu@ca.ibm.com, jyan@ca.ibm.com, michael_dawson@ca.ibm.com
> BUG=v8:6246
> LOG=N
>
> Review-Url: https://codereview.chromium.org/2861863003
> Cr-Commit-Position: refs/heads/master@{#45111}
> Committed: https://chromium.googlesource.com/v8/v8/+/d587812258c232f7b9a1f1a9a017ba3f9cea12ea

TBR=joransiu@ca.ibm.com,jyan@ca.ibm.com,michael_dawson@ca.ibm.com,rmcilroy@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=v8:6246

Review-Url: https://codereview.chromium.org/2870703003
Cr-Commit-Position: refs/heads/master@{#45195}
  • Loading branch information
bjaideep authored and Commit bot committed May 9, 2017
1 parent 6867bd6 commit c33b25b
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 25 deletions.
61 changes: 50 additions & 11 deletions src/builtins/ppc/builtins-ppc.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1342,38 +1342,69 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
// First lookup code, maybe we don't need to compile!
Label gotta_call_runtime;
Label try_shared;
Label loop_top, loop_bottom;

Register closure = r4;
Register map = r9;
Register index = r5;

// Do we have a valid feedback vector?
__ LoadP(index, FieldMemOperand(closure, JSFunction::kFeedbackVectorOffset));
__ LoadP(index, FieldMemOperand(index, Cell::kValueOffset));
__ JumpIfRoot(index, Heap::kUndefinedValueRootIndex, &gotta_call_runtime);

// Is optimized code available in the feedback vector?
__ LoadP(map,
FieldMemOperand(closure, JSFunction::kSharedFunctionInfoOffset));
__ LoadP(map,
FieldMemOperand(map, SharedFunctionInfo::kOptimizedCodeMapOffset));
__ LoadP(index, FieldMemOperand(map, FixedArray::kLengthOffset));
__ CmpSmiLiteral(index, Smi::FromInt(2), r0);
__ blt(&try_shared);

// r10 : native context
// r5 : length / index
// r9 : optimized code map
// r6 : new target
// r4 : closure
Register native_context = r10;
__ LoadP(native_context, NativeContextMemOperand());

__ bind(&loop_top);
Register temp = r11;
Register array_pointer = r8;

// Does the native context match?
__ SmiToPtrArrayOffset(array_pointer, index);
__ add(array_pointer, map, array_pointer);
__ LoadP(temp, FieldMemOperand(array_pointer,
SharedFunctionInfo::kOffsetToPreviousContext));
__ LoadP(temp, FieldMemOperand(temp, WeakCell::kValueOffset));
__ cmp(temp, native_context);
__ bne(&loop_bottom);

// Code available?
Register entry = r7;
__ LoadP(entry, FieldMemOperand(index, FeedbackVector::kOptimizedCodeIndex *
kPointerSize +
FeedbackVector::kHeaderSize));
__ LoadP(entry,
FieldMemOperand(array_pointer,
SharedFunctionInfo::kOffsetToPreviousCachedCode));
__ LoadP(entry, FieldMemOperand(entry, WeakCell::kValueOffset));
__ JumpIfSmi(entry, &try_shared);

// Found code. Get it into the closure and return.
// Store code entry in the closure.
__ addi(entry, entry, Operand(Code::kHeaderSize - kHeapObjectTag));
__ StoreP(entry, FieldMemOperand(closure, JSFunction::kCodeEntryOffset), r0);
__ RecordWriteCodeEntryField(closure, entry, r8);

// Load native context into r9.
Register native_context = r9;
__ LoadP(native_context, NativeContextMemOperand());

// Link the closure into the optimized function list.
// r7 : code entry
// r10: native context
// r4 : closure
__ LoadP(
r8, ContextMemOperand(native_context, Context::OPTIMIZED_FUNCTIONS_LIST));
__ StoreP(r8, FieldMemOperand(closure, JSFunction::kNextFunctionLinkOffset),
r0);
__ RecordWriteField(closure, JSFunction::kNextFunctionLinkOffset, r8, r5,
__ RecordWriteField(closure, JSFunction::kNextFunctionLinkOffset, r8, temp,
kLRHasNotBeenSaved, kDontSaveFPRegs, EMIT_REMEMBERED_SET,
OMIT_SMI_CHECK);
const int function_list_offset =
Expand All @@ -1383,11 +1414,19 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
ContextMemOperand(native_context, Context::OPTIMIZED_FUNCTIONS_LIST), r0);
// Save closure before the write barrier.
__ mr(r8, closure);
__ RecordWriteContextSlot(native_context, function_list_offset, r8, r5,
__ RecordWriteContextSlot(native_context, function_list_offset, r8, temp,
kLRHasNotBeenSaved, kDontSaveFPRegs);
__ JumpToJSEntry(entry);

// We found no optimized code.
__ bind(&loop_bottom);
__ SubSmiLiteral(index, index, Smi::FromInt(SharedFunctionInfo::kEntryLength),
r0);
__ CmpSmiLiteral(index, Smi::FromInt(1), r0);
__ bgt(&loop_top);

// We found no code.
__ b(&gotta_call_runtime);

__ bind(&try_shared);
__ LoadP(entry,
FieldMemOperand(closure, JSFunction::kSharedFunctionInfoOffset));
Expand Down
68 changes: 54 additions & 14 deletions src/builtins/s390/builtins-s390.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1345,38 +1345,70 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
// First lookup code, maybe we don't need to compile!
Label gotta_call_runtime;
Label try_shared;
Label loop_top, loop_bottom;

Register closure = r3;
Register map = r8;
Register index = r4;

// Do we have a valid feedback vector?
__ LoadP(index, FieldMemOperand(closure, JSFunction::kFeedbackVectorOffset));
__ LoadP(index, FieldMemOperand(index, Cell::kValueOffset));
__ JumpIfRoot(index, Heap::kUndefinedValueRootIndex, &gotta_call_runtime);

// Is optimized code available in the feedback vector?
__ LoadP(map,
FieldMemOperand(closure, JSFunction::kSharedFunctionInfoOffset));
__ LoadP(map,
FieldMemOperand(map, SharedFunctionInfo::kOptimizedCodeMapOffset));
__ LoadP(index, FieldMemOperand(map, FixedArray::kLengthOffset));
__ CmpSmiLiteral(index, Smi::FromInt(2), r0);
__ blt(&try_shared);

// Find literals.
// r9 : native context
// r4 : length / index
// r8 : optimized code map
// r5 : new target
// r3 : closure
Register native_context = r9;
__ LoadP(native_context, NativeContextMemOperand());

__ bind(&loop_top);
Register temp = r1;
Register array_pointer = r7;

// Does the native context match?
__ SmiToPtrArrayOffset(array_pointer, index);
__ AddP(array_pointer, map, array_pointer);
__ LoadP(temp, FieldMemOperand(array_pointer,
SharedFunctionInfo::kOffsetToPreviousContext));
__ LoadP(temp, FieldMemOperand(temp, WeakCell::kValueOffset));
__ CmpP(temp, native_context);
__ bne(&loop_bottom, Label::kNear);

// Code available?
Register entry = r6;
__ LoadP(entry, FieldMemOperand(index, FeedbackVector::kOptimizedCodeIndex *
kPointerSize +
FeedbackVector::kHeaderSize));
__ LoadP(entry,
FieldMemOperand(array_pointer,
SharedFunctionInfo::kOffsetToPreviousCachedCode));
__ LoadP(entry, FieldMemOperand(entry, WeakCell::kValueOffset));
__ JumpIfSmi(entry, &try_shared);

// Found code. Get it into the closure and return.
// Store code entry in the closure.
__ AddP(entry, entry, Operand(Code::kHeaderSize - kHeapObjectTag));
__ StoreP(entry, FieldMemOperand(closure, JSFunction::kCodeEntryOffset), r0);
__ RecordWriteCodeEntryField(closure, entry, r7);

// Load native context into r8.
Register native_context = r8;
__ LoadP(native_context, NativeContextMemOperand());

// Link the closure into the optimized function list.
// r6 : code entry
// r9: native context
// r3 : closure
__ LoadP(
r7, ContextMemOperand(native_context, Context::OPTIMIZED_FUNCTIONS_LIST));
__ StoreP(r7, FieldMemOperand(closure, JSFunction::kNextFunctionLinkOffset),
r0);
__ RecordWriteField(closure, JSFunction::kNextFunctionLinkOffset, r7, r4,
__ RecordWriteField(closure, JSFunction::kNextFunctionLinkOffset, r7, temp,
kLRHasNotBeenSaved, kDontSaveFPRegs, EMIT_REMEMBERED_SET,
OMIT_SMI_CHECK);
const int function_list_offset =
Expand All @@ -1386,18 +1418,26 @@ void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
ContextMemOperand(native_context, Context::OPTIMIZED_FUNCTIONS_LIST), r0);
// Save closure before the write barrier.
__ LoadRR(r7, closure);
__ RecordWriteContextSlot(native_context, function_list_offset, r7, r4,
__ RecordWriteContextSlot(native_context, function_list_offset, r7, temp,
kLRHasNotBeenSaved, kDontSaveFPRegs);
__ JumpToJSEntry(entry);

// We found no optimized code.
__ bind(&loop_bottom);
__ SubSmiLiteral(index, index, Smi::FromInt(SharedFunctionInfo::kEntryLength),
r0);
__ CmpSmiLiteral(index, Smi::FromInt(1), r0);
__ bgt(&loop_top);

// We found no code.
__ b(&gotta_call_runtime);

__ bind(&try_shared);
__ LoadP(entry,
FieldMemOperand(closure, JSFunction::kSharedFunctionInfoOffset));
// Is the shared function marked for tier up?
__ LoadlB(r7, FieldMemOperand(
entry, SharedFunctionInfo::kMarkedForTierUpByteOffset));
__ TestBit(r7, SharedFunctionInfo::kMarkedForTierUpBitWithinByte, r0);
__ LoadlB(temp, FieldMemOperand(
entry, SharedFunctionInfo::kMarkedForTierUpByteOffset));
__ TestBit(temp, SharedFunctionInfo::kMarkedForTierUpBitWithinByte, r0);
__ bne(&gotta_call_runtime);

// If SFI points to anything other than CompileLazy, install that.
Expand Down

0 comments on commit c33b25b

Please sign in to comment.