Add feature flag for loading app image startup cache
Passed from the zygote.
If false, app image string intern tables and preresolved strings are not
loaded. This means the intern strings are generated by walking the image
instead of looking at the app image intern table directly.
Bug: 123524494
Bug: 116059983
Test: test-art-host
Test: adb shell device_config put runtime_native use_app_image_startup_cache true
(cherry picked from commit 5153419cba1cdfb6d5e5baba3e45fcf703c9daec)
Merged-In: I6f800d1d989fd5e5b23166a115b1b241efac7ad2
Change-Id: I119948efd25c039a057f283c19b23431093659f4
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 2e1f364..148fdba 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -1449,6 +1449,7 @@
static void UpdateInternStrings(
gc::space::ImageSpace* space,
+ bool use_preresolved_strings,
const SafeMap<mirror::String*, mirror::String*>& intern_remap)
REQUIRES_SHARED(Locks::mutator_lock_);
};
@@ -1464,8 +1465,10 @@
ScopedTrace app_image_timing("AppImage:Updating");
Thread* const self = Thread::Current();
- gc::Heap* const heap = Runtime::Current()->GetHeap();
+ Runtime* const runtime = Runtime::Current();
+ gc::Heap* const heap = runtime->GetHeap();
const ImageHeader& header = space->GetImageHeader();
+ bool load_app_image_startup_cache = runtime->LoadAppImageStartupCache();
{
// Register dex caches with the class loader.
WriterMutexLock mu(self, *Locks::classlinker_classes_lock_);
@@ -1479,6 +1482,10 @@
class_linker->RegisterDexFileLocked(*dex_file, dex_cache, class_loader.Get());
}
+ if (!load_app_image_startup_cache) {
+ dex_cache->ClearPreResolvedStrings();
+ }
+
if (kIsDebugBuild) {
CHECK(new_class_set != nullptr);
mirror::TypeDexCacheType* const types = dex_cache->GetResolvedTypes();
@@ -1545,11 +1552,13 @@
void AppImageLoadingHelper::UpdateInternStrings(
gc::space::ImageSpace* space,
+ bool use_preresolved_strings,
const SafeMap<mirror::String*, mirror::String*>& intern_remap) {
const uint8_t* target_base = space->Begin();
const ImageSection& sro_section =
space->GetImageHeader().GetImageStringReferenceOffsetsSection();
const size_t num_string_offsets = sro_section.Size() / sizeof(AppImageReferenceOffsetInfo);
+ InternTable* const intern_table = Runtime::Current()->GetInternTable();
VLOG(image)
<< "ClassLinker:AppImage:InternStrings:imageStringReferenceOffsetCount = "
@@ -1582,24 +1591,29 @@
WriteBarrier::ForEveryFieldWrite(dex_cache);
dex_cache->GetStrings()[string_index].store(
mirror::StringDexCachePair(it->second, source.index));
+ } else if (!use_preresolved_strings) {
+ dex_cache->GetStrings()[string_index].store(
+ mirror::StringDexCachePair(intern_table->InternStrong(referred_string), source.index));
}
} else if (HasDexCachePreResolvedStringNativeRefTag(base_offset)) {
- base_offset = ClearDexCacheNativeRefTags(base_offset);
- DCHECK_ALIGNED(base_offset, 2);
+ if (use_preresolved_strings) {
+ base_offset = ClearDexCacheNativeRefTags(base_offset);
+ DCHECK_ALIGNED(base_offset, 2);
- ObjPtr<mirror::DexCache> dex_cache =
- reinterpret_cast<mirror::DexCache*>(space->Begin() + base_offset);
- uint32_t string_index = sro_base[offset_index].second;
+ ObjPtr<mirror::DexCache> dex_cache =
+ reinterpret_cast<mirror::DexCache*>(space->Begin() + base_offset);
+ uint32_t string_index = sro_base[offset_index].second;
- ObjPtr<mirror::String> referred_string =
- dex_cache->GetPreResolvedStrings()[string_index].Read();
- DCHECK(referred_string != nullptr);
+ ObjPtr<mirror::String> referred_string =
+ dex_cache->GetPreResolvedStrings()[string_index].Read();
+ DCHECK(referred_string != nullptr);
- auto it = intern_remap.find(referred_string.Ptr());
- if (it != intern_remap.end()) {
- // Because we are not using a helper function we need to mark the GC card manually.
- WriteBarrier::ForEveryFieldWrite(dex_cache);
- dex_cache->GetPreResolvedStrings()[string_index] = GcRoot<mirror::String>(it->second);
+ auto it = intern_remap.find(referred_string.Ptr());
+ if (it != intern_remap.end()) {
+ // Because we are not using a helper function we need to mark the GC card manually.
+ WriteBarrier::ForEveryFieldWrite(dex_cache);
+ dex_cache->GetPreResolvedStrings()[string_index] = GcRoot<mirror::String>(it->second);
+ }
}
} else {
uint32_t raw_member_offset = sro_base[offset_index].second;
@@ -1622,6 +1636,13 @@
/* kCheckTransaction= */ false,
kVerifyNone,
/* kIsVolatile= */ false>(member_offset, it->second);
+ } else if (!use_preresolved_strings) {
+ obj_ptr->SetFieldObject</* kTransactionActive= */ false,
+ /* kCheckTransaction= */ false,
+ kVerifyNone,
+ /* kIsVolatile= */ false>(
+ member_offset,
+ intern_table->InternStrong(referred_string));
}
}
}
@@ -1632,13 +1653,16 @@
// the strings they point to.
ScopedTrace timing("AppImage:InternString");
- InternTable* const intern_table = Runtime::Current()->GetInternTable();
+ Runtime* const runtime = Runtime::Current();
+ InternTable* const intern_table = runtime->GetInternTable();
+
+ const bool load_startup_cache = runtime->LoadAppImageStartupCache();
// Add the intern table, removing any conflicts. For conflicts, store the new address in a map
// for faster lookup.
// TODO: Optimize with a bitmap or bloom filter
SafeMap<mirror::String*, mirror::String*> intern_remap;
- intern_table->AddImageStringsToTable(space, [&](InternTable::UnorderedSet& interns)
+ auto func = [&](InternTable::UnorderedSet& interns)
REQUIRES_SHARED(Locks::mutator_lock_)
REQUIRES(Locks::intern_table_lock_) {
const size_t non_boot_image_strings = intern_table->CountInterns(
@@ -1681,14 +1705,23 @@
CHECK(intern_table->LookupStrongLocked(string) == nullptr) << string->ToModifiedUtf8();
}
}
- });
+ };
- VLOG(image) << "AppImage:conflictingInternStrings = " << intern_remap.size();
+ bool update_intern_strings;
+ if (load_startup_cache) {
+ // Only add the intern table if we are using the startup cache. Otherwise,
+ // UpdateInternStrings adds the strings to the intern table.
+ intern_table->AddImageStringsToTable(space, func);
+ update_intern_strings = kIsDebugBuild || !intern_remap.empty();
+ VLOG(image) << "AppImage:conflictingInternStrings = " << intern_remap.size();
+ } else {
+ update_intern_strings = true;
+ }
// For debug builds, always run the code below to get coverage.
- if (kIsDebugBuild || !intern_remap.empty()) {
+ if (update_intern_strings) {
// Slow path case is when there are conflicting intern strings to fix up.
- UpdateInternStrings(space, intern_remap);
+ UpdateInternStrings(space, /*use_preresolved_strings=*/ load_startup_cache, intern_remap);
}
}