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

New CLI output in assembly mode: --ewasm-ir

Browse Source
This commit is contained in:
Kamil Śliwak
2021-11-04 18:23:11 +01:00
parent affeff18f5
commit 1a19d9a5cf
20 changed files with 73 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/args
+1
View File
@@ -0,0 +1 @@
--assemble --optimize --yul-dialect evm --machine ewasm --ewasm-ir
test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/err
+1
View File
@@ -0,0 +1 @@
Warning: Yul is still experimental. Please use the output with care.
test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/input.yul
+4
View File
@@ -0,0 +1,4 @@
{
let x := 42
sstore(0, x)
}
test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/output
+34
View File
@@ -0,0 +1,34 @@
======= evm_to_wasm_output_selection_ewasm_ir_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)))
}
}
}
test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/output
-33
View File
@@ -1,39 +1,6 @@
======= 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)))
test/cmdlineTests/output_selection_ewasm_ir_only/args
+1
View File
@@ -0,0 +1 @@
--optimize --ewasm-ir
test/cmdlineTests/output_selection_ewasm_ir_only/err
+1
View File
@@ -0,0 +1 @@
The following outputs are not supported in compiler mode: --ewasm-ir.
test/cmdlineTests/output_selection_ewasm_ir_only/exit
+1
View File
@@ -0,0 +1 @@
1
test/cmdlineTests/output_selection_ewasm_ir_only/input.sol
+4
View File
@@ -0,0 +1,4 @@
// SPDX-License-Identifier: GPL-2.0
pragma solidity *;
contract C {}
test/cmdlineTests/standard_cli_output_selection_invalid/args
+1 -1
View File
@@ -1 +1 @@
--ast-compact-json --asm --asm-json --opcodes --bin --bin-runtime --abi --ir --ir-optimized --ewasm --hashes --userdoc --devdoc --metadata --storage-layout
--ast-compact-json --asm --asm-json --opcodes --bin --bin-runtime --abi --ir --ir-optimized --ewasm --ewasm-ir --hashes --userdoc --devdoc --metadata --storage-layout
test/cmdlineTests/standard_cli_output_selection_invalid/err
+1 -1
View File
@@ -1 +1 @@
The following outputs are not supported in standard JSON mode: --abi, --asm, --asm-json, --ast-compact-json, --bin, --bin-runtime, --devdoc, --ewasm, --hashes, --ir, --ir-optimized, --metadata, --opcodes, --storage-layout, --userdoc.
The following outputs are not supported in standard JSON mode: --abi, --asm, --asm-json, --ast-compact-json, --bin, --bin-runtime, --devdoc, --ewasm, --ewasm-ir, --hashes, --ir, --ir-optimized, --metadata, --opcodes, --storage-layout, --userdoc.
test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/args
+1
View File
@@ -0,0 +1 @@
--strict-assembly --optimize --ewasm-ir
test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/err
+1
View File
@@ -0,0 +1 @@
Warning: Yul is still experimental. Please use the output with care.
test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/input.yul
+4
View File
@@ -0,0 +1,4 @@
{
let x := 42
sstore(0, x)
}
test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/output
+2
View File
@@ -0,0 +1,2 @@
======= strict_asm_output_selection_ewasm_ir_only/input.yul (EVM) =======
test/solc/CommandLineParser.cpp
+4
View File
@@ -198,7 +198,9 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
true, true, true, true, true,
true, true, true, true, true,
true, true, true, true, true,
true,
};
expectedOptions.compiler.outputs.ewasmIR = false;
expectedOptions.compiler.estimateGas = true;
expectedOptions.compiler.combinedJsonRequests = {
true, true, true, true, true,
@@ -301,6 +303,7 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
"--bin",
"--ir-optimized",
"--ewasm",
"--ewasm-ir",
};
commandLine += assemblyOptions;
if (expectedLanguage == AssemblyStack::Language::StrictAssembly || expectedLanguage == AssemblyStack::Language::Ewasm)
@@ -341,6 +344,7 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
expectedOptions.compiler.outputs.binary = true;
expectedOptions.compiler.outputs.irOptimized = true;
expectedOptions.compiler.outputs.ewasm = true;
expectedOptions.compiler.outputs.ewasmIR = true;
if (expectedLanguage == AssemblyStack::Language::StrictAssembly || expectedLanguage == AssemblyStack::Language::Ewasm)
{
expectedOptions.optimizer.enabled = true;