cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reset knowledge in optimizer for path joins.

Browse Source
This commit is contained in:
chriseth 2016-07-29 11:47:26 +02:00
parent ac0d138800
commit 93ebaa4822
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libevmasm/Assembly.cpp
View File

@ -322,7 +322,8 @@ Assembly& Assembly::optimise(bool _enable, bool _isCreation, size_t _runs)
count++; count++;
{ {
ControlFlowGraph cfg(m_items); // Control flow graph that resets knowledge at path joins.
ControlFlowGraph cfg(m_items, false);
AssemblyItems optimisedItems; AssemblyItems optimisedItems;
for (BasicBlock const& block: cfg.optimisedBlocks()) for (BasicBlock const& block: cfg.optimisedBlocks())
{ {

3
libevmasm/ControlFlowGraph.cpp
View File

@ -250,7 +250,10 @@ void ControlFlowGraph::gatherKnowledge()
KnownStatePointer state = item.state; KnownStatePointer state = item.state;
if (block.startState) if (block.startState)
{ {
if (m_joinKnowledge)
state->reduceToCommonKnowledge(*block.startState, !item.blocksSeen.count(item.blockId)); state->reduceToCommonKnowledge(*block.startState, !item.blocksSeen.count(item.blockId));
else
state->reset();
if (*state == *block.startState) if (*state == *block.startState)
continue; continue;
} }

7
libevmasm/ControlFlowGraph.h
View File

@ -94,7 +94,11 @@ class ControlFlowGraph
public: public:
/// Initializes the control flow graph. /// Initializes the control flow graph.
/// @a _items has to persist across the usage of this class. /// @a _items has to persist across the usage of this class.
ControlFlowGraph(AssemblyItems const& _items): m_items(_items) {} /// @a _joinKnowledge if true, reduces state knowledge to common base at the join of two paths
explicit ControlFlowGraph(AssemblyItems const& _items, bool _joinKnowledge = true):
m_items(_items),
m_joinKnowledge(_joinKnowledge)
{}
/// @returns vector of basic blocks in the order they should be used in the final code. /// @returns vector of basic blocks in the order they should be used in the final code.
/// Should be called only once. /// Should be called only once.
BasicBlocks optimisedBlocks(); BasicBlocks optimisedBlocks();
@ -112,6 +116,7 @@ private:
unsigned m_lastUsedId = 0; unsigned m_lastUsedId = 0;
AssemblyItems const& m_items; AssemblyItems const& m_items;
bool m_joinKnowledge;
std::map<BlockId, BasicBlock> m_blocks; std::map<BlockId, BasicBlock> m_blocks;
}; };