Don't ignore output selection in assembly mode

cameel · cameel · commit dd0f8371734b · 2021-10-11T20:35:56.000+02:00
diff --git a/Changelog.md b/Changelog.md
@@ -6,6 +6,7 @@ Language Features:
 
 Compiler Features:
  * Commandline Interface: Accept nested brackets in step sequences passed to ``--yul-optimizations``.
+ * Commandline Interface: Support ``--asm``, ``--bin``, ``--ir-optimized`` and ``--ewasm`` output selection options in assembler mode.
  * SMTChecker: Output values for ``block.*``, ``msg.*`` and ``tx.*`` variables that are present in the called functions.
  * Standard JSON: Accept nested brackets in step sequences passed to ``settings.optimizer.details.yulDetails.optimizerSteps``.
 
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
@@ -1007,34 +1007,54 @@ bool CommandLineInterface::assemble(yul::AssemblyStack::Language _language, yul:
 
 		yul::AssemblyStack& stack = assemblyStacks[src.first];
 
-		sout() << endl << "Pretty printed source:" << endl;
-		sout() << stack.print() << endl;
+		if (m_options.compiler.outputs.irOptimized)
+		{
+			// NOTE: This actually outputs unoptimized code when the optimizer is disabled but
+			// 'ir' output in StandardCompiler works the same way.
+			sout() << endl << "Pretty printed source:" << endl;
+			sout() << stack.print() << endl;
+		}
 
 		if (_language != yul::AssemblyStack::Language::Ewasm && _targetMachine == yul::AssemblyStack::Machine::Ewasm)
 		{
 			stack.translate(yul::AssemblyStack::Language::Ewasm);
 			stack.optimize();
 
-			sout() << endl << "==========================" << endl;
-			sout() << endl << "Translated source:" << endl;
-			sout() << stack.print() << endl;
+			// TODO: This isn't ewasm but it's only present when we're doing Yul->EWASM translation.
+			// It should get its own output flag in the future.
+			if (m_options.compiler.outputs.ewasm)
+			{
+				sout() << endl << "==========================" << endl;
+				sout() << endl << "Translated source:" << endl;
+				sout() << stack.print() << endl;
+			}
 		}
 
 		yul::MachineAssemblyObject object;
 		object = stack.assemble(_targetMachine);
 		object.bytecode->link(m_options.linker.libraries);
 
-		sout() << endl << "Binary representation:" << endl;
-		if (object.bytecode)
-			sout() << object.bytecode->toHex() << endl;
-		else
-			serr() << "No binary representation found." << endl;
+		if (m_options.compiler.outputs.binary)
+		{
+			sout() << endl << "Binary representation:" << endl;
+			if (object.bytecode)
+				sout() << object.bytecode->toHex() << endl;
+			else
+				serr() << "No binary representation found." << endl;
+		}
 
-		sout() << endl << "Text representation:" << endl;
-		if (!object.assembly.empty())
-			sout() << object.assembly << endl;
-		else
-			serr() << "No text representation found." << endl;
+		solAssert(_targetMachine == yul::AssemblyStack::Machine::Ewasm || _targetMachine == yul::AssemblyStack::Machine::EVM, "");
+		if (
+			(_targetMachine == yul::AssemblyStack::Machine::EVM && m_options.compiler.outputs.asm_) ||
+			(_targetMachine == yul::AssemblyStack::Machine::Ewasm && m_options.compiler.outputs.ewasm)
+		)
+		{
+			sout() << endl << "Text representation:" << endl;
+			if (!object.assembly.empty())
+				sout() << object.assembly << endl;
+			else
+				serr() << "No text representation found." << endl;
+		}
 	}
 
 	return true;
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
@@ -476,13 +476,20 @@ bool CommandLineParser::parseOutputSelection()
 			CompilerOutputs::componentMap() |
 			ranges::views::keys |
 			ranges::to<set>();
