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

Apply the optimize commandline parameter to assembly mode.

Browse Source
This commit is contained in:
chriseth 2018-11-03 16:05:08 +01:00
parent cc00d8172b
commit 6c44c5f0c9
5 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -7,6 +7,7 @@ Language Features:
Compiler Features:
* Build System: LLL is not built anymore by default. Must configure it with CMake as `-DLLL=ON`.
* Code generator: Do not perform redundant double cleanup on unsigned integers when loading from calldata.
* Commandline interface: Experimental ``--optimize`` option for assembly mode.
* SMTChecker: SMTLib2 queries and responses passed via standard JSON compiler interface.
* SMTChecker: Support ``msg``, ``tx`` and ``block`` member variables.
* SMTChecker: Support ``gasleft()`` and ``blockhash()`` functions.

9
libsolidity/interface/AssemblyStack.cpp
View File

@ -34,6 +34,8 @@
#include <libevmasm/Assembly.h>
#include <libyul/optimiser/Suite.h>
using namespace std;
using namespace dev;
using namespace langutil;
@ -79,6 +81,13 @@ bool AssemblyStack::parseAndAnalyze(std::string const& _sourceName, std::string
return analyzeParsed();
}
void AssemblyStack::optimize()
{
solAssert(m_language != Language::Assembly, "Optimization requested for loose assembly.");
yul::OptimiserSuite::run(*m_parserResult->code, *m_parserResult->analysisInfo);
solAssert(analyzeParsed(), "Invalid source code after optimization.");
}
bool AssemblyStack::analyzeParsed()
{
solAssert(m_parserResult, "");

3
libsolidity/interface/AssemblyStack.h
View File

@ -69,6 +69,9 @@ public:
/// Multiple calls overwrite the previous state.
bool parseAndAnalyze(std::string const& _sourceName, std::string const& _source);
/// Run the optimizer suite. Can only be used with Yul or strict assembly.
void optimize();
/// Run the assembly step (should only be called after parseAndAnalyze).
MachineAssemblyObject assemble(Machine _machine) const;

25
solc/CommandLineInterface.cpp
View File

@ -626,15 +626,15 @@ Allowed options)",
)
(
g_argAssemble.c_str(),
"Switch to assembly mode, ignoring all options except --machine and assumes input is assembly."
"Switch to assembly mode, ignoring all options except --machine and --optimize and assumes input is assembly."
)
(
g_argYul.c_str(),
"Switch to Yul mode, ignoring all options except --machine and assumes input is Yul."
"Switch to Yul mode, ignoring all options except --machine and --optimize and assumes input is Yul."
)
(
g_argStrictAssembly.c_str(),
"Switch to strict assembly mode, ignoring all options except --machine and assumes input is strict assembly."
"Switch to strict assembly mode, ignoring all options except --machine and --optimize and assumes input is strict assembly."
)
(
g_argMachine.c_str(),
@ -820,6 +820,7 @@ bool CommandLineInterface::processInput()
using Machine = AssemblyStack::Machine;
Input inputLanguage = m_args.count(g_argYul) ? Input::Yul : (m_args.count(g_argStrictAssembly) ? Input::StrictAssembly : Input::Assembly);
Machine targetMachine = Machine::EVM;
bool optimize = m_args.count(g_argOptimize);
if (m_args.count(g_argMachine))
{
string machine = m_args[g_argMachine].as<string>();
@ -835,7 +836,18 @@ bool CommandLineInterface::processInput()
return false;
}
}
return assemble(inputLanguage, targetMachine);
if (optimize && inputLanguage == Input::Assembly)
{
serr() <<
"Optimizer cannot be used for loose assembly. Use --" <<
g_strStrictAssembly <<
" or --" <<
g_strYul <<
"." <<
endl;
return false;
}
return assemble(inputLanguage, targetMachine, optimize);
}
if (m_args.count(g_argLink))
{
@ -1179,7 +1191,8 @@ string CommandLineInterface::objectWithLinkRefsHex(eth::LinkerObject const& _obj
bool CommandLineInterface::assemble(
AssemblyStack::Language _language,
AssemblyStack::Machine _targetMachine
AssemblyStack::Machine _targetMachine,
bool _optimize
)
{
bool successful = true;
@ -1191,6 +1204,8 @@ bool CommandLineInterface::assemble(
{
if (!stack.parseAndAnalyze(src.first, src.second))
successful = false;
else if (_optimize)
stack.optimize();
}
catch (Exception const& _exception)
{

2
solc/CommandLineInterface.h
View File

@ -59,7 +59,7 @@ private:
/// @returns the full object with library placeholder hints in hex.
static std::string objectWithLinkRefsHex(eth::LinkerObject const& _obj);
bool assemble(AssemblyStack::Language _language, AssemblyStack::Machine _targetMachine);
bool assemble(AssemblyStack::Language _language, AssemblyStack::Machine _targetMachine, bool _optimize);
void outputCompilationResults();