History

Unify the indentation in the new aarch64 assembly files

Martin Storsjö committed 12 years ago

Commit ae629091 parent 964e98f2 files · +50 −50Browse files

Showing the changes to codec/processing/src (1 of 2 files). Show all

Unified · Split

codec/processing/src/arm64/vaa_calc_aarch64_neon.S+34−34
@@ -36,19 +36,19 @@ · 35 unmodified lines
3636
3737 #ifdef __APPLE__
3838 .macro ABS_SUB_SUM_16BYTES
39− ld1 {v0.16b}, [x0], x4
40− ld1 {v1.16b}, [x1], x4
41− uabal $0, v0.8b, v1.8b
42− uabal2 $1, v0.16b,v1.16b
39+ ld1 {v0.16b}, [x0], x4
40+ ld1 {v1.16b}, [x1], x4
41+ uabal $0, v0.8b, v1.8b
42+ uabal2 $1, v0.16b,v1.16b
4343 .endm
4444
4545 .macro ABS_SUB_SUM_8x16BYTES
46− ld1 {v0.16b}, [x0], x4
47− ld1 {v1.16b}, [x1], x4
48− uabdl $0, v0.8b, v1.8b
49− uabdl2 $1, v0.16b,v1.16b
46+ ld1 {v0.16b}, [x0], x4
47+ ld1 {v1.16b}, [x1], x4
48+ uabdl $0, v0.8b, v1.8b
49+ uabdl2 $1, v0.16b,v1.16b
5050
51− ABS_SUB_SUM_16BYTES $0, $1
51+ ABS_SUB_SUM_16BYTES $0, $1
5252 ABS_SUB_SUM_16BYTES $0, $1
5353 ABS_SUB_SUM_16BYTES $0, $1
5454 ABS_SUB_SUM_16BYTES $0, $1
@@ -58,19 +58,19 @@ · 3 unmodified lines
5858 .endm
5959 #else
6060 .macro ABS_SUB_SUM_16BYTES arg0, arg1
61− ld1 {v0.16b}, [x0], x4
62− ld1 {v1.16b}, [x1], x4
63− uabal \arg0, v0.8b, v1.8b
64− uabal2 \arg1, v0.16b,v1.16b
61+ ld1 {v0.16b}, [x0], x4
62+ ld1 {v1.16b}, [x1], x4
63+ uabal \arg0, v0.8b, v1.8b
64+ uabal2 \arg1, v0.16b,v1.16b
6565 .endm
6666
6767 .macro ABS_SUB_SUM_8x16BYTES arg0, arg1
68− ld1 {v0.16b}, [x0], x4
69− ld1 {v1.16b}, [x1], x4
70− uabdl \arg0, v0.8b, v1.8b
71− uabdl2 \arg1, v0.16b,v1.16b
68+ ld1 {v0.16b}, [x0], x4
69+ ld1 {v1.16b}, [x1], x4
70+ uabdl \arg0, v0.8b, v1.8b
71+ uabdl2 \arg1, v0.16b,v1.16b
7272
73− ABS_SUB_SUM_16BYTES \arg0, \arg1
73+ ABS_SUB_SUM_16BYTES \arg0, \arg1
7474 ABS_SUB_SUM_16BYTES \arg0, \arg1
7575 ABS_SUB_SUM_16BYTES \arg0, \arg1
7676 ABS_SUB_SUM_16BYTES \arg0, \arg1
@@ -82,7 +82,7 @@ · 5 unmodified lines
8282
8383 /*
8484 * void vaa_calc_sad_neon(uint8_t *cur_data, uint8_t *ref_data, int32_t pic_width, int32_t pic_height, int32_t pic_stride,
85− * int32_t *psadframe, int32_t *psad8x8)
85+ * int32_t *psadframe, int32_t *psad8x8)
8686 */
8787 WELS_ASM_AARCH64_FUNC_BEGIN VAACalcSad_AArch64_neon
8888 eor v31.16b, v31.16b, v31.16b
@@ -121,14 +121,14 @@ WELS_ASM_AARCH64_FUNC_END · 32 unmodified lines
121121
122122 .macro SAD_SD_MAD_8x16BYTES
123123 ld1 {v0.16b}, [x0], x4
124− ld1 {v1.16b}, [x1], x4
124+ ld1 {v1.16b}, [x1], x4
125125 uabd v31.16b, v0.16b, v1.16b
126126 uaddlp v2.8h, v31.16b
127127 uaddlp v4.8h, v0.16b
128128 uaddlp v5.8h, v1.16b
129129 .rept 7
130130 ld1 {v0.16b}, [x0], x4
131− ld1 {v1.16b}, [x1], x4
131+ ld1 {v1.16b}, [x1], x4
132132 uabd v30.16b, v0.16b, v1.16b
133133 umax v31.16b, v31.16b,v30.16b
134134 uadalp v2.8h, v30.16b
@@ -138,7 +138,7 @@ WELS_ASM_AARCH64_FUNC_END · 3 unmodified lines
138138 .endm
139139 /*
140140 * void vaa_calc_sad_bgd_neon(uint8_t *cur_data, uint8_t *ref_data, int32_t pic_width, int32_t pic_height, int32_t pic_stride,
141− * int32_t *psadframe, int32_t *psad8x8, int32_t *p_sd8x8, uint8_t *p_mad8x8)
141+ * int32_t *psadframe, int32_t *psad8x8, int32_t *p_sd8x8, uint8_t *p_mad8x8)
142142 */
143143 WELS_ASM_AARCH64_FUNC_BEGIN VAACalcSadBgd_AArch64_neon
144144 ldr x15, [sp, #0]
@@ -196,7 +196,7 @@ WELS_ASM_AARCH64_FUNC_END · 51 unmodified lines
196196
197197 .macro SAD_SSD_BGD_8x16BYTES_1
198198 ld1 {v0.16b}, [x0], x4
199− ld1 {v1.16b}, [x1], x4
199+ ld1 {v1.16b}, [x1], x4
200200 uabd v31.16b, v0.16b, v1.16b
201201 umull v30.8h, v31.8b, v31.8b
202202 uaddlp v29.4s, v30.8h
@@ -214,7 +214,7 @@ WELS_ASM_AARCH64_FUNC_END · 11 unmodified lines
214214 uaddlp v5.8h, v1.16b
215215 .rept 7
216216 ld1 {v0.16b}, [x0], x4
217− ld1 {v1.16b}, [x1], x4
217+ ld1 {v1.16b}, [x1], x4
218218 uabd v3.16b, v0.16b, v1.16b
219219 umax v31.16b, v31.16b,v3.16b //p_mad
220220 umull v30.8h, v3.8b, v3.8b
@@ -236,7 +236,7 @@ WELS_ASM_AARCH64_FUNC_END · 15 unmodified lines
236236
237237 .macro SAD_SSD_BGD_8x16BYTES_2
238238 ld1 {v0.16b}, [x0], x4
239− ld1 {v1.16b}, [x1], x4
239+ ld1 {v1.16b}, [x1], x4
240240 uabd v26.16b, v0.16b, v1.16b
241241 umull v30.8h, v26.8b, v26.8b
242242 uadalp v29.4s, v30.8h
@@ -254,7 +254,7 @@ WELS_ASM_AARCH64_FUNC_END · 11 unmodified lines
254254 uaddlp v7.8h, v1.16b
255255 .rept 7
256256 ld1 {v0.16b}, [x0], x4
257− ld1 {v1.16b}, [x1], x4
257+ ld1 {v1.16b}, [x1], x4
258258 uabd v3.16b, v0.16b, v1.16b
259259 umax v26.16b, v26.16b,v3.16b //p_mad
260260 umull v30.8h, v3.8b, v3.8b
@@ -347,7 +347,7 @@ WELS_ASM_AARCH64_FUNC_END · 86 unmodified lines
347347
348348 .macro SAD_SSD_8x16BYTES_1
349349 ld1 {v0.16b}, [x0], x4
350− ld1 {v1.16b}, [x1], x4
350+ ld1 {v1.16b}, [x1], x4
351351 uabd v31.16b, v0.16b, v1.16b
352352 umull v30.8h, v31.8b, v31.8b
353353 uaddlp v29.4s, v30.8h
@@ -363,7 +363,7 @@ WELS_ASM_AARCH64_FUNC_END · 9 unmodified lines
363363 uaddlp v2.8h, v31.16b // p_sad
364364 .rept 7
365365 ld1 {v0.16b}, [x0], x4
366− ld1 {v1.16b}, [x1], x4
366+ ld1 {v1.16b}, [x1], x4
367367 uabd v3.16b, v0.16b, v1.16b
368368 umull v30.8h, v3.8b, v3.8b
369369 uadalp v29.4s, v30.8h
@@ -382,7 +382,7 @@ WELS_ASM_AARCH64_FUNC_END · 12 unmodified lines
382382
383383 .macro SAD_SSD_8x16BYTES_2
384384 ld1 {v0.16b}, [x0], x4
385− ld1 {v1.16b}, [x1], x4
385+ ld1 {v1.16b}, [x1], x4
386386 uabd v26.16b, v0.16b, v1.16b
387387 umull v30.8h, v26.8b, v26.8b
388388 uadalp v29.4s, v30.8h
@@ -400,7 +400,7 @@ WELS_ASM_AARCH64_FUNC_END · 11 unmodified lines
400400 uaddlp v7.8h, v1.16b
401401 .rept 7
402402 ld1 {v0.16b}, [x0], x4
403− ld1 {v1.16b}, [x1], x4
403+ ld1 {v1.16b}, [x1], x4
404404 uabd v3.16b, v0.16b, v1.16b
405405 umull v30.8h, v3.8b, v3.8b
406406 uadalp v29.4s, v30.8h
@@ -469,7 +469,7 @@ WELS_ASM_AARCH64_FUNC_END · 62 unmodified lines
469469
470470 .macro SAD_VAR_8x16BYTES_1
471471 ld1 {v0.16b}, [x0], x4
472− ld1 {v1.16b}, [x1], x4
472+ ld1 {v1.16b}, [x1], x4
473473 uabd v31.16b, v0.16b, v1.16b
474474 uaddlp v2.8h, v31.16b // p_sad
475475
@@ -481,7 +481,7 @@ WELS_ASM_AARCH64_FUNC_END · 5 unmodified lines
481481
482482 .rept 7
483483 ld1 {v0.16b}, [x0], x4
484− ld1 {v1.16b}, [x1], x4
484+ ld1 {v1.16b}, [x1], x4
485485 uabd v3.16b, v0.16b, v1.16b
486486 uadalp v2.8h, v3.16b //p_sad
487487
@@ -494,7 +494,7 @@ WELS_ASM_AARCH64_FUNC_END · 6 unmodified lines
494494 .endm
495495 .macro SAD_VAR_8x16BYTES_2
496496 ld1 {v0.16b}, [x0], x4
497− ld1 {v1.16b}, [x1], x4
497+ ld1 {v1.16b}, [x1], x4
498498 uabd v26.16b, v0.16b, v1.16b
499499 uaddlp v16.8h,v26.16b // p_sad
500500
@@ -505,7 +505,7 @@ WELS_ASM_AARCH64_FUNC_END · 4 unmodified lines
505505 uadalp v27.4s, v30.8h // p_sqsum
506506 .rept 7
507507 ld1 {v0.16b}, [x0], x4
508− ld1 {v1.16b}, [x1], x4
508+ ld1 {v1.16b}, [x1], x4
509509 uabd v3.16b, v0.16b, v1.16b
510510 uadalp v16.8h, v3.16b //p_sad
511511

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t