diff options
author | 2017-02-13 19:03:47 -0800 | |
---|---|---|
committer | 2017-03-03 13:12:31 -0800 | |
commit | e0ac1151b360be7147fa20320c0b427688b1424f (patch) | |
tree | c33419b00c47b731075bcfd7b75b81f366beda91 /compiler/optimizing/bytecode_utils.h | |
parent | 425b5d23e2c60d295471817a75b1b554481c5334 (diff) |
Extend profman to generate profiles with inline caches
Extend profman logic to generate profiles based on a simple textual
respresentation. This will help writing tests for profile guided
compilation.
Before this CL, profman was able to generate profiles based on a list of
classes like:
java.lang.Comparable
java.lang.Math
java.lang.Object
This CL, enables profman to understand methods and classes alike. The
new format is:
# Classes
Ljava/lang/Comparable;
Ljava/lang/Math;
# Methods with inline caches
LTestInline;->inlinePolymorhic(LSuper;)I+LSubA;,LSubB;,LSubC;
LTestInline;->noInlineCache(LSuper;)I
"LTestInline;->inlinePolymorhic(LSuper;)I+LSubA;,LSubB;,LSubC;"
means that method `int inlineMonomorphicSubA(Super)` from class Main
will be added to the profile with the inline cache (SubA,SubB) for its
one and only invoke virtual.
@Main#noInlineCache:(LSuper;)I+;
meaning that method `int noInlineCache' from class Main will be added
to the profile with no inline cache.
Note that the methods are allowed to have a single invoke virtual in
their dex bytecode. That is to keep the parsing the file format
simple and easy to use.
Also, add a few more tests for profiles and fix an issue caused by
writing the dex files in a possibly wrong order.
Test: m run-test-host-gtest-profile_assistant_test
Bug: 32434870
Change-Id: I6b7340cf613007117d9818be206ccb3a27b815bf
Diffstat (limited to 'compiler/optimizing/bytecode_utils.h')
-rw-r--r-- | compiler/optimizing/bytecode_utils.h | 180 |
1 files changed, 0 insertions, 180 deletions
diff --git a/compiler/optimizing/bytecode_utils.h b/compiler/optimizing/bytecode_utils.h deleted file mode 100644 index 133afa47fe..0000000000 --- a/compiler/optimizing/bytecode_utils.h +++ /dev/null @@ -1,180 +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_OPTIMIZING_BYTECODE_UTILS_H_ -#define ART_COMPILER_OPTIMIZING_BYTECODE_UTILS_H_ - -#include "base/arena_object.h" -#include "dex_file.h" -#include "dex_file-inl.h" -#include "dex_instruction-inl.h" - -namespace art { - -class CodeItemIterator : public ValueObject { - public: - explicit CodeItemIterator(const DexFile::CodeItem& code_item) : CodeItemIterator(code_item, 0u) {} - CodeItemIterator(const DexFile::CodeItem& code_item, uint32_t start_dex_pc) - : code_ptr_(code_item.insns_ + start_dex_pc), - code_end_(code_item.insns_ + code_item.insns_size_in_code_units_), - dex_pc_(start_dex_pc) {} - - bool Done() const { return code_ptr_ >= code_end_; } - bool IsLast() const { return code_ptr_ + CurrentInstruction().SizeInCodeUnits() >= code_end_; } - - const Instruction& CurrentInstruction() const { return *Instruction::At(code_ptr_); } - uint32_t CurrentDexPc() const { return dex_pc_; } - - void Advance() { - DCHECK(!Done()); - size_t instruction_size = CurrentInstruction().SizeInCodeUnits(); - code_ptr_ += instruction_size; - dex_pc_ += instruction_size; - } - - private: - const uint16_t* code_ptr_; - const uint16_t* const code_end_; - uint32_t dex_pc_; - - DISALLOW_COPY_AND_ASSIGN(CodeItemIterator); -}; - -class DexSwitchTable : public ValueObject { - public: - DexSwitchTable(const Instruction& instruction, uint32_t dex_pc) - : instruction_(instruction), - dex_pc_(dex_pc), - sparse_(instruction.Opcode() == Instruction::SPARSE_SWITCH) { - int32_t table_offset = instruction.VRegB_31t(); - const uint16_t* table = reinterpret_cast<const uint16_t*>(&instruction) + table_offset; - DCHECK_EQ(table[0], sparse_ ? static_cast<uint16_t>(Instruction::kSparseSwitchSignature) - : static_cast<uint16_t>(Instruction::kPackedSwitchSignature)); - num_entries_ = table[1]; - values_ = reinterpret_cast<const int32_t*>(&table[2]); - } - - uint16_t GetNumEntries() const { - return num_entries_; - } - - void CheckIndex(size_t index) const { - if (sparse_) { - // In a sparse table, we have num_entries_ keys and num_entries_ values, in that order. - DCHECK_LT(index, 2 * static_cast<size_t>(num_entries_)); - } else { - // In a packed table, we have the starting key and num_entries_ values. - DCHECK_LT(index, 1 + static_cast<size_t>(num_entries_)); - } - } - - int32_t GetEntryAt(size_t index) const { - CheckIndex(index); - return values_[index]; - } - - uint32_t GetDexPcForIndex(size_t index) const { - CheckIndex(index); - return dex_pc_ + - (reinterpret_cast<const int16_t*>(values_ + index) - - reinterpret_cast<const int16_t*>(&instruction_)); - } - - // Index of the first value in the table. - size_t GetFirstValueIndex() const { - if (sparse_) { - // In a sparse table, we have num_entries_ keys and num_entries_ values, in that order. - return num_entries_; - } else { - // In a packed table, we have the starting key and num_entries_ values. - return 1; - } - } - - bool IsSparse() const { return sparse_; } - - bool ShouldBuildDecisionTree() { - return IsSparse() || GetNumEntries() <= kSmallSwitchThreshold; - } - - private: - const Instruction& instruction_; - const uint32_t dex_pc_; - - // Whether this is a sparse-switch table (or a packed-switch one). - const bool sparse_; - - // This can't be const as it needs to be computed off of the given instruction, and complicated - // expressions in the initializer list seemed very ugly. - uint16_t num_entries_; - - const int32_t* values_; - - // The number of entries in a packed switch before we use a jump table or specified - // compare/jump series. - static constexpr uint16_t kSmallSwitchThreshold = 3; - - DISALLOW_COPY_AND_ASSIGN(DexSwitchTable); -}; - -class DexSwitchTableIterator { - public: - explicit DexSwitchTableIterator(const DexSwitchTable& table) - : table_(table), - num_entries_(static_cast<size_t>(table_.GetNumEntries())), - first_target_offset_(table_.GetFirstValueIndex()), - index_(0u) {} - - bool Done() const { return index_ >= num_entries_; } - bool IsLast() const { return index_ == num_entries_ - 1; } - - void Advance() { - DCHECK(!Done()); - index_++; - } - - int32_t CurrentKey() const { - return table_.IsSparse() ? table_.GetEntryAt(index_) : table_.GetEntryAt(0) + index_; - } - - int32_t CurrentTargetOffset() const { - return table_.GetEntryAt(index_ + first_target_offset_); - } - - uint32_t GetDexPcForCurrentIndex() const { return table_.GetDexPcForIndex(index_); } - - private: - const DexSwitchTable& table_; - const size_t num_entries_; - const size_t first_target_offset_; - - size_t index_; -}; - -inline const Instruction& GetDexInstructionAt(const DexFile::CodeItem& code_item, uint32_t dex_pc) { - return CodeItemIterator(code_item, dex_pc).CurrentInstruction(); -} - -inline bool IsThrowingDexInstruction(const Instruction& instruction) { - // Special-case MONITOR_EXIT which is a throwing instruction but the verifier - // guarantees that it will never throw. This is necessary to avoid rejecting - // 'synchronized' blocks/methods. - return instruction.IsThrow() && instruction.Opcode() != Instruction::MONITOR_EXIT; -} - -} // namespace art - -#endif // ART_COMPILER_OPTIMIZING_BYTECODE_UTILS_H_ |