cerc-io/solidity
11
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

Add optimizer setting for fuzzing.

Browse Source
This commit is contained in:
Daniel Kirchner
2021-08-18 10:02:32 +02:00
parent e3bbc3f18b
commit 4c9fcda641
14 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libyul/AssemblyStack.cpp
+4 -3
View File
@@ -168,7 +168,7 @@ bool AssemblyStack::analyzeParsed(Object& _object)
return success;
}
void AssemblyStack::compileEVM(AbstractAssembly& _assembly, bool _optimize) const
void AssemblyStack::compileEVM(AbstractAssembly& _assembly, bool _optimize, bool _forceOldPipeline) const
{
EVMDialect const* dialect = nullptr;
switch (m_language)
@@ -185,7 +185,7 @@ void AssemblyStack::compileEVM(AbstractAssembly& _assembly, bool _optimize) cons
break;
}
EVMObjectCompiler::compile(*m_parserResult, _assembly, *dialect, _optimize);
EVMObjectCompiler::compile(*m_parserResult, _assembly, *dialect, _optimize, _forceOldPipeline);
}
void AssemblyStack::optimize(Object& _object, bool _isCreation)
@@ -205,6 +205,7 @@ void AssemblyStack::optimize(Object& _object, bool _isCreation)
meter.get(),
_object,
m_optimiserSettings.optimizeStackAllocation,
m_optimiserSettings.forceOldPipeline,
m_optimiserSettings.yulOptimiserSteps,
_isCreation ? nullopt : make_optional(m_optimiserSettings.expectedExecutionsPerDeployment),
{}
@@ -283,7 +284,7 @@ AssemblyStack::assembleEVMWithDeployed(optional<string_view> _deployName) const
evmasm::Assembly assembly;
EthAssemblyAdapter adapter(assembly);
compileEVM(adapter, m_optimiserSettings.optimizeStackAllocation);
compileEVM(adapter, m_optimiserSettings.optimizeStackAllocation, m_optimiserSettings.forceOldPipeline);
assembly.optimise(translateOptimiserSettings(m_optimiserSettings, m_evmVersion));
libyul/AssemblyStack.h
+1 -1
View File
@@ -125,7 +125,7 @@ private:
bool analyzeParsed();
bool analyzeParsed(yul::Object& _object);
public:
void compileEVM(yul::AbstractAssembly& _assembly, bool _optimize) const;
void compileEVM(yul::AbstractAssembly& _assembly, bool _optimize, bool _forceOldPipeline) const;
private:
void optimize(yul::Object& _object, bool _isCreation);
libyul/backends/evm/AsmCodeGen.cpp
+2 -1
View File
@@ -38,6 +38,7 @@ void CodeGenerator::assemble(
AsmAnalysisInfo& _analysisInfo,
evmasm::Assembly& _assembly,
langutil::EVMVersion _evmVersion,
bool _forceOldPipeline,
ExternalIdentifierAccess::CodeGenerator _identifierAccessCodeGen,
bool _system,
bool _optimizeStackAllocation
@@ -45,7 +46,7 @@ void CodeGenerator::assemble(
{
EthAssemblyAdapter assemblyAdapter(_assembly);
BuiltinContext builtinContext;
if (_system && _optimizeStackAllocation && _evmVersion > EVMVersion::homestead())
if (!_forceOldPipeline && _system && _optimizeStackAllocation && _evmVersion > EVMVersion::homestead())
{
int oldStackHeight = assemblyAdapter.stackHeight();
assemblyAdapter.setStackHeight(0);
libyul/backends/evm/AsmCodeGen.h
+1
View File
@@ -44,6 +44,7 @@ public:
AsmAnalysisInfo& _analysisInfo,
evmasm::Assembly& _assembly,
langutil::EVMVersion _evmVersion,
bool _forceOldPipeline,
ExternalIdentifierAccess::CodeGenerator _identifierAccess = {},
bool _system = false,
bool _optimizeStackAllocation = false
libyul/backends/evm/EVMObjectCompiler.cpp
+5 -5
View File
@@ -31,13 +31,13 @@
using namespace solidity::yul;
using namespace std;
void EVMObjectCompiler::compile(Object& _object, AbstractAssembly& _assembly, EVMDialect const& _dialect, bool _optimize)
void EVMObjectCompiler::compile(Object& _object, AbstractAssembly& _assembly, EVMDialect const& _dialect, bool _optimize, bool _forceOldPipeline)
{
EVMObjectCompiler compiler(_assembly, _dialect);
compiler.run(_object, _optimize);
compiler.run(_object, _optimize, _forceOldPipeline);
}
void EVMObjectCompiler::run(Object& _object, bool _optimize)
void EVMObjectCompiler::run(Object& _object, bool _optimize, bool _forceOldPipeline)
{
BuiltinContext context;
context.currentObject = &_object;
@@ -49,7 +49,7 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize)
auto subAssemblyAndID = m_assembly.createSubAssembly(subObject->name.str());
context.subIDs[subObject->name] = subAssemblyAndID.second;
subObject->subId = subAssemblyAndID.second;
compile(*subObject, *subAssemblyAndID.first, m_dialect, _optimize);
compile(*subObject, *subAssemblyAndID.first, m_dialect, _optimize, _forceOldPipeline);
}
else
{
@@ -63,7 +63,7 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize)
yulAssert(_object.analysisInfo, "No analysis info.");
yulAssert(_object.code, "No code.");
if (_optimize && m_dialect.evmVersion() > langutil::EVMVersion::homestead())
if (!_forceOldPipeline && (_optimize && m_dialect.evmVersion() > langutil::EVMVersion::homestead()))
{
auto stackErrors = OptimizedEVMCodeTransform::run(m_assembly, *_object.analysisInfo, *_object.code, m_dialect, context);
libyul/backends/evm/EVMObjectCompiler.h
+2 -2
View File
@@ -30,13 +30,13 @@ struct EVMDialect;
class EVMObjectCompiler
{
public:
static void compile(Object& _object, AbstractAssembly& _assembly, EVMDialect const& _dialect, bool _optimize);
static void compile(Object& _object, AbstractAssembly& _assembly, EVMDialect const& _dialect, bool _optimize, bool _forceOldPipeline);
private:
EVMObjectCompiler(AbstractAssembly& _assembly, EVMDialect const& _dialect):
m_assembly(_assembly), m_dialect(_dialect)
{}
void run(Object& _object, bool _optimize);
void run(Object& _object, bool _optimize, bool _forceOldPipeline);
AbstractAssembly& m_assembly;
EVMDialect const& m_dialect;
libyul/optimiser/Suite.cpp
+2
View File
@@ -87,6 +87,7 @@ void OptimiserSuite::run(
GasMeter const* _meter,
Object& _object,
bool _optimizeStackAllocation,
bool _forceOldPipeline,
string const& _optimisationSequence,
optional<size_t> _expectedExecutionsPerDeployment,
set<YulString> const& _externallyUsedIdentifiers,
@@ -95,6 +96,7 @@ void OptimiserSuite::run(
{
EVMDialect const* evmDialect = dynamic_cast<EVMDialect const*>(&_dialect);
bool usesOptimizedCodeGenerator =
!_forceOldPipeline &&
_optimizeStackAllocation &&
evmDialect &&
evmDialect->evmVersion() > langutil::EVMVersion::homestead();
libyul/optimiser/Suite.h
+1
View File
@@ -64,6 +64,7 @@ public:
GasMeter const* _meter,
Object& _object,
bool _optimizeStackAllocation,
bool _forceOldPipeline,
std::string const& _optimisationSequence,
std::optional<size_t> _expectedExecutionsPerDeployment,
std::set<YulString> const& _externallyUsedIdentifiers = {},