diff mbox series

[FFmpeg-devel,v3,3/4] avutil/mips: Use $at as MMI macro temporary register

Message ID 20210723055344.21961-4-jiaxun.yang@flygoat.com
State Accepted
Commit a1cd62883f84072b7c9fa13e9a2512e13618399e
Headers show
Series avcodec Loongson-2 MMI fixes
Related show

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Jiaxun Yang July 23, 2021, 5:53 a.m. UTC
Some function had exceed 30 inline assembly register oprands limiation
when using LOONGSON2 version of MMI macros. We can avoid that by take
$at, which is register reserved for assembler, as temporary register.

As none of instructions used in these macros is pseudo, it is safe to
utilize $at here.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Shiyou Yin <yinshiyou-hf@loongson.cn>
---
 libavutil/mips/mmiutils.h | 108 +++++++++++++++++++++++---------------
 1 file changed, 66 insertions(+), 42 deletions(-)

Comments

殷时友 July 28, 2021, 1:52 a.m. UTC | #1
> 2021年7月23日 下午1:53,Jiaxun Yang <jiaxun.yang@flygoat.com> 写道:
> 
> Some function had exceed 30 inline assembly register oprands limiation
> when using LOONGSON2 version of MMI macros. We can avoid that by take
> $at, which is register reserved for assembler, as temporary register.
> 
> As none of instructions used in these macros is pseudo, it is safe to
> utilize $at here.
> 
> Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
> Reviewed-by: Shiyou Yin <yinshiyou-hf@loongson.cn>
> ---
> libavutil/mips/mmiutils.h | 108 +++++++++++++++++++++++---------------
> 1 file changed, 66 insertions(+), 42 deletions(-)
> 
> diff --git a/libavutil/mips/mmiutils.h b/libavutil/mips/mmiutils.h
> index 41715c6490..7991e14e84 100644
> --- a/libavutil/mips/mmiutils.h
> +++ b/libavutil/mips/mmiutils.h
> @@ -29,74 +29,103 @@
> #include "libavutil/mem_internal.h"
> #include "libavutil/mips/asmdefs.h"
> 
> -#if HAVE_LOONGSON2
> +/*
> + * These were used to define temporary registers for MMI marcos
> + * however now we're using $at. They're theoretically unnecessary
> + * but just leave them here to avoid mess.
> + */
> +#define DECLARE_VAR_LOW32
> +#define RESTRICT_ASM_LOW32
> +#define DECLARE_VAR_ALL64
> +#define RESTRICT_ASM_ALL64
> +#define DECLARE_VAR_ADDRT
> +#define RESTRICT_ASM_ADDRT
> 
> -#define DECLARE_VAR_LOW32       int32_t low32
> -#define RESTRICT_ASM_LOW32      [low32]"=&r"(low32),
> -#define DECLARE_VAR_ALL64       int64_t all64
> -#define RESTRICT_ASM_ALL64      [all64]"=&r"(all64),
> -#define DECLARE_VAR_ADDRT       mips_reg addrt
> -#define RESTRICT_ASM_ADDRT      [addrt]"=&r"(addrt),
> +#if HAVE_LOONGSON2
> 
> #define MMI_LWX(reg, addr, stride, bias)                                    \
> -    PTR_ADDU    "%[addrt],  "#addr",    "#stride"                   \n\t"   \
> -    "lw         "#reg",     "#bias"(%[addrt])                       \n\t"
> +    ".set noat                                                 \n\t"   \
> +    PTR_ADDU    "$at,  "#addr",    "#stride"                   \n\t"   \
> +    "lw         "#reg",     "#bias"($at)                       \n\t"   \
> +    ".set at                                                   \n\t"
> 
> #define MMI_SWX(reg, addr, stride, bias)                                    \
> -    PTR_ADDU    "%[addrt],  "#addr",    "#stride"                   \n\t"   \
> -    "sw         "#reg",     "#bias"(%[addrt])                       \n\t"
> +    ".set noat                                                 \n\t"   \
> +    PTR_ADDU    "$at,  "#addr",    "#stride"                   \n\t"   \
> +    "sw         "#reg",     "#bias"($at)                       \n\t"   \
> +    ".set at                                                   \n\t"
> 
> #define MMI_LDX(reg, addr, stride, bias)                                    \
> -    PTR_ADDU    "%[addrt],  "#addr",    "#stride"                   \n\t"   \
> -    "ld         "#reg",     "#bias"(%[addrt])                       \n\t"
> +    ".set noat                                                 \n\t"   \
> +    PTR_ADDU    "$at,  "#addr",    "#stride"                   \n\t"   \
> +    "ld         "#reg",     "#bias"($at)                       \n\t"   \
> +    ".set at                                                   \n\t"
> 
> #define MMI_SDX(reg, addr, stride, bias)                                    \
> -    PTR_ADDU    "%[addrt],  "#addr",    "#stride"                   \n\t"   \
> -    "sd         "#reg",     "#bias"(%[addrt])                       \n\t"
> +    ".set noat                                                 \n\t"   \
> +    PTR_ADDU    "$at,  "#addr",    "#stride"                   \n\t"   \
> +    "sd         "#reg",     "#bias"($at)                       \n\t"   \
> +    ".set at                                                   \n\t"
> 
> #define MMI_LWC1(fp, addr, bias)                                            \
>     "lwc1       "#fp",      "#bias"("#addr")                        \n\t"
> 
> #define MMI_ULWC1(fp, addr, bias)                                           \
> -    "ulw        %[low32],   "#bias"("#addr")                        \n\t"   \
> -    "mtc1       %[low32],   "#fp"                                   \n\t"
> +    ".set noat                                                      \n\t"   \
> +    "ulw        $at,   "#bias"("#addr")                             \n\t"   \
> +    "mtc1       $at,   "#fp"                                        \n\t"   \
> +    ".set at                                                        \n\t"
> 
> #define MMI_LWXC1(fp, addr, stride, bias)                                   \
> -    PTR_ADDU    "%[addrt],  "#addr",    "#stride"                   \n\t"   \
> -    MMI_LWC1(fp, %[addrt], bias)
> +    ".set noat                                                 \n\t"   \
> +    PTR_ADDU    "$at,  "#addr",    "#stride"                   \n\t"   \
> +    MMI_LWC1(fp, $at, bias)                                            \
> +    ".set at                                                   \n\t"
> 
> #define MMI_SWC1(fp, addr, bias)                                            \
>     "swc1       "#fp",      "#bias"("#addr")                        \n\t"
> 
> #define MMI_USWC1(fp, addr, bias)                                           \
> -    "mfc1       %[low32],   "#fp"                                   \n\t"   \
> -    "usw        %[low32],   "#bias"("#addr")                        \n\t"
> +    ".set noat                                                      \n\t"   \
> +    "mfc1       $at,   "#fp"                                        \n\t"   \
> +    "usw        $at,   "#bias"("#addr")                             \n\t"   \
> +    ".set at                                                        \n\t"
> 
> #define MMI_SWXC1(fp, addr, stride, bias)                                   \
> -    PTR_ADDU    "%[addrt],  "#addr",    "#stride"                   \n\t"   \
> -    MMI_SWC1(fp, %[addrt], bias)
> +    ".set noat                                                 \n\t"   \
> +    PTR_ADDU    "$at,  "#addr",    "#stride"                   \n\t"   \
> +    MMI_SWC1(fp, $at, bias)                                           \
> +    ".set at                                                   \n\t"
> 
> #define MMI_LDC1(fp, addr, bias)                                            \
>     "ldc1       "#fp",      "#bias"("#addr")                        \n\t"
> 
> #define MMI_ULDC1(fp, addr, bias)                                           \
> -    "uld        %[all64],   "#bias"("#addr")                        \n\t"   \
> -    "dmtc1      %[all64],   "#fp"                                   \n\t"
> +    ".set noat                                                      \n\t"   \
> +    "uld        $at,   "#bias"("#addr")                             \n\t"   \
> +    "dmtc1      $at,   "#fp"                                        \n\t"   \
> +    ".set at                                                        \n\t"
> 
> #define MMI_LDXC1(fp, addr, stride, bias)                                   \
> -    PTR_ADDU    "%[addrt],  "#addr",    "#stride"                   \n\t"   \
> -    MMI_LDC1(fp, %[addrt], bias)
> +    ".set noat                                                 \n\t"   \
> +    PTR_ADDU    "$at,  "#addr",    "#stride"                   \n\t"   \
> +    MMI_LDC1(fp, $at, bias)                                           \
> +    ".set at                                                   \n\t"
> 
> #define MMI_SDC1(fp, addr, bias)                                            \
>     "sdc1       "#fp",      "#bias"("#addr")                        \n\t"
> 
> #define MMI_USDC1(fp, addr, bias)                                           \
> -    "dmfc1      %[all64],   "#fp"                                   \n\t"   \
> -    "usd        %[all64],   "#bias"("#addr")                        \n\t"
> +    ".set noat                                                      \n\t"   \
> +    "dmfc1      $at,   "#fp"                                        \n\t"   \
> +    "usd        $at,   "#bias"("#addr")                             \n\t"   \
> +    ".set at                                                        \n\t"
> 
> #define MMI_SDXC1(fp, addr, stride, bias)                                   \
> -    PTR_ADDU    "%[addrt],  "#addr",    "#stride"                   \n\t"   \
> -    MMI_SDC1(fp, %[addrt], bias)
> +    ".set noat                                                 \n\t"   \
> +    PTR_ADDU    "$at,  "#addr",    "#stride"                   \n\t"   \
> +    MMI_SDC1(fp, $at, bias)                                            \
> +    ".set at                                                   \n\t"
> 
> #define MMI_LQ(reg1, reg2, addr, bias)                                      \
>     "ld         "#reg1",    "#bias"("#addr")                        \n\t"   \
> @@ -116,11 +145,6 @@
> 
> #elif HAVE_LOONGSON3 /* !HAVE_LOONGSON2 */
> 
> -#define DECLARE_VAR_ALL64
> -#define RESTRICT_ASM_ALL64
> -#define DECLARE_VAR_ADDRT
> -#define RESTRICT_ASM_ADDRT
> -
> #define MMI_LWX(reg, addr, stride, bias)                                    \
>     "gslwx      "#reg",     "#bias"("#addr", "#stride")             \n\t"
> 
> @@ -138,12 +162,12 @@
> 
> #if _MIPS_SIM == _ABIO32 /* workaround for 3A2000 gslwlc1 bug */
> 
> -#define DECLARE_VAR_LOW32       int32_t low32
> -#define RESTRICT_ASM_LOW32      [low32]"=&r"(low32),
> -
> -#define MMI_ULWC1(fp, addr, bias)                                           \
> -    "ulw        %[low32],   "#bias"("#addr")                        \n\t"   \
> -    "mtc1       %[low32],   "#fp"                                   \n\t"
> +#define MMI_LWLRC1(fp, addr, bias, off)                                     \
> +    ".set noat                                                 \n\t"   \
> +    "lwl        $at,   "#bias"+"#off"("#addr")                 \n\t"   \
> +    "lwr        $at,   "#bias"("#addr")                        \n\t"   \
> +    "mtc1       $at,   "#fp"                                   \n\t"   \
> +    ".set at                                                   \n\t"
> 
> #else /* _MIPS_SIM != _ABIO32 */
> 
> -- 
> 2.32.0
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe”.

