Commit eb63cc6
authored
[MLAS] Fix scratch buffer over-allocation in batched/grouped NCHW Conv (microsoft#28482)
### Description
microsoft#26103 which was shipped
with ORT 1.23.2 introduced logic to parallelize on the batch and/or
group count parameters for NCHW Conv if either were > 1 to improve
performance of batched grouped convolutions - prior to that the
parallelization was only on the output spatial map. The per-thread
scratch buffer allocated by the B/G parallelization path introduced in
microsoft#26103 is excessive and is
not needed for the algorithm being used. Under the hood,
`MlasConvOperation()` uses a double tiled approach which means that the
per-thread scratch buffer needs just enough memory to fit that tile of
data and nothing more than that. This change fixes the conservative
over-allocation which shows up as a memory bloat in OP's model in issue
microsoft#28466
Note: the work partitioning across (batch × group) introduced in microsoft#26103
is unchanged — only the per-thread scratch buffer sizing is corrected.
The batched/grouped Conv speedup from microsoft#26103 is retained.
### Motivation and Context
Fix microsoft#284661 parent 45c0663 commit eb63cc6
3 files changed
Lines changed: 133 additions & 5 deletions
File tree
- onnxruntime
- core/mlas/lib
- test
- contrib_ops
- mlas/unittest
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
849 | 849 | | |
850 | 850 | | |
851 | 851 | | |
852 | | - | |
| 852 | + | |
853 | 853 | | |
854 | 854 | | |
855 | 855 | | |
| |||
1712 | 1712 | | |
1713 | 1713 | | |
1714 | 1714 | | |
1715 | | - | |
1716 | | - | |
1717 | | - | |
1718 | 1715 | | |
1719 | 1716 | | |
1720 | 1717 | | |
1721 | 1718 | | |
1722 | | - | |
| 1719 | + | |
1723 | 1720 | | |
1724 | 1721 | | |
1725 | 1722 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
374 | 374 | | |
375 | 375 | | |
376 | 376 | | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
| 434 | + | |
| 435 | + | |
| 436 | + | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
| 444 | + | |
| 445 | + | |
| 446 | + | |
| 447 | + | |
| 448 | + | |
| 449 | + | |
| 450 | + | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
| 455 | + | |
| 456 | + | |
| 457 | + | |
| 458 | + | |
| 459 | + | |
| 460 | + | |
377 | 461 | | |
378 | 462 | | |
379 | 463 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
492 | 492 | | |
493 | 493 | | |
494 | 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 | + | |
| 539 | + | |
| 540 | + | |
495 | 541 | | |
496 | 542 | | |
497 | 543 | | |
| |||
688 | 734 | | |
689 | 735 | | |
690 | 736 | | |
| 737 | + | |
691 | 738 | | |
692 | 739 | | |
0 commit comments