+		static set<string> const assemblerModeOutputs = {
+			CompilerOutputs::componentName(&CompilerOutputs::asm_),
+			CompilerOutputs::componentName(&CompilerOutputs::binary),
+			CompilerOutputs::componentName(&CompilerOutputs::irOptimized),
+			CompilerOutputs::componentName(&CompilerOutputs::ewasm),
+		};
 
 		switch (_mode)
 		{
 		case InputMode::Compiler:
 		case InputMode::CompilerWithASTImport:
 			return contains(compilerModeOutputs, _outputName);
 		case InputMode::Assembler:
+			return contains(assemblerModeOutputs,_outputName);
 		case InputMode::StandardJson:
 		case InputMode::Linker:
 			return false;
@@ -494,6 +501,16 @@ bool CommandLineParser::parseOutputSelection()
 	for (auto&& [optionName, outputComponent]: CompilerOutputs::componentMap())
 		m_options.compiler.outputs.*outputComponent = (m_args.count(optionName) > 0);
 
+	if (m_options.input.mode == InputMode::Assembler && m_options.compiler.outputs == CompilerOutputs{})
+	{
+		// In assembly mode keep the default outputs enabled for backwards-compatibility.
+		// TODO: Remove this (must be done in a breaking release).
+		m_options.compiler.outputs.asm_ = true;
+		m_options.compiler.outputs.binary = true;
+		m_options.compiler.outputs.irOptimized = true;
+		m_options.compiler.outputs.ewasm = true;
+	}
+
 	vector<string> unsupportedOutputs;
 	for (auto&& [optionName, outputComponent]: CompilerOutputs::componentMap())
 		if (m_options.compiler.outputs.*outputComponent && !outputSupported(m_options.input.mode, optionName))
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/args b/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/args
@@ -0,0 +1 @@
+--assemble --optimize --yul-dialect evm --machine ewasm --asm
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/err b/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/err
@@ -0,0 +1 @@
+Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/input.yul b/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/input.yul
@@ -0,0 +1,4 @@
+{
+    let x := 42
+    sstore(0, x)
+}
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/output b/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/output
@@ -0,0 +1,2 @@
+
+======= evm_to_wasm_output_selection_asm_only/input.yul (Ewasm) =======
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/args b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/args
@@ -0,0 +1 @@
+--assemble --optimize --yul-dialect evm --machine ewasm --ewasm
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/err b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/err
@@ -0,0 +1 @@
+Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/input.yul b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/input.yul
@@ -0,0 +1,4 @@
+{
+    let x := 42
+    sstore(0, x)
+}
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/output b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/output
@@ -0,0 +1,87 @@
+
+======= evm_to_wasm_output_selection_ewasm_only/input.yul (Ewasm) =======
+
+==========================
+
+Translated source:
+object "object" {
+    code {
+        function main()
+        {
+            let hi := i64.shl(i64.extend_i32_u(bswap32(i32.wrap_i64(0))), 32)
+            let y := i64.or(hi, i64.extend_i32_u(bswap32(i32.wrap_i64(i64.shr_u(0, 32)))))
+            i64.store(0:i32, y)
+            i64.store(i32.add(0:i32, 8:i32), y)
+            i64.store(i32.add(0:i32, 16:i32), y)
+            i64.store(i32.add(0:i32, 24:i32), y)
+            i64.store(32:i32, y)
+            i64.store(i32.add(32:i32, 8:i32), y)
+            i64.store(i32.add(32:i32, 16:i32), y)
+            let hi_1 := i64.shl(i64.extend_i32_u(bswap32(i32.wrap_i64(42))), 32)
+            i64.store(i32.add(32:i32, 24:i32), i64.or(hi_1, i64.extend_i32_u(bswap32(i32.wrap_i64(i64.shr_u(42, 32))))))
+            eth.storageStore(0:i32, 32:i32)
+        }
+        function bswap16(x:i32) -> y:i32
+        {
+            y := i32.or(i32.and(i32.shl(x, 8:i32), 0xff00:i32), i32.and(i32.shr_u(x, 8:i32), 0xff:i32))
+        }
+        function bswap32(x:i32) -> y:i32
+        {
+            let hi:i32 := i32.shl(bswap16(x), 16:i32)
+            y := i32.or(hi, bswap16(i32.shr_u(x, 16:i32)))
+        }
+    }
+}
+
+
+Text representation:
+(module
+    (import "ethereum" "storageStore" (func $eth.storageStore (param i32 i32)))
+    (memory $memory (export "memory") 1)
+    (export "main" (func $main))
+
+(func $main
+    (local $hi i64)
+    (local $y i64)
+    (local $hi_1 i64)
+    (block $label_
+        (local.set $hi (i64.shl (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.const 0)))) (i64.const 32)))
+        (local.set $y (i64.or (local.get $hi) (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.shr_u (i64.const 0) (i64.const 32)))))))
+        (i64.store (i32.const 0) (local.get $y))
+        (i64.store (i32.add (i32.const 0) (i32.const 8)) (local.get $y))
+        (i64.store (i32.add (i32.const 0) (i32.const 16)) (local.get $y))
+        (i64.store (i32.add (i32.const 0) (i32.const 24)) (local.get $y))
+        (i64.store (i32.const 32) (local.get $y))
+        (i64.store (i32.add (i32.const 32) (i32.const 8)) (local.get $y))
+        (i64.store (i32.add (i32.const 32) (i32.const 16)) (local.get $y))
+        (local.set $hi_1 (i64.shl (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.const 42)))) (i64.const 32)))
+        (i64.store (i32.add (i32.const 32) (i32.const 24)) (i64.or (local.get $hi_1) (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.shr_u (i64.const 42) (i64.const 32)))))))
+        (call $eth.storageStore (i32.const 0) (i32.const 32))
+    )
+)
+
+(func $bswap16
+    (param $x i32)
+    (result i32)
+    (local $y i32)
+    (block $label__1
+        (local.set $y (i32.or (i32.and (i32.shl (local.get $x) (i32.const 8)) (i32.const 65280)) (i32.and (i32.shr_u (local.get $x) (i32.const 8)) (i32.const 255))))
+
+    )
+    (local.get $y)
+)
+
+(func $bswap32
+    (param $x i32)
+    (result i32)
+    (local $y i32)
+    (local $hi i32)
+    (block $label__2
+        (local.set $hi (i32.shl (call $bswap16 (local.get $x)) (i32.const 16)))
+        (local.set $y (i32.or (local.get $hi) (call $bswap16 (i32.shr_u (local.get $x) (i32.const 16)))))
+
+    )
+    (local.get $y)
+)
+
+)
diff --git a/test/cmdlineTests/strict_asm_output_selection_asm_only/args b/test/cmdlineTests/strict_asm_output_selection_asm_only/args
@@ -0,0 +1 @@
+--strict-assembly --optimize --asm
diff --git a/test/cmdlineTests/strict_asm_output_selection_asm_only/err b/test/cmdlineTests/strict_asm_output_selection_asm_only/err
@@ -0,0 +1 @@
+Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/strict_asm_output_selection_asm_only/input.yul b/test/cmdlineTests/strict_asm_output_selection_asm_only/input.yul
@@ -0,0 +1,4 @@
+{
+    let x := 42
+    sstore(0, x)
+}
diff --git a/test/cmdlineTests/strict_asm_output_selection_asm_only/output b/test/cmdlineTests/strict_asm_output_selection_asm_only/output
@@ -0,0 +1,10 @@
+
+======= strict_asm_output_selection_asm_only/input.yul (EVM) =======
+
+Text representation:
+    /* "strict_asm_output_selection_asm_only/input.yul":15:17   */
+  0x2a
+    /* "strict_asm_output_selection_asm_only/input.yul":29:30   */
+  0x00
+    /* "strict_asm_output_selection_asm_only/input.yul":22:34   */
+  sstore
diff --git a/test/cmdlineTests/strict_asm_output_selection_bin_only/args b/test/cmdlineTests/strict_asm_output_selection_bin_only/args
@@ -0,0 +1 @@
+--strict-assembly --optimize --bin
diff --git a/test/cmdlineTests/strict_asm_output_selection_bin_only/err b/test/cmdlineTests/strict_asm_output_selection_bin_only/err
@@ -0,0 +1 @@
+Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/strict_asm_output_selection_bin_only/input.yul b/test/cmdlineTests/strict_asm_output_selection_bin_only/input.yul
@@ -0,0 +1,4 @@
+{
+    let x := 42
+    sstore(0, x)
+}
diff --git a/test/cmdlineTests/strict_asm_output_selection_bin_only/output b/test/cmdlineTests/strict_asm_output_selection_bin_only/output
@@ -0,0 +1,5 @@
+
+======= strict_asm_output_selection_bin_only/input.yul (EVM) =======
+
+Binary representation:
+602a600055
diff --git a/test/cmdlineTests/strict_asm_output_selection_ewasm_only/args b/test/cmdlineTests/strict_asm_output_selection_ewasm_only/args
@@ -0,0 +1 @@
+--strict-assembly --optimize --ewasm
diff --git a/test/cmdlineTests/strict_asm_output_selection_ewasm_only/err b/test/cmdlineTests/strict_asm_output_selection_ewasm_only/err
@@ -0,0 +1 @@
+Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/strict_asm_output_selection_ewasm_only/input.yul b/test/cmdlineTests/strict_asm_output_selection_ewasm_only/input.yul
@@ -0,0 +1,4 @@
+{
+    let x := 42
+    sstore(0, x)
+}
diff --git a/test/cmdlineTests/strict_asm_output_selection_ewasm_only/output b/test/cmdlineTests/strict_asm_output_selection_ewasm_only/output
@@ -0,0 +1,2 @@
+
+======= strict_asm_output_selection_ewasm_only/input.yul (EVM) =======
diff --git a/test/cmdlineTests/strict_asm_output_selection_invalid/err b/test/cmdlineTests/strict_asm_output_selection_invalid/err
@@ -1 +1 @@
-The following outputs are not supported in assembler mode: --abi, --asm, --asm-json, --bin, --bin-runtime, --devdoc, --ewasm, --hashes, --ir, --ir-optimized, --metadata, --opcodes, --storage-layout, --userdoc.
+The following outputs are not supported in assembler mode: --abi, --asm-json, --bin-runtime, --devdoc, --hashes, --ir, --metadata, --opcodes, --storage-layout, --userdoc.
diff --git a/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/args b/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/args
@@ -0,0 +1 @@
+--strict-assembly --optimize --ir-optimized
diff --git a/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/err b/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/err
@@ -0,0 +1 @@
+Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/input.yul b/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/input.yul
@@ -0,0 +1,4 @@
+{
+    let x := 42
+    sstore(0, x)
+}
diff --git a/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/output b/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/output
@@ -0,0 +1,7 @@
+
+======= strict_asm_output_selection_ir_optimized_only/input.yul (EVM) =======
+
+Pretty printed source:
+object "object" {
+    code { { sstore(0, 42) } }
+}
diff --git a/test/cmdlineTests/yul_optimize_runs/output b/test/cmdlineTests/yul_optimize_runs/output
@@ -49,4 +49,3 @@ sub_0: assembly {
         /* "yul_optimize_runs/input.yul":270:288   */
       mstore
 }
