From 5c7960be57010bf61db3d4ce879a3194687b5af9 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Thu, 11 May 2017 10:59:22 -0400 Subject: refactor gradient stage names This is just a name refactor and I'm happy to delay it until we're done with the current wave of gradient CLs. The main ideas: - we use the "linear_gradient" stages for all gradients, so cut the "linear" and just call them "gradient"; - remind ourselves that the 2-stop stage requires even spacing, i.e. stops at 0 and 1. This name should harmonize with Herb's new general evenly spaced gradient stage, currently "evenly_spaced_linear_gradient", and after it lands and I rebase, "evenly_spaced_gradient" - remind ourselves which polar coordinate xy_to_polar_unit returns, the angle. Change-Id: I0fd0c8bd4c1ead7d2d0fff45a199d318b71f34ac Reviewed-on: https://skia-review.googlesource.com/16500 Commit-Queue: Mike Klein Reviewed-by: Mike Reed --- src/jumper/SkJumper_generated_win.S | 72 ++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'src/jumper/SkJumper_generated_win.S') diff --git a/src/jumper/SkJumper_generated_win.S b/src/jumper/SkJumper_generated_win.S index 88f335f025..8cfbc62fca 100644 --- a/src/jumper/SkJumper_generated_win.S +++ b/src/jumper/SkJumper_generated_win.S @@ -3830,8 +3830,8 @@ _sk_matrix_perspective_hsw LABEL PROC DB 72,173 ; lods %ds:(%rsi),%rax DB 255,224 ; jmpq *%rax -PUBLIC _sk_linear_gradient_hsw -_sk_linear_gradient_hsw LABEL PROC +PUBLIC _sk_gradient_hsw +_sk_gradient_hsw LABEL PROC DB 72,173 ; lods %ds:(%rsi),%rax DB 196,98,125,24,64,16 ; vbroadcastss 0x10(%rax),%ymm8 DB 196,98,125,24,88,20 ; vbroadcastss 0x14(%rax),%ymm11 @@ -3839,7 +3839,7 @@ _sk_linear_gradient_hsw LABEL PROC DB 196,98,125,24,72,28 ; vbroadcastss 0x1c(%rax),%ymm9 DB 76,139,0 ; mov (%rax),%r8 DB 77,133,192 ; test %r8,%r8 - DB 15,132,143,0,0,0 ; je 3fa9 <_sk_linear_gradient_hsw+0xb5> + DB 15,132,143,0,0,0 ; je 3fa9 <_sk_gradient_hsw+0xb5> DB 72,139,64,8 ; mov 0x8(%rax),%rax DB 72,131,192,32 ; add $0x20,%rax DB 196,65,28,87,228 ; vxorps %ymm12,%ymm12,%ymm12 @@ -3866,8 +3866,8 @@ _sk_linear_gradient_hsw LABEL PROC DB 196,67,13,74,201,208 ; vblendvps %ymm13,%ymm9,%ymm14,%ymm9 DB 72,131,192,36 ; add $0x24,%rax DB 73,255,200 ; dec %r8 - DB 117,140 ; jne 3f33 <_sk_linear_gradient_hsw+0x3f> - DB 235,17 ; jmp 3fba <_sk_linear_gradient_hsw+0xc6> + DB 117,140 ; jne 3f33 <_sk_gradient_hsw+0x3f> + DB 235,17 ; jmp 3fba <_sk_gradient_hsw+0xc6> DB 197,244,87,201 ; vxorps %ymm1,%ymm1,%ymm1 DB 197,236,87,210 ; vxorps %ymm2,%ymm2,%ymm2 DB 197,228,87,219 ; vxorps %ymm3,%ymm3,%ymm3 @@ -3880,8 +3880,8 @@ _sk_linear_gradient_hsw LABEL PROC DB 197,124,41,192 ; vmovaps %ymm8,%ymm0 DB 255,224 ; jmpq *%rax -PUBLIC _sk_linear_gradient_2stops_hsw -_sk_linear_gradient_2stops_hsw LABEL PROC +PUBLIC _sk_evenly_spaced_2_stop_gradient_hsw +_sk_evenly_spaced_2_stop_gradient_hsw LABEL PROC DB 72,173 ; lods %ds:(%rsi),%rax DB 196,226,125,24,8 ; vbroadcastss (%rax),%ymm1 DB 196,98,125,24,64,16 ; vbroadcastss 0x10(%rax),%ymm8 @@ -3899,8 +3899,8 @@ _sk_linear_gradient_2stops_hsw LABEL PROC DB 197,124,41,192 ; vmovaps %ymm8,%ymm0 DB 255,224 ; jmpq *%rax -PUBLIC _sk_xy_to_polar_unit_hsw -_sk_xy_to_polar_unit_hsw LABEL PROC +PUBLIC _sk_xy_to_unit_angle_hsw +_sk_xy_to_unit_angle_hsw LABEL PROC DB 196,65,60,87,192 ; vxorps %ymm8,%ymm8,%ymm8 DB 197,60,92,200 ; vsubps %ymm0,%ymm8,%ymm9 DB 197,52,84,200 ; vandps %ymm0,%ymm9,%ymm9 @@ -9842,8 +9842,8 @@ _sk_matrix_perspective_avx LABEL PROC DB 72,173 ; lods %ds:(%rsi),%rax DB 255,224 ; jmpq *%rax -PUBLIC _sk_linear_gradient_avx -_sk_linear_gradient_avx LABEL PROC +PUBLIC _sk_gradient_avx +_sk_gradient_avx LABEL PROC DB 72,173 ; lods %ds:(%rsi),%rax DB 196,98,125,24,64,16 ; vbroadcastss 0x10(%rax),%ymm8 DB 196,226,125,24,72,20 ; vbroadcastss 0x14(%rax),%ymm1 @@ -9851,7 +9851,7 @@ _sk_linear_gradient_avx LABEL PROC DB 196,226,125,24,88,28 ; vbroadcastss 0x1c(%rax),%ymm3 DB 76,139,0 ; mov (%rax),%r8 DB 77,133,192 ; test %r8,%r8 - DB 15,132,146,0,0,0 ; je 5689 <_sk_linear_gradient_avx+0xb8> + DB 15,132,146,0,0,0 ; je 5689 <_sk_gradient_avx+0xb8> DB 72,139,64,8 ; mov 0x8(%rax),%rax DB 72,131,192,32 ; add $0x20,%rax DB 196,65,28,87,228 ; vxorps %ymm12,%ymm12,%ymm12 @@ -9878,8 +9878,8 @@ _sk_linear_gradient_avx LABEL PROC DB 196,227,13,74,219,208 ; vblendvps %ymm13,%ymm3,%ymm14,%ymm3 DB 72,131,192,36 ; add $0x24,%rax DB 73,255,200 ; dec %r8 - DB 117,140 ; jne 5613 <_sk_linear_gradient_avx+0x42> - DB 235,20 ; jmp 569d <_sk_linear_gradient_avx+0xcc> + DB 117,140 ; jne 5613 <_sk_gradient_avx+0x42> + DB 235,20 ; jmp 569d <_sk_gradient_avx+0xcc> DB 196,65,36,87,219 ; vxorps %ymm11,%ymm11,%ymm11 DB 196,65,44,87,210 ; vxorps %ymm10,%ymm10,%ymm10 DB 196,65,52,87,201 ; vxorps %ymm9,%ymm9,%ymm9 @@ -9896,8 +9896,8 @@ _sk_linear_gradient_avx LABEL PROC DB 197,124,41,192 ; vmovaps %ymm8,%ymm0 DB 255,224 ; jmpq *%rax -PUBLIC _sk_linear_gradient_2stops_avx -_sk_linear_gradient_2stops_avx LABEL PROC +PUBLIC _sk_evenly_spaced_2_stop_gradient_avx +_sk_evenly_spaced_2_stop_gradient_avx LABEL PROC DB 72,173 ; lods %ds:(%rsi),%rax DB 196,226,125,24,8 ; vbroadcastss (%rax),%ymm1 DB 196,226,125,24,80,16 ; vbroadcastss 0x10(%rax),%ymm2 @@ -9919,8 +9919,8 @@ _sk_linear_gradient_2stops_avx LABEL PROC DB 197,124,41,192 ; vmovaps %ymm8,%ymm0 DB 255,224 ; jmpq *%rax -PUBLIC _sk_xy_to_polar_unit_avx -_sk_xy_to_polar_unit_avx LABEL PROC +PUBLIC _sk_xy_to_unit_angle_avx +_sk_xy_to_unit_angle_avx LABEL PROC DB 196,65,60,87,192 ; vxorps %ymm8,%ymm8,%ymm8 DB 197,60,92,200 ; vsubps %ymm0,%ymm8,%ymm9 DB 197,52,84,200 ; vandps %ymm0,%ymm9,%ymm9 @@ -14611,8 +14611,8 @@ _sk_matrix_perspective_sse41 LABEL PROC DB 65,15,40,201 ; movaps %xmm9,%xmm1 DB 255,224 ; jmpq *%rax -PUBLIC _sk_linear_gradient_sse41 -_sk_linear_gradient_sse41 LABEL PROC +PUBLIC _sk_gradient_sse41 +_sk_gradient_sse41 LABEL PROC DB 72,173 ; lods %ds:(%rsi),%rax DB 243,68,15,16,80,16 ; movss 0x10(%rax),%xmm10 DB 69,15,198,210,0 ; shufps $0x0,%xmm10,%xmm10 @@ -14624,7 +14624,7 @@ _sk_linear_gradient_sse41 LABEL PROC DB 69,15,198,237,0 ; shufps $0x0,%xmm13,%xmm13 DB 72,139,8 ; mov (%rax),%rcx DB 72,133,201 ; test %rcx,%rcx - DB 15,132,4,1,0,0 ; je 3e44 <_sk_linear_gradient_sse41+0x13e> + DB 15,132,4,1,0,0 ; je 3e44 <_sk_gradient_sse41+0x13e> DB 72,131,236,88 ; sub $0x58,%rsp DB 15,41,36,36 ; movaps %xmm4,(%rsp) DB 15,41,108,36,16 ; movaps %xmm5,0x10(%rsp) @@ -14675,13 +14675,13 @@ _sk_linear_gradient_sse41 LABEL PROC DB 15,40,196 ; movaps %xmm4,%xmm0 DB 72,131,192,36 ; add $0x24,%rax DB 72,255,201 ; dec %rcx - DB 15,133,65,255,255,255 ; jne 3d6c <_sk_linear_gradient_sse41+0x66> + DB 15,133,65,255,255,255 ; jne 3d6c <_sk_gradient_sse41+0x66> DB 15,40,124,36,48 ; movaps 0x30(%rsp),%xmm7 DB 15,40,116,36,32 ; movaps 0x20(%rsp),%xmm6 DB 15,40,108,36,16 ; movaps 0x10(%rsp),%xmm5 DB 15,40,36,36 ; movaps (%rsp),%xmm4 DB 72,131,196,88 ; add $0x58,%rsp - DB 235,13 ; jmp 3e51 <_sk_linear_gradient_sse41+0x14b> + DB 235,13 ; jmp 3e51 <_sk_gradient_sse41+0x14b> DB 15,87,201 ; xorps %xmm1,%xmm1 DB 15,87,210 ; xorps %xmm2,%xmm2 DB 15,87,219 ; xorps %xmm3,%xmm3 @@ -14698,8 +14698,8 @@ _sk_linear_gradient_sse41 LABEL PROC DB 65,15,40,193 ; movaps %xmm9,%xmm0 DB 255,224 ; jmpq *%rax -PUBLIC _sk_linear_gradient_2stops_sse41 -_sk_linear_gradient_2stops_sse41 LABEL PROC +PUBLIC _sk_evenly_spaced_2_stop_gradient_sse41 +_sk_evenly_spaced_2_stop_gradient_sse41 LABEL PROC DB 68,15,40,192 ; movaps %xmm0,%xmm8 DB 72,173 ; lods %ds:(%rsi),%rax DB 243,15,16,0 ; movss (%rax),%xmm0 @@ -14729,8 +14729,8 @@ _sk_linear_gradient_2stops_sse41 LABEL PROC DB 72,173 ; lods %ds:(%rsi),%rax DB 255,224 ; jmpq *%rax -PUBLIC _sk_xy_to_polar_unit_sse41 -_sk_xy_to_polar_unit_sse41 LABEL PROC +PUBLIC _sk_xy_to_unit_angle_sse41 +_sk_xy_to_unit_angle_sse41 LABEL PROC DB 68,15,40,200 ; movaps %xmm0,%xmm9 DB 69,15,87,192 ; xorps %xmm8,%xmm8 DB 15,87,192 ; xorps %xmm0,%xmm0 @@ -21126,8 +21126,8 @@ _sk_matrix_perspective_sse2 LABEL PROC DB 65,15,40,201 ; movaps %xmm9,%xmm1 DB 255,224 ; jmpq *%rax -PUBLIC _sk_linear_gradient_sse2 -_sk_linear_gradient_sse2 LABEL PROC +PUBLIC _sk_gradient_sse2 +_sk_gradient_sse2 LABEL PROC DB 72,173 ; lods %ds:(%rsi),%rax DB 243,68,15,16,72,16 ; movss 0x10(%rax),%xmm9 DB 69,15,198,201,0 ; shufps $0x0,%xmm9,%xmm9 @@ -21139,7 +21139,7 @@ _sk_linear_gradient_sse2 LABEL PROC DB 69,15,198,228,0 ; shufps $0x0,%xmm12,%xmm12 DB 72,139,8 ; mov (%rax),%rcx DB 72,133,201 ; test %rcx,%rcx - DB 15,132,15,1,0,0 ; je 42da <_sk_linear_gradient_sse2+0x149> + DB 15,132,15,1,0,0 ; je 42da <_sk_gradient_sse2+0x149> DB 72,139,64,8 ; mov 0x8(%rax),%rax DB 72,131,192,32 ; add $0x20,%rax DB 69,15,87,192 ; xorps %xmm8,%xmm8 @@ -21200,8 +21200,8 @@ _sk_linear_gradient_sse2 LABEL PROC DB 69,15,86,231 ; orps %xmm15,%xmm12 DB 72,131,192,36 ; add $0x24,%rax DB 72,255,201 ; dec %rcx - DB 15,133,8,255,255,255 ; jne 41e0 <_sk_linear_gradient_sse2+0x4f> - DB 235,13 ; jmp 42e7 <_sk_linear_gradient_sse2+0x156> + DB 15,133,8,255,255,255 ; jne 41e0 <_sk_gradient_sse2+0x4f> + DB 235,13 ; jmp 42e7 <_sk_gradient_sse2+0x156> DB 15,87,201 ; xorps %xmm1,%xmm1 DB 15,87,210 ; xorps %xmm2,%xmm2 DB 15,87,219 ; xorps %xmm3,%xmm3 @@ -21218,8 +21218,8 @@ _sk_linear_gradient_sse2 LABEL PROC DB 65,15,40,192 ; movaps %xmm8,%xmm0 DB 255,224 ; jmpq *%rax -PUBLIC _sk_linear_gradient_2stops_sse2 -_sk_linear_gradient_2stops_sse2 LABEL PROC +PUBLIC _sk_evenly_spaced_2_stop_gradient_sse2 +_sk_evenly_spaced_2_stop_gradient_sse2 LABEL PROC DB 68,15,40,192 ; movaps %xmm0,%xmm8 DB 72,173 ; lods %ds:(%rsi),%rax DB 243,15,16,0 ; movss (%rax),%xmm0 @@ -21249,8 +21249,8 @@ _sk_linear_gradient_2stops_sse2 LABEL PROC DB 72,173 ; lods %ds:(%rsi),%rax DB 255,224 ; jmpq *%rax -PUBLIC _sk_xy_to_polar_unit_sse2 -_sk_xy_to_polar_unit_sse2 LABEL PROC +PUBLIC _sk_xy_to_unit_angle_sse2 +_sk_xy_to_unit_angle_sse2 LABEL PROC DB 68,15,40,192 ; movaps %xmm0,%xmm8 DB 15,87,192 ; xorps %xmm0,%xmm0 DB 69,15,87,201 ; xorps %xmm9,%xmm9 -- cgit v1.2.3