Skip to content

Commit 2b4fde7

Browse files
hvitvedhvitved
committed
Data flow: Speedup subpaths predicate
Before ``` [2022-05-02 15:47:16] (1280s) Tuple counts for DataFlowImpl::Subpaths::subpaths#656de156#ffff/4@c5f3dclb after 3m22s: 8389013 ~4% {5} r1 = JOIN DataFlowImpl::Subpaths::subpaths#656de156#ffff#shared WITH DataFlowImpl::PathNode::getASuccessor#dispred#f0820431#ff_10#join_rhs ON FIRST 1 OUTPUT Rhs.1 'arg', Lhs.1, Lhs.2, Lhs.3, Lhs.4 'out' 6689751 ~0% {4} r2 = JOIN r1 WITH DataFlowImpl::Subpaths::subpaths03#656de156#ffffff_034512#join_rhs ON FIRST 4 OUTPUT Rhs.4, Lhs.4 'out', Lhs.0 'arg', Rhs.5 'ret' 1513839768 ~1% {5} r3 = JOIN r2 WITH DataFlowImpl::PathNodeImpl::getNodeEx#dispred#f0820431#ff_10#join_rhs ON FIRST 1 OUTPUT Lhs.1 'out', Lhs.2 'arg', Lhs.3 'ret', Rhs.1 'par', Lhs.3 'ret' 1513839768 ~1% {5} r4 = r3 AND NOT DataFlowImpl::PathNodeImpl::isHidden#dispred#f0820431#f(Lhs.4 'ret') 1513839768 ~5% {4} r5 = SCAN r4 OUTPUT In.1 'arg', In.3 'par', In.0 'out', In.4 'ret' 1513839768 ~2% {4} r6 = JOIN r2 WITH DataFlowImpl::PathNodeImpl::getNodeEx#dispred#f0820431#ff_10#join_rhs ON FIRST 1 OUTPUT Lhs.3 'ret', Lhs.1 'out', Lhs.2 'arg', Rhs.1 'par' 0 ~0% {5} r7 = JOIN r6 WITH boundedFastTC(DataFlowImpl::Subpaths::localStepToHidden#656de156#ff_10#higher_order_body,DataFlowImpl::Subpaths::subpaths#656de156#ffff#higher_order_body) ON FIRST 1 OUTPUT Lhs.1 'out', Lhs.2 'arg', Lhs.0, Lhs.3 'par', Rhs.1 'ret' 0 ~0% {5} r8 = r7 AND NOT DataFlowImpl::PathNodeImpl::isHidden#dispred#f0820431#f(Lhs.4 'ret') 0 ~0% {4} r9 = SCAN r8 OUTPUT In.1 'arg', In.3 'par', In.0 'out', In.4 'ret' 1513839768 ~5% {4} r10 = r5 UNION r9 6689751 ~0% {4} r11 = JOIN r10 WITH DataFlowImpl::PathNode::getASuccessor#dispred#f0820431#ff ON FIRST 2 OUTPUT Lhs.0 'arg', Lhs.1 'par', Lhs.3 'ret', Lhs.2 'out' return r11 ``` After ``` [2022-05-03 11:44:10] (969s) Tuple counts for DataFlowImpl::Subpaths::subpaths#656de156#ffff/4@b26b969r after 11.8s: 8372525 ~0% {3} r1 = JOIN DataFlowImpl::PathNode::getASuccessor#dispred#f0820431#ff_10#join_rhs WITH DataFlowImpl::PathNodeImpl::getNodeEx#dispred#f0820431#ff ON FIRST 1 OUTPUT Lhs.1 'arg', Rhs.1, Rhs.0 6673799 ~6% {9} r2 = JOIN r1 WITH DataFlowImpl::Subpaths::subpaths03#656de156#fffffffff ON FIRST 2 OUTPUT Rhs.3, Rhs.4, Rhs.5, Rhs.7, Rhs.6, Rhs.8, Lhs.2 'par', Lhs.0 'arg', Rhs.2 'ret' 6637884 ~0% {5} r3 = JOIN r2 WITH project#DataFlowImpl::pathNode#656de156#ffffffff_1234560#join_rhs ON FIRST 6 OUTPUT Lhs.6 'par', Lhs.7 'arg', Lhs.8 'ret', Rhs.6 'out', Lhs.8 'ret' 6637884 ~0% {4} r4 = JOIN r2 WITH project#DataFlowImpl::pathNode#656de156#ffffffff_1234560#join_rhs ON FIRST 6 OUTPUT Rhs.6 'out', Lhs.6 'par', Lhs.7 'arg', Lhs.8 'ret' 51867 ~0% {5} r5 = JOIN r4 WITH DataFlowImpl::PathNodeMid::projectToSink#dispred#f0820431#ff ON FIRST 1 OUTPUT Lhs.1 'par', Lhs.2 'arg', Lhs.3 'ret', Rhs.1 'out', Lhs.3 'ret' 6689751 ~0% {5} r6 = r3 UNION r5 6689751 ~0% {5} r7 = r6 AND NOT DataFlowImpl::PathNodeImpl::isHidden#dispred#f0820431#f(Lhs.4 'ret') 6689751 ~0% {4} r8 = SCAN r7 OUTPUT In.1 'arg', In.0 'par', In.4 'ret', In.3 'out' 6637884 ~0% {4} r9 = JOIN r2 WITH project#DataFlowImpl::pathNode#656de156#ffffffff_1234560#join_rhs ON FIRST 6 OUTPUT Lhs.8 'ret', Lhs.6 'par', Lhs.7 'arg', Rhs.6 'out' 51867 ~0% {4} r10 = JOIN r4 WITH DataFlowImpl::PathNodeMid::projectToSink#dispred#f0820431#ff ON FIRST 1 OUTPUT Lhs.3 'ret', Lhs.1 'par', Lhs.2 'arg', Rhs.1 'out' 6689751 ~0% {4} r11 = r9 UNION r10 0 ~0% {5} r12 = JOIN r11 WITH boundedFastTC(DataFlowImpl::Subpaths::localStepToHidden#656de156#ff_10#higher_order_body,DataFlowImpl::Subpaths::subpaths#656de156#ffff#higher_order_body) ON FIRST 1 OUTPUT Lhs.1 'par', Lhs.2 'arg', Lhs.0, Lhs.3 'out', Rhs.1 'ret' 0 ~0% {5} r13 = r12 AND NOT DataFlowImpl::PathNodeImpl::isHidden#dispred#f0820431#f(Lhs.4 'ret') 0 ~0% {4} r14 = SCAN r13 OUTPUT In.1 'arg', In.0 'par', In.4 'ret', In.3 'out' 6689751 ~0% {4} r15 = r8 UNION r14 return r15 ```
1 parent 806dacb commit 2b4fde7