LGTM
diff mbox series

Patch

diff --git a/libavutil/mips/mmiutils.h b/libavutil/mips/mmiutils.h
index 41715c6490..7991e14e84 100644
--- a/libavutil/mips/mmiutils.h
+++ b/libavutil/mips/mmiutils.h
@@ -29,74 +29,103 @@ 
 #include "libavutil/mem_internal.h"
 #include "libavutil/mips/asmdefs.h"
 
-#if HAVE_LOONGSON2
+/*
+ * These were used to define temporary registers for MMI marcos
+ * however now we're using $at. They're theoretically unnecessary
+ * but just leave them here to avoid mess.
+ */
+#define DECLARE_VAR_LOW32
+#define RESTRICT_ASM_LOW32
+#define DECLARE_VAR_ALL64
+#define RESTRICT_ASM_ALL64
+#define DECLARE_VAR_ADDRT
+#define RESTRICT_ASM_ADDRT
 
-#define DECLARE_VAR_LOW32       int32_t low32
-#define RESTRICT_ASM_LOW32      [low32]"=&r"(low32),
-#define DECLARE_VAR_ALL64       int64_t all64
-#define RESTRICT_ASM_ALL64      [all64]"=&r"(all64),
-#define DECLARE_VAR_ADDRT       mips_reg addrt
-#define RESTRICT_ASM_ADDRT      [addrt]"=&r"(addrt),
+#if HAVE_LOONGSON2
 
 #define MMI_LWX(reg, addr, stride, bias)                                    \
