Skip to content

F
ffmpeg.wasm-core
Commit 951014e5 authored by Ronald S. Bultje's avatar Ronald S. Bultje
Browse files
Options

cabac: use struct+offset instead of memory operand in BRANCHLESS_GET_CABAC().

parent a0bdcb01
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 20 deletions
libavcodec/x86/cabac.h
View file @ 951014e5
...@@ -89,11 +89,11 @@ static av_always_inline int get_cabac_inline_x86(CABACContext *c, ...@@ -89,11 +89,11 @@ static av_always_inline int get_cabac_inline_x86(CABACContext *c,
int bit, tmp; int bit, tmp;
__asm__ volatile( __asm__ volatile(
BRANCHLESS_GET_CABAC("%0", "(%5)", "%1", "%w1", "%2", BRANCHLESS_GET_CABAC("%0", "(%4)", "%1", "%w1",
"%3", "%b3", "%4") "%2", "%3", "%b3", "%a6(%5)")
:"=&r"(bit), "+&r"(c->low), "+&r"(c->range), "=&q"(tmp), : "=&r"(bit), "+&r"(c->low), "+&r"(c->range), "=&q"(tmp)
"+m"(c->bytestream) : "r"(state), "r"(c),
:"r"(state) "i"(offsetof(CABACContext, bytestream))
: "%"REG_c, "memory" : "%"REG_c, "memory"
); );
return bit & 1; return bit & 1;
......
libavcodec/x86/h264_i386.h
View file @ 951014e5
...@@ -48,15 +48,15 @@ static int decode_significance_x86(CABACContext *c, int max_coeff, ...@@ -48,15 +48,15 @@ static int decode_significance_x86(CABACContext *c, int max_coeff,
__asm__ volatile( __asm__ volatile(
"2: \n\t" "2: \n\t"
BRANCHLESS_GET_CABAC("%4", "(%1)", "%3", BRANCHLESS_GET_CABAC("%4", "(%1)", "%3", "%w3",
"%w3", "%5", "%k0", "%b0", "%6") "%5", "%k0", "%b0", "%a11(%6)")
"test $1, %4 \n\t" "test $1, %4 \n\t"
" jz 3f \n\t" " jz 3f \n\t"
"add %10, %1 \n\t" "add %10, %1 \n\t"
BRANCHLESS_GET_CABAC("%4", "(%1)", "%3", BRANCHLESS_GET_CABAC("%4", "(%1)", "%3", "%w3",
"%w3", "%5", "%k0", "%b0", "%6") "%5", "%k0", "%b0", "%a11(%6)")
"sub %10, %1 \n\t" "sub %10, %1 \n\t"
"mov %2, %0 \n\t" "mov %2, %0 \n\t"
...@@ -80,10 +80,10 @@ static int decode_significance_x86(CABACContext *c, int max_coeff, ...@@ -80,10 +80,10 @@ static int decode_significance_x86(CABACContext *c, int max_coeff,
"4: \n\t" "4: \n\t"
"add %9, %k0 \n\t" "add %9, %k0 \n\t"
"shr $2, %k0 \n\t" "shr $2, %k0 \n\t"
:"=&q"(coeff_count), "+r"(significant_coeff_ctx_base), "+m"(index), : "=&q"(coeff_count), "+r"(significant_coeff_ctx_base), "+m"(index),
"+&r"(c->low), "=&r"(bit), "+&r"(c->range), "+&r"(c->low), "=&r"(bit), "+&r"(c->range)
"+m"(c->bytestream) : "r"(c), "m"(minusstart), "m"(end), "m"(minusindex), "m"(last_off),
:"m"(minusstart), "m"(end), "m"(minusindex), "m"(last_off) "i"(offsetof(CABACContext, bytestream))
: "%"REG_c, "memory" : "%"REG_c, "memory"
); );
return coeff_count; return coeff_count;
...@@ -105,8 +105,8 @@ static int decode_significance_8x8_x86(CABACContext *c, ...@@ -105,8 +105,8 @@ static int decode_significance_8x8_x86(CABACContext *c,
"movzbl (%0, %6), %k6 \n\t" "movzbl (%0, %6), %k6 \n\t"
"add %9, %6 \n\t" "add %9, %6 \n\t"
BRANCHLESS_GET_CABAC("%4", "(%6)", "%3", BRANCHLESS_GET_CABAC("%4", "(%6)", "%3", "%w3",
"%w3", "%5", "%k0", "%b0", "%7") "%5", "%k0", "%b0", "%a12(%7)")
"mov %1, %k6 \n\t" "mov %1, %k6 \n\t"
"test $1, %4 \n\t" "test $1, %4 \n\t"
...@@ -115,8 +115,8 @@ static int decode_significance_8x8_x86(CABACContext *c, ...@@ -115,8 +115,8 @@ static int decode_significance_8x8_x86(CABACContext *c,
"movzbl "MANGLE(last_coeff_flag_offset_8x8)"(%k6), %k6\n\t" "movzbl "MANGLE(last_coeff_flag_offset_8x8)"(%k6), %k6\n\t"
"add %11, %6 \n\t" "add %11, %6 \n\t"
BRANCHLESS_GET_CABAC("%4", "(%6)", "%3", BRANCHLESS_GET_CABAC("%4", "(%6)", "%3", "%w3",
"%w3", "%5", "%k0", "%b0", "%7") "%5", "%k0", "%b0", "%a12(%7)")
"mov %2, %0 \n\t" "mov %2, %0 \n\t"
"mov %1, %k6 \n\t" "mov %1, %k6 \n\t"
...@@ -137,9 +137,11 @@ static int decode_significance_8x8_x86(CABACContext *c, ...@@ -137,9 +137,11 @@ static int decode_significance_8x8_x86(CABACContext *c,
"4: \n\t" "4: \n\t"
"addl %8, %k0 \n\t" "addl %8, %k0 \n\t"
"shr $2, %k0 \n\t" "shr $2, %k0 \n\t"
:"=&q"(coeff_count),"+m"(last), "+m"(index), "+&r"(c->low), "=&r"(bit), : "=&q"(coeff_count), "+m"(last), "+m"(index), "+&r"(c->low),
"+&r"(c->range), "=&r"(state), "+m"(c->bytestream) "=&r"(bit), "+&r"(c->range), "=&r"(state)
:"m"(minusindex), "m"(significant_coeff_ctx_base), "m"(sig_off), "m"(last_coeff_ctx_base) : "r"(c), "m"(minusindex), "m"(significant_coeff_ctx_base),
"m"(sig_off), "m"(last_coeff_ctx_base),
"i"(offsetof(CABACContext, bytestream))
: "%"REG_c, "memory" : "%"REG_c, "memory"
); );
return coeff_count; return coeff_count;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment