mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Merge pull request #10811 from ethereum/prep-for-fuzzable-opt-steps
Minor refactor yul optimizer test framework to make it easier to fuzz
This commit is contained in:
chriseth
GitHub
commit
f5092088b4
@ -85,123 +85,96 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
|
||||
m_analysisInfo = m_object->analysisInfo;
|
||||
m_dialect = &_dialect;
|
||||
m_optimizerStep = _optimizerStep;
|
||||
}
|
||||
|
||||
bool YulOptimizerTestCommon::runStep()
|
||||
{
|
||||
yulAssert(m_dialect, "Dialect not set.");
|
||||
|
||||
updateContext();
|
||||
|
||||
if (m_optimizerStep == "disambiguator")
|
||||
disambiguate();
|
||||
else if (m_optimizerStep == "nameDisplacer")
|
||||
{
|
||||
m_namedSteps = {
|
||||
{"disambiguator", [&]() { disambiguate(); }},
|
||||
{"nameDisplacer", [&]() {
|
||||
disambiguate();
|
||||
NameDisplacer{
|
||||
*m_nameDispenser,
|
||||
{"illegal1"_yulstring, "illegal2"_yulstring, "illegal3"_yulstring, "illegal4"_yulstring, "illegal5"_yulstring}
|
||||
}(*m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "blockFlattener")
|
||||
{
|
||||
}},
|
||||
{"blockFlattener", [&]() {
|
||||
disambiguate();
|
||||
BlockFlattener::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "constantOptimiser")
|
||||
{
|
||||
}},
|
||||
{"constantOptimiser", [&]() {
|
||||
GasMeter meter(dynamic_cast<EVMDialect const&>(*m_dialect), false, 200);
|
||||
ConstantOptimiser{dynamic_cast<EVMDialect const&>(*m_dialect), meter}(*m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "varDeclInitializer")
|
||||
VarDeclInitializer::run(*m_context, *m_ast);
|
||||
else if (m_optimizerStep == "varNameCleaner")
|
||||
{
|
||||
}},
|
||||
{"varDeclInitializer", [&]() { VarDeclInitializer::run(*m_context, *m_ast); }},
|
||||
{"varNameCleaner", [&]() {
|
||||
disambiguate();
|
||||
FunctionHoister::run(*m_context, *m_ast);
|
||||
FunctionGrouper::run(*m_context, *m_ast);
|
||||
VarNameCleaner::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "forLoopConditionIntoBody")
|
||||
{
|
||||
}},
|
||||
{"forLoopConditionIntoBody", [&]() {
|
||||
disambiguate();
|
||||
ForLoopConditionIntoBody::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "forLoopInitRewriter")
|
||||
{
|
||||
}},
|
||||
{"forLoopInitRewriter", [&]() {
|
||||
disambiguate();
|
||||
ForLoopInitRewriter::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "commonSubexpressionEliminator")
|
||||
{
|
||||
}},
|
||||
{"commonSubexpressionEliminator", [&]() {
|
||||
disambiguate();
|
||||
ForLoopInitRewriter::run(*m_context, *m_ast);
|
||||
FunctionHoister::run(*m_context, *m_ast);
|
||||
CommonSubexpressionEliminator::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "conditionalUnsimplifier")
|
||||
{
|
||||
}},
|
||||
{"conditionalUnsimplifier", [&]() {
|
||||
disambiguate();
|
||||
ConditionalUnsimplifier::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "conditionalSimplifier")
|
||||
{
|
||||
}},
|
||||
{"conditionalSimplifier", [&]() {
|
||||
disambiguate();
|
||||
ConditionalSimplifier::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "expressionSplitter")
|
||||
ExpressionSplitter::run(*m_context, *m_ast);
|
||||
else if (m_optimizerStep == "expressionJoiner")
|
||||
{
|
||||
}},
|
||||
{"expressionSplitter", [&]() { ExpressionSplitter::run(*m_context, *m_ast); }},
|
||||
{"expressionJoiner", [&]() {
|
||||
disambiguate();
|
||||
ExpressionJoiner::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "splitJoin")
|
||||
{
|
||||
}},
|
||||
{"splitJoin", [&]() {
|
||||
disambiguate();
|
||||
ExpressionSplitter::run(*m_context, *m_ast);
|
||||
ExpressionJoiner::run(*m_context, *m_ast);
|
||||
ExpressionJoiner::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "functionGrouper")
|
||||
{
|
||||
}},
|
||||
{"functionGrouper", [&]() {
|
||||
disambiguate();
|
||||
FunctionGrouper::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "functionHoister")
|
||||
{
|
||||
}},
|
||||
{"functionHoister", [&]() {
|
||||
disambiguate();
|
||||
FunctionHoister::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "expressionInliner")
|
||||
{
|
||||
}},
|
||||
{"expressionInliner", [&]() {
|
||||
disambiguate();
|
||||
ExpressionInliner::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "fullInliner")
|
||||
{
|
||||
}},
|
||||
{"fullInliner", [&]() {
|
||||
disambiguate();
|
||||
FunctionHoister::run(*m_context, *m_ast);
|
||||
FunctionGrouper::run(*m_context, *m_ast);
|
||||
ExpressionSplitter::run(*m_context, *m_ast);
|
||||
FullInliner::run(*m_context, *m_ast);
|
||||
ExpressionJoiner::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "mainFunction")
|
||||
{
|
||||
}},
|
||||
{"mainFunction", [&]() {
|
||||
disambiguate();
|
||||
FunctionGrouper::run(*m_context, *m_ast);
|
||||
MainFunction::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "rematerialiser")
|
||||
{
|
||||
}},
|
||||
{"rematerialiser", [&]() {
|
||||
disambiguate();
|
||||
ForLoopInitRewriter::run(*m_context, *m_ast);
|
||||
FunctionHoister::run(*m_context, *m_ast);
|
||||
Rematerialiser::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "expressionSimplifier")
|
||||
{
|
||||
}},
|
||||
{"expressionSimplifier", [&]() {
|
||||
disambiguate();
|
||||
ForLoopInitRewriter::run(*m_context, *m_ast);
|
||||
FunctionHoister::run(*m_context, *m_ast);
|
||||
@ -213,9 +186,8 @@ bool YulOptimizerTestCommon::runStep()
|
||||
UnusedPruner::run(*m_context, *m_ast);
|
||||
ExpressionJoiner::run(*m_context, *m_ast);
|
||||
ExpressionJoiner::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "fullSimplify")
|
||||
{
|
||||
}},
|
||||
{"fullSimplify", [&]() {
|
||||
disambiguate();
|
||||
ExpressionSplitter::run(*m_context, *m_ast);
|
||||
ForLoopInitRewriter::run(*m_context, *m_ast);
|
||||
@ -227,53 +199,45 @@ bool YulOptimizerTestCommon::runStep()
|
||||
DeadCodeEliminator::run(*m_context, *m_ast);
|
||||
ExpressionJoiner::run(*m_context, *m_ast);
|
||||
ExpressionJoiner::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "unusedFunctionParameterPruner")
|
||||
{
|
||||
}},
|
||||
{"unusedFunctionParameterPruner", [&]() {
|
||||
disambiguate();
|
||||
ForLoopInitRewriter::run(*m_context, *m_ast);
|
||||
FunctionHoister::run(*m_context, *m_object->code);
|
||||
LiteralRematerialiser::run(*m_context, *m_object->code);
|
||||
UnusedFunctionParameterPruner::run(*m_context, *m_object->code);
|
||||
}
|
||||
else if (m_optimizerStep == "unusedPruner")
|
||||
{
|
||||
}},
|
||||
{"unusedPruner", [&]() {
|
||||
disambiguate();
|
||||
UnusedPruner::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "circularReferencesPruner")
|
||||
{
|
||||
}},
|
||||
{"circularReferencesPruner", [&]() {
|
||||
disambiguate();
|
||||
FunctionHoister::run(*m_context, *m_ast);
|
||||
CircularReferencesPruner::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "deadCodeEliminator")
|
||||
{
|
||||
}},
|
||||
{"deadCodeEliminator", [&]() {
|
||||
disambiguate();
|
||||
ForLoopInitRewriter::run(*m_context, *m_ast);
|
||||
DeadCodeEliminator::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "ssaTransform")
|
||||
{
|
||||
}},
|
||||
{"ssaTransform", [&]() {
|
||||
disambiguate();
|
||||
ForLoopInitRewriter::run(*m_context, *m_ast);
|
||||
SSATransform::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "redundantAssignEliminator")
|
||||
{
|
||||
}},
|
||||
{"redundantAssignEliminator", [&]() {
|
||||
disambiguate();
|
||||
ForLoopInitRewriter::run(*m_context, *m_ast);
|
||||
RedundantAssignEliminator::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "ssaPlusCleanup")
|
||||
{
|
||||
}},
|
||||
{"ssaPlusCleanup", [&]() {
|
||||
disambiguate();
|
||||
ForLoopInitRewriter::run(*m_context, *m_ast);
|
||||
SSATransform::run(*m_context, *m_ast);
|
||||
RedundantAssignEliminator::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "loadResolver")
|
||||
{
|
||||
}},
|
||||
{"loadResolver", [&]() {
|
||||
disambiguate();
|
||||
ForLoopInitRewriter::run(*m_context, *m_ast);
|
||||
FunctionHoister::run(*m_context, *m_ast);
|
||||
@ -286,47 +250,40 @@ bool YulOptimizerTestCommon::runStep()
|
||||
UnusedPruner::run(*m_context, *m_ast);
|
||||
ExpressionJoiner::run(*m_context, *m_ast);
|
||||
ExpressionJoiner::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "loopInvariantCodeMotion")
|
||||
{
|
||||
}},
|
||||
{"loopInvariantCodeMotion", [&]() {
|
||||
disambiguate();
|
||||
ForLoopInitRewriter::run(*m_context, *m_ast);
|
||||
FunctionHoister::run(*m_context, *m_ast);
|
||||
LoopInvariantCodeMotion::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "controlFlowSimplifier")
|
||||
{
|
||||
}},
|
||||
{"controlFlowSimplifier", [&]() {
|
||||
disambiguate();
|
||||
ForLoopInitRewriter::run(*m_context, *m_ast);
|
||||
ControlFlowSimplifier::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "structuralSimplifier")
|
||||
{
|
||||
}},
|
||||
{"structuralSimplifier", [&]() {
|
||||
disambiguate();
|
||||
ForLoopInitRewriter::run(*m_context, *m_ast);
|
||||
FunctionHoister::run(*m_context, *m_ast);
|
||||
LiteralRematerialiser::run(*m_context, *m_ast);
|
||||
StructuralSimplifier::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "reasoningBasedSimplifier")
|
||||
{
|
||||
}},
|
||||
{"reasoningBasedSimplifier", [&]() {
|
||||
disambiguate();
|
||||
ReasoningBasedSimplifier::run(*m_context, *m_object->code);
|
||||
}
|
||||
else if (m_optimizerStep == "equivalentFunctionCombiner")
|
||||
{
|
||||
}},
|
||||
{"equivalentFunctionCombiner", [&]() {
|
||||
disambiguate();
|
||||
ForLoopInitRewriter::run(*m_context, *m_ast);
|
||||
FunctionHoister::run(*m_context, *m_ast);
|
||||
EquivalentFunctionCombiner::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "ssaReverser")
|
||||
{
|
||||
}},
|
||||
{"ssaReverser", [&]() {
|
||||
disambiguate();
|
||||
SSAReverser::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "ssaAndBack")
|
||||
{
|
||||
}},
|
||||
{"ssaAndBack", [&]() {
|
||||
disambiguate();
|
||||
ForLoopInitRewriter::run(*m_context, *m_ast);
|
||||
// apply SSA
|
||||
@ -337,9 +294,8 @@ bool YulOptimizerTestCommon::runStep()
|
||||
FunctionHoister::run(*m_context, *m_ast);
|
||||
CommonSubexpressionEliminator::run(*m_context, *m_ast);
|
||||
UnusedPruner::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "stackCompressor")
|
||||
{
|
||||
}},
|
||||
{"stackCompressor", [&]() {
|
||||
disambiguate();
|
||||
ForLoopInitRewriter::run(*m_context, *m_ast);
|
||||
FunctionHoister::run(*m_context, *m_ast);
|
||||
@ -347,29 +303,25 @@ bool YulOptimizerTestCommon::runStep()
|
||||
size_t maxIterations = 16;
|
||||
StackCompressor::run(*m_dialect, *m_object, true, maxIterations);
|
||||
BlockFlattener::run(*m_context, *m_ast);
|
||||
}
|
||||
else if (m_optimizerStep == "wordSizeTransform")
|
||||
{
|
||||
}},
|
||||
{"wordSizeTransform", [&]() {
|
||||
disambiguate();
|
||||
ExpressionSplitter::run(*m_context, *m_ast);
|
||||
WordSizeTransform::run(*m_dialect, *m_dialect, *m_ast, *m_nameDispenser);
|
||||
}
|
||||
else if (m_optimizerStep == "fullSuite")
|
||||
{
|
||||
}},
|
||||
{"fullSuite", [&]() {
|
||||
GasMeter meter(dynamic_cast<EVMDialect const&>(*m_dialect), false, 200);
|
||||
OptimiserSuite::run(*m_dialect, &meter, *m_object, true, solidity::frontend::OptimiserSettings::DefaultYulOptimiserSteps);
|
||||
}
|
||||
else if (m_optimizerStep == "stackLimitEvader")
|
||||
{
|
||||
}},
|
||||
{"stackLimitEvader", [&]() {
|
||||
disambiguate();
|
||||
StackLimitEvader::run(*m_context, *m_object, CompilabilityChecker{
|
||||
*m_dialect,
|
||||
*m_object,
|
||||
true
|
||||
}.unreachableVariables);
|
||||
}
|
||||
else if (m_optimizerStep == "fakeStackLimitEvader")
|
||||
{
|
||||
}},
|
||||
{"fakeStackLimitEvader", [&]() {
|
||||
disambiguate();
|
||||
// Mark all variables with a name starting with "$" for escalation to memory.
|
||||
struct FakeUnreachableGenerator: ASTWalker
|
||||
@ -404,7 +356,18 @@ bool YulOptimizerTestCommon::runStep()
|
||||
FakeUnreachableGenerator fakeUnreachableGenerator;
|
||||
fakeUnreachableGenerator(*m_ast);
|
||||
StackLimitEvader::run(*m_context, *m_object, fakeUnreachableGenerator.fakeUnreachables);
|
||||
}
|
||||
}}
|
||||
};
|
||||
}
|
||||
|
||||
bool YulOptimizerTestCommon::runStep()
|
||||
{
|
||||
yulAssert(m_dialect, "Dialect not set.");
|
||||
|
||||
updateContext();
|
||||
|
||||
if (m_namedSteps.count(m_optimizerStep))
|
||||
m_namedSteps[m_optimizerStep]();
|
||||
else
|
||||
return false;
|
||||
|
||||
|
||||
@ -63,6 +63,7 @@ private:
|
||||
std::shared_ptr<Object> m_object;
|
||||
std::shared_ptr<Block> m_ast;
|
||||
std::shared_ptr<AsmAnalysisInfo> m_analysisInfo;
|
||||
std::map<std::string, std::function<void(void)>> m_namedSteps;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user