Skip to content
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

Jump to bottom

[seqbench] the-good-parts-mk3 sequence #15030

Merged
merged 4 commits into from May 13, 2024
Merged

[seqbench] the-good-parts-mk3 sequence #15030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10afe0d
Make fullSuite medium test case less artificial
cameel May 11, 2024
54ab398
Change the default optimizer sequence to the `the-good-parts-mk3` can…
cameel Mar 6, 2024
c12fe8a
Update gas expectations
cameel Mar 8, 2024
e19abe4
Update other test expectations
cameel Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 17 additions & 15 deletions libsolidity/interface/OptimiserSettings.h
View file
Open in desktop
Expand Up @@ -43,23 +43,25 @@ 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
"Vcul [j]" // Reverse SSA

// should have good "compilability" property here.

"Trpeul" // Run functional expression inliner
"xa[r]cL" // Turn into SSA again and simplify
"gvifM" // Run full inliner
"CTUca[r]LSsTFOtfDnca[r]Iulc" // SSA plus simplify

"scCTUt"
"gvifM" // Run full inliner
"x[scCTUt] TOntnfDIul" // Perform structural simplification
"gvifM" // Run full inliner

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

static char constexpr DefaultYulOptimiserCleanupSteps[] = "fDnTOcmu";
static char constexpr DefaultYulOptimiserCleanupSteps[] = "fDnTOcmuO";

