Skip to content

[seqbench] single-pass sequence #14887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cameel wants to merge 3 commits into from
Closed

[seqbench] single-pass sequence #14887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd805da
Change the default optimizer sequence to one with only a single pass …
cameel Feb 26, 2024
c61d817
Update gas expectations
cameel Feb 26, 2024
062e016
Update other test expectations
cameel Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions libsolidity/interface/OptimiserSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,20 @@ struct OptimiserSettings
{
static char constexpr DefaultYulOptimiserSteps[] =
"dhfoDgvulfnTUtnIf" // None of these can make stack problems worse
"["
"xa[r]EscLM" // Turn into SSA and simplify
"cCTUtTOntnfDIul" // Perform structural simplification
"Lcul" // Simplify again
"Vcul [j]" // Reverse SSA

// should have good "compilability" property here.

"Tpeul" // Run functional expression inliner
"xa[rul]" // Prune a bit more in SSA
"xa[r]cL" // Turn into SSA again and simplify
"gvif" // Run full inliner
"CTUca[r]LSsTFOtfDnca[r]Iulc" // SSA plus simplify
"]"

"xa[r]EscLM" // Turn into SSA and simplify
"cCTUtTOntnfDIul" // Perform structural simplification
"Lcul" // Simplify again
"Vcul [j]" // Reverse SSA

// should have good "compilability" property here.

"Tpeul" // Run functional expression inliner
"xa[rul]" // Prune a bit more in SSA
"xa[r]cL" // Turn into SSA again and simplify
"gvif" // Run full inliner
"CTUca[r]LSsTFOtfDnca[r]Iulc" // SSA plus simplify

"jmul[jul] VcTOcul jmul"; // Make source short and pretty

static char constexpr DefaultYulOptimiserCleanupSteps[] = "fDnTOcmu";
Expand Down
85 changes: 55 additions & 30 deletions test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,8 +443,7 @@ object "D_27" {
/// @src 0:446:491 "new /// @src 0:149:156 \"new C()\"..."
let _3 := datasize("C_2")
let _4 := add(_1, _3)
let _5 := 0xffffffffffffffff
if or(gt(_4, _5), lt(_4, _1))
if or(gt(_4, 0xffffffffffffffff), lt(_4, _1))
{
/// @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..."
mstore(0, shl(224, 0x4e487b71))
Expand All @@ -460,45 +459,71 @@ object "D_27" {
returndatacopy(pos, 0, returndatasize())
revert(pos, returndatasize())
}
let memPtr := mload(_2)
let newFreePtr := add(memPtr, _2)
if or(gt(newFreePtr, /** @src 0:446:491 "new /// @src 0:149:156 \"new C()\"..." */ _5), /** @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..." */ lt(newFreePtr, memPtr))
{
mstore(0, shl(224, 0x4e487b71))
mstore(4, 0x41)
revert(0, 0x24)
}
mstore(_2, newFreePtr)
mstore(memPtr, 2)
let _6 := 32
mstore(add(memPtr, _6), "/*")
let memPtr_1 := mload(_2)
let newFreePtr_1 := add(memPtr_1, 96)
if or(gt(newFreePtr_1, /** @src 0:446:491 "new /// @src 0:149:156 \"new C()\"..." */ _5), /** @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..." */ lt(newFreePtr_1, memPtr_1))
{
mstore(0, shl(224, 0x4e487b71))
mstore(4, 0x41)
revert(0, 0x24)
}
mstore(_2, newFreePtr_1)
mstore(memPtr_1, 39)
mstore(add(memPtr_1, _6), 0x2f2a2a204073726320303a39363a313635202022636f6e74726163742044207b)
let memPtr := allocate_memory_array_string()
let _5 := 32
mstore(add(memPtr, _5), "/*")
let memPtr_1 := allocate_memory_array_string_710()
mstore(add(memPtr_1, _5), 0x2f2a2a204073726320303a39363a313635202022636f6e74726163742044207b)
mstore(add(memPtr_1, _2), shl(200, 0x2e2e2e22202a2f))
let memPos := mload(_2)
mstore(memPos, _6)
mstore(memPos, _5)
let length := mload(memPtr_1)
mstore(add(memPos, _6), length)
mstore(add(memPos, _5), length)
let i := 0
for { } lt(i, length) { i := add(i, _6) }
for { } lt(i, length) { i := add(i, _5) }
{
mstore(add(add(memPos, i), _2), mload(add(add(memPtr_1, i), _6)))
mstore(add(add(memPos, i), _2), mload(add(add(memPtr_1, i), _5)))
}
mstore(add(add(memPos, length), _2), 0)
return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), _2))
return(memPos, sub(add(add(memPos, and(add(length, 31), not(31))), _2), memPos))
}
}
revert(0, 0)
}
function allocate_memory_array_string() -> memPtr
{
let _1 := 0xffffffffffffffff
if gt(2, _1)
{
mstore(/** @src -1:-1:-1 */ 0, /** @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..." */ shl(224, 0x4e487b71))
mstore(4, 0x41)
revert(/** @src -1:-1:-1 */ 0, /** @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..." */ 0x24)
}
let _2 := not(31)
let memPtr_1 := mload(64)
let newFreePtr := add(memPtr_1, and(add(and(add(2, 31), _2), 63), _2))
if or(gt(newFreePtr, _1), lt(newFreePtr, memPtr_1))
{
mstore(/** @src -1:-1:-1 */ 0, /** @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..." */ shl(224, 0x4e487b71))
mstore(4, 0x41)
revert(/** @src -1:-1:-1 */ 0, /** @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..." */ 0x24)
}
mstore(64, newFreePtr)
memPtr := memPtr_1
mstore(memPtr_1, 2)
}
function allocate_memory_array_string_710() -> memPtr
{
let _1 := 0xffffffffffffffff
if gt(39, _1)
{
mstore(/** @src -1:-1:-1 */ 0, /** @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..." */ shl(224, 0x4e487b71))
mstore(4, 0x41)
revert(/** @src -1:-1:-1 */ 0, /** @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..." */ 0x24)
}
let _2 := not(31)
let memPtr_1 := mload(64)
let newFreePtr := add(memPtr_1, and(add(and(add(39, 31), _2), 63), _2))
if or(gt(newFreePtr, _1), lt(newFreePtr, memPtr_1))
{
mstore(/** @src -1:-1:-1 */ 0, /** @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..." */ shl(224, 0x4e487b71))
mstore(4, 0x41)
revert(/** @src -1:-1:-1 */ 0, /** @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..." */ 0x24)
}
mstore(64, newFreePtr)
memPtr := memPtr_1
mstore(memPtr_1, 39)
}
}
/// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
object "C_2" {
Expand Down
4 changes: 2 additions & 2 deletions test/cmdlineTests/mcopy_bytes_array_returned_from_function/output
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ object "C_14" {
code {
{
let _1 := memoryguard(0x80)
let _2 := 64
if iszero(lt(calldatasize(), 4))
{
if eq(0xc2985578, shr(224, calldataload(0)))
{
if callvalue() { revert(0, 0) }
if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
let _2 := 64
let newFreePtr := add(_1, _2)
if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _1))
{
Expand All @@ -40,7 +40,7 @@ object "C_14" {
mstore(add(memPos, 0x20), length)
mcopy(add(memPos, _2), _3, length)
mstore(add(add(memPos, length), _2), 0)
return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), _2))
return(memPos, sub(add(add(memPos, and(add(length, 31), not(31))), _2), memPos))
}
}
revert(0, 0)
Expand Down
4 changes: 2 additions & 2 deletions test/cmdlineTests/mcopy_string_literal_returned_from_function/output
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ object "C_10" {
code {
{
let _1 := memoryguard(0x80)
let _2 := 64
if iszero(lt(calldatasize(), 4))
{
if eq(0xc2985578, shr(224, calldataload(0)))
{
if callvalue() { revert(0, 0) }
if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
let _2 := 64
let newFreePtr := add(_1, _2)
if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _1))
{
Expand All @@ -40,7 +40,7 @@ object "C_10" {
mstore(add(memPos, 0x20), length)
mcopy(add(memPos, _2), _3, length)
mstore(add(add(memPos, length), _2), 0)
return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), _2))
return(memPos, sub(add(add(memPos, and(add(length, 31), not(31))), _2), memPos))
}
}
revert(0, 0)
Expand Down
Loading