-    PTR_ADDU    "%[addrt],  "#addr",    "#stride"                   \n\t"   \
-    "lw         "#reg",     "#bias"(%[addrt])                       \n\t"
+    ".set noat                                                 \n\t"   \
+    PTR_ADDU    "$at,  "#addr",    "#stride"                   \n\t"   \
+    "lw         "#reg",     "#bias"($at)                       \n\t"   \
+    ".set at                                                   \n\t"
 
 #define MMI_SWX(reg, addr, stride, bias)                                    \
-    PTR_ADDU    "%[addrt],  "#addr",    "#stride"                   \n\t"   \
-    "sw         "#reg",     "#bias"(%[addrt])                       \n\t"
+    ".set noat                                                 \n\t"   \
+    PTR_ADDU    "$at,  "#addr",    "#stride"                   \n\t"   \
+    "sw         "#reg",     "#bias"($at)                       \n\t"   \
+    ".set at                                                   \n\t"
 
 #define MMI_LDX(reg, addr, stride, bias)                                    \
-    PTR_ADDU    "%[addrt],  "#addr",    "#stride"                   \n\t"   \
-    "ld         "#reg",     "#bias"(%[addrt])                       \n\t"
+    ".set noat                                                 \n\t"   \
+    PTR_ADDU    "$at,  "#addr",    "#stride"                   \n\t"   \
+    "ld         "#reg",     "#bias"($at)                       \n\t"   \
+    ".set at                                                   \n\t"
 
 #define MMI_SDX(reg, addr, stride, bias)                                    \
