History

Get rid of double spaces in macro declarations

Martin Storsjö committed 12 years ago

Commit faaf62a1 parent ac03b8b8 files · +33 −33Browse files

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

Unified · Split

2 files
  1. codec/processing/src/arm/vaa_calc_neon.S +12 −12
  2. codec/processing/src/x86/vaa.asm +5 −5
codec/processing/src/arm/vaa_calc_neon.S+12−12
@@ -161,7 +161,7 @@ WELS_ASM_FUNC_END · 160 unmodified lines
161 161
162 162
163#ifdef __APPLE__163#ifdef __APPLE__
164.macro SAD_SD_MAD_16BYTES164.macro SAD_SD_MAD_16BYTES
165 vld1.32 {q0}, [$0], $2165 vld1.32 {q0}, [$0], $2
166 vld1.32 {q1}, [$1], $2166 vld1.32 {q1}, [$1], $2
167 167
@@ -173,7 +173,7 @@ WELS_ASM_FUNC_END · 5 unmodified lines
173 vpadal.u8 $6, q0173 vpadal.u8 $6, q0
174.endm174.endm
175 175
176.macro SAD_SD_MAD_8x16BYTES176.macro SAD_SD_MAD_8x16BYTES
177 vld1.32 {q0}, [$0], $2177 vld1.32 {q0}, [$0], $2
178 vld1.32 {q1}, [$1], $2178 vld1.32 {q1}, [$1], $2
179 179
@@ -195,7 +195,7 @@ WELS_ASM_FUNC_END · 15 unmodified lines
195 vsub.u16 $5, q2, q3195 vsub.u16 $5, q2, q3
196.endm196.endm
197 197
198.macro SAD_SD_MAD_CALC198.macro SAD_SD_MAD_CALC
199 vpmax.u8 d0, $0, $1 //8bytes199 vpmax.u8 d0, $0, $1 //8bytes
200 vpmax.u8 d0, d0, d0 //4bytes200 vpmax.u8 d0, d0, d0 //4bytes
201 vpmax.u8 $2, d0, d0 //2bytes201 vpmax.u8 $2, d0, d0 //2bytes
@@ -206,7 +206,7 @@ WELS_ASM_FUNC_END · 4 unmodified lines
206 vpaddl.s32 $4, $4206 vpaddl.s32 $4, $4
207.endm207.endm
208#else208#else
209.macro SAD_SD_MAD_16BYTES arg0, arg1, arg2, arg3, arg4, arg5, arg6209.macro SAD_SD_MAD_16BYTES arg0, arg1, arg2, arg3, arg4, arg5, arg6
210 vld1.32 {q0}, [\arg0], \arg2210 vld1.32 {q0}, [\arg0], \arg2
211 vld1.32 {q1}, [\arg1], \arg2211 vld1.32 {q1}, [\arg1], \arg2
212 212
@@ -218,7 +218,7 @@ WELS_ASM_FUNC_END · 5 unmodified lines
218 vpadal.u8 \arg6, q0218 vpadal.u8 \arg6, q0
219.endm219.endm
220 220
221.macro SAD_SD_MAD_8x16BYTES arg0, arg1, arg2, arg3, arg4, arg5221.macro SAD_SD_MAD_8x16BYTES arg0, arg1, arg2, arg3, arg4, arg5
222 vld1.32 {q0}, [\arg0], \arg2222 vld1.32 {q0}, [\arg0], \arg2
223 vld1.32 {q1}, [\arg1], \arg2223 vld1.32 {q1}, [\arg1], \arg2
224 224
@@ -240,7 +240,7 @@ WELS_ASM_FUNC_END · 15 unmodified lines
240 vsub.u16 \arg5, q2, q3240 vsub.u16 \arg5, q2, q3
241.endm241.endm
242 242
243.macro SAD_SD_MAD_CALC arg0, arg1, arg2, arg3, arg4243.macro SAD_SD_MAD_CALC arg0, arg1, arg2, arg3, arg4
244 vpmax.u8 d0, \arg0, \arg1 //8bytes244 vpmax.u8 d0, \arg0, \arg1 //8bytes
245 vpmax.u8 d0, d0, d0 //4bytes245 vpmax.u8 d0, d0, d0 //4bytes
246 vpmax.u8 \arg2, d0, d0 //2bytes246 vpmax.u8 \arg2, d0, d0 //2bytes
@@ -315,7 +315,7 @@ WELS_ASM_FUNC_END · 68 unmodified lines
315 315
316 316
317#ifdef __APPLE__317#ifdef __APPLE__
318.macro SSD_MUL_SUM_16BYTES_RESET318.macro SSD_MUL_SUM_16BYTES_RESET
319 vmull.u8 $3, $0, $0319 vmull.u8 $3, $0, $0
320 vpaddl.u16 $2, $3320 vpaddl.u16 $2, $3
321 321
@@ -323,7 +323,7 @@ WELS_ASM_FUNC_END · 1 unmodified line
323 vpadal.u16 $2, $3323 vpadal.u16 $2, $3
324.endm324.endm
325 325
326.macro SSD_MUL_SUM_16BYTES326.macro SSD_MUL_SUM_16BYTES
327 vmull.u8 $3, $0, $0327 vmull.u8 $3, $0, $0
328 vpadal.u16 $2, $3328 vpadal.u16 $2, $3
329 329
@@ -467,13 +467,13 @@ WELS_ASM_FUNC_END · 137 unmodified lines
467 SAD_SSD_BGD_CALC_8x16 d27, q15, q7467 SAD_SSD_BGD_CALC_8x16 d27, q15, q7
468.endm468.endm
469 469
470.macro SSD_SAD_SD_MAD_PADDL470.macro SSD_SAD_SD_MAD_PADDL
471 vpaddl.s16 $0, $0471 vpaddl.s16 $0, $0
472 vpaddl.s32 $0, $0472 vpaddl.s32 $0, $0
473 vadd.i32 $1, $1, $2473 vadd.i32 $1, $1, $2
474.endm474.endm
475#else475#else
476.macro SSD_MUL_SUM_16BYTES_RESET arg0, arg1, arg2, arg3476.macro SSD_MUL_SUM_16BYTES_RESET arg0, arg1, arg2, arg3
477 vmull.u8 \arg3, \arg0, \arg0477 vmull.u8 \arg3, \arg0, \arg0
478 vpaddl.u16 \arg2, \arg3478 vpaddl.u16 \arg2, \arg3
479 479
@@ -481,7 +481,7 @@ WELS_ASM_FUNC_END · 1 unmodified line
481 vpadal.u16 \arg2, \arg3481 vpadal.u16 \arg2, \arg3
482.endm482.endm
483 483
484.macro SSD_MUL_SUM_16BYTES arg0, arg1, arg2, arg3484.macro SSD_MUL_SUM_16BYTES arg0, arg1, arg2, arg3
485 vmull.u8 \arg3, \arg0, \arg0485 vmull.u8 \arg3, \arg0, \arg0
486 vpadal.u16 \arg2, \arg3486 vpadal.u16 \arg2, \arg3
487 487
@@ -625,7 +625,7 @@ WELS_ASM_FUNC_END · 137 unmodified lines
625 SAD_SSD_BGD_CALC_8x16 d27, q15, q7625 SAD_SSD_BGD_CALC_8x16 d27, q15, q7
626.endm626.endm
627 627
628.macro SSD_SAD_SD_MAD_PADDL arg0, arg1, arg2628.macro SSD_SAD_SD_MAD_PADDL arg0, arg1, arg2
629 vpaddl.s16 \arg0, \arg0629 vpaddl.s16 \arg0, \arg0
630 vpaddl.s32 \arg0, \arg0630 vpaddl.s32 \arg0, \arg0
631 vadd.i32 \arg1, \arg1, \arg2631 vadd.i32 \arg1, \arg1, \arg2
codec/processing/src/x86/vaa.asm+5−5
@@ -85,7 +85,7 @@ · 84 unmodified lines
85 ; end of @sum_8x285 ; end of @sum_8x2
86%endmacro ; END of SUM_WORD_8x2_SSE286%endmacro ; END of SUM_WORD_8x2_SSE2
87 87
88%macro WELS_SAD_SUM_SQSUM_16x1_SSE2 3 ;esi:%1,edi:%2,ebx:%388%macro WELS_SAD_SUM_SQSUM_16x1_SSE2 3 ;esi:%1,edi:%2,ebx:%3
89 movdqa xmm1, [%1]89 movdqa xmm1, [%1]
90 movdqa xmm2, [%2]90 movdqa xmm2, [%2]
91 movdqa xmm3, xmm191 movdqa xmm3, xmm1
@@ -108,7 +108,7 @@ · 16 unmodified lines
108 add %2, %3108 add %2, %3
109%endmacro109%endmacro
110 110
111%macro WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 3 ;esi:%1 edi:%2 ebx:%3111%macro WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 3 ;esi:%1 edi:%2 ebx:%3
112 movdqa xmm1, [%1]112 movdqa xmm1, [%1]
113 movdqa xmm2, [%2]113 movdqa xmm2, [%2]
114 movdqa xmm3, xmm1114 movdqa xmm3, xmm1
@@ -144,7 +144,7 @@ · 29 unmodified lines
144 add %2, %3144 add %2, %3
145%endmacro145%endmacro
146 146
147%macro WELS_SAD_SD_MAD_16x1_SSE2 7 ;esi:%5 edi:%6 ebx:%7147%macro WELS_SAD_SD_MAD_16x1_SSE2 7 ;esi:%5 edi:%6 ebx:%7
148%define sad_reg %1148%define sad_reg %1
149%define sum_cur_reg %2149%define sum_cur_reg %2
150%define sum_ref_reg %3150%define sum_ref_reg %3
@@ -172,7 +172,7 @@ · 21 unmodified lines
172%endmacro172%endmacro
173 173
174 174
175%macro WELS_MAX_REG_SSE2 1 ; xmm1, xmm2, xmm3 can be used175%macro WELS_MAX_REG_SSE2 1 ; xmm1, xmm2, xmm3 can be used
176%define max_reg %1176%define max_reg %1
177 movdqa xmm1, max_reg177 movdqa xmm1, max_reg
178 psrldq xmm1, 4178 psrldq xmm1, 4
@@ -185,7 +185,7 @@ · 6 unmodified lines
185 pmaxub max_reg, xmm1185 pmaxub max_reg, xmm1
186%endmacro186%endmacro
187 187
188%macro WELS_SAD_BGD_SQDIFF_16x1_SSE2 7 ;esi:%5 edi:%6 ebx:%7188%macro WELS_SAD_BGD_SQDIFF_16x1_SSE2 7 ;esi:%5 edi:%6 ebx:%7
189%define sad_reg %1189%define sad_reg %1
190%define sum_reg %2190%define sum_reg %2
191%define mad_reg %3191%define mad_reg %3

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