Repository navigation
Commit fd8e6d7
committed
VisibilityCheck: walk the dep tree instead of its CNF form
process_depset() enumerated edepset.iter_cnf_solutions() and then walked
the resulting clause list once per profile. pkgcore's OrRestriction
converts to CNF by distributing, so an any-of block of N all-of branches
of M atoms each yields M^N clauses. That shape is exactly what
python_gen_any_dep emits, one branch per implementation, so
dev-python/click with distutils_enable_sphinx (6 impls, 7 atoms per
branch) produced 117,649 clauses, and every further implementation
multiplied the runtime by 7:
impls clauses enumeration
6 117,649 0.023s
7 823,543 0.294s
8 5,764,801 3.040s
9 40,353,607 22.294s
Hence the CI timeout on the reverted commit adding python3_15, and the
distutils_enable_sphinx calls commented out in click and cython.
Evaluate the node tree directly instead: an atom is solvable per the
existing per-profile caches, an all-of block needs every child, an any-of
block needs one. This is equivalent to requiring every CNF clause to
hold, blockers included -- a clause containing a blocker was dropped,
which matches treating a blocker as solvable -- but linear in the size of
the depset rather than exponential. The only divergence is that the CNF
form also collected atoms reached solely through redundant superset
clauses, so the reported solutions list is now tighter; that case doesn't
occur anywhere in ::gentoo.
While here, honor the insoluble cache. "if node in insoluble: pass" was a
no-op, so a known-unsolvable atom was re-queried on every clause it
appeared in.
Scanning the two packages from the report with their sphinx deps restored,
-j10: click 21.2s real / 56.0s CPU -> 5.9s / 5.1s, cython 5.9s / 14.8s ->
2.9s / 3.7s.
Resolves: #782
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>1 parent ce7263a commit fd8e6d7
9 files changed
Lines changed: 94 additions & 42 deletions
File tree
- src/pkgcheck/checks
- testdata
- data/repos/visibility/VisibilityCheck/NonsolvableDepsInStable
- repos/visibility
- NonsolvableDepsInStable
- any-of-solvable
- any-of
- profiles/visibility/amd64
- dev
- exp
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
34 | 41 | | |
35 | 42 | | |
36 | 43 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
486 | 486 | | |
487 | 487 | | |
488 | 488 | | |
489 | | - | |
490 | | - | |
| 489 | + | |
| 490 | + | |
| 491 | + | |
| 492 | + | |
| 493 | + | |
| 494 | + | |
| 495 | + | |
| 496 | + | |
| 497 | + | |
491 | 498 | | |
492 | | - | |
493 | | - | |
494 | | - | |
495 | | - | |
496 | | - | |
497 | | - | |
498 | | - | |
| 499 | + | |
| 500 | + | |
| 501 | + | |
| 502 | + | |
| 503 | + | |
| 504 | + | |
| 505 | + | |
| 506 | + | |
| 507 | + | |
| 508 | + | |
| 509 | + | |
| 510 | + | |
| 511 | + | |
| 512 | + | |
| 513 | + | |
| 514 | + | |
| 515 | + | |
| 516 | + | |
| 517 | + | |
| 518 | + | |
| 519 | + | |
| 520 | + | |
| 521 | + | |
| 522 | + | |
| 523 | + | |
| 524 | + | |
| 525 | + | |
| 526 | + | |
| 527 | + | |
| 528 | + | |
| 529 | + | |
| 530 | + | |
| 531 | + | |
| 532 | + | |
| 533 | + | |
| 534 | + | |
| 535 | + | |
| 536 | + | |
| 537 | + | |
| 538 | + | |
499 | 539 | | |
| 540 | + | |
500 | 541 | | |
501 | 542 | | |
502 | | - | |
503 | | - | |
504 | | - | |
505 | | - | |
506 | | - | |
507 | | - | |
508 | | - | |
509 | | - | |
510 | | - | |
511 | | - | |
512 | | - | |
513 | | - | |
514 | | - | |
515 | | - | |
516 | | - | |
517 | | - | |
518 | | - | |
519 | | - | |
520 | | - | |
521 | | - | |
522 | | - | |
523 | | - | |
524 | | - | |
525 | | - | |
526 | | - | |
527 | | - | |
528 | | - | |
529 | | - | |
530 | | - | |
531 | | - | |
532 | | - | |
533 | | - | |
534 | | - | |
| 543 | + | |
535 | 544 | | |
536 | 545 | | |
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
Lines changed: 10 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
Lines changed: 11 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
Lines changed: 11 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
2 | 3 | | |
3 | 4 | | |
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
2 | 3 | | |
3 | 4 | | |
0 commit comments