[FFmpeg-devel] [PATCH v2_2 1/6] Update R-V V vvc_mc vset to support more lengths

[Nuo Mi]

Thank you, Yuechi.
Applied.

On Sun, Dec 15, 2024 at 11:57 PM flow gg <hlefthleft at gmail.com> wrote:

> Resolved the conflict (because #elif ARCH_WASM was newly added in master).
>
> <uk7b-at-foxmail.com at ffmpeg.org> 于2024年12月15日周日 23:56写道：
>
>> From: sunyuechi <sunyuechi at iscas.ac.cn>
>>
>> ---
>>  libavcodec/riscv/vvc/vvc_mc_rvv.S | 46 +++++++++++++++----------------
>>  1 file changed, 23 insertions(+), 23 deletions(-)
>>
>> diff --git a/libavcodec/riscv/vvc/vvc_mc_rvv.S
>> b/libavcodec/riscv/vvc/vvc_mc_rvv.S
>> index 45f4750f82..18532616d9 100644
>> --- a/libavcodec/riscv/vvc/vvc_mc_rvv.S
>> +++ b/libavcodec/riscv/vvc/vvc_mc_rvv.S
>> @@ -23,25 +23,25 @@
>>  .macro vsetvlstatic8 w, vlen
>>          .if \w == 2 && \vlen == 128
>>                  vsetivli        zero, \w, e8, mf8, ta, ma
>> -        .elseif \w == 4 && \vlen == 128
>> +        .elseif \w <= 4 && \vlen == 128
>>                  vsetivli        zero, \w, e8, mf4, ta, ma
>> -        .elseif \w == 8 && \vlen == 128
>> +        .elseif \w <= 8 && \vlen == 128
>>                  vsetivli        zero, \w, e8, mf2, ta, ma
>> -        .elseif \w == 16 && \vlen == 128
>> +        .elseif \w <= 16 && \vlen == 128
>>                  vsetivli        zero, \w, e8, m1, ta, ma
>> -        .elseif \w == 32 && \vlen == 128
>> +        .elseif \w <= 32 && \vlen == 128
>>                  li              t0, \w
>>                  vsetvli         zero, t0, e8, m2, ta, ma
>>          .elseif \w <= 4 && \vlen == 256
>>                  vsetivli        zero, \w, e8, mf8, ta, ma
>> -        .elseif \w == 8 && \vlen == 256
>> +        .elseif \w <= 8 && \vlen == 256
>>                  vsetivli        zero, \w, e8, mf4, ta, ma
>> -        .elseif \w == 16 && \vlen == 256
>> +        .elseif \w <= 16 && \vlen == 256
>>                  vsetivli        zero, \w, e8, mf2, ta, ma
>> -        .elseif \w == 32 && \vlen == 256
>> +        .elseif \w <= 32 && \vlen == 256
>>                  li              t0, \w
>>                  vsetvli         zero, t0, e8, m1, ta, ma
>> -        .elseif \w == 64 && \vlen == 256
>> +        .elseif \w <= 64 && \vlen == 256
>>                  li              t0, \w
>>                  vsetvli         zero, t0, e8, m2, ta, ma
>>          .else
>> @@ -53,25 +53,25 @@
>>  .macro vsetvlstatic16 w, vlen
>>          .if \w == 2 && \vlen == 128
>>                  vsetivli        zero, \w, e16, mf4, ta, ma
>> -        .elseif \w == 4 && \vlen == 128
>> +        .elseif \w <= 4 && \vlen == 128
>>                  vsetivli        zero, \w, e16, mf2, ta, ma
>> -        .elseif \w == 8 && \vlen == 128
>> +        .elseif \w <= 8 && \vlen == 128
>>                  vsetivli        zero, \w, e16, m1, ta, ma
>> -        .elseif \w == 16 && \vlen == 128
>> +        .elseif \w <= 16 && \vlen == 128
>>                  vsetivli        zero, \w, e16, m2, ta, ma
>> -        .elseif \w == 32 && \vlen == 128
>> +        .elseif \w <= 32 && \vlen == 128
>>                  li              t0, \w
>>                  vsetvli         zero, t0, e16, m4, ta, ma
>>          .elseif \w <= 4 && \vlen == 256
>>                  vsetivli        zero, \w, e16, mf4, ta, ma
>> -        .elseif \w == 8 && \vlen == 256
>> +        .elseif \w <= 8 && \vlen == 256
>>                  vsetivli        zero, \w, e16, mf2, ta, ma
>> -        .elseif \w == 16 && \vlen == 256
>> +        .elseif \w <= 16 && \vlen == 256
>>                  vsetivli        zero, \w, e16, m1, ta, ma
>> -        .elseif \w == 32 && \vlen == 256
>> +        .elseif \w <= 32 && \vlen == 256
>>                  li              t0, \w
>>                  vsetvli         zero, t0, e16, m2, ta, ma
>> -        .elseif \w == 64 && \vlen == 256
>> +        .elseif \w <= 64 && \vlen == 256
>>                  li              t0, \w
>>                  vsetvli         zero, t0, e16, m4, ta, ma
>>          .else
>> @@ -83,19 +83,19 @@
>>  .macro vsetvlstatic32 w, vlen
>>          .if \w == 2
>>                  vsetivli        zero, \w, e32, mf2, ta, ma
>> -        .elseif \w == 4 && \vlen == 128
>> +        .elseif \w <= 4 && \vlen == 128
>>                  vsetivli        zero, \w, e32, m1, ta, ma
>> -        .elseif \w == 8 && \vlen == 128
>> +        .elseif \w <= 8 && \vlen == 128
>>                  vsetivli        zero, \w, e32, m2, ta, ma
>> -        .elseif \w == 16 && \vlen == 128
>> +        .elseif \w <= 16 && \vlen == 128
>>                  vsetivli        zero, \w, e32, m4, ta, ma
>> -        .elseif \w == 4 && \vlen == 256
>> +        .elseif \w <= 4 && \vlen == 256
>>                  vsetivli        zero, \w, e32, mf2, ta, ma
>> -        .elseif \w == 8 && \vlen == 256
>> +        .elseif \w <= 8 && \vlen == 256
>>                  vsetivli        zero, \w, e32, m1, ta, ma
>> -        .elseif \w == 16 && \vlen == 256
>> +        .elseif \w <= 16 && \vlen == 256
>>                  vsetivli        zero, \w, e32, m2, ta, ma
>> -        .elseif \w == 32 && \vlen == 256
>> +        .elseif \w <= 32 && \vlen == 256
>>                  li              t0, \w
>>                  vsetvli         zero, t0, e32, m4, ta, ma
>>          .else
>> --
>> 2.47.1
>>
>> _______________________________________________
>> ffmpeg-devel mailing list
>> ffmpeg-devel at ffmpeg.org
>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>
>> To unsubscribe, visit link above, or email
>> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".
>>
>