cerc-io/solidity
16
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

Only apply rules for yul optimizer

Browse Source
This commit is contained in:
Daniel Lupu 2022-06-11 13:43:55 +03:00 committed by wechman
parent d1e382f2a8
commit b99f85ec65
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libevmasm/RuleList.h
View File

@ -275,6 +275,7 @@ std::vector<SimplificationRule<Pattern>> simplificationRuleListPart4_5(
template <class Pattern> template <class Pattern>
std::vector<SimplificationRule<Pattern>> simplificationRuleListPart5( std::vector<SimplificationRule<Pattern>> simplificationRuleListPart5(
bool _forYulOptimizer,
Pattern A, Pattern A,
Pattern B, Pattern B,
Pattern, Pattern,
@ -287,23 +288,27 @@ std::vector<SimplificationRule<Pattern>> simplificationRuleListPart5(
std::vector<SimplificationRule<Pattern>> rules; std::vector<SimplificationRule<Pattern>> rules;
// Replace MOD(MUL(X, Y), A) with MULMOD(X, Y, A) iff A=2**N // The libevmasm optimizer does not support rules resulting in opcodes with more than two arguments.
rules.push_back({ if (_forYulOptimizer)
Builtins::MOD(Builtins::MUL(X, Y), A), {
[=]() -> Pattern { return Builtins::MULMOD(X, Y, A); }, // Replace MOD(MUL(X, Y), A) with MULMOD(X, Y, A) iff A=2**N
[=] { rules.push_back({
return A.d() > 0 && ((A.d() & (A.d() - 1)) == 0); Builtins::MOD(Builtins::MUL(X, Y), A),
} [=]() -> Pattern { return Builtins::MULMOD(X, Y, A); },
}); [=] {
return A.d() > 0 && ((A.d() & (A.d() - 1)) == 0);
}
});
// Replace MOD(ADD(X, Y), A) with ADDMOD(X, Y, A) iff A=2**N // Replace MOD(ADD(X, Y), A) with ADDMOD(X, Y, A) iff A=2**N
rules.push_back({ rules.push_back({
Builtins::MOD(Builtins::ADD(X, Y), A), Builtins::MOD(Builtins::ADD(X, Y), A),
[=]() -> Pattern { return Builtins::ADDMOD(X, Y, A); }, [=]() -> Pattern { return Builtins::ADDMOD(X, Y, A); },
[=] { [=] {
return A.d() > 0 && ((A.d() & (A.d() - 1)) == 0); return A.d() > 0 && ((A.d() & (A.d() - 1)) == 0);
} }
}); });
}
// Replace MOD X, <power-of-two> with AND X, <power-of-two> - 1 // Replace MOD X, <power-of-two> with AND X, <power-of-two> - 1
for (size_t i = 0; i < Pattern::WordSize; ++i) for (size_t i = 0; i < Pattern::WordSize; ++i)
@ -816,7 +821,7 @@ std::vector<SimplificationRule<Pattern>> simplificationRuleList(
rules += simplificationRuleListPart3(A, B, C, W, X); rules += simplificationRuleListPart3(A, B, C, W, X);
rules += simplificationRuleListPart4(A, B, C, W, X); rules += simplificationRuleListPart4(A, B, C, W, X);
rules += simplificationRuleListPart4_5(A, B, C, W, X); rules += simplificationRuleListPart4_5(A, B, C, W, X);
rules += simplificationRuleListPart5(A, B, C, W, X); rules += simplificationRuleListPart5(_evmVersion.has_value(), A, B, C, W, X);
rules += simplificationRuleListPart6(A, B, C, W, X); rules += simplificationRuleListPart6(A, B, C, W, X);
rules += simplificationRuleListPart7(A, B, C, W, X); rules += simplificationRuleListPart7(A, B, C, W, X);
rules += simplificationRuleListPart8(A, B, C, W, X); rules += simplificationRuleListPart8(A, B, C, W, X);