Skip to content

SSA-CFG: Fix detection of equivalent instructions in Outliner #16768

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

Draft
blishko wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

SSA-CFG: Fix detection of equivalent instructions in Outliner #16768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions libyul/backends/evm/ssa/transform/Outliner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,12 @@ bool EquivalentBlocksDetector::areEquivalent(BlockIdentifier const _bid1, BlockI
std::unordered_map<InstId::ValueType, InstId::ValueType> instMapping;
auto knownToBeEquivalent = [&](auto const& idPair) {
auto && [id1, id2] = idPair;
if (id1 == id2)
return true;
auto const it = instMapping.find(id1.value);
return it != instMapping.end() && it->second == id2.value;
if (it != instMapping.end() && it->second == id2.value)
return true;
if (cfg1.isLiteral(id1) && cfg2.isLiteral(id2) && cfg1.literalPayload(id1) == cfg2.literalPayload(id2))
return true;
return false;
};

for (auto&& [iid1, iid2] : ranges::views::zip(block1.instructions, block2.instructions))
Expand Down Expand Up @@ -180,8 +182,9 @@ bool EquivalentBlocksDetector::areEquivalent(BlockIdentifier const _bid1, BlockI
}
case InstOpcode::Const:
{
if (iid1 != iid2)
if (cfg1.literalPayload(iid1) != cfg2.literalPayload(iid2))
return false;
instMapping.insert({iid1.value, iid2.value});
break;
}
case InstOpcode::Identity:
Expand Down Expand Up @@ -233,8 +236,6 @@ EquivalentBlocksDetector::EquivalenceClasses EquivalentBlocksDetector::run() &&
{
for (auto const& [id, cfg]: m_program.functionGraphs | ranges::views::enumerate)
{
if (cfg->numBlocks() == 1)
continue;
auto const graphId = static_cast<ControlFlowGraphs::FunctionGraphID>(id);
for (BlockId const blockId: cfg->liveBlocks())
processBlock({.graphId = graphId, .blockId = blockId});
Expand Down
4 changes: 2 additions & 2 deletions test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ contract FixedFeeRegistrar is Registrar {
// gas legacy code: 792400
// gas legacyOptimized: 84598
// gas legacyOptimized code: 388000
// gas ssaCFGOptimized: 78924
// gas ssaCFGOptimized code: 322800
// gas ssaCFGOptimized: 79004
// gas ssaCFGOptimized code: 323800
// reserve(string), 69 ether: 0x20, 3, "abc" ->
// ~ emit Changed(string): #0x4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45
// gas irOptimized: 45741
Expand Down
4 changes: 2 additions & 2 deletions test/libsolidity/semanticTests/externalContracts/base64.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ contract test {
// gas legacy code: 629800
// gas legacyOptimized: 87926
// gas legacyOptimized code: 429800
// gas ssaCFGOptimized: 79463
// gas ssaCFGOptimized code: 327800
// gas ssaCFGOptimized: 79879
// gas ssaCFGOptimized code: 331800
// 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="
Expand Down
2 changes: 1 addition & 1 deletion test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ contract DepositContract is IDepositContract, ERC165 {
// gas legacy code: 1438800
// gas legacyOptimized: 848699
// gas legacyOptimized code: 878200
// gas ssaCFGOptimized: 809718
// gas ssaCFGOptimized: 809586
// gas ssaCFGOptimized code: 570200
// supportsInterface(bytes4): 0x0 -> 0
// supportsInterface(bytes4): 0xffffffff00000000000000000000000000000000000000000000000000000000 -> false # defined to be false by ERC-165 #
Expand Down
4 changes: 2 additions & 2 deletions test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ contract test {
// gas legacy code: 2205000
// gas legacyOptimized: 178012
// gas legacyOptimized code: 1669600
// gas ssaCFGOptimized: 174817
// gas ssaCFGOptimized code: 1636800
// gas ssaCFGOptimized: 174968
// gas ssaCFGOptimized code: 1638600
// div(int256,int256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
// gas irOptimized: 22045
// gas legacy: 22736
Expand Down
4 changes: 2 additions & 2 deletions test/libsolidity/semanticTests/externalContracts/strings.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ contract test {
// gas legacy code: 932600
// gas legacyOptimized: 102639
// gas legacyOptimized code: 612400
// gas ssaCFGOptimized: 95825
// gas ssaCFGOptimized code: 527800
// gas ssaCFGOptimized: 96220
// gas ssaCFGOptimized code: 532800
// toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0
// gas irOptimized: 22646
// gas legacy: 23168
Expand Down