Unified · Split
| @@ -20,15 +20,30 @@ · 19 unmodified lines | ||
| 20 | 20 | |
| 21 | 21 | #include "libavutil/riscv/asm.S" |
| 22 | 22 | |
| 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 | |
| 28 | 29 | |
| 29 | 30 | .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 | |
| 31 | 45 | slli t2, a5, 3 |
| 46 | + lb s2, (t5) | |
| 32 | 47 | mul t1, a5, a4 |
| 33 | 48 | sh3add a5, a4, t2 |
| 34 | 49 | slli a4, a4, 3 |
| @@ -80,17 +95,19 @@ · 45 unmodified lines | ||
| 80 | 95 | vwmulu.vx v12, v14, a6 |
| 81 | 96 | vwmaccu.vx v10, t1, v15 |
| 82 | 97 | vwmaccu.vx v12, a7, v15 |
| 83 | − vnclipu.wi v15, v8, 6 | |
| 98 | + vwaddu.wx v20, v8, s2 | |
| 99 | + vnsrl.wi v15, v20, 6 | |
| 84 | 100 | .ifc \type,avg |
| 85 | 101 | vle8.v v9, (a0) |
| 86 | − manual_avg v15, v15, v9 | |
| 102 | + vaaddu.vv v15, v15, v9 | |
| 87 | 103 | .endif |
| 88 | 104 | vse8.v v15, (a0) |
| 89 | 105 | add a0, a0, a2 |
| 90 | − vnclipu.wi v8, v10, 6 | |
| 106 | + vwaddu.wx v20, v10, s2 | |
| 107 | + vnsrl.wi v8, v20, 6 | |
| 91 | 108 | .ifc \type,avg |
| 92 | 109 | vle8.v v9, (a0) |
| 93 | − manual_avg v8, v8, v9 | |
| 110 | + vaaddu.vv v8, v8, v9 | |
| 94 | 111 | .endif |
| 95 | 112 | add t4, t4, t3 |
| 96 | 113 | vse8.v v8, (a0) |
| @@ -115,17 +132,19 @@ · 18 unmodified lines | ||
| 115 | 132 | vslide1down.vx v14, v14, t5 |
| 116 | 133 | vsetvli zero, t6, e8, m1, ta, ma |
| 117 | 134 | vwmaccu.vx v16, t1, v14 |
| 118 | − vnclipu.wi v8, v12, 6 | |
| 135 | + vwaddu.wx v20, v12, s2 | |
| 136 | + vnsrl.wi v8, v20, 6 | |
| 119 | 137 | .ifc \type,avg |
| 120 | 138 | vle8.v v9, (a0) |
| 121 | − manual_avg v8, v8, v9 | |
| 139 | + vaaddu.vv v8, v8, v9 | |
| 122 | 140 | .endif |
| 123 | 141 | vse8.v v8, (a0) |
| 124 | 142 | add a0, a0, a2 |
| 125 | − vnclipu.wi v8, v16, 6 | |
| 143 | + vwaddu.wx v20, v16, s2 | |
| 144 | + vnsrl.wi v8, v20, 6 | |
| 126 | 145 | .ifc \type,avg |
| 127 | 146 | vle8.v v9, (a0) |
| 128 | − manual_avg v8, v8, v9 | |
| 147 | + vaaddu.vv v8, v8, v9 | |
| 129 | 148 | .endif |
| 130 | 149 | vse8.v v8, (a0) |
| 131 | 150 | add a0, a0, a2 |
| @@ -159,18 +178,20 @@ · 27 unmodified lines | ||
| 159 | 178 | vwmaccu.vx v10, t0, v8 |
| 160 | 179 | add a4, a4, a7 |
| 161 | 180 | vwmaccu.vx v12, t0, v9 |
| 162 | − vnclipu.wi v15, v10, 6 | |
| 181 | + vwaddu.wx v20, v10, s2 | |
| 182 | + vnsrl.wi v15, v20, 6 | |
| 163 | 183 | vwmulu.vx v10, v9, a6 |
| 164 | − vnclipu.wi v9, v12, 6 | |
| 184 | + vwaddu.wx v20, v12, s2 | |
| 185 | + vnsrl.wi v9, v20, 6 | |
| 165 | 186 | .ifc \type,avg |
| 166 | 187 | vle8.v v16, (a0) |
| 167 | − manual_avg v15, v15, v16 | |
| 188 | + vaaddu.vv v15, v15, v16 | |
| 168 | 189 | .endif |
| 169 | 190 | vse8.v v15, (a0) |
| 170 | 191 | add a0, a0, a2 |
| 171 | 192 | .ifc \type,avg |
| 172 | 193 | vle8.v v16, (a0) |
| 173 | − manual_avg v9, v9, v16 | |
| 194 | + vaaddu.vv v9, v9, v16 | |
| 174 | 195 | .endif |
| 175 | 196 | vse8.v v9, (a0) |
| 176 | 197 | add a0, a0, a2 |
| @@ -179,18 +200,20 @@ · 2 unmodified lines | ||
| 179 | 200 | vle8.v v14, (a5) |
| 180 | 201 | vwmaccu.vx v10, t0, v8 |
| 181 | 202 | vwmulu.vx v12, v8, a6 |
| 182 | − vnclipu.wi v8, v10, 6 | |
| 203 | + vwaddu.wx v20, v10, s2 | |
| 204 | + vnsrl.wi v8, v20, 6 | |
| 183 | 205 | vwmaccu.vx v12, t0, v14 |
| 184 | 206 | .ifc \type,avg |
| 185 | 207 | vle8.v v16, (a0) |
| 186 | − manual_avg v8, v8, v16 | |
| 208 | + vaaddu.vv v8, v8, v16 | |
| 187 | 209 | .endif |
| 188 | 210 | vse8.v v8, (a0) |
| 189 | 211 | add a0, a0, a2 |
| 190 | − vnclipu.wi v8, v12, 6 | |
| 212 | + vwaddu.wx v20, v12, s2 | |
| 213 | + vnsrl.wi v8, v20, 6 | |
| 191 | 214 | .ifc \type,avg |
| 192 | 215 | vle8.v v16, (a0) |
| 193 | − manual_avg v8, v8, v16 | |
| 216 | + vaaddu.vv v8, v8, v16 | |
| 194 | 217 | .endif |
| 195 | 218 | vse8.v v8, (a0) |
| 196 | 219 | add a0, a0, a2 |
| @@ -226,17 +249,19 @@ · 29 unmodified lines | ||
| 226 | 249 | vsetvli zero, t6, e8, m1, ta, ma |
| 227 | 250 | vwmulu.vx v12, v8, a6 |
| 228 | 251 | vwmaccu.vx v12, a7, v9 |
| 229 | − vnclipu.wi v16, v10, 6 | |
| 252 | + vwaddu.wx v20, v10, s2 | |
| 253 | + vnsrl.wi v16, v20, 6 | |
| 230 | 254 | .ifc \type,avg |
| 231 | 255 | vle8.v v18, (a0) |
| 232 | − manual_avg v16, v16, v18 | |
| 256 | + vaaddu.vv v16, v16, v18 | |
| 233 | 257 | .endif |
| 234 | 258 | vse8.v v16, (a0) |
| 235 | 259 | add a0, a0, a2 |
| 236 | − vnclipu.wi v10, v12, 6 | |
| 260 | + vwaddu.wx v20, v12, s2 | |
| 261 | + vnsrl.wi v10, v20, 6 | |
| 237 | 262 | .ifc \type,avg |
| 238 | 263 | vle8.v v18, (a0) |
| 239 | − manual_avg v10, v10, v18 | |
| 264 | + vaaddu.vv v10, v10, v18 | |
| 240 | 265 | .endif |
| 241 | 266 | add a4, a4, t1 |
| 242 | 267 | vse8.v v10, (a0) |
| @@ -254,18 +279,20 @@ · 11 unmodified lines | ||
| 254 | 279 | vslide1down.vx v9, v8, t5 |
| 255 | 280 | vsetvli zero, t6, e8, m1, ta, ma |
| 256 | 281 | vwmulu.vx v12, v8, a6 |
| 257 | − vnclipu.wi v8, v14, 6 | |
| 282 | + vwaddu.wx v20, v14, s2 | |
| 283 | + vnsrl.wi v8, v20, 6 | |
| 258 | 284 | vwmaccu.vx v12, a7, v9 |
| 259 | 285 | .ifc \type,avg |
| 260 | 286 | vle8.v v18, (a0) |
| 261 | − manual_avg v8, v8, v18 | |
| 287 | + vaaddu.vv v8, v8, v18 | |
| 262 | 288 | .endif |
| 263 | 289 | vse8.v v8, (a0) |
| 264 | 290 | add a0, a0, a2 |
| 265 | − vnclipu.wi v8, v12, 6 | |
| 291 | + vwaddu.wx v20, v12, s2 | |
| 292 | + vnsrl.wi v8, v20, 6 | |
| 266 | 293 | .ifc \type,avg |
| 267 | 294 | vle8.v v18, (a0) |
| 268 | − manual_avg v8, v8, v18 | |
| 295 | + vaaddu.vv v8, v8, v18 | |
| 269 | 296 | .endif |
| 270 | 297 | vse8.v v8, (a0) |
| 271 | 298 | add a0, a0, a2 |
| @@ -293,18 +320,20 @@ · 21 unmodified lines | ||
| 293 | 320 | vwmulu.vx v10, v8, a6 |
| 294 | 321 | vle8.v v8, (t0) |
| 295 | 322 | add t0, t1, a2 |
| 296 | − vnclipu.wi v13, v10, 6 | |
| 323 | + vwaddu.wx v20, v10, s2 | |
| 324 | + vnsrl.wi v13, v20, 6 | |
| 297 | 325 | vwmulu.vx v10, v8, a6 |
| 298 | 326 | .ifc \type,avg |
| 299 | 327 | vle8.v v18, (a5) |
| 300 | − manual_avg v13, v13, v18 | |
| 328 | + vaaddu.vv v13, v13, v18 | |
| 301 | 329 | .endif |
| 302 | 330 | vse8.v v13, (a5) |
| 303 | 331 | add a5, a5, a2 |
| 304 | − vnclipu.wi v8, v10, 6 | |
| 332 | + vwaddu.wx v20, v10, s2 | |
| 333 | + vnsrl.wi v8, v20, 6 | |
| 305 | 334 | .ifc \type,avg |
| 306 | 335 | vle8.v v18, (a5) |
| 307 | − manual_avg v8, v8, v18 | |
| 336 | + vaaddu.vv v8, v8, v18 | |
| 308 | 337 | .endif |
| 309 | 338 | vse8.v v8, (a5) |
| 310 | 339 | add a5, a5, a2 |
| @@ -312,23 +341,34 @@ · 1 unmodified line | ||
| 312 | 341 | vle8.v v9, (t1) |
| 313 | 342 | vle8.v v12, (t0) |
| 314 | 343 | vwmulu.vx v10, v9, a6 |
| 315 | − vnclipu.wi v8, v10, 6 | |
| 344 | + vwaddu.wx v20, v10, s2 | |
| 345 | + vnsrl.wi v8, v20, 6 | |
| 316 | 346 | vwmulu.vx v10, v12, a6 |
| 317 | 347 | .ifc \type,avg |
| 318 | 348 | vle8.v v18, (a5) |
| 319 | − manual_avg v8, v8, v18 | |
| 349 | + vaaddu.vv v8, v8, v18 | |
| 320 | 350 | .endif |
| 321 | 351 | vse8.v v8, (a5) |
| 322 | 352 | add a5, a5, a2 |
| 323 | − vnclipu.wi v8, v10, 6 | |
| 353 | + vwaddu.wx v20, v10, s2 | |
| 354 | + vnsrl.wi v8, v20, 6 | |
| 324 | 355 | .ifc \type,avg |
| 325 | 356 | vle8.v v18, (a5) |
| 326 | − manual_avg v8, v8, v18 | |
| 357 | + vaaddu.vv v8, v8, v18 | |
| 327 | 358 | .endif |
| 328 | 359 | vse8.v v8, (a5) |
| 329 | 360 | .endif |
| 330 | 361 | blt t2, a3, 7b |
| 331 | 362 | 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 | + | |
| 332 | 372 | ret |
| 333 | 373 | .endm |
| 334 | 374 | |