Skip to content

Commit 1ff685d

Browse files
schuayV8 LUCI CQ
schuay
authored and
V8 LUCI CQ
committed
[deoptimizer] Remove soft deopts
.. since they are the same as eager deopts (% an unused counter). Fixed: v8:12765 Change-Id: I2be6210e476ead4ac6629a49259f28321e965867 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3565717 Reviewed-by: Tobias Tebbi <tebbi@chromium.org> Reviewed-by: Leszek Swirski <leszeks@chromium.org> Commit-Queue: Jakob Linke <jgruber@chromium.org> Cr-Commit-Position: refs/heads/main@{#79729}
1 parent d936623 commit 1ff685d

57 files changed

Lines changed: 153 additions & 236 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎include/v8-internal.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,8 @@ class Internals {
365365

366366
static const uint32_t kNumIsolateDataSlots = 4;
367367
static const int kStackGuardSize = 7 * kApiSystemPointerSize;
368-
static const int kBuiltinTier0EntryTableSize = 10 * kApiSystemPointerSize;
369-
static const int kBuiltinTier0TableSize = 10 * kApiSystemPointerSize;
368+
static const int kBuiltinTier0EntryTableSize = 9 * kApiSystemPointerSize;
369+
static const int kBuiltinTier0TableSize = 9 * kApiSystemPointerSize;
370370

371371
// IsolateData layout guarantees.
372372
static const int kIsolateCageBaseOffset = 0;

‎src/builtins/arm/builtins-arm.cc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3537,10 +3537,6 @@ void Builtins::Generate_DeoptimizationEntry_Eager(MacroAssembler* masm) {
35373537
Generate_DeoptimizationEntry(masm, DeoptimizeKind::kEager);
35383538
}
35393539

3540-
void Builtins::Generate_DeoptimizationEntry_Soft(MacroAssembler* masm) {
3541-
Generate_DeoptimizationEntry(masm, DeoptimizeKind::kSoft);
3542-
}
3543-
35443540
void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
35453541
Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
35463542
}

‎src/builtins/arm64/builtins-arm64.cc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4055,10 +4055,6 @@ void Builtins::Generate_DeoptimizationEntry_Eager(MacroAssembler* masm) {
40554055
Generate_DeoptimizationEntry(masm, DeoptimizeKind::kEager);
40564056
}
40574057

4058-
void Builtins::Generate_DeoptimizationEntry_Soft(MacroAssembler* masm) {
4059-
Generate_DeoptimizationEntry(masm, DeoptimizeKind::kSoft);
4060-
}
4061-
40624058
void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
40634059
Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
40644060
}

‎src/builtins/builtins-definitions.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ namespace internal {
4545
#define BUILTIN_LIST_BASE_TIER0(CPP, TFJ, TFC, TFS, TFH, ASM) \
4646
/* Deoptimization entries. */ \
4747
ASM(DeoptimizationEntry_Eager, DeoptimizationEntry) \
48-
ASM(DeoptimizationEntry_Soft, DeoptimizationEntry) \
4948
ASM(DeoptimizationEntry_Lazy, DeoptimizationEntry) \
5049
\
5150
/* GC write barrier. */ \

‎src/builtins/ia32/builtins-ia32.cc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4150,10 +4150,6 @@ void Builtins::Generate_DeoptimizationEntry_Eager(MacroAssembler* masm) {
41504150
Generate_DeoptimizationEntry(masm, DeoptimizeKind::kEager);
41514151
}
41524152

4153-
void Builtins::Generate_DeoptimizationEntry_Soft(MacroAssembler* masm) {
4154-
Generate_DeoptimizationEntry(masm, DeoptimizeKind::kSoft);
4155-
}
4156-
41574153
void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
41584154
Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
41594155
}

‎src/builtins/x64/builtins-x64.cc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4973,10 +4973,6 @@ void Builtins::Generate_DeoptimizationEntry_Eager(MacroAssembler* masm) {
49734973
Generate_DeoptimizationEntry(masm, DeoptimizeKind::kEager);
49744974
}
49754975