/// No optimisations at all - not recommended.
static OptimiserSettings none()
Expand Down
62 changes: 34 additions & 28 deletions test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
View file
Open in desktop
Expand Up @@ -428,65 +428,71 @@ object "D_27" {
{
/// @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..."
let _1 := memoryguard(0x80)
let _2 := 64
mstore(_2, _1)
mstore(64, _1)
if iszero(lt(calldatasize(), 4))
{
if eq(0x26121ff0, shr(224, calldataload(0)))
{
if callvalue() { revert(0, 0) }
if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
/// @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))
let _2 := datasize("C_2")
let _3 := add(_1, _2)
if or(gt(_3, 0xffffffffffffffff), lt(_3, _1))
{
/// @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..."
mstore(0, shl(224, 0x4e487b71))
mstore(4, 0x41)
revert(0, 0x24)
}
/// @src 0:446:491 "new /// @src 0:149:156 \"new C()\"..."
datacopy(_1, dataoffset("C_2"), _3)
if iszero(create(/** @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..." */ 0, /** @src 0:446:491 "new /// @src 0:149:156 \"new C()\"..." */ _1, sub(_4, _1)))
datacopy(_1, dataoffset("C_2"), _2)
if iszero(create(/** @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..." */ 0, /** @src 0:446:491 "new /// @src 0:149:156 \"new C()\"..." */ _1, sub(_3, _1)))
{
/// @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..."
let pos := mload(_2)
let pos := mload(64)
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))
let memPtr := 0
let size := 0
size := 0
let memPtr_1 := mload(64)
let newFreePtr := add(memPtr_1, 64)
if or(gt(newFreePtr, /** @src 0:446:491 "new /// @src 0:149:156 \"new C()\"..." */ 0xffffffffffffffff), /** @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..." */ lt(newFreePtr, memPtr_1))
{
mstore(0, shl(224, 0x4e487b71))
mstore(4, 0x41)
revert(0, 0x24)
}
mstore(_2, newFreePtr)
mstore(memPtr, 2)
mstore(add(memPtr, 32), "/*")
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(64, newFreePtr)
memPtr := memPtr_1
mstore(memPtr_1, 2)
mstore(add(memPtr_1, 32), "/*")
let memPtr_2 := 0
let size_1 := 0
size_1 := 0
let memPtr_3 := mload(64)
let newFreePtr_1 := add(memPtr_3, 96)
if or(gt(newFreePtr_1, /** @src 0:446:491 "new /// @src 0:149:156 \"new C()\"..." */ 0xffffffffffffffff), /** @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..." */ lt(newFreePtr_1, memPtr_3))
{
mstore(0, shl(224, 0x4e487b71))
mstore(4, 0x41)
revert(0, 0x24)
}
mstore(_2, newFreePtr_1)
mstore(memPtr_1, 39)
let _6 := add(memPtr_1, 32)
mstore(_6, 0x2f2a2a204073726320303a39363a313635202022636f6e74726163742044207b)
mstore(add(memPtr_1, _2), shl(200, 0x2e2e2e22202a2f))
let memPos := mload(_2)
mstore(64, newFreePtr_1)
memPtr_2 := memPtr_3
mstore(memPtr_3, 39)
let _4 := add(memPtr_3, 32)
mstore(_4, 0x2f2a2a204073726320303a39363a313635202022636f6e74726163742044207b)
mstore(add(memPtr_3, 64), shl(200, 0x2e2e2e22202a2f))
let memPos := mload(64)
mstore(memPos, 32)
let length := mload(memPtr_1)
let length := mload(memPtr_3)
mstore(add(memPos, 32), length)
mcopy(add(memPos, _2), _6, length)
mstore(add(add(memPos, length), _2), 0)
return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), _2))
mcopy(add(memPos, 64), _4, length)
mstore(add(add(memPos, length), 64), 0)
return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), 64))
}
}
revert(0, 0)
Expand Down
4 changes: 2 additions & 2 deletions test/cmdlineTests/function_debug_info/output
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@
"returnSlots": 2
},
"abi_decode_tuple_t_uint256": {
"entryPoint": 269,
"entryPoint": 271,
"parameterSlots": 2,
"returnSlots": 1
},
Expand All @@ -40,7 +40,7 @@
"returnSlots": 1
},
"panic_error_0x32": {
"entryPoint": 292,
"entryPoint": 294,
"parameterSlots": 0,
"returnSlots": 0
}
Expand Down
21 changes: 10 additions & 11 deletions test/cmdlineTests/mcopy_bytes_array_returned_from_function/output
View file
Open in desktop
Expand Up @@ -22,25 +22,24 @@ object "C_14" {
{
if callvalue() { revert(0, 0) }
if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
let _2 := 64
let newFreePtr := add(_1, _2)
let newFreePtr := add(_1, 64)
if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _1))
{
mstore(0, shl(224, 0x4e487b71))
mstore(4, 0x41)
revert(0, 36)
}
mstore(_2, newFreePtr)
mstore(64, newFreePtr)
mstore(_1, 5)
let _3 := add(_1, 0x20)
mstore(_3, "aaaaa")
let memPos := mload(_2)
mstore(memPos, 0x20)
let _2 := add(_1, 32)
mstore(_2, "aaaaa")
let memPos := mload(64)
mstore(memPos, 32)
let length := mload(_1)
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))
mstore(add(memPos, 32), length)
mcopy(add(memPos, 64), _2, length)
mstore(add(add(memPos, length), 64), 0)
return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), 64))
}
}
revert(0, 0)
Expand Down
21 changes: 10 additions & 11 deletions test/cmdlineTests/mcopy_string_literal_returned_from_function/output
View file
Open in desktop
Expand Up @@ -22,25 +22,24 @@ object "C_10" {
{
if callvalue() { revert(0, 0) }
if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
let _2 := 64
let newFreePtr := add(_1, _2)
let newFreePtr := add(_1, 64)
if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _1))
{
mstore(0, shl(224, 0x4e487b71))
mstore(4, 0x41)
revert(0, 0x24)
}
mstore(_2, newFreePtr)
mstore(64, newFreePtr)
mstore(_1, 25)
let _3 := add(_1, 0x20)
mstore(_3, "MCOPY on Cancun vacation.")
let memPos := mload(_2)
mstore(memPos, 0x20)
let _2 := add(_1, 32)
mstore(_2, "MCOPY on Cancun vacation.")
let memPos := mload(64)
mstore(memPos, 32)
let length := mload(_1)
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))
mstore(add(memPos, 32), length)
mcopy(add(memPos, 64), _2, length)
mstore(add(add(memPos, length), 64), 0)
return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), 64))
}
}
revert(0, 0)
Expand Down