Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-16 13:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ZAM optimization for constructing records w/ fields initialized to network_time

Browse source
This commit is contained in:
Vern Paxson 2024-04-08 18:29:40 -04:00 • committed by Tim Wojtulewicz
parent 68aa8221e1
commit ef4386ea13
2 changed files with 52 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/script_opt/ZAM/Expr.cc
View file

@ -1219,6 +1219,8 @@ const ZAMStmt ZAMCompiler::ConstructRecord(const NameExpr* n, const Expr* e) {
ZOp op;
const auto& map = rc->Map();
int network_time_index = -1; // -1 = "no network_time() initializer"
if ( map ) {
aux->map = *map;
@ -1234,22 +1236,49 @@ const ZAMStmt ZAMCompiler::ConstructRecord(const NameExpr* n, const Expr* e) {
break;
}
if ( ! seen ) {
// Look for very fine-grained optimization: a record
// initialization expression of network_time(). This winds
// up occurring a lot, and it's expensive since it means
// every such record creation entails a script-level
// function call.
auto ie = c.second->InitExpr();
if ( ie && ie->Tag() == EXPR_CALL ) {
auto call = ie->AsCallExpr();
auto func = call->Func();
if ( func->Tag() == EXPR_NAME ) {
auto f = func->AsNameExpr()->Id();
if ( f->Name() == std::string("network_time") ) {
network_time_index = c.first;
seen = true;
}
}
}
}
if ( ! seen )
// Need to generate field dynamically.
fi->push_back(c);
}
if ( fi->empty() )
op = OP_CONSTRUCT_KNOWN_RECORD_V;
if ( fi->empty() ) {
if ( network_time_index >= 0 )
op = OP_CONSTRUCT_KNOWN_RECORD_WITH_NT_VV;
else
op = OP_CONSTRUCT_KNOWN_RECORD_V;
}
else {
op = OP_CONSTRUCT_KNOWN_RECORD_WITH_INITS_V;
if ( network_time_index >= 0 )
op = OP_CONSTRUCT_KNOWN_RECORD_WITH_INITS_AND_NT_VV;
else
op = OP_CONSTRUCT_KNOWN_RECORD_WITH_INITS_V;
aux->field_inits = std::move(fi);
}
}
else
op = OP_CONSTRUCT_DIRECT_RECORD_V;
ZInstI z = GenInst(op, n);
ZInstI z = network_time_index >= 0 ? GenInst(op, n, network_time_index) : GenInst(op, n);
z.aux = aux;
z.t = e->GetType();