-    PTR_ADDU    "%[addrt],  "#addr",    "#stride"                   \n\t"   \
-    "sd         "#reg",     "#bias"(%[addrt])                       \n\t"
+    ".set noat                                                 \n\t"   \
+    PTR_ADDU    "$at,  "#addr",    "#stride"                   \n\t"   \
+    "sd         "#reg",     "#bias"($at)                       \n\t"   \
+    ".set at                                                   \n\t"
 
 #define MMI_LWC1(fp, addr, bias)                                            \
     "lwc1       "#fp",      "#bias"("#addr")                        \n\t"
 
 #define MMI_ULWC1(fp, addr, bias)                                           \
-    "ulw        %[low32],   "#bias"("#addr")                        \n\t"   \
-    "mtc1       %[low32],   "#fp"                                   \n\t"
+    ".set noat                                                      \n\t"   \
+    "ulw        $at,   "#bias"("#addr")                             \n\t"   \
+    "mtc1       $at,   "#fp"                                        \n\t"   \
+    ".set at                                                        \n\t"
 
 #define MMI_LWXC1(fp, addr, stride, bias)                                   \
-    PTR_ADDU    "%[addrt],  "#addr",    "#stride"                   \n\t"   \
-    MMI_LWC1(fp, %[addrt], bias)
+    ".set noat                                                 \n\t"   \
+    PTR_ADDU    "$at,  "#addr",    "#stride"                   \n\t"   \
+    MMI_LWC1(fp, $at, bias)                                            \
+    ".set at                                                   \n\t"
 
 #define MMI_SWC1(fp, addr, bias)                                            \
     "swc1       "#fp",      "#bias"("#addr")                        \n\t"
 
 #define MMI_USWC1(fp, addr, bias)                                           \
-    "mfc1       %[low32],   "#fp"                                   \n\t"   \
-    "usw        %[low32],   "#bias"("#addr")                        \n\t"
+    ".set noat                                                      \n\t"   \
+    "mfc1       $at,   "#fp"                                        \n\t"   \
+    "usw        $at,   "#bias"("#addr")                             \n\t"   \
+    ".set at                                                        \n\t"
 
 #define MMI_SWXC1(fp, addr, stride, bias)                                   \
