dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[vm/aot] Remove support for disabling table dispatch

Browse Source 
--use_table_dispatch option is enabled everywhere for a while
(since https://dart-review.googlesource.com/c/sdk/+/131833).
An ability to disable dispatch table is not tested well and
adds maintenance burden.

TEST=ci

Change-Id: I7cec18f12a4b5619d510dfd6dc9f918825918e2a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/225360
Reviewed-by: Aske Simon Christensen <askesc@google.com>
Reviewed-by: Slava Egorov <vegorov@google.com>
Commit-Queue: Alexander Markov <alexmarkov@google.com>
This commit is contained in:
Alexander Markov
2022-01-04 16:51:15 +00:00
committed by Commit Bot
parent 2766add19a
commit b2652f5985
13 changed files with 13 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/tests/vm/dart/deferred_loading_call_modes_test.dart
-3
View File
@@ -2,9 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// VMOptions=--use_table_dispatch=false
// VMOptions=--use_table_dispatch=true
import "splay_test.dart" deferred as splay; // Some non-trivial code.
main() async {
runtime/tests/vm/dart/v8_snapshot_profile_writer_test.dart
-6
View File
@@ -108,7 +108,6 @@ Future<void> testJIT(String dillPath, String snapshotKind) async {
Future<void> testAOT(String dillPath,
{bool useAsm = false,
bool forceDrops = false,
bool useDispatch = true,
bool stripUtil = false, // Note: forced true if useAsm.
bool stripFlag = false,
bool disassemble = false}) async {
@@ -129,9 +128,6 @@ Future<void> testAOT(String dillPath,
if (forceDrops) {
descriptionBuilder.write('-dropped');
}
if (!useDispatch) {
descriptionBuilder.write('-nodispatch');
}
if (stripFlag) {
descriptionBuilder.write('-intstrip');
}
@@ -158,7 +154,6 @@ Future<void> testAOT(String dillPath,
'--no-retain-function-objects',
'--no-retain-code-objects'
],
useDispatch ? '--use-table-dispatch' : '--no-use-table-dispatch',
if (disassemble) '--disassemble', // Not defined in PRODUCT mode.
dillPath,
];
@@ -434,7 +429,6 @@ main() async {
// Test unstripped ELF generation directly.
await testAOT(aotDillPath);
await testAOT(aotDillPath, forceDrops: true);
await testAOT(aotDillPath, forceDrops: true, useDispatch: false);
// Test flag-stripped ELF generation.
await testAOT(aotDillPath, stripFlag: true);
runtime/tests/vm/dart_2/deferred_loading_call_modes_test.dart
-3
View File
@@ -4,9 +4,6 @@
// @dart = 2.9
// VMOptions=--use_table_dispatch=false
// VMOptions=--use_table_dispatch=true
import "splay_test.dart" deferred as splay; // Some non-trivial code.
main() async {
runtime/tests/vm/dart_2/v8_snapshot_profile_writer_test.dart
-6
View File
@@ -110,7 +110,6 @@ Future<void> testJIT(String dillPath, String snapshotKind) async {
Future<void> testAOT(String dillPath,
{bool useAsm = false,
bool forceDrops = false,
bool useDispatch = true,
bool stripUtil = false, // Note: forced true if useAsm.
bool stripFlag = false,
bool disassemble = false}) async {
@@ -131,9 +130,6 @@ Future<void> testAOT(String dillPath,
if (forceDrops) {
descriptionBuilder.write('-dropped');
}
if (!useDispatch) {
descriptionBuilder.write('-nodispatch');
}
if (stripFlag) {
descriptionBuilder.write('-intstrip');
}
@@ -160,7 +156,6 @@ Future<void> testAOT(String dillPath,
'--no-retain-function-objects',
'--no-retain-code-objects'
],
useDispatch ? '--use-table-dispatch' : '--no-use-table-dispatch',
if (disassemble) '--disassemble', // Not defined in PRODUCT mode.
dillPath,
];
@@ -428,7 +423,6 @@ main() async {
// Test unstripped ELF generation directly.
await testAOT(aotDillPath);
await testAOT(aotDillPath, forceDrops: true);
await testAOT(aotDillPath, forceDrops: true, useDispatch: false);
// Test flag-stripped ELF generation.
await testAOT(aotDillPath, stripFlag: true);
runtime/vm/compiler/aot/precompiler.cc
+2 -11
View File
@@ -487,10 +487,8 @@ void Precompiler::DoCompileAll() {
// as well as other type checks.
HierarchyInfo hierarchy_info(T);
if (FLAG_use_table_dispatch) {
dispatch_table_generator_ = new compiler::DispatchTableGenerator(Z);
dispatch_table_generator_->Initialize(IG->class_table());
}
dispatch_table_generator_ = new compiler::DispatchTableGenerator(Z);
dispatch_table_generator_->Initialize(IG->class_table());
// Precompile constructors to compute information such as
// optimized instruction count (used in inlining heuristics).
@@ -1446,8 +1444,6 @@ void Precompiler::AddSelector(const String& selector) {
}
void Precompiler::AddTableSelector(const compiler::TableSelector* selector) {
ASSERT(FLAG_use_table_dispatch);
if (is_tracing()) {
tracer_->WriteTableSelectorRef(selector->id);
}
@@ -1459,10 +1455,6 @@ void Precompiler::AddTableSelector(const compiler::TableSelector* selector) {
}
bool Precompiler::IsHitByTableSelector(const Function& function) {
if (!FLAG_use_table_dispatch) {
return false;
}
const int32_t selector_id = selector_map()->SelectorId(function);
if (selector_id == compiler::SelectorMap::kInvalidSelectorId) return false;
return seen_table_selectors_.HasKey(selector_id);
@@ -2011,7 +2003,6 @@ void Precompiler::TraceForRetainedFunctions() {
void Precompiler::FinalizeDispatchTable() {
PRECOMPILER_TIMER_SCOPE(this, FinalizeDispatchTable);
if (!FLAG_use_table_dispatch) return;
HANDLESCOPE(T);
// Build the entries used to serialize the dispatch table before
// dropping functions, as we may clear references to Code objects.
runtime/vm/compiler/aot/precompiler.h
-1
View File
@@ -247,7 +247,6 @@ class Precompiler : public ValueObject {
}
compiler::SelectorMap* selector_map() {
ASSERT(FLAG_use_table_dispatch);
return dispatch_table_generator_->selector_map();
}
runtime/vm/compiler/aot/precompiler_tracer.cc
+1 -3
View File
@@ -90,9 +90,7 @@ void PrecompilerTracer::WriteEntityTable() {
const auto& fun = Function::Cast(obj);
cls_ = fun.Owner();
const intptr_t selector_id =
FLAG_use_table_dispatch
? precompiler_->selector_map()->SelectorId(fun)
: -1;
precompiler_->selector_map()->SelectorId(fun);
Write("\"%c\",%" Pd ",%" Pd ",%" Pd "",
fun.IsDynamicFunction() ? 'F' : 'S', InternEntity(cls_),
InternString(NameForTrace(fun)), selector_id);
runtime/vm/compiler/assembler/assembler_arm.cc
+2 -4
View File
@@ -1604,10 +1604,8 @@ void Assembler::LoadPoolPointer(Register reg) {
void Assembler::SetupGlobalPoolAndDispatchTable() {
ASSERT(FLAG_precompiled_mode);
ldr(PP, Address(THR, target::Thread::global_object_pool_offset()));
if (FLAG_use_table_dispatch) {
ldr(DISPATCH_TABLE_REG,
Address(THR, target::Thread::dispatch_table_array_offset()));
}
ldr(DISPATCH_TABLE_REG,
Address(THR, target::Thread::dispatch_table_array_offset()));
}
void Assembler::LoadIsolate(Register rd) {
runtime/vm/compiler/assembler/assembler_arm64.cc
+2 -4
View File
@@ -1552,10 +1552,8 @@ void Assembler::SetupGlobalPoolAndDispatchTable() {
ASSERT(FLAG_precompiled_mode);
ldr(PP, Address(THR, target::Thread::global_object_pool_offset()));
sub(PP, PP, Operand(kHeapObjectTag)); // Pool in PP is untagged!
if (FLAG_use_table_dispatch) {
ldr(DISPATCH_TABLE_REG,
Address(THR, target::Thread::dispatch_table_array_offset()));
}
ldr(DISPATCH_TABLE_REG,
Address(THR, target::Thread::dispatch_table_array_offset()));
}
void Assembler::CheckCodePointer() {
runtime/vm/compiler/compiler_pass.cc
+1 -3
View File
@@ -470,9 +470,7 @@ COMPILER_PASS(SelectRepresentations, {
});
COMPILER_PASS(UseTableDispatch, {
if (FLAG_use_table_dispatch) {
state->call_specializer->ReplaceInstanceCallsWithDispatchTableCalls();
}
state->call_specializer->ReplaceInstanceCallsWithDispatchTableCalls();
});
COMPILER_PASS_REPEAT(CSE, { return DominatorBasedCSE::Optimize(flow_graph); });
runtime/vm/compiler/frontend/kernel_translation_helper.cc
+2 -8
View File
@@ -3636,10 +3636,7 @@ void TypeTranslator::SetupUnboxingInfoMetadata(const Function& function,
const auto unboxing_info =
unboxing_info_metadata_helper_.GetUnboxingInfoMetadata(kernel_offset);
// TODO(dartbug.com/32292): accept unboxed parameters and return value
// when FLAG_use_table_dispatch == false.
if (FLAG_precompiled_mode && unboxing_info != nullptr &&
FLAG_use_table_dispatch) {
if (FLAG_precompiled_mode && unboxing_info != nullptr) {
for (intptr_t i = 0; i < unboxing_info->unboxed_args_info.length(); i++) {
SetupUnboxingInfoOfParameter(function, i, unboxing_info);
}
@@ -3655,10 +3652,7 @@ void TypeTranslator::SetupUnboxingInfoMetadataForFieldAccessors(
const auto unboxing_info =
unboxing_info_metadata_helper_.GetUnboxingInfoMetadata(kernel_offset);
// TODO(dartbug.com/32292): accept unboxed parameters and return value
// when FLAG_use_table_dispatch == false.
if (FLAG_precompiled_mode && unboxing_info != nullptr &&
FLAG_use_table_dispatch) {
if (FLAG_precompiled_mode && unboxing_info != nullptr) {
if (field_accessor.IsImplicitSetterFunction()) {
for (intptr_t i = 0; i < unboxing_info->unboxed_args_info.length(); i++) {
SetupUnboxingInfoOfParameter(field_accessor, i, unboxing_info);
runtime/vm/flag_list.h
-1
View File
@@ -184,7 +184,6 @@ constexpr bool FLAG_support_il_printer = false;
P(reorder_basic_blocks, bool, true, "Reorder basic blocks") \
C(stress_async_stacks, false, false, bool, false, \
"Stress test async stack traces") \
P(use_table_dispatch, bool, true, "Enable dispatch table based calls.") \
P(retain_function_objects, bool, true, \
"Serialize function objects for all code objects even if not otherwise " \
"needed in the precompiled runtime.") \
runtime/vm/object.cc
+3 -2
View File
@@ -10161,8 +10161,9 @@ bool Function::NeedsMonomorphicCheckedEntry(Zone* zone) const {
return true;
}
// If table dispatch is disabled, all instance calls use switchable calls.
if (!(FLAG_precompiled_mode && FLAG_use_table_dispatch)) {
// AOT mode uses table dispatch.
// In JIT mode all instance calls use switchable calls.
if (!FLAG_precompiled_mode) {
return true;
}