Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/vern/ZAM-inlining'

Browse source 
* origin/topic/vern/ZAM-inlining:
  speed up ZAM compilation by capping function size when inlining
This commit is contained in:
Tim Wojtulewicz 2022-05-19 11:45:38 -07:00
commit 73273fc87b
15 changed files with 85 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/script_opt/Inline.cc
View file

@ -5,10 +5,13 @@
#include "zeek/Desc.h"
#include "zeek/script_opt/ProfileFunc.h"
#include "zeek/script_opt/ScriptOpt.h"
#include "zeek/script_opt/StmtOptInfo.h"
namespace zeek::detail
{
constexpr int MAX_INLINE_SIZE = 1000;
void Inliner::Analyze()
{
// Locate self- and indirectly recursive functions.
@ -139,8 +142,15 @@ void Inliner::InlineFunction(FuncInfo* f)
// particular body.
curr_frame_size = f->Scope()->Length();
auto oi = f->Body()->GetOptInfo();
num_stmts = oi->num_stmts;
num_exprs = oi->num_exprs;
f->Body()->Inline(this);
oi->num_stmts = num_stmts;
oi->num_exprs = num_exprs;
int new_frame_size = curr_frame_size + max_inlined_frame_size;
if ( new_frame_size > f->Func()->FrameSize() )
@ -175,9 +185,19 @@ ExprPtr Inliner::CheckForInlining(CallExprPtr c)
if ( inline_ables.count(func_vf) == 0 )
return c;
ListExprPtr args = {NewRef{}, c->Args()};
// We're going to inline the body, unless it's too large.
auto body = func_vf->GetBodies()[0].stmts; // there's only 1 body
auto t = c->GetType();
auto oi = body->GetOptInfo();
if ( num_stmts + oi->num_stmts + num_exprs + oi->num_exprs > MAX_INLINE_SIZE )
return nullptr;
num_stmts += oi->num_stmts;
num_exprs += oi->num_exprs;
auto body_dup = body->Duplicate();
body_dup->GetOptInfo()->num_stmts = oi->num_stmts;
body_dup->GetOptInfo()->num_exprs = oi->num_exprs;
// Getting the names of the parameters is tricky. It's tempting
// to take them from the function's type declaration, but alas
@ -198,8 +218,6 @@ ExprPtr Inliner::CheckForInlining(CallExprPtr c)
for ( int i = 0; i < nparam; ++i )
params.emplace_back(vars[i]);
auto body_dup = body->Duplicate();
// Recursively inline the body. This is safe to do because we've
// ensured there are no recursive loops ... but we have to be
// careful in accounting for the frame sizes.
@ -221,6 +239,8 @@ ExprPtr Inliner::CheckForInlining(CallExprPtr c)
else
max_inlined_frame_size = hold_max_inlined_frame_size;
ListExprPtr args = {NewRef{}, c->Args()};
auto t = c->GetType();
auto ie = make_intrusive<InlineExpr>(args, std::move(params), body_dup, curr_frame_size, t);
ie->SetOriginal(c);