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

hook for skipping chains + optimize common case of all-assignments-managed

Browse source
This commit is contained in:
Vern Paxson 2024-05-10 10:56:03 -07:00
parent 9d886f61cc
commit c0045c4643
3 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/script_opt/Stmt.cc
View file

@ -904,6 +904,10 @@ bool StmtList::SimplifyChain(unsigned int start, unsigned int end, std::vector<S
OpChain add_chains; OpChain add_chains;
std::set<const Stmt*> chain_stmts; std::set<const Stmt*> chain_stmts;
static bool skip_chains = getenv("ZAM_SKIP_CHAINS");
if ( skip_chains )
return false;
for ( auto i = start; i <= end; ++i ) { for ( auto i = start; i <= end; ++i ) {
auto& s = stmts[i]; auto& s = stmts[i];
chain_stmts.insert(s.get()); chain_stmts.insert(s.get());

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

@ -242,7 +242,7 @@ const ZAMStmt ZAMCompiler::CompileRecFieldUpdates(const RecordFieldUpdates* e) {
std::set<TypeTag> field_tags; std::set<TypeTag> field_tags;
bool is_managed = false; size_t num_managed = 0;
for ( auto i : rhs_map ) { for ( auto i : rhs_map ) {
auto rt = rhs->GetType()->AsRecordType(); auto rt = rhs->GetType()->AsRecordType();
@ -251,7 +251,7 @@ const ZAMStmt ZAMCompiler::CompileRecFieldUpdates(const RecordFieldUpdates* e) {
if ( ZVal::IsManagedType(rt_ft_i) ) { if ( ZVal::IsManagedType(rt_ft_i) ) {
aux->is_managed.push_back(true); aux->is_managed.push_back(true);
is_managed = true; ++num_managed;
} }
else else
// This will only be needed if is_managed winds up being true, // This will only be needed if is_managed winds up being true,
@ -269,8 +269,14 @@ const ZAMStmt ZAMCompiler::CompileRecFieldUpdates(const RecordFieldUpdates* e) {
ZOp op; ZOp op;
if ( e->Tag() == EXPR_REC_ASSIGN_FIELDS ) if ( e->Tag() == EXPR_REC_ASSIGN_FIELDS ) {
op = is_managed ? OP_REC_ASSIGN_FIELDS_MANAGED_VV : OP_REC_ASSIGN_FIELDS_VV; if ( num_managed == rhs_map.size() )
op = OP_REC_ASSIGN_FIELDS_ALL_MANAGED_VV;
else if ( num_managed > 0 )
op = OP_REC_ASSIGN_FIELDS_MANAGED_VV;
else
op = OP_REC_ASSIGN_FIELDS_VV;
}
else if ( homogeneous ) { else if ( homogeneous ) {
if ( field_tags.count(TYPE_DOUBLE) > 0 ) if ( field_tags.count(TYPE_DOUBLE) > 0 )

14
src/script_opt/ZAM/Ops.in
View file

@ -1301,6 +1301,20 @@ eval SetUpRecFieldOps()
else else
lhs->RawOptField(lhs_map[i]) = rhs->RawField(rhs_map[i]); lhs->RawOptField(lhs_map[i]) = rhs->RawField(rhs_map[i]);
op Rec-Assign-Fields-All-Managed
op1-read
type VV
eval SetUpRecFieldOps()
for ( size_t i = 0U; i < n; ++i )
{
auto& lhs_i = lhs->RawOptField(lhs_map[i]);
auto rhs_i = rhs->RawField(rhs_map[i]);
zeek::Ref(rhs_i.ManagedVal());
if ( lhs_i )
ZVal::DeleteManagedType(*lhs_i);
lhs_i = rhs_i;
}
op Rec-Add-Int-Fields op Rec-Add-Int-Fields
op1-read op1-read
type VV type VV