CommandLineParser: Handle --optimize-runs option in assembly mode

Fixes ethereum#11708.
jaa2 · Jul 28, 2021 · 03ff141 · 03ff141
1 parent 1794e1c
commit 03ff141
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/docs/yul.rst b/docs/yul.rst
@@ -1177,11 +1177,13 @@ intermediate states. This allows for easy debugging and verification of the opti
 Please refer to the general :ref:`optimizer documentation <optimizer>`
 for more details about the different optimization stages and how to use the optimizer.
 
-If you want to use Solidity in stand-alone Yul mode, you activate the optimizer using ``--optimize``:
+If you want to use Solidity in stand-alone Yul mode, you activate the optimizer using ``--optimize``
+and optionally specify the :ref:`expected number of runs <optimizer-parameter-runs>` with
+``--optimize-runs``:
 
 .. code-block:: sh
 
-    solc --strict-assembly --optimize
+    solc --strict-assembly --optimize --optimize-runs 200
 
 In Solidity mode, the Yul optimizer is activated together with the regular optimizer.
 

diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
@@ -555,6 +555,7 @@ bool CommandLineInterface::processInput()
 			m_options.assembly.inputLanguage,
 			m_options.assembly.targetMachine,
 			m_options.optimizer.enabled,
+			m_options.optimizer.expectedExecutionsPerDeployment,
 			m_options.optimizer.yulSteps
 		);
 	}
@@ -941,6 +942,7 @@ bool CommandLineInterface::assemble(
 	yul::AssemblyStack::Language _language,
 	yul::AssemblyStack::Machine _targetMachine,
 	bool _optimize,
+	unsigned int _expectedExecutionsPerDeployment,
 	optional<string> _yulOptimiserSteps
 )
 {
@@ -951,6 +953,7 @@ bool CommandLineInterface::assemble(
 	for (auto const& src: m_fileReader.sourceCodes())
 	{
 		OptimiserSettings settings = _optimize ? OptimiserSettings::full() : OptimiserSettings::minimal();
+		settings.expectedExecutionsPerDeployment = _expectedExecutionsPerDeployment;
 		if (_yulOptimiserSteps.has_value())
 			settings.yulOptimiserSteps = _yulOptimiserSteps.value();
 

diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
@@ -78,6 +78,7 @@ class CommandLineInterface
 		yul::AssemblyStack::Language _language,
 		yul::AssemblyStack::Machine _targetMachine,
 		bool _optimize,
+		unsigned int _expectedExecutionsPerDeployment,
 		std::optional<std::string> _yulOptimiserSteps = std::nullopt
 	);
 

diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
@@ -966,6 +966,11 @@ General Information)").c_str(),
 		m_options.assembly.inputLanguage = m_args.count(g_strYul) ? Input::Yul : (m_args.count(g_strStrictAssembly) ? Input::StrictAssembly : Input::Assembly);
 		m_options.optimizer.enabled = (m_args.count(g_strOptimize) > 0);
 		m_options.optimizer.noOptimizeYul = (m_args.count(g_strNoOptimizeYul) > 0);
+
+		if (m_args.count(g_strOptimizeRuns))
+		{
+			m_options.optimizer.expectedExecutionsPerDeployment = m_args[g_strOptimizeRuns].as<unsigned>();
+		}
 
 		if (m_args.count(g_strYulOptimizations))
 		{

diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
@@ -294,7 +294,7 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 		if (expectedLanguage == AssemblyStack::Language::StrictAssembly || expectedLanguage == AssemblyStack::Language::Ewasm)
 			commandLine += vector<string>{
 				"--optimize",
-				"--optimize-runs=1000",    // Ignored in assembly mode
+				"--optimize-runs=1000",
 				"--yul-optimizations=agf",
 			};
 
@@ -332,6 +332,7 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 		{
 			expectedOptions.optimizer.enabled = true;
 			expectedOptions.optimizer.yulSteps = "agf";
+			expectedOptions.optimizer.expectedExecutionsPerDeployment = 1000;
 		}
 
 		stringstream sout, serr;