From 8e2c56252aa9527bd9a82bdd147fdc46cf5deb9c Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Tue, 21 Jun 2016 15:14:20 -0700 Subject: Dump more dex file data in oatdump Dump some statistics for each dex file along side with strings loaded from code and dex code bytes. Sample output: Cumulative dex file data Num string ids: 202809 Num method ids: 320464 Num field ids: 162822 Num type ids: 68151 Num class defs: 48061 Unique strings loaded from dex code: 51049 Total strings loaded from dex code: 106651 Number of unique dex code items: 247929 Total number of dex code bytes: 11090574 Added content testing to oat dump test. No significant slowdown. TEST: test-art-host Bug: 29462018 Change-Id: I60effd3087d8c427eda4ee26431d5d77165b3939 --- compiler/utils/string_reference.h | 65 --------------------------------------- 1 file changed, 65 deletions(-) delete mode 100644 compiler/utils/string_reference.h (limited to 'compiler/utils/string_reference.h') diff --git a/compiler/utils/string_reference.h b/compiler/utils/string_reference.h deleted file mode 100644 index e4c34ca605..0000000000 --- a/compiler/utils/string_reference.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ART_COMPILER_UTILS_STRING_REFERENCE_H_ -#define ART_COMPILER_UTILS_STRING_REFERENCE_H_ - -#include - -#include "base/logging.h" -#include "dex_file-inl.h" -#include "utf-inl.h" - -namespace art { - -// A string is located by its DexFile and the string_ids_ table index into that DexFile. -struct StringReference { - StringReference(const DexFile* file, uint32_t index) : dex_file(file), string_index(index) { } - - const char* GetStringData() const { - return dex_file->GetStringData(dex_file->GetStringId(string_index)); - } - - const DexFile* dex_file; - uint32_t string_index; -}; - -// Compare the actual referenced string values. Used for string reference deduplication. -struct StringReferenceValueComparator { - bool operator()(StringReference sr1, StringReference sr2) const { - // Note that we want to deduplicate identical strings even if they are referenced - // by different dex files, so we need some (any) total ordering of strings, rather - // than references. However, the references should usually be from the same dex file, - // so we choose the dex file string ordering so that we can simply compare indexes - // and avoid the costly string comparison in the most common case. - if (sr1.dex_file == sr2.dex_file) { - // Use the string order enforced by the dex file verifier. - DCHECK_EQ( - sr1.string_index < sr2.string_index, - CompareModifiedUtf8ToModifiedUtf8AsUtf16CodePointValues(sr1.GetStringData(), - sr2.GetStringData()) < 0); - return sr1.string_index < sr2.string_index; - } else { - // Cannot compare indexes, so do the string comparison. - return CompareModifiedUtf8ToModifiedUtf8AsUtf16CodePointValues(sr1.GetStringData(), - sr2.GetStringData()) < 0; - } - } -}; - -} // namespace art - -#endif // ART_COMPILER_UTILS_STRING_REFERENCE_H_ -- cgit v1.2.3-59-g8ed1b