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

Profiler probes for non-sequence steps #15518

Merged
merged 1 commit into from
Oct 17, 2024
Merged

Profiler probes for non-sequence steps #15518

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
54 changes: 38 additions & 16 deletions libyul/optimiser/Suite.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,15 @@ void OptimiserSuite::run(
std::set<YulName> reservedIdentifiers = _externallyUsedIdentifiers;
reservedIdentifiers += _dialect.fixedFunctionNames();

auto astRoot = std::get<Block>(Disambiguator(
_dialect,
*_object.analysisInfo,
reservedIdentifiers
)(_object.code()->root()));
Block astRoot;
{
PROFILER_PROBE("Disambiguator", probe);
astRoot = std::get<Block>(Disambiguator(
_dialect,
*_object.analysisInfo,
reservedIdentifiers
)(_object.code()->root()));
}

NameDispenser dispenser{_dialect, astRoot, reservedIdentifiers};
OptimiserStepContext context{_dialect, dispenser, reservedIdentifiers, _expectedExecutionsPerDeployment};
Expand All @@ -123,7 +127,10 @@ void OptimiserSuite::run(
// ForLoopInitRewriter. Run them first to be able to run arbitrary sequences safely.
suite.runSequence("hgfo", astRoot);

NameSimplifier::run(suite.m_context, astRoot);
{
PROFILER_PROBE("NameSimplifier", probe);
NameSimplifier::run(suite.m_context, astRoot);
}
Comment on lines -126 to +133
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder why we're running NameSimplifier twice. It has been that way ever since it was added in #9591. I don't see any specific justification for this in that PR though.

Removing it could shave off 2-3% of the optimizer running time.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking that perhaps it yields nicer names in some cases, but at least for our test suite it doesn't even change anything.

Copy link
Member Author

@cameel cameel Oct 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice. You could submit that as a PR then. We should run it by Daniel just to make sure there wasn't any obscure reason he's aware of but if it's having no effect, we should really get rid of it. It's too expensive to run it without a good reason.

// Now the user-supplied part
suite.runSequence(_optimisationSequence, astRoot);

Expand All @@ -135,6 +142,7 @@ void OptimiserSuite::run(
// message once we perform code generation.
if (!usesOptimizedCodeGenerator)
{
PROFILER_PROBE("StackCompressor", probe);
_object.setCode(std::make_shared<AST>(std::move(astRoot)));
astRoot = std::get<1>(StackCompressor::run(
_dialect,
Expand All @@ -154,32 +162,46 @@ void OptimiserSuite::run(
if (evmDialect)
{
yulAssert(_meter, "");
ConstantOptimiser{*evmDialect, *_meter}(astRoot);
{
PROFILER_PROBE("ConstantOptimiser", probe);
ConstantOptimiser{*evmDialect, *_meter}(astRoot);
}
if (usesOptimizedCodeGenerator)
{
_object.setCode(std::make_shared<AST>(std::move(astRoot)));
astRoot = std::get<1>(StackCompressor::run(
_dialect,
_object,
_optimizeStackAllocation,
stackCompressorMaxIterations
));
{
PROFILER_PROBE("StackCompressor", probe);
_object.setCode(std::make_shared<AST>(std::move(astRoot)));
astRoot = std::get<1>(StackCompressor::run(
_dialect,
_object,
_optimizeStackAllocation,
stackCompressorMaxIterations
));
}
if (evmDialect->providesObjectAccess())
{
PROFILER_PROBE("StackLimitEvader", probe);
_object.setCode(std::make_shared<AST>(std::move(astRoot)));
astRoot = StackLimitEvader::run(suite.m_context, _object);
}
}
else if (evmDialect->providesObjectAccess() && _optimizeStackAllocation)
{
PROFILER_PROBE("StackLimitEvader", probe);
_object.setCode(std::make_shared<AST>(std::move(astRoot)));
astRoot = StackLimitEvader::run(suite.m_context, _object);
}
}

dispenser.reset(astRoot);
NameSimplifier::run(suite.m_context, astRoot);
VarNameCleaner::run(suite.m_context, astRoot);
{
PROFILER_PROBE("NameSimplifier", probe);
NameSimplifier::run(suite.m_context, astRoot);
}
{
PROFILER_PROBE("VarNameCleaner", probe);
VarNameCleaner::run(suite.m_context, astRoot);
}

_object.setCode(std::make_shared<AST>(std::move(astRoot)));
_object.analysisInfo = std::make_shared<AsmAnalysisInfo>(AsmAnalyzer::analyzeStrictAssertCorrect(_dialect, _object));
Expand Down