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

Merge pull request #10699 from ethereum/refactor-yul-optimiser-test-framework

Browse Source 
Yul optimizer test: Separate test parsing and optimisation
This commit is contained in:
chriseth 2021-01-18 14:28:15 +01:00 committed by GitHub
commit 87d4ae503b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
40 changed files with 642 additions and 527 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/CMakeLists.txt
View File

@ -137,6 +137,8 @@ set(libyul_sources
libyul/YulInterpreterTest.h
libyul/YulOptimizerTest.cpp
libyul/YulOptimizerTest.h
libyul/YulOptimizerTestCommon.cpp
libyul/YulOptimizerTestCommon.h
)
detect_stray_source_files("${libyul_sources}" "libyul/")

386
test/libyul/YulOptimizerTest.cpp
View File

@ -17,76 +17,21 @@
// SPDX-License-Identifier: GPL-3.0
#include <test/libyul/YulOptimizerTest.h>
#include <test/libyul/YulOptimizerTestCommon.h>
#include <test/libsolidity/util/SoltestErrors.h>
#include <test/libyul/Common.h>
#include <test/Common.h>
#include <libyul/optimiser/BlockFlattener.h>
#include <libyul/optimiser/VarDeclInitializer.h>
#include <libyul/optimiser/VarNameCleaner.h>
#include <libyul/optimiser/ControlFlowSimplifier.h>
#include <libyul/optimiser/DeadCodeEliminator.h>
#include <libyul/optimiser/Disambiguator.h>
#include <libyul/optimiser/CallGraphGenerator.h>
#include <libyul/optimiser/CircularReferencesPruner.h>
#include <libyul/optimiser/ConditionalUnsimplifier.h>
#include <libyul/optimiser/ConditionalSimplifier.h>
#include <libyul/optimiser/CommonSubexpressionEliminator.h>
#include <libyul/optimiser/NameCollector.h>
#include <libyul/optimiser/EquivalentFunctionCombiner.h>
#include <libyul/optimiser/ExpressionSplitter.h>
#include <libyul/optimiser/FunctionGrouper.h>
#include <libyul/optimiser/FunctionHoister.h>
#include <libyul/optimiser/ExpressionInliner.h>
#include <libyul/optimiser/FullInliner.h>
#include <libyul/optimiser/ForLoopConditionIntoBody.h>
#include <libyul/optimiser/ForLoopConditionOutOfBody.h>
#include <libyul/optimiser/ForLoopInitRewriter.h>
#include <libyul/optimiser/LoadResolver.h>
#include <libyul/optimiser/LoopInvariantCodeMotion.h>
#include <libyul/optimiser/MainFunction.h>
#include <libyul/optimiser/StackLimitEvader.h>
#include <libyul/optimiser/NameDisplacer.h>
#include <libyul/optimiser/Rematerialiser.h>
#include <libyul/optimiser/ExpressionSimplifier.h>
#include <libyul/optimiser/UnusedFunctionParameterPruner.h>
#include <libyul/optimiser/UnusedPruner.h>
#include <libyul/optimiser/ExpressionJoiner.h>
#include <libyul/optimiser/OptimiserStep.h>
#include <libyul/Object.h>
#include <libyul/optimiser/ReasoningBasedSimplifier.h>
#include <libyul/optimiser/SSAReverser.h>
#include <libyul/optimiser/SSATransform.h>
#include <libyul/optimiser/Semantics.h>
#include <libyul/optimiser/RedundantAssignEliminator.h>
#include <libyul/optimiser/StructuralSimplifier.h>
#include <libyul/optimiser/StackCompressor.h>
#include <libyul/optimiser/StackToMemoryMover.h>
#include <libyul/optimiser/Suite.h>
#include <libyul/backends/evm/ConstantOptimiser.h>
#include <libyul/backends/evm/EVMDialect.h>
#include <libyul/backends/evm/EVMMetrics.h>
#include <libyul/backends/wasm/WordSizeTransform.h>
#include <libyul/backends/wasm/WasmDialect.h>
#include <libyul/AsmPrinter.h>
#include <libyul/AsmParser.h>
#include <libyul/AsmAnalysis.h>
#include <libyul/AssemblyStack.h>
#include <libyul/CompilabilityChecker.h>
#include <liblangutil/SourceReferenceFormatter.h>
#include <liblangutil/ErrorReporter.h>
#include <liblangutil/Scanner.h>
#include <liblangutil/SourceReferenceFormatter.h>
#include <libsolutil/AnsiColorized.h>
#include <libsolidity/interface/OptimiserSettings.h>
#include <boost/test/unit_test.hpp>
#include <boost/algorithm/string.hpp>
#include <fstream>
#include <variant>
using namespace solidity;
using namespace solidity::util;
@ -128,312 +73,10 @@ TestCase::TestResult YulOptimizerTest::run(ostream& _stream, string const& _line
soltestAssert(m_dialect, "Dialect not set.");
updateContext();
m_object->analysisInfo = m_analysisInfo;
YulOptimizerTestCommon tester(m_object, *m_dialect, m_optimizerStep);
if (m_optimizerStep == "disambiguator")
disambiguate();
else if (m_optimizerStep == "nameDisplacer")
{
disambiguate();
NameDisplacer{
*m_nameDispenser,
{"illegal1"_yulstring, "illegal2"_yulstring, "illegal3"_yulstring, "illegal4"_yulstring, "illegal5"_yulstring}
}(*m_object->code);
}
else if (m_optimizerStep == "blockFlattener")
{
disambiguate();
BlockFlattener::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "constantOptimiser")
{
GasMeter meter(dynamic_cast<EVMDialect const&>(*m_dialect), false, 200);
ConstantOptimiser{dynamic_cast<EVMDialect const&>(*m_dialect), meter}(*m_object->code);
}
else if (m_optimizerStep == "varDeclInitializer")
VarDeclInitializer::run(*m_context, *m_object->code);
else if (m_optimizerStep == "varNameCleaner")
{
disambiguate();
FunctionGrouper::run(*m_context, *m_object->code);
VarNameCleaner::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "forLoopConditionIntoBody")
{
disambiguate();
ForLoopConditionIntoBody::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "forLoopInitRewriter")
{
disambiguate();
ForLoopInitRewriter::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "commonSubexpressionEliminator")
{
disambiguate();
CommonSubexpressionEliminator::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "conditionalUnsimplifier")
{
disambiguate();
ConditionalUnsimplifier::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "conditionalSimplifier")
{
disambiguate();
ConditionalSimplifier::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "expressionSplitter")
ExpressionSplitter::run(*m_context, *m_object->code);
else if (m_optimizerStep == "expressionJoiner")
{
disambiguate();
ExpressionJoiner::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "splitJoin")
{
disambiguate();
ExpressionSplitter::run(*m_context, *m_object->code);
ExpressionJoiner::run(*m_context, *m_object->code);
ExpressionJoiner::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "functionGrouper")
{
disambiguate();
FunctionGrouper::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "functionHoister")
{
disambiguate();
FunctionHoister::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "expressionInliner")
{
disambiguate();
ExpressionInliner::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "fullInliner")
{
disambiguate();
FunctionHoister::run(*m_context, *m_object->code);
FunctionGrouper::run(*m_context, *m_object->code);
ExpressionSplitter::run(*m_context, *m_object->code);
FullInliner::run(*m_context, *m_object->code);
ExpressionJoiner::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "mainFunction")
{
disambiguate();
FunctionGrouper::run(*m_context, *m_object->code);
MainFunction::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "rematerialiser")
{
disambiguate();
Rematerialiser::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "expressionSimplifier")
{
disambiguate();
ExpressionSplitter::run(*m_context, *m_object->code);
CommonSubexpressionEliminator::run(*m_context, *m_object->code);
ExpressionSimplifier::run(*m_context, *m_object->code);
ExpressionSimplifier::run(*m_context, *m_object->code);
ExpressionSimplifier::run(*m_context, *m_object->code);
UnusedPruner::run(*m_context, *m_object->code);
ExpressionJoiner::run(*m_context, *m_object->code);
ExpressionJoiner::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "fullSimplify")
{
disambiguate();
ExpressionSplitter::run(*m_context, *m_object->code);
ForLoopInitRewriter::run(*m_context, *m_object->code);
CommonSubexpressionEliminator::run(*m_context, *m_object->code);
ExpressionSimplifier::run(*m_context, *m_object->code);
UnusedPruner::run(*m_context, *m_object->code);
CircularReferencesPruner::run(*m_context, *m_object->code);
DeadCodeEliminator::run(*m_context, *m_object->code);
ExpressionJoiner::run(*m_context, *m_object->code);
ExpressionJoiner::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "unusedFunctionParameterPruner")
{
disambiguate();
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")
{
disambiguate();
UnusedPruner::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "circularReferencesPruner")
{
disambiguate();
FunctionHoister::run(*m_context, *m_object->code);
CircularReferencesPruner::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "deadCodeEliminator")
{
disambiguate();
ForLoopInitRewriter::run(*m_context, *m_object->code);
DeadCodeEliminator::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "ssaTransform")
{
disambiguate();
ForLoopInitRewriter::run(*m_context, *m_object->code);
SSATransform::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "redundantAssignEliminator")
{
disambiguate();
RedundantAssignEliminator::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "ssaPlusCleanup")
{
disambiguate();
SSATransform::run(*m_context, *m_object->code);
RedundantAssignEliminator::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "loadResolver")
{
disambiguate();
ForLoopInitRewriter::run(*m_context, *m_object->code);
ExpressionSplitter::run(*m_context, *m_object->code);
CommonSubexpressionEliminator::run(*m_context, *m_object->code);
ExpressionSimplifier::run(*m_context, *m_object->code);
LoadResolver::run(*m_context, *m_object->code);
UnusedPruner::run(*m_context, *m_object->code);
ExpressionJoiner::run(*m_context, *m_object->code);
ExpressionJoiner::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "loopInvariantCodeMotion")
{
disambiguate();
ForLoopInitRewriter::run(*m_context, *m_object->code);
LoopInvariantCodeMotion::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "controlFlowSimplifier")
{
disambiguate();
ControlFlowSimplifier::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "structuralSimplifier")
{
disambiguate();
ForLoopInitRewriter::run(*m_context, *m_object->code);
LiteralRematerialiser::run(*m_context, *m_object->code);
StructuralSimplifier::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "reasoningBasedSimplifier")
{
disambiguate();
ReasoningBasedSimplifier::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "equivalentFunctionCombiner")
{
disambiguate();
EquivalentFunctionCombiner::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "ssaReverser")
{
disambiguate();
SSAReverser::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "ssaAndBack")
{
disambiguate();
// apply SSA
SSATransform::run(*m_context, *m_object->code);
RedundantAssignEliminator::run(*m_context, *m_object->code);
// reverse SSA
SSAReverser::run(*m_context, *m_object->code);
CommonSubexpressionEliminator::run(*m_context, *m_object->code);
UnusedPruner::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "stackCompressor")
{
disambiguate();
FunctionGrouper::run(*m_context, *m_object->code);
size_t maxIterations = 16;
Object obj;
obj.code = m_object->code;
StackCompressor::run(*m_dialect, obj, true, maxIterations);
m_object->code = obj.code;
BlockFlattener::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "wordSizeTransform")
{
disambiguate();
ExpressionSplitter::run(*m_context, *m_object->code);
WordSizeTransform::run(*m_dialect, *m_dialect, *m_object->code, *m_nameDispenser);
}
else if (m_optimizerStep == "fullSuite")
{
GasMeter meter(dynamic_cast<EVMDialect const&>(*m_dialect), false, 200);
yul::Object obj;
obj.code = m_object->code;
obj.analysisInfo = m_analysisInfo;
OptimiserSuite::run(*m_dialect, &meter, obj, true, solidity::frontend::OptimiserSettings::DefaultYulOptimiserSteps);
}
else if (m_optimizerStep == "stackLimitEvader")
{
yul::Object obj;
obj.code = m_object->code;
obj.analysisInfo = m_analysisInfo;
disambiguate();
StackLimitEvader::run(*m_context, obj, CompilabilityChecker{
*m_dialect,
obj,
true
}.unreachableVariables);
}
else if (m_optimizerStep == "fakeStackLimitEvader")
{
yul::Object obj;
obj.code = m_object->code;
obj.analysisInfo = m_analysisInfo;
disambiguate();
// Mark all variables with a name starting with "$" for escalation to memory.
struct FakeUnreachableGenerator: ASTWalker
{
map<YulString, set<YulString>> fakeUnreachables;
using ASTWalker::operator();
void operator()(FunctionDefinition const& _function) override
{
YulString originalFunctionName = m_currentFunction;
m_currentFunction = _function.name;
ASTWalker::operator()(_function);
m_currentFunction = originalFunctionName;
}
void visitVariableName(YulString _var)
{
if (!_var.empty() && _var.str().front() == '$')
fakeUnreachables[m_currentFunction].insert(_var);
}
void operator()(VariableDeclaration const& _varDecl) override
{
for (auto const& var: _varDecl.variables)
visitVariableName(var.name);
ASTWalker::operator()(_varDecl);
}
void operator()(Identifier const& _identifier) override
{
visitVariableName(_identifier.name);
ASTWalker::operator()(_identifier);
}
YulString m_currentFunction = YulString{};
};
FakeUnreachableGenerator fakeUnreachableGenerator;
fakeUnreachableGenerator(*obj.code);
StackLimitEvader::run(*m_context, obj, fakeUnreachableGenerator.fakeUnreachables);
}
else
if (!tester.runStep())
{
AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Invalid optimizer step: " << m_optimizerStep << endl;
return TestResult::FatalError;
@ -477,23 +120,6 @@ std::pair<std::shared_ptr<Object>, std::shared_ptr<AsmAnalysisInfo>> YulOptimize
return {std::move(object), std::move(analysisInfo)};
}
void YulOptimizerTest::disambiguate()
{
*m_object->code = std::get<Block>(Disambiguator(*m_dialect, *m_analysisInfo)(*m_object->code));
m_analysisInfo.reset();
updateContext();
}
void YulOptimizerTest::updateContext()
{
m_nameDispenser = make_unique<NameDispenser>(*m_dialect, *m_object->code, m_reservedIdentifiers);
m_context = make_unique<OptimiserStepContext>(OptimiserStepContext{
*m_dialect,
*m_nameDispenser,
m_reservedIdentifiers
});
}
void YulOptimizerTest::printErrors(ostream& _stream, ErrorList const& _errors)
{
SourceReferenceFormatter formatter(_stream, true, false);

16
test/libyul/YulOptimizerTest.h
View File

@ -20,17 +20,8 @@
#include <test/TestCase.h>
#include <libyul/optimiser/OptimiserStep.h>
#include <libyul/optimiser/NameDispenser.h>
#include <libyul/YulString.h>
#include <set>
#include <memory>
namespace solidity::langutil
{
class Scanner;
class Error;
using ErrorList = std::vector<std::shared_ptr<Error const>>;
}
@ -56,22 +47,15 @@ public:
explicit YulOptimizerTest(std::string const& _filename);
TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool const _formatted = false) override;
private:
std::pair<std::shared_ptr<Object>, std::shared_ptr<AsmAnalysisInfo>> parse(
std::ostream& _stream, std::string const& _linePrefix, bool const _formatted, std::string const& _source
);
void disambiguate();
void updateContext();
static void printErrors(std::ostream& _stream, langutil::ErrorList const& _errors);
std::string m_optimizerStep;
Dialect const* m_dialect = nullptr;
std::set<YulString> m_reservedIdentifiers;
std::unique_ptr<NameDispenser> m_nameDispenser;
std::unique_ptr<OptimiserStepContext> m_context;
std::shared_ptr<Object> m_object;
std::shared_ptr<AsmAnalysisInfo> m_analysisInfo;

434
test/libyul/YulOptimizerTestCommon.cpp Normal file
View File

@ -0,0 +1,434 @@
/*
This file is part of solidity.
solidity 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.
solidity 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 solidity. If not, see <http://www.gnu.org/licenses/>.
*/
// SPDX-License-Identifier: GPL-3.0
#include <test/libyul/YulOptimizerTestCommon.h>
#include <libyul/optimiser/BlockFlattener.h>
#include <libyul/optimiser/VarDeclInitializer.h>
#include <libyul/optimiser/VarNameCleaner.h>
#include <libyul/optimiser/ControlFlowSimplifier.h>
#include <libyul/optimiser/DeadCodeEliminator.h>
#include <libyul/optimiser/Disambiguator.h>
#include <libyul/optimiser/CircularReferencesPruner.h>
#include <libyul/optimiser/ConditionalUnsimplifier.h>
#include <libyul/optimiser/ConditionalSimplifier.h>
#include <libyul/optimiser/CommonSubexpressionEliminator.h>
#include <libyul/optimiser/EquivalentFunctionCombiner.h>
#include <libyul/optimiser/ExpressionSplitter.h>
#include <libyul/optimiser/FunctionGrouper.h>
#include <libyul/optimiser/FunctionHoister.h>
#include <libyul/optimiser/ExpressionInliner.h>
#include <libyul/optimiser/FullInliner.h>
#include <libyul/optimiser/ForLoopConditionIntoBody.h>
#include <libyul/optimiser/ForLoopInitRewriter.h>
#include <libyul/optimiser/LoadResolver.h>
#include <libyul/optimiser/LoopInvariantCodeMotion.h>
#include <libyul/optimiser/MainFunction.h>
#include <libyul/optimiser/StackLimitEvader.h>
#include <libyul/optimiser/NameDisplacer.h>
#include <libyul/optimiser/Rematerialiser.h>
#include <libyul/optimiser/ExpressionSimplifier.h>
#include <libyul/optimiser/UnusedFunctionParameterPruner.h>
#include <libyul/optimiser/UnusedPruner.h>
#include <libyul/optimiser/ExpressionJoiner.h>
#include <libyul/optimiser/OptimiserStep.h>
#include <libyul/optimiser/ReasoningBasedSimplifier.h>
#include <libyul/optimiser/SSAReverser.h>
#include <libyul/optimiser/SSATransform.h>
#include <libyul/optimiser/Semantics.h>
#include <libyul/optimiser/RedundantAssignEliminator.h>
#include <libyul/optimiser/StructuralSimplifier.h>
#include <libyul/optimiser/StackCompressor.h>
#include <libyul/optimiser/Suite.h>
#include <libyul/backends/evm/ConstantOptimiser.h>
#include <libyul/backends/evm/EVMDialect.h>
#include <libyul/backends/evm/EVMMetrics.h>
#include <libyul/backends/wasm/WordSizeTransform.h>
#include <libyul/backends/wasm/WasmDialect.h>
#include <libyul/AsmPrinter.h>
#include <libyul/AsmAnalysis.h>
#include <libyul/CompilabilityChecker.h>
#include <libsolidity/interface/OptimiserSettings.h>
using namespace solidity;
using namespace solidity::util;
using namespace solidity::langutil;
using namespace solidity::yul;
using namespace solidity::yul::test;
using namespace solidity::frontend;
using namespace std;
YulOptimizerTestCommon::YulOptimizerTestCommon(
shared_ptr<Object> _obj,
Dialect const& _dialect,
string const& _optimizerStep
)
{
m_object = _obj;
m_ast = m_object->code;
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")
{
disambiguate();
NameDisplacer{
*m_nameDispenser,
{"illegal1"_yulstring, "illegal2"_yulstring, "illegal3"_yulstring, "illegal4"_yulstring, "illegal5"_yulstring}
}(*m_ast);
}
else if (m_optimizerStep == "blockFlattener")
{
disambiguate();
BlockFlattener::run(*m_context, *m_ast);
}
else if (m_optimizerStep == "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")
{
disambiguate();
FunctionHoister::run(*m_context, *m_ast);
FunctionGrouper::run(*m_context, *m_ast);
VarNameCleaner::run(*m_context, *m_ast);
}
else if (m_optimizerStep == "forLoopConditionIntoBody")
{
disambiguate();
ForLoopConditionIntoBody::run(*m_context, *m_ast);
}
else if (m_optimizerStep == "forLoopInitRewriter")
{
disambiguate();
ForLoopInitRewriter::run(*m_context, *m_ast);
}
else if (m_optimizerStep == "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")
{
disambiguate();
ConditionalUnsimplifier::run(*m_context, *m_ast);
}
else if (m_optimizerStep == "conditionalSimplifier")
{
disambiguate();
ConditionalSimplifier::run(*m_context, *m_ast);
}
else if (m_optimizerStep == "expressionSplitter")
ExpressionSplitter::run(*m_context, *m_ast);
else if (m_optimizerStep == "expressionJoiner")
{
disambiguate();
ExpressionJoiner::run(*m_context, *m_ast);
}
else if (m_optimizerStep == "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")
{
disambiguate();
FunctionGrouper::run(*m_context, *m_ast);
}
else if (m_optimizerStep == "functionHoister")
{
disambiguate();
FunctionHoister::run(*m_context, *m_ast);
}
else if (m_optimizerStep == "expressionInliner")
{
disambiguate();
ExpressionInliner::run(*m_context, *m_ast);
}
else if (m_optimizerStep == "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")
{
disambiguate();
FunctionGrouper::run(*m_context, *m_ast);
MainFunction::run(*m_context, *m_ast);
}
else if (m_optimizerStep == "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")
{
disambiguate();
ForLoopInitRewriter::run(*m_context, *m_ast);
FunctionHoister::run(*m_context, *m_ast);
ExpressionSplitter::run(*m_context, *m_ast);
CommonSubexpressionEliminator::run(*m_context, *m_ast);
ExpressionSimplifier::run(*m_context, *m_ast);
ExpressionSimplifier::run(*m_context, *m_ast);
ExpressionSimplifier::run(*m_context, *m_ast);
UnusedPruner::run(*m_context, *m_ast);
ExpressionJoiner::run(*m_context, *m_ast);
ExpressionJoiner::run(*m_context, *m_ast);
}
else if (m_optimizerStep == "fullSimplify")
{
disambiguate();
ExpressionSplitter::run(*m_context, *m_ast);
ForLoopInitRewriter::run(*m_context, *m_ast);
FunctionHoister::run(*m_context, *m_ast);
CommonSubexpressionEliminator::run(*m_context, *m_ast);
ExpressionSimplifier::run(*m_context, *m_ast);
UnusedPruner::run(*m_context, *m_ast);
CircularReferencesPruner::run(*m_context, *m_ast);
DeadCodeEliminator::run(*m_context, *m_ast);
ExpressionJoiner::run(*m_context, *m_ast);
ExpressionJoiner::run(*m_context, *m_ast);
}
else if (m_optimizerStep == "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")
{
disambiguate();
UnusedPruner::run(*m_context, *m_ast);
}
else if (m_optimizerStep == "circularReferencesPruner")
{
disambiguate();
FunctionHoister::run(*m_context, *m_ast);
CircularReferencesPruner::run(*m_context, *m_ast);
}
else if (m_optimizerStep == "deadCodeEliminator")
{
disambiguate();
ForLoopInitRewriter::run(*m_context, *m_ast);
DeadCodeEliminator::run(*m_context, *m_ast);
}
else if (m_optimizerStep == "ssaTransform")
{
disambiguate();
ForLoopInitRewriter::run(*m_context, *m_ast);
SSATransform::run(*m_context, *m_ast);
}
else if (m_optimizerStep == "redundantAssignEliminator")
{
disambiguate();
ForLoopInitRewriter::run(*m_context, *m_ast);
RedundantAssignEliminator::run(*m_context, *m_ast);
}
else if (m_optimizerStep == "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")
{
disambiguate();
ForLoopInitRewriter::run(*m_context, *m_ast);
FunctionHoister::run(*m_context, *m_ast);
ExpressionSplitter::run(*m_context, *m_ast);
CommonSubexpressionEliminator::run(*m_context, *m_ast);
ExpressionSimplifier::run(*m_context, *m_ast);
LoadResolver::run(*m_context, *m_ast);
UnusedPruner::run(*m_context, *m_ast);
ExpressionJoiner::run(*m_context, *m_ast);
ExpressionJoiner::run(*m_context, *m_ast);
}
else if (m_optimizerStep == "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")
{
disambiguate();
ForLoopInitRewriter::run(*m_context, *m_ast);
ControlFlowSimplifier::run(*m_context, *m_ast);
}
else if (m_optimizerStep == "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")
{
disambiguate();
ReasoningBasedSimplifier::run(*m_context, *m_object->code);
}
else if (m_optimizerStep == "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")
{
disambiguate();
SSAReverser::run(*m_context, *m_ast);
}
else if (m_optimizerStep == "ssaAndBack")
{
disambiguate();
ForLoopInitRewriter::run(*m_context, *m_ast);
// apply SSA
SSATransform::run(*m_context, *m_ast);
RedundantAssignEliminator::run(*m_context, *m_ast);
// reverse SSA
SSAReverser::run(*m_context, *m_ast);
FunctionHoister::run(*m_context, *m_ast);
CommonSubexpressionEliminator::run(*m_context, *m_ast);
UnusedPruner::run(*m_context, *m_ast);
}
else if (m_optimizerStep == "stackCompressor")
{
disambiguate();
ForLoopInitRewriter::run(*m_context, *m_ast);
FunctionHoister::run(*m_context, *m_ast);
FunctionGrouper::run(*m_context, *m_ast);
size_t maxIterations = 16;
StackCompressor::run(*m_dialect, *m_object, true, maxIterations);
BlockFlattener::run(*m_context, *m_ast);
}
else if (m_optimizerStep == "wordSizeTransform")
{
disambiguate();
ExpressionSplitter::run(*m_context, *m_ast);
WordSizeTransform::run(*m_dialect, *m_dialect, *m_ast, *m_nameDispenser);
}
else if (m_optimizerStep == "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")
{
disambiguate();
StackLimitEvader::run(*m_context, *m_object, CompilabilityChecker{
*m_dialect,
*m_object,
true
}.unreachableVariables);
}
else if (m_optimizerStep == "fakeStackLimitEvader")
{
disambiguate();
// Mark all variables with a name starting with "$" for escalation to memory.
struct FakeUnreachableGenerator: ASTWalker
{
map<YulString, set<YulString>> fakeUnreachables;
using ASTWalker::operator();
void operator()(FunctionDefinition const& _function) override
{
YulString originalFunctionName = m_currentFunction;
m_currentFunction = _function.name;
ASTWalker::operator()(_function);
m_currentFunction = originalFunctionName;
}
void visitVariableName(YulString _var)
{
if (!_var.empty() && _var.str().front() == '$')
fakeUnreachables[m_currentFunction].insert(_var);
}
void operator()(VariableDeclaration const& _varDecl) override
{
for (auto const& var: _varDecl.variables)
visitVariableName(var.name);
ASTWalker::operator()(_varDecl);
}
void operator()(Identifier const& _identifier) override
{
visitVariableName(_identifier.name);
ASTWalker::operator()(_identifier);
}
YulString m_currentFunction = YulString{};
};
FakeUnreachableGenerator fakeUnreachableGenerator;
fakeUnreachableGenerator(*m_ast);
StackLimitEvader::run(*m_context, *m_object, fakeUnreachableGenerator.fakeUnreachables);
}
else
return false;
return true;
}
shared_ptr<Block> YulOptimizerTestCommon::run()
{
return runStep() ? m_ast : nullptr;
}
void YulOptimizerTestCommon::disambiguate()
{
*m_object->code = std::get<Block>(Disambiguator(*m_dialect, *m_analysisInfo)(*m_object->code));
m_analysisInfo.reset();
updateContext();
}
void YulOptimizerTestCommon::updateContext()
{
m_nameDispenser = make_unique<NameDispenser>(*m_dialect, *m_object->code, m_reservedIdentifiers);
m_context = make_unique<OptimiserStepContext>(OptimiserStepContext{
*m_dialect,
*m_nameDispenser,
m_reservedIdentifiers
});
}

68
test/libyul/YulOptimizerTestCommon.h Normal file
View File

@ -0,0 +1,68 @@
/*
This file is part of solidity.
solidity 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.
solidity 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 solidity. If not, see <http://www.gnu.org/licenses/>.
*/
// SPDX-License-Identifier: GPL-3.0
#pragma once
#include <libyul/optimiser/OptimiserStep.h>
#include <libyul/optimiser/NameDispenser.h>
#include <libyul/YulString.h>
#include <set>
#include <memory>
namespace solidity::yul
{
struct AsmAnalysisInfo;
struct Object;
struct Dialect;
}
namespace solidity::yul::test
{
class YulOptimizerTestCommon
{
public:
explicit YulOptimizerTestCommon(
std::shared_ptr<Object> _obj,
Dialect const& _dialect,
std::string const& _optimizerStep
);
/// Runs chosen optimiser step returning pointer
/// to yul AST Block post optimisation.
std::shared_ptr<Block> run();
/// Runs chosen optimiser step returning true if
/// successful, false otherwise.
bool runStep();
private:
void disambiguate();
void updateContext();
std::string m_optimizerStep;
Dialect const* m_dialect = nullptr;
std::set<YulString> m_reservedIdentifiers;
std::unique_ptr<NameDispenser> m_nameDispenser;
std::unique_ptr<OptimiserStepContext> m_context;
std::shared_ptr<Object> m_object;
std::shared_ptr<Block> m_ast;
std::shared_ptr<AsmAnalysisInfo> m_analysisInfo;
};
}

18
test/libyul/yulOptimizerTests/commonSubexpressionEliminator/function_scopes.yul
View File

@ -27,6 +27,15 @@
// step: commonSubexpressionEliminator
//
// {
// let _6 := 0x20
// let _7 := allocate(_6)
// pop(_7)
// let _8 := 0x40
// let x := allocate(_8)
// let _9 := 2
// let _10 := 3
// let _11 := array_index_access(x, _10)
// mstore(_11, _9)
// function allocate(size) -> p
// {
// let _1 := 0x40
@ -41,13 +50,4 @@
// let _5 := mul(index, _4)
// p_1 := add(array, _5)
// }
// let _6 := 0x20
// let _7 := allocate(_6)
// pop(_7)
// let _8 := 0x40
// let x := allocate(_8)
// let _9 := 2
// let _10 := 3
// let _11 := array_index_access(x, _10)
// mstore(_11, _9)
// }

10
test/libyul/yulOptimizerTests/commonSubexpressionEliminator/movable_functions.yul
View File

@ -11,6 +11,11 @@
// step: commonSubexpressionEliminator
//
// {
// let i := mload(3)
// let a := double(i)
// let b := a
// let c := double_with_se(i)
// let d := double_with_se(i)
// function double(x) -> y
// { y := add(x, x) }
// function double_with_se(x_1) -> y_2
@ -18,9 +23,4 @@
// y_2 := add(x_1, x_1)
// mstore(40, 4)
// }
// let i := mload(3)
// let a := double(i)
// let b := a
// let c := double_with_se(i)
// let d := double_with_se(i)
// }

6
test/libyul/yulOptimizerTests/commonSubexpressionEliminator/unassigned_return.yul
View File

@ -13,12 +13,12 @@
// step: commonSubexpressionEliminator
//
// {
// let a
// let b := a
// sstore(a, a)
// function f() -> x
// {
// let y := x
// mstore(x, 7)
// }
// let a
// let b := a
// sstore(a, a)
// }

4
test/libyul/yulOptimizerTests/expressionSimplifier/assigned_vars_multi.yul
View File

@ -8,8 +8,8 @@
// step: expressionSimplifier
//
// {
// function f() -> x, z
// { }
// let c, d := f()
// sstore(add(add(d, c), 7), 20)
// function f() -> x, z
// { }
// }

2
test/libyul/yulOptimizerTests/expressionSimplifier/including_function_calls.yul
View File

@ -7,7 +7,7 @@
// step: expressionSimplifier
//
// {
// sstore(0, f())
// function f() -> a
// { }
// sstore(0, f())
// }

4
test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_arguments.yul
View File

@ -7,9 +7,9 @@
// step: expressionSimplifier
//
// {
// function f(a) -> b
// { }
// let _2 := f(1)
// let _3 := 0
// sstore(_3, sub(f(_3), _2))
// function f(a) -> b
// { }
// }

2
test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_names.yul
View File

@ -8,9 +8,9 @@
// step: expressionSimplifier
//
// {
// sstore(0, sub(f1(), f2()))
// function f1() -> a
// { }
// function f2() -> b
// { }
// sstore(0, sub(f1(), f2()))
// }

2
test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_equality_not_movable.yul
View File

@ -8,7 +8,7 @@
// step: expressionSimplifier
//
// {
// sstore(sub(f(), f()), 8)
// function f() -> a
// { mstore(a, 1) }
// sstore(sub(f(), f()), 8)
// }

4
test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_func.yul
View File

@ -8,8 +8,8 @@
// step: expressionSimplifier
//
// {
// function f() -> x
// { mstore(x, 1337) }
// pop(f())
// mstore(0, 0)
// function f() -> x
// { mstore(x, 1337) }
// }

2
test/libyul/yulOptimizerTests/expressionSimplifier/return_vars_zero.yul
View File

@ -10,7 +10,7 @@
// step: expressionSimplifier
//
// {
// let t, v := f()
// function f() -> c, d
// { sstore(d, 7) }
// let t, v := f()
// }

2
test/libyul/yulOptimizerTests/fullSimplify/including_function_calls.yul
View File

@ -7,7 +7,7 @@
// step: fullSimplify
//
// {
// mstore(f(), 0)
// function f() -> a
// { }
// mstore(f(), 0)
// }

4
test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_different_arguments.yul
View File

@ -6,9 +6,9 @@
// step: fullSimplify
//
// {
// function f(a) -> b
// { }
// let _2 := f(1)
// let _3 := 0
// mstore(_3, sub(f(_3), _2))
// function f(a) -> b
// { }
// }

2
test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_different_names.yul
View File

@ -8,9 +8,9 @@
// step: fullSimplify
//
// {
// mstore(0, sub(f1(), f2()))
// function f1() -> a
// { }
// function f2() -> b
// { }
// mstore(0, sub(f1(), f2()))
// }

2
test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_equality_not_movable.yul
View File

@ -8,7 +8,7 @@
// step: fullSimplify
//
// {
// mstore(0, sub(f(), f()))
// function f() -> a
// { mstore(1, 2) }
// mstore(0, sub(f(), f()))
// }

16
test/libyul/yulOptimizerTests/loadResolver/mload_in_function.yul
View File

@ -10,20 +10,20 @@
// step: loadResolver
//
// {
// let _1 := 1337
// let _2 := 0
// mstore(_2, _1)
// foo(42)
// sstore(_2, mload(_2))
// function foo(x)
// {
// for { }
// x
// {
// let _1 := 0
// x := mload(_1)
// mstore(_1, _1)
// let _7 := 0
// x := mload(_7)
// mstore(_7, _7)
// }
// { }
// }
// let _4 := 1337
// let _5 := 0
// mstore(_5, _4)
// foo(42)
// sstore(_5, mload(_5))
// }

14
test/libyul/yulOptimizerTests/loadResolver/mstore_in_function_loop_body.yul
View File

@ -15,6 +15,11 @@
// step: loadResolver
//
// {
// let _1 := 1337
// let _2 := 0
// mstore(_2, _1)
// funcWithLoop(42)
// sstore(_2, mload(_2))
// function userNot(x) -> y
// { y := iszero(x) }
// function funcWithLoop(x_1)
@ -22,14 +27,9 @@
// for { }
// userNot(x_1)
// {
// let _1 := 0
// mstore(_1, _1)
// let _7 := 0
// mstore(_7, _7)
// }
// { }
// }
// let _3 := 1337
// let _4 := 0
// mstore(_4, _3)
// funcWithLoop(42)
// sstore(_4, mload(_4))
// }

14
test/libyul/yulOptimizerTests/loadResolver/mstore_in_function_loop_init.yul
View File

@ -15,18 +15,18 @@
// step: loadResolver
//
// {
// let _1 := 1337
// let _2 := 0
// mstore(_2, _1)
// funcWithLoop(42)
// sstore(_2, mload(_2))
// function userNot(x) -> y
// { y := iszero(x) }
// function funcWithLoop(x_1)
// {
// let _1 := 0
// mstore(_1, _1)
// let _7 := 0
// mstore(_7, _7)
// for { } userNot(x_1) { }
// { }
// }
// let _3 := 1337
// let _4 := 0
// mstore(_4, _3)
// funcWithLoop(42)
// sstore(_4, mload(_4))
// }

18
test/libyul/yulOptimizerTests/loadResolver/side_effects_of_user_functions.yul
View File

@ -12,17 +12,17 @@
// step: loadResolver
//
// {
// let _1 := 9
// let _2 := 2
// mstore(_2, _1)
// reads()
// let _4 := _1
// let _5 := 0
// sstore(_5, _4)
// stores()
// sstore(_5, mload(_2))
// function stores()
// { mstore(0, 1) }
// function reads()
// { sstore(9, mload(7)) }
// let _6 := 9
// let _7 := 2
// mstore(_7, _6)
// reads()
// let _9 := _6
// let _10 := 0
// sstore(_10, _9)
// stores()
// sstore(_10, mload(_7))
// }

8
test/libyul/yulOptimizerTests/loopInvariantCodeMotion/create_sload.yul
View File

@ -15,10 +15,6 @@
// step: loopInvariantCodeMotion
//
// {
// function g() -> x
// { x := create(100, 0, 32) }
// function f() -> x_1
// { x_1 := mload(0) }
// let b := 1
// let a := 1
// let z := f()
@ -27,4 +23,8 @@
// let q := sload(5)
// let r := g()
// }
// function g() -> x
// { x := create(100, 0, 32) }
// function f() -> x_1
// { x_1 := mload(0) }
// }

4
test/libyul/yulOptimizerTests/loopInvariantCodeMotion/move_memory_function.yul
View File

@ -12,8 +12,6 @@
// step: loopInvariantCodeMotion
//
// {
// function g() -> x
// { x := add(sload(mload(x)), 1) }
// let b := 1
// let a := 1
// let t := mload(g())
@ -21,4 +19,6 @@
// let q := g()
// for { } iszero(eq(a, 10)) { a := add(a, 1) }
// { }
// function g() -> x
// { x := add(sload(mload(x)), 1) }
// }

8
test/libyul/yulOptimizerTests/loopInvariantCodeMotion/move_state_function.yul
View File

@ -12,14 +12,14 @@
// step: loopInvariantCodeMotion
//
// {
// function f() -> x
// { x := mload(g()) }
// function g() -> x_1
// { x_1 := add(sload(x_1), 1) }
// let b := 1
// let a := 1
// let t := extcodesize(f())
// let q := g()
// for { } iszero(eq(a, 10)) { a := add(a, 1) }
// { }
// function f() -> x
// { x := mload(g()) }
// function g() -> x_1
// { x_1 := add(sload(x_1), 1) }
// }

8
test/libyul/yulOptimizerTests/loopInvariantCodeMotion/move_storage_function.yul
View File

@ -12,14 +12,14 @@
// step: loopInvariantCodeMotion
//
// {
// function f() -> x
// { x := g() }
// function g() -> x_1
// { x_1 := add(x_1, 1) }
// let b := 1
// let a := 1
// let t := sload(f())
// let q := g()
// for { } iszero(eq(a, 10)) { a := add(a, 1) }
// { }
// function f() -> x
// { x := g() }
// function g() -> x_1
// { x_1 := add(x_1, 1) }
// }

8
test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_immovables.yul
View File

@ -14,10 +14,6 @@
//
// {
// let a := 1
// function f() -> x
// { invalid() }
// function g() -> y
// { return(0, 0) }
// let i := 1
// for { } iszero(eq(i, 10)) { a := add(i, 1) }
// {
@ -26,4 +22,8 @@
// let d := g()
// let e := sload(g())
// }
// function f() -> x
// { invalid() }
// function g() -> y
// { return(0, 0) }
// }

14
test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_loop.yul
View File

@ -12,13 +12,6 @@
// step: loopInvariantCodeMotion
//
// {
// function f() -> x
// { x := g() }
// function g() -> x_1
// {
// for { } 1 { }
// { }
// }
// let b := 1
// let a := 1
// for { } iszero(eq(a, 10)) { a := add(a, 1) }
@ -26,4 +19,11 @@
// let t := f()
// let q := g()
// }
// function f() -> x
// { x := g() }
// function g() -> x_1
// {
// for { } 1 { }
// { }
// }
// }

14
test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_memory_loop.yul
View File

@ -12,13 +12,6 @@
// step: loopInvariantCodeMotion
//
// {
// function f() -> x
// { x := g() }
// function g() -> x_1
// {
// for { } 1 { }
// { }
// }
// let b := 1
// let a := 1
// for { } iszero(eq(a, 10)) { a := add(a, 1) }
@ -26,4 +19,11 @@
// let t := mload(f())
// let q := g()
// }
// function f() -> x
// { x := g() }
// function g() -> x_1
// {
// for { } 1 { }
// { }
// }
// }

8
test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_recursive_function.yul
View File

@ -12,10 +12,6 @@
// step: loopInvariantCodeMotion
//
// {
// function f() -> x
// { x := g() }
// function g() -> x_1
// { x_1 := g() }
// let b := 1
// let a := 1
// for { } iszero(eq(a, 10)) { a := add(a, 1) }
@ -23,4 +19,8 @@
// let t := f()
// let q := g()
// }
// function f() -> x
// { x := g() }
// function g() -> x_1
// { x_1 := g() }
// }

14
test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_state_function.yul
View File

@ -15,13 +15,6 @@
// step: loopInvariantCodeMotion
//
// {
// function f() -> x
// { x := g() }
// function g() -> x_1
// {
// x_1 := add(x_1, 1)
// sstore(0x00, 0x00)
// }
// let b := 1
// let a := 1
// for { } iszero(eq(a, 10)) { a := add(a, 1) }
@ -29,4 +22,11 @@
// let t := extcodesize(f())
// let q := sload(g())
// }
// function f() -> x
// { x := g() }
// function g() -> x_1
// {
// x_1 := add(x_1, 1)
// sstore(0x00, 0x00)
// }
// }

14
test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_state_loop.yul
View File

@ -12,13 +12,6 @@
// step: loopInvariantCodeMotion
//
// {
// function f() -> x
// { x := g() }
// function g() -> x_1
// {
// for { } 1 { }
// { }
// }
// let b := 1
// let a := 1
// for { } iszero(eq(a, 10)) { a := add(a, 1) }
@ -26,4 +19,11 @@
// let t := extcodesize(f())
// let q := g()
// }
// function f() -> x
// { x := g() }
// function g() -> x_1
// {
// for { } 1 { }
// { }
// }
// }

8
test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_state_recursive_function.yul
View File

@ -12,10 +12,6 @@
// step: loopInvariantCodeMotion
//
// {
// function f() -> x
// { x := g() }
// function g() -> x_1
// { x_1 := g() }
// let b := 1
// let a := 1
// for { } iszero(eq(a, 10)) { a := add(a, 1) }
@ -23,4 +19,8 @@
// let t := extcodesize(f())
// let q := sload(g())
// }
// function f() -> x
// { x := g() }
// function g() -> x_1
// { x_1 := g() }
// }

8
test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_storage_function.yul
View File

@ -14,6 +14,10 @@
// step: loopInvariantCodeMotion
//
// {
// let b := 1
// let a := 1
// for { } iszero(eq(a, 10)) { a := add(a, 1) }
// { let q := sload(g()) }
// function f() -> x
// { x := g() }
// function g() -> x_1
@ -21,8 +25,4 @@
// x_1 := add(x_1, 1)
// sstore(0x00, 0x00)
// }
// let b := 1
// let a := 1
// for { } iszero(eq(a, 10)) { a := add(a, 1) }
// { let q := sload(g()) }
// }

8
test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_storage_loop.yul
View File

@ -11,6 +11,10 @@
// step: loopInvariantCodeMotion
//
// {
// let b := 1
// let a := 1
// for { } iszero(eq(a, 10)) { a := add(a, 1) }
// { let t := sload(f()) }
// function f() -> x
// { x := g() }
// function g() -> x_1
@ -18,8 +22,4 @@
// for { } 1 { }
// { }
// }
// let b := 1
// let a := 1
// for { } iszero(eq(a, 10)) { a := add(a, 1) }
// { let t := sload(f()) }
// }

4
test/libyul/yulOptimizerTests/loopInvariantCodeMotion/not_first.yul
View File

@ -11,11 +11,11 @@
// step: loopInvariantCodeMotion
//
// {
// function g() -> x
// { x := add(mload(x), 1) }
// let b := 1
// let a := 1
// let q := keccak256(g(), 32)
// for { } iszero(eq(a, 10)) { a := add(a, 1) }
// { sstore(0, a) }
// function g() -> x
// { x := add(mload(x), 1) }
// }

4
test/libyul/yulOptimizerTests/rematerialiser/non_movable_function.yul
View File

@ -9,10 +9,10 @@
// step: rematerialiser
//
// {
// function f(x) -> y
// { }
// let a := 1
// let b := f(1)
// let c := 1
// mstore(add(1, b), 1)
// function f(x) -> y
// { }
// }

4
test/libyul/yulOptimizerTests/ssaAndBack/ssaReverse.yul
View File

@ -24,6 +24,8 @@
// step: ssaAndBack
//
// {
// let a, b := abi_decode_t_bytes_calldata_ptr(mload(0), mload(1))
// mstore(a, b)
// function abi_decode_t_bytes_calldata_ptr(offset_12, end_13) -> arrayPos_14, length_15
// {
// if iszero(slt(add(offset_12, 0x1f), end_13))
@ -38,6 +40,4 @@
// arrayPos_14 := add(offset_12, 0x20)
// if gt(add(add(offset_12, length_15), 0x20), end_13) { revert(0, 0) }
// }
// let a, b := abi_decode_t_bytes_calldata_ptr(mload(0), mload(1))
// mstore(a, b)
// }

1
test/tools/CMakeLists.txt
View File

@ -37,6 +37,7 @@ add_executable(isoltest
../libyul/ObjectCompilerTest.cpp
../libyul/SyntaxTest.cpp
../libyul/YulOptimizerTest.cpp
../libyul/YulOptimizerTestCommon.cpp
../libyul/YulInterpreterTest.cpp
)
target_link_libraries(isoltest PRIVATE evmc libsolc solidity yulInterpreter evmasm Boost::boost Boost::program_options Boost::unit_test_framework)