Gav Wood
10 years ago
57 changed files with 1265 additions and 485 deletions
@ -0,0 +1,260 @@ |
|||||
|
/*
|
||||
|
This file is part of cpp-ethereum. |
||||
|
|
||||
|
cpp-ethereum is free software: you can redistribute it and/or modify |
||||
|
it under the terms of the GNU General Public License as published by |
||||
|
the Free Software Foundation, either version 3 of the License, or |
||||
|
(at your option) any later version. |
||||
|
|
||||
|
cpp-ethereum is distributed in the hope that it will be useful, |
||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
|
GNU General Public License for more details. |
||||
|
|
||||
|
You should have received a copy of the GNU General Public License |
||||
|
along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
*/ |
||||
|
/**
|
||||
|
* @file ControlFlowGraph.cpp |
||||
|
* @author Christian <c@ethdev.com> |
||||
|
* @date 2015 |
||||
|
* Control flow analysis for the optimizer. |
||||
|
*/ |
||||
|
|
||||
|
#include <libevmcore/ControlFlowGraph.h> |
||||
|
#include <map> |
||||
|
#include <libevmcore/Exceptions.h> |
||||
|
#include <libevmcore/AssemblyItem.h> |
||||
|
#include <libevmcore/SemanticInformation.h> |
||||
|
|
||||
|
using namespace std; |
||||
|
using namespace dev; |
||||
|
using namespace dev::eth; |
||||
|
|
||||
|
BlockId::BlockId(u256 const& _id): m_id(_id) |
||||
|
{ |
||||
|
assertThrow( _id < initial().m_id, OptimizerException, "Tag number too large."); |
||||
|
} |
||||
|
|
||||
|
AssemblyItems ControlFlowGraph::optimisedItems() |
||||
|
{ |
||||
|
if (m_items.empty()) |
||||
|
return m_items; |
||||
|
|
||||
|
findLargestTag(); |
||||
|
splitBlocks(); |
||||
|
resolveNextLinks(); |
||||
|
removeUnusedBlocks(); |
||||
|
setPrevLinks(); |
||||
|
|
||||
|
return rebuildCode(); |
||||
|
} |
||||
|
|
||||
|
void ControlFlowGraph::findLargestTag() |
||||
|
{ |
||||
|
m_lastUsedId = 0; |
||||
|
for (auto const& item: m_items) |
||||
|
if (item.type() == Tag || item.type() == PushTag) |
||||
|
{ |
||||
|
// Assert that it can be converted.
|
||||
|
BlockId(item.data()); |
||||
|
m_lastUsedId = max(unsigned(item.data()), m_lastUsedId); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
void ControlFlowGraph::splitBlocks() |
||||
|
{ |
||||
|
m_blocks.clear(); |
||||
|
BlockId id = BlockId::initial(); |
||||
|
m_blocks[id].begin = 0; |
||||
|
for (size_t index = 0; index < m_items.size(); ++index) |
||||
|
{ |
||||
|
AssemblyItem const& item = m_items.at(index); |
||||
|
if (item.type() == Tag) |
||||
|
{ |
||||
|
if (id) |
||||
|
m_blocks[id].end = index; |
||||
|
id = BlockId::invalid(); |
||||
|
} |
||||
|
if (!id) |
||||
|
{ |
||||
|
id = item.type() == Tag ? BlockId(item.data()) : generateNewId(); |
||||
|
m_blocks[id].begin = index; |
||||
|
} |
||||
|
if (item.type() == PushTag) |
||||
|
m_blocks[id].pushedTags.push_back(BlockId(item.data())); |
||||
|
if (SemanticInformation::altersControlFlow(item)) |
||||
|
{ |
||||
|
m_blocks[id].end = index + 1; |
||||
|
if (item == Instruction::JUMP) |
||||
|
m_blocks[id].endType = BasicBlock::EndType::JUMP; |
||||
|
else if (item == Instruction::JUMPI) |
||||
|
m_blocks[id].endType = BasicBlock::EndType::JUMPI; |
||||
|
else |
||||
|
m_blocks[id].endType = BasicBlock::EndType::STOP; |
||||
|
id = BlockId::invalid(); |
||||
|
} |
||||
|
} |
||||
|
if (id) |
||||
|
{ |
||||
|
m_blocks[id].end = m_items.size(); |
||||
|
if (m_blocks[id].endType == BasicBlock::EndType::HANDOVER) |
||||
|
m_blocks[id].endType = BasicBlock::EndType::STOP; |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
void ControlFlowGraph::resolveNextLinks() |
||||
|
{ |
||||
|
map<unsigned, BlockId> blockByBeginPos; |
||||
|
for (auto const& idAndBlock: m_blocks) |
||||
|
if (idAndBlock.second.begin != idAndBlock.second.end) |
||||
|
blockByBeginPos[idAndBlock.second.begin] = idAndBlock.first; |
||||
|
|
||||
|
for (auto& idAndBlock: m_blocks) |
||||
|
{ |
||||
|
BasicBlock& block = idAndBlock.second; |
||||
|
switch (block.endType) |
||||
|
{ |
||||
|
case BasicBlock::EndType::JUMPI: |
||||
|
case BasicBlock::EndType::HANDOVER: |
||||
|
assertThrow( |
||||
|
blockByBeginPos.count(block.end), |
||||
|
OptimizerException, |
||||
|
"Successor block not found." |
||||
|
); |
||||
|
block.next = blockByBeginPos.at(block.end); |
||||
|
break; |
||||
|
default: |
||||
|
break; |
||||
|
} |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
void ControlFlowGraph::removeUnusedBlocks() |
||||
|
{ |
||||
|
vector<BlockId> blocksToProcess{BlockId::initial()}; |
||||
|
set<BlockId> neededBlocks{BlockId::initial()}; |
||||
|
while (!blocksToProcess.empty()) |
||||
|
{ |
||||
|
BasicBlock const& block = m_blocks.at(blocksToProcess.back()); |
||||
|
blocksToProcess.pop_back(); |
||||
|
for (BlockId tag: block.pushedTags) |
||||
|
if (!neededBlocks.count(tag)) |
||||
|
{ |
||||
|
neededBlocks.insert(tag); |
||||
|
blocksToProcess.push_back(tag); |
||||
|
} |
||||
|
if (block.next && !neededBlocks.count(block.next)) |
||||
|
{ |
||||
|
neededBlocks.insert(block.next); |
||||
|
blocksToProcess.push_back(block.next); |
||||
|
} |
||||
|
} |
||||
|
for (auto it = m_blocks.begin(); it != m_blocks.end();) |
||||
|
if (neededBlocks.count(it->first)) |
||||
|
++it; |
||||
|
else |
||||
|
m_blocks.erase(it++); |
||||
|
} |
||||
|
|
||||
|
void ControlFlowGraph::setPrevLinks() |
||||
|
{ |
||||
|
for (auto& idAndBlock: m_blocks) |
||||
|
{ |
||||
|
BasicBlock& block = idAndBlock.second; |
||||
|
switch (block.endType) |
||||
|
{ |
||||
|
case BasicBlock::EndType::JUMPI: |
||||
|
case BasicBlock::EndType::HANDOVER: |
||||
|
assertThrow( |
||||
|
!m_blocks.at(block.next).prev, |
||||
|
OptimizerException, |
||||
|
"Successor already has predecessor." |
||||
|
); |
||||
|
m_blocks[block.next].prev = idAndBlock.first; |
||||
|
break; |
||||
|
default: |
||||
|
break; |
||||
|
} |
||||
|
} |
||||
|
// If block ends with jump to not yet linked block, link them removing the jump
|
||||
|
for (auto& idAndBlock: m_blocks) |
||||
|
{ |
||||
|
BlockId blockId = idAndBlock.first; |
||||
|
BasicBlock& block = idAndBlock.second; |
||||
|
if (block.endType != BasicBlock::EndType::JUMP || block.end - block.begin < 2) |
||||
|
continue; |
||||
|
AssemblyItem const& push = m_items.at(block.end - 2); |
||||
|
if (push.type() != PushTag) |
||||
|
continue; |
||||
|
BlockId nextId(push.data()); |
||||
|
if (m_blocks.at(nextId).prev) |
||||
|
continue; |
||||
|
bool hasLoop = false; |
||||
|
for (BlockId id = nextId; id && !hasLoop; id = m_blocks.at(id).next) |
||||
|
hasLoop = (id == blockId); |
||||
|
if (hasLoop) |
||||
|
continue; |
||||
|
|
||||
|
m_blocks[nextId].prev = blockId; |
||||
|
block.next = nextId; |
||||
|
block.end -= 2; |
||||
|
assertThrow( |
||||
|
!block.pushedTags.empty() && block.pushedTags.back() == nextId, |
||||
|
OptimizerException, |
||||
|
"Last pushed tag not at end of pushed list." |
||||
|
); |
||||
|
block.pushedTags.pop_back(); |
||||
|
block.endType = BasicBlock::EndType::HANDOVER; |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
AssemblyItems ControlFlowGraph::rebuildCode() |
||||
|
{ |
||||
|
map<BlockId, unsigned> pushes; |
||||
|
for (auto& idAndBlock: m_blocks) |
||||
|
for (BlockId ref: idAndBlock.second.pushedTags) |
||||
|
pushes[ref]++; |
||||
|
|
||||
|
set<BlockId> blocksToAdd; |
||||
|
for (auto it: m_blocks) |
||||
|
blocksToAdd.insert(it.first); |
||||
|
set<BlockId> blocksAdded; |
||||
|
AssemblyItems code; |
||||
|
|
||||
|
for ( |
||||
|
BlockId blockId = BlockId::initial(); |
||||
|
blockId; |
||||
|
blockId = blocksToAdd.empty() ? BlockId::invalid() : *blocksToAdd.begin() |
||||
|
) |
||||
|
{ |
||||
|
bool previousHandedOver = (blockId == BlockId::initial()); |
||||
|
while (m_blocks.at(blockId).prev) |
||||
|
blockId = m_blocks.at(blockId).prev; |
||||
|
for (; blockId; blockId = m_blocks.at(blockId).next) |
||||
|
{ |
||||
|
BasicBlock const& block = m_blocks.at(blockId); |
||||
|
blocksToAdd.erase(blockId); |
||||
|
blocksAdded.insert(blockId); |
||||
|
|
||||
|
auto begin = m_items.begin() + block.begin; |
||||
|
auto end = m_items.begin() + block.end; |
||||
|
if (begin == end) |
||||
|
continue; |
||||
|
// If block starts with unused tag, skip it.
|
||||
|
if (previousHandedOver && !pushes[blockId] && begin->type() == Tag) |
||||
|
++begin; |
||||
|
previousHandedOver = (block.endType == BasicBlock::EndType::HANDOVER); |
||||
|
copy(begin, end, back_inserter(code)); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
return code; |
||||
|
} |
||||
|
|
||||
|
BlockId ControlFlowGraph::generateNewId() |
||||
|
{ |
||||
|
BlockId id = BlockId(++m_lastUsedId); |
||||
|
assertThrow(id < BlockId::initial(), OptimizerException, "Out of block IDs."); |
||||
|
return id; |
||||
|
} |
||||
@ -0,0 +1,108 @@ |
|||||
|
/*
|
||||
|
This file is part of cpp-ethereum. |
||||
|
|
||||
|
cpp-ethereum is free software: you can redistribute it and/or modify |
||||
|
it under the terms of the GNU General Public License as published by |
||||
|
the Free Software Foundation, either version 3 of the License, or |
||||
|
(at your option) any later version. |
||||
|
|
||||
|
cpp-ethereum is distributed in the hope that it will be useful, |
||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
|
GNU General Public License for more details. |
||||
|
|
||||
|
You should have received a copy of the GNU General Public License |
||||
|
along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
*/ |
||||
|
/**
|
||||
|
* @file ControlFlowGraph.h |
||||
|
* @author Christian <c@ethdev.com> |
||||
|
* @date 2015 |
||||
|
* Control flow analysis for the optimizer. |
||||
|
*/ |
||||
|
|
||||
|
#pragma once |
||||
|
|
||||
|
#include <vector> |
||||
|
#include <libdevcore/Common.h> |
||||
|
#include <libdevcore/Assertions.h> |
||||
|
|
||||
|
namespace dev |
||||
|
{ |
||||
|
namespace eth |
||||
|
{ |
||||
|
|
||||
|
class AssemblyItem; |
||||
|
using AssemblyItems = std::vector<AssemblyItem>; |
||||
|
|
||||
|
/**
|
||||
|
* Identifier for a block, coincides with the tag number of an AssemblyItem but adds a special |
||||
|
* ID for the inital block. |
||||
|
*/ |
||||
|
class BlockId |
||||
|
{ |
||||
|
public: |
||||
|
BlockId() { *this = invalid(); } |
||||
|
explicit BlockId(unsigned _id): m_id(_id) {} |
||||
|
explicit BlockId(u256 const& _id); |
||||
|
static BlockId initial() { return BlockId(-2); } |
||||
|
static BlockId invalid() { return BlockId(-1); } |
||||
|
|
||||
|
bool operator==(BlockId const& _other) const { return m_id == _other.m_id; } |
||||
|
bool operator!=(BlockId const& _other) const { return m_id != _other.m_id; } |
||||
|
bool operator<(BlockId const& _other) const { return m_id < _other.m_id; } |
||||
|
explicit operator bool() const { return *this != invalid(); } |
||||
|
|
||||
|
private: |
||||
|
unsigned m_id; |
||||
|
}; |
||||
|
|
||||
|
/**
|
||||
|
* Control flow block inside which instruction counter is always incremented by one |
||||
|
* (except for possibly the last instruction). |
||||
|
*/ |
||||
|
struct BasicBlock |
||||
|
{ |
||||
|
/// Start index into assembly item list.
|
||||
|
unsigned begin = 0; |
||||
|
/// End index (excluded) inte assembly item list.
|
||||
|
unsigned end = 0; |
||||
|
/// Tags pushed inside this block, with multiplicity.
|
||||
|
std::vector<BlockId> pushedTags; |
||||
|
/// ID of the block that always follows this one (either JUMP or flow into new block),
|
||||
|
/// or BlockId::invalid() otherwise
|
||||
|
BlockId next = BlockId::invalid(); |
||||
|
/// ID of the block that has to precede this one.
|
||||
|
BlockId prev = BlockId::invalid(); |
||||
|
|
||||
|
enum class EndType { JUMP, JUMPI, STOP, HANDOVER }; |
||||
|
EndType endType = EndType::HANDOVER; |
||||
|
}; |
||||
|
|
||||
|
class ControlFlowGraph |
||||
|
{ |
||||
|
public: |
||||
|
/// Initializes the control flow graph.
|
||||
|
/// @a _items has to persist across the usage of this class.
|
||||
|
ControlFlowGraph(AssemblyItems const& _items): m_items(_items) {} |
||||
|
/// @returns the collection of optimised items, should be called only once.
|
||||
|
AssemblyItems optimisedItems(); |
||||
|
|
||||
|
private: |
||||
|
void findLargestTag(); |
||||
|
void splitBlocks(); |
||||
|
void resolveNextLinks(); |
||||
|
void removeUnusedBlocks(); |
||||
|
void setPrevLinks(); |
||||
|
AssemblyItems rebuildCode(); |
||||
|
|
||||
|
BlockId generateNewId(); |
||||
|
|
||||
|
unsigned m_lastUsedId = 0; |
||||
|
AssemblyItems const& m_items; |
||||
|
std::map<BlockId, BasicBlock> m_blocks; |
||||
|
}; |
||||
|
|
||||
|
|
||||
|
} |
||||
|
} |
||||
File diff suppressed because one or more lines are too long
Loading…
Reference in new issue