File tree

1 file changed

+22
-17
lines changed

1 file changed

+22
-17
lines changed

‎csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll‎

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4206,10 +4206,11 @@ private module Subpaths {
42064206
pragma[nomagic]
42074207
private predicate subpaths01(
42084208
PathNodeImpl arg, ParamNodeEx par, SummaryCtxSome sc, CallContext innercc, ReturnKindExt kind,
4209-
NodeEx out, FlowState sout, AccessPath apout
4209+
NodeEx out, FlowState sout, CallContext ccout, AccessPath apout
42104210
) {
42114211
exists(Configuration config |
4212-
pathThroughCallable(arg, out, pragma[only_bind_into](sout), _, pragma[only_bind_into](apout)) and
4212+
pathThroughCallable(arg, out, pragma[only_bind_into](sout), ccout,
4213+
pragma[only_bind_into](apout)) and
42134214
pathIntoCallable(arg, par, _, _, innercc, sc, _, config) and
42144215
paramFlowsThrough(kind, pragma[only_bind_into](sout), innercc, sc,
42154216
pragma[only_bind_into](apout), _, unbindConf(config)) and
@@ -4224,10 +4225,11 @@ private module Subpaths {
42244225
pragma[nomagic]
42254226
private predicate subpaths02(
42264227
PathNode arg, ParamNodeEx par, SummaryCtxSome sc, CallContext innercc, ReturnKindExt kind,
4227-
NodeEx out, FlowState sout, AccessPath apout
4228+
NodeEx out, FlowState sout, CallContext ccout, AccessPath apout, Configuration config
42284229
) {
4229-
subpaths01(arg, par, sc, innercc, kind, out, sout, apout) and
4230-
out.asNode() = kind.getAnOutNode(_)
4230+
subpaths01(arg, par, sc, innercc, kind, out, sout, ccout, apout) and
4231+
out.asNode() = kind.getAnOutNode(_) and
4232+
config = getPathNodeConf(arg)
42314233
}
42324234

42334235
pragma[nomagic]
@@ -4238,12 +4240,14 @@ private module Subpaths {
42384240
*/
42394241
pragma[nomagic]
42404242
private predicate subpaths03(
4241-
PathNode arg, ParamNodeEx par, PathNodeMid ret, NodeEx out, FlowState sout, AccessPath apout
4243+
PathNodeMid arg, ParamNodeEx par, PathNodeMid ret, NodeEx out, FlowState sout,
4244+
CallContext ccout, AccessPath apout, SummaryCtx scout, Configuration config
42424245
) {
42434246
exists(SummaryCtxSome sc, CallContext innercc, ReturnKindExt kind, RetNodeEx retnode |
4244-
subpaths02(arg, par, sc, innercc, kind, out, sout, apout) and
4245-
pathNode(ret, retnode, sout, innercc, sc, apout, unbindConf(getPathNodeConf(arg)), _) and
4246-
kind = retnode.getKind()
4247+
subpaths02(arg, par, sc, innercc, kind, out, sout, ccout, apout, config) and
4248+
pathNode(ret, retnode, sout, innercc, sc, apout, config, _) and
4249+
kind = retnode.getKind() and
4250+
scout = arg.getSummaryCtx()
42474251
)
42484252
}
42494253

@@ -4263,16 +4267,17 @@ private module Subpaths {
42634267
* `ret -> out` is summarized as the edge `arg -> out`.
42644268
*/
42654269
predicate subpaths(PathNode arg, PathNodeImpl par, PathNodeImpl ret, PathNode out) {
4266-
exists(ParamNodeEx p, NodeEx o, FlowState sout, AccessPath apout, PathNodeMid out0 |
4270+
exists(
4271+
ParamNodeEx p, NodeEx o, FlowState sout, AccessPath apout, CallContext ccout,
4272+
SummaryCtx scout, PathNodeMid out0, Configuration config
4273+
|
42674274
pragma[only_bind_into](arg).getASuccessor() = par and
4268-
pragma[only_bind_into](arg).getASuccessor() = out0 and
4269-
subpaths03(arg, p, localStepToHidden*(ret), o, sout, apout) and
4275+
subpaths03(arg, p, localStepToHidden*(ret), o, sout, ccout, apout, scout, config) and
4276+
pathNode(out0, o, sout, ccout, scout, apout, config, _) and
42704277
not ret.isHidden() and
4271-
par.getNodeEx() = p and
4272-
out0.getNodeEx() = o and
4273-
out0.getState() = sout and
4274-
out0.getAp() = apout and
4275-
(out = out0 or out = out0.projectToSink())
4278+
par.getNodeEx() = p
4279+
|
4280+
out = out0 or out = out0.projectToSink()
42764281
)
42774282
}
42784283

0 commit comments

Comments
 (0)