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
2020
2121 #include "libavutil/riscv/asm.S"
2222
23−.macro manual_avg dst src1 src2
24− vadd.vv \dst, \src1, \src2
25− vadd.vi \dst, \dst, 1
26− vsrl.vi \dst, \dst, 1
27−.endm
23+const rv40_bias
24+ .byte 0, 16, 32, 16
25+ .byte 32, 28, 32, 28
26+ .byte 0, 32, 16, 32
27+ .byte 32, 28, 32, 28
28+endconst
2829
2930 .macro do_chroma_mc type unroll
30− csrwi vxrm, 2
31+ 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
3145 slli t2, a5, 3
46+ lb s2, (t5)
3247 mul t1, a5, a4
3348 sh3add a5, a4, t2
3449 slli a4, a4, 3
@@ -80,17 +95,19 @@ · 45 unmodified lines
8095 vwmulu.vx v12, v14, a6
8196 vwmaccu.vx v10, t1, v15
8297 vwmaccu.vx v12, a7, v15
83− vnclipu.wi v15, v8, 6
98+ vwaddu.wx v20, v8, s2
99+ vnsrl.wi v15, v20, 6
84100 .ifc \type,avg
85101 vle8.v v9, (a0)
86− manual_avg v15, v15, v9
102+ vaaddu.vv v15, v15, v9
87103 .endif
88104 vse8.v v15, (a0)
89105 add a0, a0, a2
90− vnclipu.wi v8, v10, 6
106+ vwaddu.wx v20, v10, s2
107+ vnsrl.wi v8, v20, 6
91108 .ifc \type,avg
92109 vle8.v v9, (a0)
93− manual_avg v8, v8, v9
110+ vaaddu.vv v8, v8, v9
94111 .endif
95112 add t4, t4, t3
96113 vse8.v v8, (a0)
@@ -115,17 +132,19 @@ · 18 unmodified lines
115132 vslide1down.vx v14, v14, t5
116133 vsetvli zero, t6, e8, m1, ta, ma
117134 vwmaccu.vx v16, t1, v14
118− vnclipu.wi v8, v12, 6
135+ vwaddu.wx v20, v12, s2
136+ vnsrl.wi v8, v20, 6
119137 .ifc \type,avg
120138 vle8.v v9, (a0)
121− manual_avg v8, v8, v9
139+ vaaddu.vv v8, v8, v9
122140 .endif
123141 vse8.v v8, (a0)
124142 add a0, a0, a2
125− vnclipu.wi v8, v16, 6
143+ vwaddu.wx v20, v16, s2
144+ vnsrl.wi v8, v20, 6
126145 .ifc \type,avg
127146 vle8.v v9, (a0)
128− manual_avg v8, v8, v9
147+ vaaddu.vv v8, v8, v9
129148 .endif
130149 vse8.v v8, (a0)
131150 add a0, a0, a2
@@ -159,18 +178,20 @@ · 27 unmodified lines
159178 vwmaccu.vx v10, t0, v8
160179 add a4, a4, a7
161180 vwmaccu.vx v12, t0, v9
162− vnclipu.wi v15, v10, 6
181+ vwaddu.wx v20, v10, s2
182+ vnsrl.wi v15, v20, 6
163183 vwmulu.vx v10, v9, a6
164− vnclipu.wi v9, v12, 6
184+ vwaddu.wx v20, v12, s2
185+ vnsrl.wi v9, v20, 6
165186 .ifc \type,avg
166187 vle8.v v16, (a0)
167− manual_avg v15, v15, v16
188+ vaaddu.vv v15, v15, v16
168189 .endif
169190 vse8.v v15, (a0)
170191 add a0, a0, a2
171192 .ifc \type,avg
172193 vle8.v v16, (a0)
173− manual_avg v9, v9, v16
194+ vaaddu.vv v9, v9, v16
174195 .endif
175196 vse8.v v9, (a0)
176197 add a0, a0, a2
@@ -179,18 +200,20 @@ · 2 unmodified lines
179200 vle8.v v14, (a5)
180201 vwmaccu.vx v10, t0, v8
181202 vwmulu.vx v12, v8, a6
182− vnclipu.wi v8, v10, 6
203+ vwaddu.wx v20, v10, s2
204+ vnsrl.wi v8, v20, 6
183205 vwmaccu.vx v12, t0, v14
184206 .ifc \type,avg
185207 vle8.v v16, (a0)
186− manual_avg v8, v8, v16
208+ vaaddu.vv v8, v8, v16
187209 .endif
188210 vse8.v v8, (a0)
189211 add a0, a0, a2
190− vnclipu.wi v8, v12, 6
212+ vwaddu.wx v20, v12, s2
213+ vnsrl.wi v8, v20, 6
191214 .ifc \type,avg
192215 vle8.v v16, (a0)
193− manual_avg v8, v8, v16
216+ vaaddu.vv v8, v8, v16
194217 .endif
195218 vse8.v v8, (a0)
196219 add a0, a0, a2
@@ -226,17 +249,19 @@ · 29 unmodified lines
226249 vsetvli zero, t6, e8, m1, ta, ma
227250 vwmulu.vx v12, v8, a6
228251 vwmaccu.vx v12, a7, v9
229− vnclipu.wi v16, v10, 6
252+ vwaddu.wx v20, v10, s2
253+ vnsrl.wi v16, v20, 6
230254 .ifc \type,avg
231255 vle8.v v18, (a0)
232− manual_avg v16, v16, v18
256+ vaaddu.vv v16, v16, v18
233257 .endif
234258 vse8.v v16, (a0)
235259 add a0, a0, a2
236− vnclipu.wi v10, v12, 6
260+ vwaddu.wx v20, v12, s2
261+ vnsrl.wi v10, v20, 6
237262 .ifc \type,avg
238263 vle8.v v18, (a0)
239− manual_avg v10, v10, v18
264+ vaaddu.vv v10, v10, v18
240265 .endif
241266 add a4, a4, t1
242267 vse8.v v10, (a0)
@@ -254,18 +279,20 @@ · 11 unmodified lines
254279 vslide1down.vx v9, v8, t5
255280 vsetvli zero, t6, e8, m1, ta, ma
256281 vwmulu.vx v12, v8, a6
257− vnclipu.wi v8, v14, 6
282+ vwaddu.wx v20, v14, s2
283+ vnsrl.wi v8, v20, 6
258284 vwmaccu.vx v12, a7, v9
259285 .ifc \type,avg
260286 vle8.v v18, (a0)
261− manual_avg v8, v8, v18
287+ vaaddu.vv v8, v8, v18
262288 .endif
263289 vse8.v v8, (a0)
264290 add a0, a0, a2
265− vnclipu.wi v8, v12, 6
291+ vwaddu.wx v20, v12, s2
292+ vnsrl.wi v8, v20, 6
266293 .ifc \type,avg
267294 vle8.v v18, (a0)
268− manual_avg v8, v8, v18
295+ vaaddu.vv v8, v8, v18
269296 .endif
270297 vse8.v v8, (a0)
271298 add a0, a0, a2
@@ -293,18 +320,20 @@ · 21 unmodified lines
293320 vwmulu.vx v10, v8, a6
294321 vle8.v v8, (t0)
295322 add t0, t1, a2
296− vnclipu.wi v13, v10, 6
323+ vwaddu.wx v20, v10, s2
324+ vnsrl.wi v13, v20, 6
297325 vwmulu.vx v10, v8, a6
298326 .ifc \type,avg
299327 vle8.v v18, (a5)
300− manual_avg v13, v13, v18
328+ vaaddu.vv v13, v13, v18
301329 .endif
302330 vse8.v v13, (a5)
303331 add a5, a5, a2
304− vnclipu.wi v8, v10, 6
332+ vwaddu.wx v20, v10, s2
333+ vnsrl.wi v8, v20, 6
305334 .ifc \type,avg
306335 vle8.v v18, (a5)
307− manual_avg v8, v8, v18
336+ vaaddu.vv v8, v8, v18
308337 .endif
309338 vse8.v v8, (a5)
310339 add a5, a5, a2
@@ -312,23 +341,34 @@ · 1 unmodified line
312341 vle8.v v9, (t1)
313342 vle8.v v12, (t0)
314343 vwmulu.vx v10, v9, a6
315− vnclipu.wi v8, v10, 6
344+ vwaddu.wx v20, v10, s2
345+ vnsrl.wi v8, v20, 6
316346 vwmulu.vx v10, v12, a6
317347 .ifc \type,avg
318348 vle8.v v18, (a5)
319− manual_avg v8, v8, v18
349+ vaaddu.vv v8, v8, v18
320350 .endif
321351 vse8.v v8, (a5)
322352 add a5, a5, a2
323− vnclipu.wi v8, v10, 6
353+ vwaddu.wx v20, v10, s2
354+ vnsrl.wi v8, v20, 6
324355 .ifc \type,avg
325356 vle8.v v18, (a5)
326− manual_avg v8, v8, v18
357+ vaaddu.vv v8, v8, v18
327358 .endif
328359 vse8.v v8, (a5)
329360 .endif
330361 blt t2, a3, 7b
331362 8:
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+
332372 ret
333373 .endm
334374

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