-    PTR_ADDU    "%[addrt],  "#addr",    "#stride"                   \n\t"   \
-    MMI_SWC1(fp, %[addrt], bias)
+    ".set noat                                                 \n\t"   \
+    PTR_ADDU    "$at,  "#addr",    "#stride"                   \n\t"   \
+    MMI_SWC1(fp, $at, bias)                                           \
+    ".set at                                                   \n\t"
 
 #define MMI_LDC1(fp, addr, bias)                                            \
     "ldc1       "#fp",      "#bias"("#addr")                        \n\t"
 
 #define MMI_ULDC1(fp, addr, bias)                                           \
-    "uld        %[all64],   "#bias"("#addr")                        \n\t"   \
-    "dmtc1      %[all64],   "#fp"                                   \n\t"
+    ".set noat                                                      \n\t"   \
+    "uld        $at,   "#bias"("#addr")                             \n\t"   \
+    "dmtc1      $at,   "#fp"                                        \n\t"   \
+    ".set at                                                        \n\t"
 
 #define MMI_LDXC1(fp, addr, stride, bias)                                   \
-    PTR_ADDU    "%[addrt],  "#addr",    "#stride"                   \n\t"   \
-    MMI_LDC1(fp, %[addrt], bias)
+    ".set noat                                                 \n\t"   \
+    PTR_ADDU    "$at,  "#addr",    "#stride"                   \n\t"   \
+    MMI_LDC1(fp, $at, bias)                                           \
+    ".set at                                                   \n\t"
 
 #define MMI_SDC1(fp, addr, bias)                                            \
     "sdc1       "#fp",      "#bias"("#addr")                        \n\t"
 
 #define MMI_USDC1(fp, addr, bias)                                           \
-    "dmfc1      %[all64],   "#fp"                                   \n\t"   \
-    "usd        %[all64],   "#bias"("#addr")                        \n\t"
+    ".set noat                                                      \n\t"   \
+    "dmfc1      $at,   "#fp"                                        \n\t"   \
+    "usd        $at,   "#bias"("#addr")                             \n\t"   \
+    ".set at                                                        \n\t"
 
 #define MMI_SDXC1(fp, addr, stride, bias)                                   \
-    PTR_ADDU    "%[addrt],  "#addr",    "#stride"                   \n\t"   \
-    MMI_SDC1(fp, %[addrt], bias)
+    ".set noat                                                 \n\t"   \
+    PTR_ADDU    "$at,  "#addr",    "#stride"                   \n\t"   \
+    MMI_SDC1(fp, $at, bias)                                            \
+    ".set at                                                   \n\t"
 
 #define MMI_LQ(reg1, reg2, addr, bias)                                      \
     "ld         "#reg1",    "#bias"("#addr")                        \n\t"   \
@@ -116,11 +145,6 @@ 
 
 #elif HAVE_LOONGSON3 /* !HAVE_LOONGSON2 */
 
-#define DECLARE_VAR_ALL64
-#define RESTRICT_ASM_ALL64
-#define DECLARE_VAR_ADDRT
-#define RESTRICT_ASM_ADDRT
-
 #define MMI_LWX(reg, addr, stride, bias)                                    \
     "gslwx      "#reg",     "#bias"("#addr", "#stride")             \n\t"
 
@@ -138,12 +162,12 @@ 
 
 #if _MIPS_SIM == _ABIO32 /* workaround for 3A2000 gslwlc1 bug */
 
-#define DECLARE_VAR_LOW32       int32_t low32
-#define RESTRICT_ASM_LOW32      [low32]"=&r"(low32),
-
-#define MMI_ULWC1(fp, addr, bias)                                           \
-    "ulw        %[low32],   "#bias"("#addr")                        \n\t"   \
-    "mtc1       %[low32],   "#fp"                                   \n\t"
+#define MMI_LWLRC1(fp, addr, bias, off)                                     \
+    ".set noat                                                 \n\t"   \
+    "lwl        $at,   "#bias"+"#off"("#addr")                 \n\t"   \
+    "lwr        $at,   "#bias"("#addr")                        \n\t"   \
+    "mtc1       $at,   "#fp"                                   \n\t"   \
+    ".set at                                                   \n\t"
 
 #else /* _MIPS_SIM != _ABIO32 */