-
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
@@ -289,6 +289,10 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 				"underflow,"
 				"divByZero",
 			"--model-checker-timeout=5",   // Ignored in assembly mode
+			"--asm",
+			"--bin",
+			"--ir-optimized",
+			"--ewasm",
 		};
 		commandLine += assemblyOptions;
 		if (expectedLanguage == AssemblyStack::Language::StrictAssembly || expectedLanguage == AssemblyStack::Language::Ewasm)
@@ -324,6 +328,10 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 		};
 		expectedOptions.formatting.coloredOutput = false;
 		expectedOptions.formatting.withErrorIds = true;
+		expectedOptions.compiler.outputs.asm_ = true;
+		expectedOptions.compiler.outputs.binary = true;
+		expectedOptions.compiler.outputs.irOptimized = true;
+		expectedOptions.compiler.outputs.ewasm = true;
 		if (expectedLanguage == AssemblyStack::Language::StrictAssembly || expectedLanguage == AssemblyStack::Language::Ewasm)
 		{
 			expectedOptions.optimizer.enabled = true;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+--assemble --optimize --yul-dialect evm --machine ewasm --asm`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Warning: Yul is still experimental. Please use the output with care.`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +    let x := 42
 +    sstore(0, x)
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+`
	`2`	`+======= evm_to_wasm_output_selection_asm_only/input.yul (Ewasm) =======`