History

lavc/rv40dsp: fix RISC-V chroma_mc

sunyuechi committed 1 year ago

Commit 2dc864e1 parent 82da7691 file · +78 −38Browse files

Unified · Split

libavcodec/riscv/rv40dsp_rvv.S+78−38
@@ -20,15 +20,30 @@ · 19 unmodified lines
20 20
21#include "libavutil/riscv/asm.S"21#include "libavutil/riscv/asm.S"
22 22
23.macro manual_avg dst src1 src223const rv40_bias
24 vadd.vv \dst, \src1, \src224 .byte 0, 16, 32, 16
25 vadd.vi \dst, \dst, 125 .byte 32, 28, 32, 28
26 vsrl.vi \dst, \dst, 126 .byte 0, 32, 16, 32
27.endm27 .byte 32, 28, 32, 28
28endconst
28 29
29.macro do_chroma_mc type unroll30.macro do_chroma_mc type unroll
30 csrwi vxrm, 231 csrwi vxrm, 0
32 addi sp, sp, -16
33#if __riscv_xlen == 32
34 sw s2, (sp)
35#elif __riscv_xlen == 64
36 sd s2, (sp)
37#else
38 sq s2, (sp)
39#endif
40 lla t4, rv40_bias
41 srli t5, a5, 1
42 sh2add t4, t5, t4
43 srli t5, a4, 1
44 add t5, t4, t5
31 slli t2, a5, 345 slli t2, a5, 3
46 lb s2, (t5)
32 mul t1, a5, a447 mul t1, a5, a4
33 sh3add a5, a4, t248 sh3add a5, a4, t2
34 slli a4, a4, 349 slli a4, a4, 3
@@ -80,17 +95,19 @@ · 45 unmodified lines
80 vwmulu.vx v12, v14, a695 vwmulu.vx v12, v14, a6
81 vwmaccu.vx v10, t1, v1596 vwmaccu.vx v10, t1, v15
82 vwmaccu.vx v12, a7, v1597 vwmaccu.vx v12, a7, v15
83 vnclipu.wi v15, v8, 698 vwaddu.wx v20, v8, s2
99 vnsrl.wi v15, v20, 6
84 .ifc \type,avg100 .ifc \type,avg
85 vle8.v v9, (a0)101 vle8.v v9, (a0)
86 manual_avg v15, v15, v9102 vaaddu.vv v15, v15, v9
87 .endif103 .endif
88 vse8.v v15, (a0)104 vse8.v v15, (a0)
89 add a0, a0, a2105 add a0, a0, a2
90 vnclipu.wi v8, v10, 6106 vwaddu.wx v20, v10, s2
107 vnsrl.wi v8, v20, 6
91 .ifc \type,avg108 .ifc \type,avg
92 vle8.v v9, (a0)109 vle8.v v9, (a0)
93 manual_avg v8, v8, v9110 vaaddu.vv v8, v8, v9
94 .endif111 .endif
95 add t4, t4, t3112 add t4, t4, t3
96 vse8.v v8, (a0)113 vse8.v v8, (a0)
@@ -115,17 +132,19 @@ · 18 unmodified lines
115 vslide1down.vx v14, v14, t5132 vslide1down.vx v14, v14, t5
116 vsetvli zero, t6, e8, m1, ta, ma133 vsetvli zero, t6, e8, m1, ta, ma
117 vwmaccu.vx v16, t1, v14134 vwmaccu.vx v16, t1, v14
118 vnclipu.wi v8, v12, 6135 vwaddu.wx v20, v12, s2
136 vnsrl.wi v8, v20, 6
119 .ifc \type,avg137 .ifc \type,avg
120 vle8.v v9, (a0)138 vle8.v v9, (a0)
121 manual_avg v8, v8, v9139 vaaddu.vv v8, v8, v9
122 .endif140 .endif
123 vse8.v v8, (a0)141 vse8.v v8, (a0)
124 add a0, a0, a2142 add a0, a0, a2
125 vnclipu.wi v8, v16, 6143 vwaddu.wx v20, v16, s2
144 vnsrl.wi v8, v20, 6
126 .ifc \type,avg145 .ifc \type,avg
127 vle8.v v9, (a0)146 vle8.v v9, (a0)
128 manual_avg v8, v8, v9147 vaaddu.vv v8, v8, v9
129 .endif148 .endif
130 vse8.v v8, (a0)149 vse8.v v8, (a0)
131 add a0, a0, a2150 add a0, a0, a2
@@ -159,18 +178,20 @@ · 27 unmodified lines
159 vwmaccu.vx v10, t0, v8178 vwmaccu.vx v10, t0, v8
160 add a4, a4, a7179 add a4, a4, a7
161 vwmaccu.vx v12, t0, v9180 vwmaccu.vx v12, t0, v9
162 vnclipu.wi v15, v10, 6181 vwaddu.wx v20, v10, s2
182 vnsrl.wi v15, v20, 6
163 vwmulu.vx v10, v9, a6183 vwmulu.vx v10, v9, a6
164 vnclipu.wi v9, v12, 6184 vwaddu.wx v20, v12, s2
185 vnsrl.wi v9, v20, 6
165 .ifc \type,avg186 .ifc \type,avg
166 vle8.v v16, (a0)187 vle8.v v16, (a0)
167 manual_avg v15, v15, v16188 vaaddu.vv v15, v15, v16
168 .endif189 .endif
169 vse8.v v15, (a0)190 vse8.v v15, (a0)
170 add a0, a0, a2191 add a0, a0, a2
171 .ifc \type,avg192 .ifc \type,avg
172 vle8.v v16, (a0)193 vle8.v v16, (a0)
173 manual_avg v9, v9, v16194 vaaddu.vv v9, v9, v16
174 .endif195 .endif
175 vse8.v v9, (a0)196 vse8.v v9, (a0)
176 add a0, a0, a2197 add a0, a0, a2
@@ -179,18 +200,20 @@ · 2 unmodified lines
179 vle8.v v14, (a5)200 vle8.v v14, (a5)
180 vwmaccu.vx v10, t0, v8201 vwmaccu.vx v10, t0, v8
181 vwmulu.vx v12, v8, a6202 vwmulu.vx v12, v8, a6
182 vnclipu.wi v8, v10, 6203 vwaddu.wx v20, v10, s2
204 vnsrl.wi v8, v20, 6
183 vwmaccu.vx v12, t0, v14205 vwmaccu.vx v12, t0, v14
184 .ifc \type,avg206 .ifc \type,avg
185 vle8.v v16, (a0)207 vle8.v v16, (a0)
186 manual_avg v8, v8, v16208 vaaddu.vv v8, v8, v16
187 .endif209 .endif
188 vse8.v v8, (a0)210 vse8.v v8, (a0)
189 add a0, a0, a2211 add a0, a0, a2
190 vnclipu.wi v8, v12, 6212 vwaddu.wx v20, v12, s2
213 vnsrl.wi v8, v20, 6
191 .ifc \type,avg214 .ifc \type,avg
192 vle8.v v16, (a0)215 vle8.v v16, (a0)
193 manual_avg v8, v8, v16216 vaaddu.vv v8, v8, v16
194 .endif217 .endif
195 vse8.v v8, (a0)218 vse8.v v8, (a0)
196 add a0, a0, a2219 add a0, a0, a2
@@ -226,17 +249,19 @@ · 29 unmodified lines
226 vsetvli zero, t6, e8, m1, ta, ma249 vsetvli zero, t6, e8, m1, ta, ma
227 vwmulu.vx v12, v8, a6250 vwmulu.vx v12, v8, a6
228 vwmaccu.vx v12, a7, v9251 vwmaccu.vx v12, a7, v9
229 vnclipu.wi v16, v10, 6252 vwaddu.wx v20, v10, s2
253 vnsrl.wi v16, v20, 6
230 .ifc \type,avg254 .ifc \type,avg
231 vle8.v v18, (a0)255 vle8.v v18, (a0)
232 manual_avg v16, v16, v18256 vaaddu.vv v16, v16, v18
233 .endif257 .endif
234 vse8.v v16, (a0)258 vse8.v v16, (a0)
235 add a0, a0, a2259 add a0, a0, a2
236 vnclipu.wi v10, v12, 6260 vwaddu.wx v20, v12, s2
261 vnsrl.wi v10, v20, 6
237 .ifc \type,avg262 .ifc \type,avg
238 vle8.v v18, (a0)263 vle8.v v18, (a0)
239 manual_avg v10, v10, v18264 vaaddu.vv v10, v10, v18
240 .endif265 .endif
241 add a4, a4, t1266 add a4, a4, t1
242 vse8.v v10, (a0)267 vse8.v v10, (a0)
@@ -254,18 +279,20 @@ · 11 unmodified lines
254 vslide1down.vx v9, v8, t5279 vslide1down.vx v9, v8, t5
255 vsetvli zero, t6, e8, m1, ta, ma280 vsetvli zero, t6, e8, m1, ta, ma
256 vwmulu.vx v12, v8, a6281 vwmulu.vx v12, v8, a6
257 vnclipu.wi v8, v14, 6282 vwaddu.wx v20, v14, s2
283 vnsrl.wi v8, v20, 6
258 vwmaccu.vx v12, a7, v9284 vwmaccu.vx v12, a7, v9
259 .ifc \type,avg285 .ifc \type,avg
260 vle8.v v18, (a0)286 vle8.v v18, (a0)
261 manual_avg v8, v8, v18287 vaaddu.vv v8, v8, v18
262 .endif288 .endif
263 vse8.v v8, (a0)289 vse8.v v8, (a0)
264 add a0, a0, a2290 add a0, a0, a2
265 vnclipu.wi v8, v12, 6291 vwaddu.wx v20, v12, s2
292 vnsrl.wi v8, v20, 6
266 .ifc \type,avg293 .ifc \type,avg
267 vle8.v v18, (a0)294 vle8.v v18, (a0)
268 manual_avg v8, v8, v18295 vaaddu.vv v8, v8, v18
269 .endif296 .endif
270 vse8.v v8, (a0)297 vse8.v v8, (a0)
271 add a0, a0, a2298 add a0, a0, a2
@@ -293,18 +320,20 @@ · 21 unmodified lines
293 vwmulu.vx v10, v8, a6320 vwmulu.vx v10, v8, a6
294 vle8.v v8, (t0)321 vle8.v v8, (t0)
295 add t0, t1, a2322 add t0, t1, a2
296 vnclipu.wi v13, v10, 6323 vwaddu.wx v20, v10, s2
324 vnsrl.wi v13, v20, 6
297 vwmulu.vx v10, v8, a6325 vwmulu.vx v10, v8, a6
298 .ifc \type,avg326 .ifc \type,avg
299 vle8.v v18, (a5)327 vle8.v v18, (a5)
300 manual_avg v13, v13, v18328 vaaddu.vv v13, v13, v18
301 .endif329 .endif
302 vse8.v v13, (a5)330 vse8.v v13, (a5)
303 add a5, a5, a2331 add a5, a5, a2
304 vnclipu.wi v8, v10, 6332 vwaddu.wx v20, v10, s2
333 vnsrl.wi v8, v20, 6
305 .ifc \type,avg334 .ifc \type,avg
306 vle8.v v18, (a5)335 vle8.v v18, (a5)
307 manual_avg v8, v8, v18336 vaaddu.vv v8, v8, v18
308 .endif337 .endif
309 vse8.v v8, (a5)338 vse8.v v8, (a5)
310 add a5, a5, a2339 add a5, a5, a2
@@ -312,23 +341,34 @@ · 1 unmodified line
312 vle8.v v9, (t1)341 vle8.v v9, (t1)
313 vle8.v v12, (t0)342 vle8.v v12, (t0)
314 vwmulu.vx v10, v9, a6343 vwmulu.vx v10, v9, a6
315 vnclipu.wi v8, v10, 6344 vwaddu.wx v20, v10, s2
345 vnsrl.wi v8, v20, 6
316 vwmulu.vx v10, v12, a6346 vwmulu.vx v10, v12, a6
317 .ifc \type,avg347 .ifc \type,avg
318 vle8.v v18, (a5)348 vle8.v v18, (a5)
319 manual_avg v8, v8, v18349 vaaddu.vv v8, v8, v18
320 .endif350 .endif
321 vse8.v v8, (a5)351 vse8.v v8, (a5)
322 add a5, a5, a2352 add a5, a5, a2
323 vnclipu.wi v8, v10, 6353 vwaddu.wx v20, v10, s2
354 vnsrl.wi v8, v20, 6
324 .ifc \type,avg355 .ifc \type,avg
325 vle8.v v18, (a5)356 vle8.v v18, (a5)
326 manual_avg v8, v8, v18357 vaaddu.vv v8, v8, v18
327 .endif358 .endif
328 vse8.v v8, (a5)359 vse8.v v8, (a5)
329 .endif360 .endif
330 blt t2, a3, 7b361 blt t2, a3, 7b
3318:3628:
363#if __riscv_xlen == 32
364 lw s2, (sp)
365#elif __riscv_xlen == 64
366 ld s2, (sp)
367#else
368 lq s2, (sp)
369#endif
370 addi sp, sp, 16
371
332 ret372 ret
333.endm373.endm
334 374

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