4976-
void Builtins::Generate_DeoptimizationEntry_Soft(MacroAssembler* masm) {
4977-
Generate_DeoptimizationEntry(masm, DeoptimizeKind::kSoft);
4978-
}
4979-
49804976
void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
49814977
Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
49824978
}

‎src/codegen/arm/macro-assembler-arm.cc‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2648,9 +2648,8 @@ void TurboAssembler::CallForDeoptimization(Builtin target, int, Label* exit,
26482648
MemOperand(kRootRegister, IsolateData::BuiltinEntrySlotOffset(target)));
26492649
Call(ip);
26502650
DCHECK_EQ(SizeOfCodeGeneratedSince(exit),
2651-
(kind == DeoptimizeKind::kLazy)
2652-
? Deoptimizer::kLazyDeoptExitSize
2653-
: Deoptimizer::kNonLazyDeoptExitSize);
2651+
(kind == DeoptimizeKind::kLazy) ? Deoptimizer::kLazyDeoptExitSize
2652+
: Deoptimizer::kEagerDeoptExitSize);
26542653

26552654
// The above code must not emit constants either.
26562655
DCHECK(!has_pending_constants());

‎src/codegen/arm64/macro-assembler-arm64.cc‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2219,9 +2219,8 @@ void TurboAssembler::CallForDeoptimization(
22192219
BlockPoolsScope scope(this);
22202220
bl(jump_deoptimization_entry_label);
22212221
DCHECK_EQ(SizeOfCodeGeneratedSince(exit),
2222-
(kind == DeoptimizeKind::kLazy)
2223-
? Deoptimizer::kLazyDeoptExitSize
2224-
: Deoptimizer::kNonLazyDeoptExitSize);
2222+
(kind == DeoptimizeKind::kLazy) ? Deoptimizer::kLazyDeoptExitSize
2223+
: Deoptimizer::kEagerDeoptExitSize);
22252224
}
22262225

22272226
void MacroAssembler::LoadStackLimit(Register destination, StackLimitKind kind) {

‎src/codegen/ia32/macro-assembler-ia32.cc‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2033,9 +2033,8 @@ void TurboAssembler::CallForDeoptimization(Builtin target, int, Label* exit,
20332033
ASM_CODE_COMMENT(this);
20342034
CallBuiltin(target);
20352035
DCHECK_EQ(SizeOfCodeGeneratedSince(exit),
2036-
(kind == DeoptimizeKind::kLazy)
2037-
? Deoptimizer::kLazyDeoptExitSize
2038-
: Deoptimizer::kNonLazyDeoptExitSize);
2036+
(kind == DeoptimizeKind::kLazy) ? Deoptimizer::kLazyDeoptExitSize
2037+
: Deoptimizer::kEagerDeoptExitSize);
20392038
}
20402039

20412040
void TurboAssembler::Trap() { int3(); }

‎src/codegen/loong64/macro-assembler-loong64.cc‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4087,9 +4087,8 @@ void TurboAssembler::CallForDeoptimization(Builtin target, int, Label* exit,
40874087
MemOperand(kRootRegister, IsolateData::BuiltinEntrySlotOffset(target)));
40884088
Call(t7);
40894089
DCHECK_EQ(SizeOfCodeGeneratedSince(exit),
4090-
(kind == DeoptimizeKind::kLazy)
4091-
? Deoptimizer::kLazyDeoptExitSize
4092-
: Deoptimizer::kNonLazyDeoptExitSize);
4090+
(kind == DeoptimizeKind::kLazy) ? Deoptimizer::kLazyDeoptExitSize
4091+
: Deoptimizer::kEagerDeoptExitSize);
40934092
}
40944093

40954094
void TurboAssembler::LoadCodeObjectEntry(Register destination,

0 commit comments

Comments
 (0)