Unified · Split
| @@ -202,8 +202,8 @@ cglobal %2_to_%1_%3, 3, 3, 6, dst, src, len · 201 unmodified lines | ||
| 202 | 202 | %endif |
| 203 | 203 | %endmacro |
| 204 | 204 | |
| 205 | −%macro PACK_6CH 5-7 | |
| 206 | −cglobal pack_6ch_%2_to_%1_%3, 2,8,7, dst, src, src1, src2, src3, src4, src5, len | |
| 205 | +%macro PACK_6CH 8 | |
| 206 | +cglobal pack_6ch_%2_to_%1_%3, 2, 8, %6, dst, src, src1, src2, src3, src4, src5, len | |
| 207 | 207 | %if ARCH_X86_64 |
| 208 | 208 | mov lend, r2d |
| 209 | 209 | %else |
| @@ -239,7 +239,7 @@ pack_6ch_%2_to_%1_u_int %+ SUFFIX: · 29 unmodified lines | ||
| 239 | 239 | sub src3q, srcq |
| 240 | 240 | sub src4q, srcq |
| 241 | 241 | sub src5q, srcq |
| 242 | − %7 x,x,x,x,m7,x | |
| 242 | + %8 x,x,x,x,m7,x | |
| 243 | 243 | .loop: |
| 244 | 244 | mov%3 m0, [srcq ] |
| 245 | 245 | mov%3 m1, [srcq+src1q] |
| @@ -271,9 +271,9 @@ pack_6ch_%2_to_%1_u_int %+ SUFFIX: · 25 unmodified lines | ||
| 271 | 271 | movlhps m1, m3 |
| 272 | 272 | movhlps m5, m3 |
| 273 | 273 | |
| 274 | − %6 m0,m6,x,x,m7,m3 | |
| 275 | − %6 m4,m1,x,x,m7,m3 | |
| 276 | − %6 m2,m5,x,x,m7,m3 | |
| 274 | + %7 m0,m6,x,x,m7,m3 | |
| 275 | + %7 m4,m1,x,x,m7,m3 | |
| 276 | + %7 m2,m5,x,x,m7,m3 | |
| 277 | 277 | |
| 278 | 278 | mov %+ %3 %+ ps [dstq ], m0 |
| 279 | 279 | mov %+ %3 %+ ps [dstq+16], m6 |
| @@ -305,8 +305,8 @@ pack_6ch_%2_to_%1_u_int %+ SUFFIX: · 25 unmodified lines | ||
| 305 | 305 | %endif |
| 306 | 306 | %endmacro |
| 307 | 307 | |
| 308 | −%macro UNPACK_6CH 5-7 | |
| 309 | −cglobal unpack_6ch_%2_to_%1_%3, 2, 8, 8, dst, src, dst1, dst2, dst3, dst4, dst5, len | |
| 308 | +%macro UNPACK_6CH 8 | |
| 309 | +cglobal unpack_6ch_%2_to_%1_%3, 2, 8, %6, dst, src, dst1, dst2, dst3, dst4, dst5, len | |
| 310 | 310 | %if ARCH_X86_64 |
| 311 | 311 | mov lend, r2d |
| 312 | 312 | %else |
| @@ -342,7 +342,7 @@ unpack_6ch_%2_to_%1_u_int %+ SUFFIX: · 29 unmodified lines | ||
| 342 | 342 | sub dst3q, dstq |
| 343 | 343 | sub dst4q, dstq |
| 344 | 344 | sub dst5q, dstq |
| 345 | − %7 x,x,x,x,m7,x | |
| 345 | + %8 x,x,x,x,m7,x | |
| 346 | 346 | .loop: |
| 347 | 347 | mov%3 m0, [srcq ] |
| 348 | 348 | mov%3 m1, [srcq+16] |
| @@ -360,9 +360,9 @@ unpack_6ch_%2_to_%1_u_int %+ SUFFIX: · 11 unmodified lines | ||
| 360 | 360 | SWAP 1, 4 |
| 361 | 361 | SWAP 2, 3 |
| 362 | 362 | |
| 363 | − %6 m0,m1,x,x,m7,m6 | |
| 364 | − %6 m2,m3,x,x,m7,m6 | |
| 365 | − %6 m4,m5,x,x,m7,m6 | |
| 363 | + %7 m0,m1,x,x,m7,m6 | |
| 364 | + %7 m2,m3,x,x,m7,m6 | |
| 365 | + %7 m4,m5,x,x,m7,m6 | |
| 366 | 366 | |
| 367 | 367 | mov %+ %3 %+ ps [dstq ], m0 |
| 368 | 368 | mov %+ %3 %+ ps [dstq+dst1q], m1 |
| @@ -380,8 +380,8 @@ unpack_6ch_%2_to_%1_u_int %+ SUFFIX: · 11 unmodified lines | ||
| 380 | 380 | |
| 381 | 381 | %define PACK_8CH_GPRS (10 * ARCH_X86_64) + ((6 + HAVE_ALIGNED_STACK) * ARCH_X86_32) |
| 382 | 382 | |
| 383 | −%macro PACK_8CH 5-7 | |
| 384 | −cglobal pack_8ch_%2_to_%1_%3, 2,PACK_8CH_GPRS,10, ARCH_X86_32*48, dst, src, len, src1, src2, src3, src4, src5, src6, src7 | |
| 383 | +%macro PACK_8CH 8 | |
| 384 | +cglobal pack_8ch_%2_to_%1_%3, 2, PACK_8CH_GPRS, %6, ARCH_X86_32*48, dst, src, len, src1, src2, src3, src4, src5, src6, src7 | |
| 385 | 385 | mov dstq, [dstq] |
| 386 | 386 | %if ARCH_X86_32 |
| 387 | 387 | DEFINE_ARGS dst, src, src2, src3, src4, src5, src6 |
| @@ -463,7 +463,7 @@ pack_8ch_%2_to_%1_u_int %+ SUFFIX: · 75 unmodified lines | ||
| 463 | 463 | %endif |
| 464 | 464 | |
| 465 | 465 | %if ARCH_X86_64 |
| 466 | − %7 x,x,x,x,m9,x | |
| 466 | + %8 x,x,x,x,m9,x | |
| 467 | 467 | %elifidn %1, int32 |
| 468 | 468 | %define m9 [flt2p31] |
| 469 | 469 | %else |
| @@ -489,10 +489,10 @@ pack_8ch_%2_to_%1_u_int %+ SUFFIX: · 19 unmodified lines | ||
| 489 | 489 | %if ARCH_X86_64 |
| 490 | 490 | TRANSPOSE8x4D 0, 1, 2, 3, 4, 5, 6, 7, 8 |
| 491 | 491 | |
| 492 | − %6 m0,m1,x,x,m9,m8 | |
| 493 | − %6 m2,m3,x,x,m9,m8 | |
| 494 | − %6 m4,m5,x,x,m9,m8 | |
| 495 | − %6 m6,m7,x,x,m9,m8 | |
| 492 | + %7 m0,m1,x,x,m9,m8 | |
| 493 | + %7 m2,m3,x,x,m9,m8 | |
| 494 | + %7 m4,m5,x,x,m9,m8 | |
| 495 | + %7 m6,m7,x,x,m9,m8 | |
| 496 | 496 | |
| 497 | 497 | mov%3 [dstq], m0 |
| 498 | 498 | %else |
| @@ -500,12 +500,12 @@ pack_8ch_%2_to_%1_u_int %+ SUFFIX: · 1 unmodified line | ||
| 500 | 500 | |
| 501 | 501 | TRANSPOSE8x4D 0, 1, 2, 3, 4, 5, 6, 7, [rsp], [rsp+16], 1 |
| 502 | 502 | |
| 503 | − %6 m0,m1,x,x,m9,m2 | |
| 503 | + %7 m0,m1,x,x,m9,m2 | |
| 504 | 504 | mova m2, [rsp] |
| 505 | 505 | mov%3 [dstq], m0 |
| 506 | − %6 m2,m3,x,x,m9,m0 | |
| 507 | − %6 m4,m5,x,x,m9,m0 | |
| 508 | − %6 m6,m7,x,x,m9,m0 | |
| 506 | + %7 m2,m3,x,x,m9,m0 | |
| 507 | + %7 m4,m5,x,x,m9,m0 | |
| 508 | + %7 m6,m7,x,x,m9,m0 | |
| 509 | 509 | |
| 510 | 510 | %endif |
| 511 | 511 | |
| @@ -614,15 +614,15 @@ CONV int32, int16, a, 2, 1, INT16_TO_INT32_N, NOP_N · 102 unmodified lines | ||
| 614 | 614 | CONV int16, int32, u, 1, 2, INT32_TO_INT16_N, NOP_N |
| 615 | 615 | CONV int16, int32, a, 1, 2, INT32_TO_INT16_N, NOP_N |
| 616 | 616 | |
| 617 | −PACK_6CH float, float, u, 2, 2, NOP_N, NOP_N | |
| 618 | −PACK_6CH float, float, a, 2, 2, NOP_N, NOP_N | |
| 617 | +PACK_6CH float, float, u, 2, 2, 0, NOP_N, NOP_N | |
| 618 | +PACK_6CH float, float, a, 2, 2, 0, NOP_N, NOP_N | |
| 619 | 619 | |
| 620 | 620 | INIT_XMM sse |
| 621 | −PACK_6CH float, float, u, 2, 2, NOP_N, NOP_N | |
| 622 | −PACK_6CH float, float, a, 2, 2, NOP_N, NOP_N | |
| 621 | +PACK_6CH float, float, u, 2, 2, 7, NOP_N, NOP_N | |
| 622 | +PACK_6CH float, float, a, 2, 2, 7, NOP_N, NOP_N | |
| 623 | 623 | |
| 624 | −UNPACK_6CH float, float, u, 2, 2, NOP_N, NOP_N | |
| 625 | −UNPACK_6CH float, float, a, 2, 2, NOP_N, NOP_N | |
| 624 | +UNPACK_6CH float, float, u, 2, 2, 7, NOP_N, NOP_N | |
| 625 | +UNPACK_6CH float, float, a, 2, 2, 7, NOP_N, NOP_N | |
| 626 | 626 | |
| 627 | 627 | INIT_XMM sse2 |
| 628 | 628 | CONV int32, int16, u, 2, 1, INT16_TO_INT32_N, NOP_N |
| @@ -675,23 +675,23 @@ UNPACK_2CH float, int16, a, 2, 1, INT16_TO_FLOAT_N, INT16_TO_FLOAT_INIT · 46 unmodified lines | ||
| 675 | 675 | UNPACK_2CH int16, float, u, 1, 2, FLOAT_TO_INT16_N, FLOAT_TO_INT16_INIT |
| 676 | 676 | UNPACK_2CH int16, float, a, 1, 2, FLOAT_TO_INT16_N, FLOAT_TO_INT16_INIT |
| 677 | 677 | |
| 678 | −PACK_6CH float, int32, u, 2, 2, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 679 | −PACK_6CH float, int32, a, 2, 2, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 680 | −PACK_6CH int32, float, u, 2, 2, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 681 | −PACK_6CH int32, float, a, 2, 2, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 678 | +PACK_6CH float, int32, u, 2, 2, 8, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 679 | +PACK_6CH float, int32, a, 2, 2, 8, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 680 | +PACK_6CH int32, float, u, 2, 2, 8, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 681 | +PACK_6CH int32, float, a, 2, 2, 8, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 682 | 682 | |
| 683 | −UNPACK_6CH float, int32, u, 2, 2, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 684 | −UNPACK_6CH float, int32, a, 2, 2, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 685 | −UNPACK_6CH int32, float, u, 2, 2, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 686 | −UNPACK_6CH int32, float, a, 2, 2, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 683 | +UNPACK_6CH float, int32, u, 2, 2, 8, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 684 | +UNPACK_6CH float, int32, a, 2, 2, 8, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 685 | +UNPACK_6CH int32, float, u, 2, 2, 8, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 686 | +UNPACK_6CH int32, float, a, 2, 2, 8, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 687 | 687 | |
| 688 | −PACK_8CH float, float, u, 2, 2, NOP_N, NOP_N | |
| 689 | −PACK_8CH float, float, a, 2, 2, NOP_N, NOP_N | |
| 688 | +PACK_8CH float, float, u, 2, 2, 9, NOP_N, NOP_N | |
| 689 | +PACK_8CH float, float, a, 2, 2, 9, NOP_N, NOP_N | |
| 690 | 690 | |
| 691 | −PACK_8CH float, int32, u, 2, 2, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 692 | −PACK_8CH float, int32, a, 2, 2, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 693 | −PACK_8CH int32, float, u, 2, 2, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 694 | −PACK_8CH int32, float, a, 2, 2, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 691 | +PACK_8CH float, int32, u, 2, 2, 10, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 692 | +PACK_8CH float, int32, a, 2, 2, 10, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 693 | +PACK_8CH int32, float, u, 2, 2, 10, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 694 | +PACK_8CH int32, float, a, 2, 2, 10, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 695 | 695 | |
| 696 | 696 | INIT_XMM ssse3 |
| 697 | 697 | UNPACK_2CH int16, int16, u, 1, 1, NOP_N, NOP_N |
| @@ -703,29 +703,29 @@ UNPACK_2CH float, int16, a, 2, 1, INT16_TO_FLOAT_N, INT16_TO_FLOAT_INIT · 5 unmodified lines | ||
| 703 | 703 | |
| 704 | 704 | %if HAVE_AVX_EXTERNAL |
| 705 | 705 | INIT_XMM avx |
| 706 | −PACK_6CH float, float, u, 2, 2, NOP_N, NOP_N | |
| 707 | −PACK_6CH float, float, a, 2, 2, NOP_N, NOP_N | |
| 706 | +PACK_6CH float, float, u, 2, 2, 8, NOP_N, NOP_N | |
| 707 | +PACK_6CH float, float, a, 2, 2, 8, NOP_N, NOP_N | |
| 708 | 708 | |
| 709 | −UNPACK_6CH float, float, u, 2, 2, NOP_N, NOP_N | |
| 710 | −UNPACK_6CH float, float, a, 2, 2, NOP_N, NOP_N | |
| 709 | +UNPACK_6CH float, float, u, 2, 2, 8, NOP_N, NOP_N | |
| 710 | +UNPACK_6CH float, float, a, 2, 2, 8, NOP_N, NOP_N | |
| 711 | 711 | |
| 712 | −PACK_6CH float, int32, u, 2, 2, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 713 | −PACK_6CH float, int32, a, 2, 2, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 714 | −PACK_6CH int32, float, u, 2, 2, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 715 | −PACK_6CH int32, float, a, 2, 2, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 712 | +PACK_6CH float, int32, u, 2, 2, 8, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 713 | +PACK_6CH float, int32, a, 2, 2, 8, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 714 | +PACK_6CH int32, float, u, 2, 2, 8, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 715 | +PACK_6CH int32, float, a, 2, 2, 8, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 716 | 716 | |
| 717 | −UNPACK_6CH float, int32, u, 2, 2, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 718 | −UNPACK_6CH float, int32, a, 2, 2, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 719 | −UNPACK_6CH int32, float, u, 2, 2, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 720 | −UNPACK_6CH int32, float, a, 2, 2, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 717 | +UNPACK_6CH float, int32, u, 2, 2, 8, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 718 | +UNPACK_6CH float, int32, a, 2, 2, 8, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 719 | +UNPACK_6CH int32, float, u, 2, 2, 8, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 720 | +UNPACK_6CH int32, float, a, 2, 2, 8, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 721 | 721 | |
| 722 | −PACK_8CH float, float, u, 2, 2, NOP_N, NOP_N | |
| 723 | −PACK_8CH float, float, a, 2, 2, NOP_N, NOP_N | |
| 722 | +PACK_8CH float, float, u, 2, 2, 9, NOP_N, NOP_N | |
| 723 | +PACK_8CH float, float, a, 2, 2, 9, NOP_N, NOP_N | |
| 724 | 724 | |
| 725 | −PACK_8CH float, int32, u, 2, 2, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 726 | −PACK_8CH float, int32, a, 2, 2, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 727 | −PACK_8CH int32, float, u, 2, 2, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 728 | −PACK_8CH int32, float, a, 2, 2, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 725 | +PACK_8CH float, int32, u, 2, 2, 10, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 726 | +PACK_8CH float, int32, a, 2, 2, 10, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT | |
| 727 | +PACK_8CH int32, float, u, 2, 2, 10, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 728 | +PACK_8CH int32, float, a, 2, 2, 10, FLOAT_TO_INT32_N, FLOAT_TO_INT32_INIT | |
| 729 | 729 | |
| 730 | 730 | INIT_YMM avx |
| 731 | 731 | CONV float, int32, u, 2, 2, INT32_TO_FLOAT_N, INT32_TO_FLOAT_INIT |