diff --git a/libyul/backends/evm/ssa/StackShuffler.h b/libyul/backends/evm/ssa/StackShuffler.h index 70c381a899dc..9d9d8b0ab451 100644 --- a/libyul/backends/evm/ssa/StackShuffler.h +++ b/libyul/backends/evm/ssa/StackShuffler.h @@ -41,6 +41,11 @@ struct Target { Target(StackData const& _args, LivenessAnalysis::LivenessData const& _liveOut, std::size_t _targetSize); + auto argsRange() const + { + return ranges::views::iota(tailSize, size) | ranges::views::transform([](auto _i) { return StackOffset{_i}; }); + } + StackData const& args; LivenessAnalysis::LivenessData const& liveOut; std::size_t const size; @@ -258,7 +263,6 @@ class StackShuffler // if there are no args, we should be done now if (_state.target().args.empty()) return {StackShufflerResult::Status::Admissible}; - yulAssert(_stack.size() == _state.target().size); // check whether we are done if (_state.admissible()) @@ -505,53 +509,126 @@ class StackShuffler if (auto result = dupDeepSlotIfRequired(_stack, _state); result.status != ShuffleHelperResult::Status::NoAction) return result; + // depth of an args-region offset `_o` after the next grow, clamped from below to zero + auto const depthFromNewTop = [&](StackOffset _o) -> std::size_t + { + if (_o.value >= _stack.size()) + return 0u; + return _stack.offsetToDepth(_o).value + 1; + }; + // duping up `_arg` only makes progress if some target args-region offset wanting `_arg` is still + // unfilled and reachable from the new top + auto const canReachSomeUnfilledTarget = [&](Slot const& _arg) + { + for (auto offset: _state.target().argsRange()) + { + if (_state.targetArg(offset) != _arg) + continue; + if (_state.isArgsCompatible(offset, offset)) + continue; + if (depthFromNewTop(offset) <= ReachableStackDepth) + return true; + } + return false; + }; + // after the grow, every misaligned args-region offset below the new top must still + // be swap-reachable, otherwise we'd strand it + bool const prefixReachable = [&] + { + for (StackOffset p: _state.stackArgsRange()) + if (!_state.isArgsCompatible(p, p) && depthFromNewTop(p) > ReachableStackDepth) + return false; + return true; + }(); + + // stricter gate for the fast path: every misaligned prefix offset must remain swap-reachable + // after the grow AND after one more placement op (so the prefix can still be fixed later) + bool const pushKeepsDeepPrefixReachable = [&] { + for (StackOffset p: _state.stackArgsRange()) + if (!_state.isArgsCompatible(p, p) && depthFromNewTop(p) + 1 > ReachableStackDepth) + return false; + return true; + }(); + + // fast path: if the arg the target wants at the new top is under-supplied, place it directly there. + // Skip when growing would push a misaligned prefix offset out of swap range for subsequent fixups; + // otherwise we'd push and then immediately shrink back, oscillating + if (pushKeepsDeepPrefixReachable) + { + // the slot we're about to create lives at the current stack size (i.e. the post-grow top) StackOffset const targetOffset{_stack.size()}; - if (_state.count(_state.targetArg(targetOffset)) < _state.targetMinCount(_state.targetArg(targetOffset))) + Slot const& targetArg = _state.targetArg(targetOffset); + if ( + !targetArg.isJunk() && + ( + _state.count(targetArg) < _state.targetMinCount(targetArg) || + _state.countInArgs(targetArg) < _state.targetArgsCount(targetArg) + ) + ) { - auto const sourceDepth = _stack.findSlotDepth(_state.targetArg(targetOffset)); - if (!sourceDepth) + // prefer duping an existing copy over generating a fresh one + if (auto sourceDepth = _stack.findSlotDepth(targetArg)) { - _stack.push(_state.targetArg(targetOffset)); + if (_stack.dupReachable(*sourceDepth)) + { + _stack.dup(*sourceDepth); + return {ShuffleHelperResult::Status::StackModified}; + } + // existing copy is out of dup range; if we also can't regenerate it, bail + if (!_stack.canBeFreelyGenerated(targetArg)) + return {ShuffleHelperResult::Status::StackTooDeep, targetArg}; + } + // no reachable copy (or none at all), push a fresh instance if the slot allows it + if (_stack.canBeFreelyGenerated(targetArg)) + { + _stack.push(targetArg); return {ShuffleHelperResult::Status::StackModified}; } - - if (!_stack.dupReachable(*sourceDepth)) - return {ShuffleHelperResult::Status::StackTooDeep, _state.targetArg(targetOffset)}; - _stack.dup(*sourceDepth); - return {ShuffleHelperResult::Status::StackModified}; } } // if we can't directly produce targetOffset, take the deepest arg that we don't have enough of and dup/push that // First, prioritize duping args that are on the stack over pushing freely-generatable ones - for (StackOffset offset{_state.target().tailSize}; offset < _state.target().size; ++offset.value) + for (StackOffset const offset: _state.target().argsRange()) { Slot const& arg = _state.targetArg(offset); - if (!arg.isJunk() && (_state.count(arg) < _state.targetMinCount(arg) || _state.countInArgs(arg) < _state.targetArgsCount(arg))) + if (arg.isJunk()) + continue; + if (_state.count(arg) >= _state.targetMinCount(arg) && _state.countInArgs(arg) >= _state.targetArgsCount(arg)) + continue; + // If none of this arg's unfilled targets are reachable from the new top, growing for it + // won't help — skip and let another arg or a later step (e.g. the tail loop) handle it. + if (!canReachSomeUnfilledTarget(arg)) + continue; + if (auto sourceDepth = _stack.findSlotDepth(arg)) { - if (auto sourceDepth = _stack.findSlotDepth(arg)) + if (_stack.dupReachable(*sourceDepth)) { - if (_stack.dupReachable(*sourceDepth)) - { - _stack.dup(*sourceDepth); - return {ShuffleHelperResult::Status::StackModified}; - } - if (!_stack.canBeFreelyGenerated(arg)) - return {ShuffleHelperResult::Status::StackTooDeep, arg}; + _stack.dup(*sourceDepth); + return {ShuffleHelperResult::Status::StackModified}; } - yulAssert(_stack.canBeFreelyGenerated(arg)); - _stack.push(arg); - return {ShuffleHelperResult::Status::StackModified}; + if (!_stack.canBeFreelyGenerated(arg)) + return {ShuffleHelperResult::Status::StackTooDeep, arg}; } + if (!prefixReachable) + continue; + yulAssert(_stack.canBeFreelyGenerated(arg)); + _stack.push(arg); + return {ShuffleHelperResult::Status::StackModified}; } // Try to dup the optimal slot based on liveness analysis if (auto slotToDup = selectOptimalSlotToDup(_stack, _state)) + { _stack.dup(*slotToDup); - else - // If no suitable slot found, push junk - _stack.push(Slot::makeJunk()); + return {ShuffleHelperResult::Status::StackModified}; + } + // Growing would strand a misaligned prefix slot + if (!prefixReachable) + return {ShuffleHelperResult::Status::NoAction}; + // If no suitable slot found, push junk + _stack.push(Slot::makeJunk()); return {ShuffleHelperResult::Status::StackModified}; } @@ -792,7 +869,7 @@ class StackShuffler static std::optional allNecessarySlotsReachableOrFinal(Stack const& _stack, detail::State const& _state) { // check that args are either in position or reachable - for (StackOffset offset{_state.target().tailSize}; offset < _state.target().size; ++offset.value) + for (StackOffset const offset: _state.target().argsRange()) { if (_state.isArgsCompatible(offset, offset)) continue; diff --git a/test/libsolidity/semanticTests/externalContracts/base64.sol b/test/libsolidity/semanticTests/externalContracts/base64.sol index 93799e936df4..39292cb8071a 100644 --- a/test/libsolidity/semanticTests/externalContracts/base64.sol +++ b/test/libsolidity/semanticTests/externalContracts/base64.sol @@ -41,8 +41,8 @@ contract test { // gas legacy code: 629800 // gas legacyOptimized: 87926 // gas legacyOptimized code: 429800 -// gas ssaCFGOptimized: 79931 -// gas ssaCFGOptimized code: 332600 +// gas ssaCFGOptimized: 79883 +// gas ssaCFGOptimized code: 332000 // encode_inline_asm(bytes): 0x20, 0 -> 0x20, 0 // encode_inline_asm(bytes): 0x20, 1, "f" -> 0x20, 4, "Zg==" // encode_inline_asm(bytes): 0x20, 2, "fo" -> 0x20, 4, "Zm8=" @@ -66,4 +66,4 @@ contract test { // gas irOptimized: 3512081 // gas legacy: 4600082 // gas legacyOptimized: 2813075 -// gas ssaCFGOptimized: 3089081 +// gas ssaCFGOptimized: 3078081 diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol index baa951e71040..d3a9834a82bd 100644 --- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol +++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol @@ -185,8 +185,8 @@ contract DepositContract is IDepositContract, ERC165 { // gas legacy code: 1438800 // gas legacyOptimized: 848699 // gas legacyOptimized code: 878200 -// gas ssaCFGOptimized: 809663 -// gas ssaCFGOptimized code: 570000 +// gas ssaCFGOptimized: 809667 +// gas ssaCFGOptimized code: 570200 // supportsInterface(bytes4): 0x0 -> 0 // supportsInterface(bytes4): 0xffffffff00000000000000000000000000000000000000000000000000000000 -> false # defined to be false by ERC-165 # // supportsInterface(bytes4): 0x01ffc9a700000000000000000000000000000000000000000000000000000000 -> true # ERC-165 id # @@ -195,14 +195,14 @@ contract DepositContract is IDepositContract, ERC165 { // gas irOptimized: 109178 // gas legacy: 142741 // gas legacyOptimized: 117558 -// gas ssaCFGOptimized: 109748 +// gas ssaCFGOptimized: 109751 // get_deposit_count() -> 0x20, 8, 0 # TODO: check balance and logs after each deposit # // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0 -> FAILURE # Empty input # // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e // gas irOptimized: 109178 // gas legacy: 142741 // gas legacyOptimized: 117558 -// gas ssaCFGOptimized: 109748 +// gas ssaCFGOptimized: 109751 // get_deposit_count() -> 0x20, 8, 0 // deposit(bytes,bytes,bytes,bytes32), 1 ether: 0x80, 0xe0, 0x120, 0xaa4a8d0b7d9077248630f1a4701ae9764e42271d7f22b7838778411857fd349e, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0x00f50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8 -> # txhash: 0x7085c586686d666e8bb6e9477a0f0b09565b2060a11f1c4209d3a52295033832 # // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0xf50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x08, 0xca9a3b00000000000000000000000000000000000000000000000000000000, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8, 0x08, 0x00 @@ -210,7 +210,7 @@ contract DepositContract is IDepositContract, ERC165 { // gas irOptimized: 109174 // gas legacy: 142750 // gas legacyOptimized: 117570 -// gas ssaCFGOptimized: 109744 +// gas ssaCFGOptimized: 109747 // get_deposit_count() -> 0x20, 8, 0x0100000000000000000000000000000000000000000000000000000000000000 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0x80, 0xe0, 0x120, 0xdbd986dc85ceb382708cf90a3500f500f0a393c5ece76963ac3ed72eccd2c301, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x00344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d -> # txhash: 0x404d8e109822ce448e68f45216c12cb051b784d068fbe98317ab8e50c58304ac # // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x08, 0x40597307000000000000000000000000000000000000000000000000000000, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d, 0x08, 0x0100000000000000000000000000000000000000000000000000000000000000 @@ -218,5 +218,5 @@ contract DepositContract is IDepositContract, ERC165 { // gas irOptimized: 109174 // gas legacy: 142750 // gas legacyOptimized: 117570 -// gas ssaCFGOptimized: 109744 +// gas ssaCFGOptimized: 109747 // get_deposit_count() -> 0x20, 8, 0x0200000000000000000000000000000000000000000000000000000000000000 diff --git a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol index 44208308acab..37359ebeb8bb 100644 --- a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol +++ b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol @@ -42,8 +42,8 @@ contract test { // gas legacy code: 523600 // gas legacyOptimized: 82667 // gas legacyOptimized code: 369200 -// gas ssaCFGOptimized: 77956 -// gas ssaCFGOptimized code: 313400 +// gas ssaCFGOptimized: 77804 +// gas ssaCFGOptimized code: 311200 // prb_pi() -> 3141592656369545286 // gas irOptimized: 55036 // gas legacy: 100657 diff --git a/test/libsolidity/semanticTests/externalContracts/snark.sol b/test/libsolidity/semanticTests/externalContracts/snark.sol index f7e450487310..d28869c77206 100644 --- a/test/libsolidity/semanticTests/externalContracts/snark.sol +++ b/test/libsolidity/semanticTests/externalContracts/snark.sol @@ -297,10 +297,10 @@ contract Test { // gas irOptimized: 275229 // gas legacy: 293579 // gas legacyOptimized: 276313 -// gas ssaCFGOptimized: 275795 +// gas ssaCFGOptimized: 275791 // verifyTx() -> true // ~ emit Verified(string): 0x20, 0x16, "Successfully verified." // gas irOptimized: 818076 // gas legacy: 904397 // gas legacyOptimized: 816770 -// gas ssaCFGOptimized: 820130 +// gas ssaCFGOptimized: 820120 diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol index 9bd1f39a0f92..999ead07b92f 100644 --- a/test/libsolidity/semanticTests/externalContracts/strings.sol +++ b/test/libsolidity/semanticTests/externalContracts/strings.sol @@ -58,8 +58,8 @@ contract test { // gas legacy code: 932600 // gas legacyOptimized: 102639 // gas legacyOptimized code: 612400 -// gas ssaCFGOptimized: 96160 -// gas ssaCFGOptimized code: 532200 +// gas ssaCFGOptimized: 95989 +// gas ssaCFGOptimized code: 530000 // toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0 // gas irOptimized: 22646 // gas legacy: 23168 @@ -80,4 +80,4 @@ contract test { // gas irOptimized: 1976778 // gas legacy: 4234020 // gas legacyOptimized: 2318668 -// gas ssaCFGOptimized: 1882355 +// gas ssaCFGOptimized: 1841235 diff --git a/test/libyul/ssa/stackLayoutGenerator/nested_for.yul b/test/libyul/ssa/stackLayoutGenerator/nested_for.yul index 0d37b16e503b..b26480b8bbac 100644 --- a/test/libyul/ssa/stackLayoutGenerator/nested_for.yul +++ b/test/libyul/ssa/stackLayoutGenerator/nested_for.yul @@ -107,11 +107,11 @@ // Block0_3 [label="\ // IN: [phi0, phi3, JUNK]\l\ // \l\ -// [JUNK, phi3, lit2, phi0]\l\ +// [phi3, lit2, phi0]\l\ // add\l\ -// [JUNK, phi3, v5]\l\ +// [phi3, v5]\l\ // \l\ -// OUT: [JUNK, phi3, v5]\l\ +// OUT: [phi3, v5]\l\ // "]; // Block0_3 -> Block0_3Exit [arrowhead=none]; // Block0_3Exit [label="Jump" shape=oval]; diff --git a/test/libyul/ssa/stackShuffler/deep_values_grow_to_args.stack b/test/libyul/ssa/stackShuffler/deep_values_grow_to_args.stack index e84310023a51..848d246fe619 100644 --- a/test/libyul/ssa/stackShuffler/deep_values_grow_to_args.stack +++ b/test/libyul/ssa/stackShuffler/deep_values_grow_to_args.stack @@ -8,33 +8,12 @@ targetStackTop: [JUNK, v2, JUNK, JUNK, JUNK, JUNK, JUNK, JUNK, JUNK, JUNK, JUNK, // POP| * * * * * * * * * * * * * v1 v2 // PUSH lit2| * * * * * * * * * * * * * v1 v2 lit2 // DUP2| * * * * * * * * * * * * * v1 v2 lit2 v2 -// PUSH lit3| * * * * * * * * * * * * * v1 v2 lit2 v2 lit3 -// DUP2| * * * * * * * * * * * * * v1 v2 lit2 v2 lit3 v2 -// PUSH lit1| * * * * * * * * * * * * * v1 v2 lit2 v2 lit3 v2 lit1 -// SWAP6| * * * * * * * * * * * * * lit1 v2 lit2 v2 lit3 v2 v1 -// SWAP1| * * * * * * * * * * * * * lit1 v2 lit2 v2 lit3 v1 v2 -// SWAP7| * * * * * * * * * * * * v2 lit1 v2 lit2 v2 lit3 v1 * -// POP| * * * * * * * * * * * * v2 lit1 v2 lit2 v2 lit3 v1 -// DUP3| * * * * * * * * * * * * v2 lit1 v2 lit2 v2 lit3 v1 v2 -// SWAP8| * * * * * * * * * * * v2 v2 lit1 v2 lit2 v2 lit3 v1 * -// POP| * * * * * * * * * * * v2 v2 lit1 v2 lit2 v2 lit3 v1 -// DUP3| * * * * * * * * * * * v2 v2 lit1 v2 lit2 v2 lit3 v1 v2 -// SWAP9| * * * * * * * * * * v2 v2 v2 lit1 v2 lit2 v2 lit3 v1 * -// POP| * * * * * * * * * * v2 v2 v2 lit1 v2 lit2 v2 lit3 v1 -// DUP3| * * * * * * * * * * v2 v2 v2 lit1 v2 lit2 v2 lit3 v1 v2 -// SWAP10| * * * * * * * * * v2 v2 v2 v2 lit1 v2 lit2 v2 lit3 v1 * -// POP| * * * * * * * * * v2 v2 v2 v2 lit1 v2 lit2 v2 lit3 v1 -// DUP3| * * * * * * * * * v2 v2 v2 v2 lit1 v2 lit2 v2 lit3 v1 v2 -// SWAP11| * * * * * * * * v2 v2 v2 v2 v2 lit1 v2 lit2 v2 lit3 v1 * -// POP| * * * * * * * * v2 v2 v2 v2 v2 lit1 v2 lit2 v2 lit3 v1 -// DUP3| * * * * * * * * v2 v2 v2 v2 v2 lit1 v2 lit2 v2 lit3 v1 v2 -// SWAP12| * * * * * * * v2 v2 v2 v2 v2 v2 lit1 v2 lit2 v2 lit3 v1 * -// POP| * * * * * * * v2 v2 v2 v2 v2 v2 lit1 v2 lit2 v2 lit3 v1 -// DUP3| * * * * * * * v2 v2 v2 v2 v2 v2 lit1 v2 lit2 v2 lit3 v1 v2 -// SWAP13| * * * * * * v2 v2 v2 v2 v2 v2 v2 lit1 v2 lit2 v2 lit3 v1 * -// POP| * * * * * * v2 v2 v2 v2 v2 v2 v2 lit1 v2 lit2 v2 lit3 v1 -// DUP3| * * * * * * v2 v2 v2 v2 v2 v2 v2 lit1 v2 lit2 v2 lit3 v1 v2 -// ...| +// DUP1| * * * * * * * * * * * * * v1 v2 lit2 v2 v2 +// SWAP16| * v2 * * * * * * * * * * * v1 v2 lit2 v2 * +// PUSH lit1| * v2 * * * * * * * * * * * v1 v2 lit2 v2 * lit1 +// SWAP5| * v2 * * * * * * * * * * * lit1 v2 lit2 v2 * v1 +// PUSH lit3| * v2 * * * * * * * * * * * lit1 v2 lit2 v2 * v1 lit3 +// SWAP2| * v2 * * * * * * * * * * * lit1 v2 lit2 v2 lit3 v1 * // +-------------------------------------------------------------------------------------------------------------------------------------------- // (target)| * v2 * * * * * * * * * * * lit1 v2 lit2 v2 lit3 v1 * -// Status: MaxIterationsReached +// Status: Admissible diff --git a/test/libyul/ssa/stackShuffler/dup_value_into_args_with_grow_1.stack b/test/libyul/ssa/stackShuffler/dup_value_into_args_with_grow_1.stack index 0b81b635f176..4f27cf720971 100644 --- a/test/libyul/ssa/stackShuffler/dup_value_into_args_with_grow_1.stack +++ b/test/libyul/ssa/stackShuffler/dup_value_into_args_with_grow_1.stack @@ -9,10 +9,7 @@ targetStackTop: [v2, JUNK, JUNK, JUNK, JUNK, JUNK, JUNK, JUNK, JUNK, JUNK, phi1, // POP| v3 * * * * * * * * * phi1 * v1 v2 // PUSH lit2| v3 * * * * * * * * * phi1 * v1 v2 lit2 // DUP2| v3 * * * * * * * * * phi1 * v1 v2 lit2 v2 -// PUSH lit1| v3 * * * * * * * * * phi1 * v1 v2 lit2 v2 lit1 -// DUP2| v3 * * * * * * * * * phi1 * v1 v2 lit2 v2 lit1 v2 -// SWAP1| v3 * * * * * * * * * phi1 * v1 v2 lit2 v2 v2 lit1 -// POP| v3 * * * * * * * * * phi1 * v1 v2 lit2 v2 v2 +// DUP1| v3 * * * * * * * * * phi1 * v1 v2 lit2 v2 v2 // SWAP16| v2 * * * * * * * * * phi1 * v1 v2 lit2 v2 v3 // PUSH lit1| v2 * * * * * * * * * phi1 * v1 v2 lit2 v2 v3 lit1 // SWAP5| v2 * * * * * * * * * phi1 * lit1 v2 lit2 v2 v3 v1 diff --git a/test/libyul/ssa/stackShuffler/dup_value_into_tail_and_args.stack b/test/libyul/ssa/stackShuffler/dup_value_into_tail_and_args.stack index 287ba86cf2a2..ae4266c6b18b 100644 --- a/test/libyul/ssa/stackShuffler/dup_value_into_tail_and_args.stack +++ b/test/libyul/ssa/stackShuffler/dup_value_into_tail_and_args.stack @@ -9,10 +9,7 @@ targetStackTop: [JUNK, JUNK, v2, JUNK, JUNK, JUNK, JUNK, JUNK, JUNK, JUNK, JUNK, // POP| * * v3 * * * * * * * * * * * v1 v2 // PUSH lit2| * * v3 * * * * * * * * * * * v1 v2 lit2 // DUP2| * * v3 * * * * * * * * * * * v1 v2 lit2 v2 -// PUSH lit3| * * v3 * * * * * * * * * * * v1 v2 lit2 v2 lit3 -// DUP2| * * v3 * * * * * * * * * * * v1 v2 lit2 v2 lit3 v2 -// SWAP1| * * v3 * * * * * * * * * * * v1 v2 lit2 v2 v2 lit3 -// POP| * * v3 * * * * * * * * * * * v1 v2 lit2 v2 v2 +// DUP1| * * v3 * * * * * * * * * * * v1 v2 lit2 v2 v2 // SWAP16| * * v2 * * * * * * * * * * * v1 v2 lit2 v2 v3 // PUSH lit1| * * v2 * * * * * * * * * * * v1 v2 lit2 v2 v3 lit1 // SWAP5| * * v2 * * * * * * * * * * * lit1 v2 lit2 v2 v3 v1 diff --git a/test/libyul/ssa/stackShuffler/multi_dup_with_phi_in_tail.stack b/test/libyul/ssa/stackShuffler/multi_dup_with_phi_in_tail.stack index aa563e6f9f2b..f608f4b7f1cd 100644 --- a/test/libyul/ssa/stackShuffler/multi_dup_with_phi_in_tail.stack +++ b/test/libyul/ssa/stackShuffler/multi_dup_with_phi_in_tail.stack @@ -9,10 +9,7 @@ targetStackTop: [JUNK, v5, JUNK, v1, v2, JUNK, JUNK, JUNK, JUNK, phi1, JUNK, v3, // POP| * v6 * v1 v2 * * * * phi1 * v3 phi2 v4 v5 // PUSH lit2| * v6 * v1 v2 * * * * phi1 * v3 phi2 v4 v5 lit2 // DUP2| * v6 * v1 v2 * * * * phi1 * v3 phi2 v4 v5 lit2 v5 -// PUSH lit3| * v6 * v1 v2 * * * * phi1 * v3 phi2 v4 v5 lit2 v5 lit3 -// DUP2| * v6 * v1 v2 * * * * phi1 * v3 phi2 v4 v5 lit2 v5 lit3 v5 -// SWAP1| * v6 * v1 v2 * * * * phi1 * v3 phi2 v4 v5 lit2 v5 v5 lit3 -// POP| * v6 * v1 v2 * * * * phi1 * v3 phi2 v4 v5 lit2 v5 v5 +// DUP1| * v6 * v1 v2 * * * * phi1 * v3 phi2 v4 v5 lit2 v5 v5 // SWAP16| * v5 * v1 v2 * * * * phi1 * v3 phi2 v4 v5 lit2 v5 v6 // PUSH lit1| * v5 * v1 v2 * * * * phi1 * v3 phi2 v4 v5 lit2 v5 v6 lit1 // SWAP5| * v5 * v1 v2 * * * * phi1 * v3 phi2 lit1 v5 lit2 v5 v6 v4 diff --git a/test/libyul/ssa/stackShuffler/return_label_with_dup_and_grow.stack b/test/libyul/ssa/stackShuffler/return_label_with_dup_and_grow.stack index 571ed4a24269..d583b0d6d503 100644 --- a/test/libyul/ssa/stackShuffler/return_label_with_dup_and_grow.stack +++ b/test/libyul/ssa/stackShuffler/return_label_with_dup_and_grow.stack @@ -20,10 +20,7 @@ targetStackTop: [ReturnLabel[1], JUNK, JUNK, v2, JUNK, JUNK, JUNK, JUNK, JUNK, J // POP| ReturnLabel[1] * * v3 * * * * * * * * * * * v1 v2 // PUSH lit2| ReturnLabel[1] * * v3 * * * * * * * * * * * v1 v2 lit2 // DUP2| ReturnLabel[1] * * v3 * * * * * * * * * * * v1 v2 lit2 v2 -// PUSH lit1| ReturnLabel[1] * * v3 * * * * * * * * * * * v1 v2 lit2 v2 lit1 -// DUP2| ReturnLabel[1] * * v3 * * * * * * * * * * * v1 v2 lit2 v2 lit1 v2 -// SWAP1| ReturnLabel[1] * * v3 * * * * * * * * * * * v1 v2 lit2 v2 v2 lit1 -// POP| ReturnLabel[1] * * v3 * * * * * * * * * * * v1 v2 lit2 v2 v2 +// DUP1| ReturnLabel[1] * * v3 * * * * * * * * * * * v1 v2 lit2 v2 v2 // SWAP16| ReturnLabel[1] * * v2 * * * * * * * * * * * v1 v2 lit2 v2 v3 // PUSH lit1| ReturnLabel[1] * * v2 * * * * * * * * * * * v1 v2 lit2 v2 v3 lit1 // SWAP5| ReturnLabel[1] * * v2 * * * * * * * * * * * lit1 v2 lit2 v2 v3 v1 diff --git a/test/libyul/ssa/stackShuffler/satisfy_tail_requirements.stack b/test/libyul/ssa/stackShuffler/satisfy_tail_requirements.stack index a97447af9235..fb0927f0126d 100644 --- a/test/libyul/ssa/stackShuffler/satisfy_tail_requirements.stack +++ b/test/libyul/ssa/stackShuffler/satisfy_tail_requirements.stack @@ -8,20 +8,26 @@ targetStackSize: 17 // +------------------------------------------------- +---------------------------------------------------------------------- // (initial)| v2 v3 v4 v5 v6 v7 v8 | v9 v10 // SWAP8| v10 v3 v4 v5 v6 v7 v8 | v9 v2 -// PUSH lit3| v10 v3 v4 v5 v6 v7 v8 | v9 v2 lit3 -// SWAP2| v10 v3 v4 v5 v6 v7 v8 | lit3 v2 v9 -// SWAP1| v10 v3 v4 v5 v6 v7 v8 | lit3 v9 v2 -// DUP4| v10 v3 v4 v5 v6 v7 v8 | lit3 v9 v2 v8 -// SWAP1| v10 v3 v4 v5 v6 v7 v8 | lit3 v9 v8 v2 -// DUP6| v10 v3 v4 v5 v6 v7 v8 | lit3 v9 v8 v2 v7 -// SWAP1| v10 v3 v4 v5 v6 v7 v8 | lit3 v9 v8 v7 v2 -// DUP8| v10 v3 v4 v5 v6 v7 v8 | lit3 v9 v8 v7 v2 v6 -// SWAP1| v10 v3 v4 v5 v6 v7 v8 | lit3 v9 v8 v7 v6 v2 -// DUP10| v10 v3 v4 v5 v6 v7 v8 | lit3 v9 v8 v7 v6 v2 v5 -// SWAP1| v10 v3 v4 v5 v6 v7 v8 | lit3 v9 v8 v7 v6 v5 v2 -// DUP12| v10 v3 v4 v5 v6 v7 v8 | lit3 v9 v8 v7 v6 v5 v2 v4 -// SWAP1| v10 v3 v4 v5 v6 v7 v8 | lit3 v9 v8 v7 v6 v5 v4 v2 -// DUP14| v10 v3 v4 v5 v6 v7 v8 | lit3 v9 v8 v7 v6 v5 v4 v2 v3 +// DUP3| v10 v3 v4 v5 v6 v7 v8 | v9 v2 v8 +// SWAP2| v10 v3 v4 v5 v6 v7 v8 | v8 v2 v9 +// SWAP1| v10 v3 v4 v5 v6 v7 v8 | v8 v9 v2 +// DUP5| v10 v3 v4 v5 v6 v7 v8 | v8 v9 v2 v7 +// SWAP3| v10 v3 v4 v5 v6 v7 v8 | v7 v9 v2 v8 +// SWAP1| v10 v3 v4 v5 v6 v7 v8 | v7 v9 v8 v2 +// DUP7| v10 v3 v4 v5 v6 v7 v8 | v7 v9 v8 v2 v6 +// SWAP4| v10 v3 v4 v5 v6 v7 v8 | v6 v9 v8 v2 v7 +// SWAP1| v10 v3 v4 v5 v6 v7 v8 | v6 v9 v8 v7 v2 +// DUP9| v10 v3 v4 v5 v6 v7 v8 | v6 v9 v8 v7 v2 v5 +// SWAP5| v10 v3 v4 v5 v6 v7 v8 | v5 v9 v8 v7 v2 v6 +// SWAP1| v10 v3 v4 v5 v6 v7 v8 | v5 v9 v8 v7 v6 v2 +// DUP11| v10 v3 v4 v5 v6 v7 v8 | v5 v9 v8 v7 v6 v2 v4 +// SWAP6| v10 v3 v4 v5 v6 v7 v8 | v4 v9 v8 v7 v6 v2 v5 +// SWAP1| v10 v3 v4 v5 v6 v7 v8 | v4 v9 v8 v7 v6 v5 v2 +// DUP13| v10 v3 v4 v5 v6 v7 v8 | v4 v9 v8 v7 v6 v5 v2 v3 +// SWAP7| v10 v3 v4 v5 v6 v7 v8 | v3 v9 v8 v7 v6 v5 v2 v4 +// SWAP1| v10 v3 v4 v5 v6 v7 v8 | v3 v9 v8 v7 v6 v5 v4 v2 +// PUSH lit3| v10 v3 v4 v5 v6 v7 v8 | v3 v9 v8 v7 v6 v5 v4 v2 lit3 +// SWAP8| v10 v3 v4 v5 v6 v7 v8 | lit3 v9 v8 v7 v6 v5 v4 v2 v3 // SWAP1| v10 v3 v4 v5 v6 v7 v8 | lit3 v9 v8 v7 v6 v5 v4 v3 v2 // DUP16| v10 v3 v4 v5 v6 v7 v8 | lit3 v9 v8 v7 v6 v5 v4 v3 v2 v10 // +------------------------------------------------- +---------------------------------------------------------------------- diff --git a/test/libyul/ssa/stackShuffler/swap_junk_over_pop.stack b/test/libyul/ssa/stackShuffler/swap_junk_over_pop.stack index b83cef92f7ef..5c51427d171f 100644 --- a/test/libyul/ssa/stackShuffler/swap_junk_over_pop.stack +++ b/test/libyul/ssa/stackShuffler/swap_junk_over_pop.stack @@ -6,9 +6,11 @@ targetStackSize: 4 // | 0 | 1 2 3 // +------- +--------------------- // (initial)| v0 | * v2 -// PUSH lit2| v0 | * v2 lit2 -// SWAP2| v0 | lit2 v2 * -// SWAP3| * | lit2 v2 v0 +// DUP3| v0 | * v2 v0 +// SWAP2| v0 | v0 v2 * +// POP| v0 | v0 v2 +// PUSH lit2| v0 | v0 v2 lit2 +// SWAP2| v0 | lit2 v2 v0 // +------- +--------------------- // (target)| {} | lit2 v2 v0 // Status: Admissible diff --git a/test/libyul/ssa/stackShuffler/triple_dup_no_phi.stack b/test/libyul/ssa/stackShuffler/triple_dup_no_phi.stack index 845095016f9d..46dde8a40333 100644 --- a/test/libyul/ssa/stackShuffler/triple_dup_no_phi.stack +++ b/test/libyul/ssa/stackShuffler/triple_dup_no_phi.stack @@ -9,10 +9,7 @@ targetStackTop: [JUNK, v2, JUNK, JUNK, JUNK, JUNK, JUNK, JUNK, JUNK, JUNK, JUNK, // POP| * v3 * * * * * * * * * * * v1 v2 // PUSH lit2| * v3 * * * * * * * * * * * v1 v2 lit2 // DUP2| * v3 * * * * * * * * * * * v1 v2 lit2 v2 -// PUSH lit3| * v3 * * * * * * * * * * * v1 v2 lit2 v2 lit3 -// DUP2| * v3 * * * * * * * * * * * v1 v2 lit2 v2 lit3 v2 -// SWAP1| * v3 * * * * * * * * * * * v1 v2 lit2 v2 v2 lit3 -// POP| * v3 * * * * * * * * * * * v1 v2 lit2 v2 v2 +// DUP1| * v3 * * * * * * * * * * * v1 v2 lit2 v2 v2 // SWAP16| * v2 * * * * * * * * * * * v1 v2 lit2 v2 v3 // PUSH lit1| * v2 * * * * * * * * * * * v1 v2 lit2 v2 v3 lit1 // SWAP5| * v2 * * * * * * * * * * * lit1 v2 lit2 v2 v3 v1 diff --git a/test/libyul/ssa/stackShuffler/triple_dup_with_phi.stack b/test/libyul/ssa/stackShuffler/triple_dup_with_phi.stack index 3d28212bd91f..60f890972dcc 100644 --- a/test/libyul/ssa/stackShuffler/triple_dup_with_phi.stack +++ b/test/libyul/ssa/stackShuffler/triple_dup_with_phi.stack @@ -9,10 +9,7 @@ targetStackTop: [JUNK, v2, JUNK, JUNK, JUNK, JUNK, JUNK, JUNK, phi1, JUNK, JUNK, // POP| * v3 * * * * * * phi1 * * * * v1 v2 // PUSH lit2| * v3 * * * * * * phi1 * * * * v1 v2 lit2 // DUP2| * v3 * * * * * * phi1 * * * * v1 v2 lit2 v2 -// PUSH lit3| * v3 * * * * * * phi1 * * * * v1 v2 lit2 v2 lit3 -// DUP2| * v3 * * * * * * phi1 * * * * v1 v2 lit2 v2 lit3 v2 -// SWAP1| * v3 * * * * * * phi1 * * * * v1 v2 lit2 v2 v2 lit3 -// POP| * v3 * * * * * * phi1 * * * * v1 v2 lit2 v2 v2 +// DUP1| * v3 * * * * * * phi1 * * * * v1 v2 lit2 v2 v2 // SWAP16| * v2 * * * * * * phi1 * * * * v1 v2 lit2 v2 v3 // PUSH lit1| * v2 * * * * * * phi1 * * * * v1 v2 lit2 v2 v3 lit1 // SWAP5| * v2 * * * * * * phi1 * * * * lit1 v2 lit2 v2 v3 v1