Skip to content

F
ffmpeg.wasm-core
Commit 8ca2c872 authored by Shivraj Patil's avatar Shivraj Patil Committed by Michael Niedermayer
Browse files
Options

configure: build fix for P5600 with mips code restructuring 

Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent b59d06d5
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 195 deletions
configure
View file @ 8ca2c872
...@@ -1685,6 +1685,7 @@ ARCH_EXT_LIST_ARM=" ...@@ -1685,6 +1685,7 @@ ARCH_EXT_LIST_ARM="
ARCH_EXT_LIST_MIPS=" ARCH_EXT_LIST_MIPS="
mipsfpu mipsfpu
mips32r2 mips32r2
mips32r5
mips64r2 mips64r2
mips32r6 mips32r6
mips64r6 mips64r6
...@@ -2183,10 +2184,11 @@ mipsfpu_deps="mips" ...@@ -2183,10 +2184,11 @@ mipsfpu_deps="mips"
mipsdsp_deps="mips" mipsdsp_deps="mips"
mipsdspr2_deps="mips" mipsdspr2_deps="mips"
mips32r2_deps="mips" mips32r2_deps="mips"
mips32r5_deps="mips"
mips32r6_deps="mips" mips32r6_deps="mips"
mips64r2_deps="mips" mips64r2_deps="mips"
mips64r6_deps="mips" mips64r6_deps="mips"
msa_deps="mips" msa_deps="mipsfpu"
mmi_deps="mips" mmi_deps="mips"
altivec_deps="ppc" altivec_deps="ppc"
...@@ -4208,118 +4210,90 @@ elif enabled mips; then ...@@ -4208,118 +4210,90 @@ elif enabled mips; then
cpuflags="-march=$cpu" cpuflags="-march=$cpu"
case $cpu in if [ "$cpu" != "generic" ]; then
24kc) disable mips32r2
disable mips32r6 disable mips32r5
disable mips64r2 disable mips64r2
disable mips64r6 disable mips32r6
disable mipsfpu disable mips64r6
disable mipsdsp disable loongson2
disable mipsdspr2 disable loongson3
disable msa
;; case $cpu in
24kf*) 24kc|24kf*|24kec|34kc|1004kc|24kef*|34kf*|1004kf*|74kc|74kf)
disable mips32r6 enable mips32r2
disable mips64r2 disable msa
disable mips64r6 ;;
disable mipsdsp p5600|i6400)
disable mipsdspr2 disable mipsdsp
disable msa disable mipsdspr2
;; ;;
24kec|34kc|1004kc) loongson*)
disable mips32r6 enable loongson2
disable mips64r2 enable loongson3
disable mips64r6 enable local_aligned_8 local_aligned_16 local_aligned_32
disable mipsfpu enable simd_align_16
disable mipsdspr2 enable fast_64bit
disable msa enable fast_clz
;; enable fast_cmov
24kef*|34kf*|1004kf*) enable fast_unaligned
disable mips32r6 disable aligned_stack
disable mips64r2 case $cpu in
disable mips64r6 loongson3*)
disable mipsdspr2 cpuflags="-march=loongson3a -mhard-float -fno-expensive-optimizations"
disable msa ;;
;; loongson2e)
74kc) cpuflags="-march=loongson2e -mhard-float -fno-expensive-optimizations"
disable mips32r6 ;;
disable mips64r2 loongson2f)
disable mips64r6 cpuflags="-march=loongson2f -mhard-float -fno-expensive-optimizations"
disable mipsfpu ;;
disable msa esac
;; ;;
74kf) *)
disable mips32r6 # Unknown CPU. Disable everything.
disable mips64r2 warn "unknown CPU. Disabling all MIPS optimizations."
disable mips64r6 disable mipsfpu
disable msa disable mipsdsp
;; disable mipsdspr2
p5600) disable msa
disable mips32r6 disable mmi
disable mips64r2 ;;
disable mips64r6 esac
disable mipsdsp
disable mipsdspr2 case $cpu in
check_cflags "-mtune=p5600" && 24kc)
check_cflags "-mfp64 -msched-weight -mload-store-pairs -funroll-loops" && disable mipsfpu
add_asflags "-mfp64" disable mipsdsp
;; disable mipsdspr2
i6400) ;;
disable mips32r2 24kf*)
disable mips32r6 disable mipsdsp
disable mips64r2 disable mipsdspr2
disable mipsdsp ;;
disable mipsdspr2 24kec|34kc|1004kc)
check_cflags "-mtune=i6400 -mabi=64" && disable mipsfpu
check_cflags "-mfp64 -msched-weight -mload-store-pairs -funroll-loops" && disable mipsdspr2
check_ldflags "-mabi=64" && ;;
add_asflags "-mfp64" 24kef*|34kf*|1004kf*)
;; disable mipsdspr2
loongson*) ;;
disable mips32r2 74kc)
disable mips32r6 disable mipsfpu
disable mips64r2 ;;
disable mips64r6 p5600)
disable mipsfpu enable mips32r5
disable mipsdsp check_cflags "-mtune=p5600" && check_cflags "-msched-weight -mload-store-pairs -funroll-loops"
disable mipsdspr2 ;;
disable msa i6400)
enable local_aligned_8 local_aligned_16 local_aligned_32 enable mips64r6
enable simd_align_16 check_cflags "-mtune=i6400 -mabi=64" && check_cflags "-msched-weight -mload-store-pairs -funroll-loops" && check_ldflags "-mabi=64"
enable fast_64bit ;;
enable fast_clz esac
enable fast_cmov else
enable fast_unaligned # We do not disable anything. Is up to the user to disable the unwanted features.
disable aligned_stack warn 'generic cpu selected'
case $cpu in fi
loongson3*)
cpuflags="-march=loongson3a -mhard-float -fno-expensive-optimizations"
;;
loongson2e)
cpuflags="-march=loongson2e -mhard-float -fno-expensive-optimizations"
;;
loongson2f)
cpuflags="-march=loongson2f -mhard-float -fno-expensive-optimizations"
;;
esac
;;
generic)
# We do not disable anything. Is up to the user to disable
# the unwanted features.
;;
*)
# Unknown CPU. Disable everything.
warn "unknown CPU. Disabling all MIPS optimizations."
disable mipsfpu
disable mips32r2
disable mips32r6
disable mips64r2
disable mips64r6
disable mipsdsp
disable mipsdspr2
disable msa
;;
esac
elif enabled ppc; then elif enabled ppc; then
...@@ -5132,91 +5106,20 @@ elif enabled mips; then ...@@ -5132,91 +5106,20 @@ elif enabled mips; then
# Enable minimum ISA based on selected options # Enable minimum ISA based on selected options
if enabled mips64; then if enabled mips64; then
if enabled mips64r6; then enabled mips64r6 && check_inline_asm_flags mips64r6 '"dlsa $0, $0, $0, 1"' '-mips64r6'
check_ldflags "-mips64r6" && enabled mips64r2 && check_inline_asm_flags mips64r2 '"dext $0, $0, 0, 1"' '-mips64r2'
add_cflags "-mips64r6" && disabled mips64r6 && disabled mips64r2 && check_inline_asm_flags mips64r1 '"daddi $0, $0, 0"' '-mips64'
add_asflags "-mips64r6" &&
check_inline_asm mips64r6 '"dlsa $0, $0, $0, 1"' ||
disable mips64r6
fi
if disabled mips64r6 && enabled mips64r2; then
check_ldflags "-mips64r2" &&
add_cflags "-mips64r2" &&
add_asflags "-mips64r2" &&
check_inline_asm mips64r2 '"dext $0, $0, 0, 1"' ||
disable mips64r2
fi
if disabled mips64r6 && disabled mips64r2; then
check_ldflags "-mips64" &&
add_cflags "-mips64" &&
add_asflags "-mips64" &&
check_inline_asm mips64r1 '"daddi $0, $0, 0"' ||
disable mips64r1
fi
else else
if enabled mips32r6; then enabled mips32r6 && check_inline_asm_flags mips32r6 '"aui $0, $0, 0"' '-mips32r6'
check_ldflags "-mips32r6" && enabled mips32r5 && check_inline_asm_flags mips32r5 '"eretnc"' '-mips32r5'
add_cflags "-mips32r6" && enabled mips32r2 && check_inline_asm_flags mips32r2 '"ext $0, $0, 0, 1"' '-mips32r2'
add_asflags "-mips32r6" && disabled mips32r6 && disabled mips32r5 && disabled mips32r2 && check_inline_asm_flags mips32r1 '"addi $0, $0, 0"' '-mips32'
check_inline_asm mips32r6 '"aui $0, $0, 0"' ||
disable mips32r6
fi
if disabled mips32r6 && enabled mips32r2; then
check_ldflags "-mips32r2" &&
add_cflags "-mips32r2" &&
add_asflags "-mips32r2" &&
check_inline_asm mips32r2 '"ext $0, $0, 0, 1"' ||
disable mips32r2
fi
if disabled mips32r6 && disabled mips32r2; then
check_ldflags "-mips32" &&
add_cflags "-mips32" &&
add_asflags "-mips32" &&
check_inline_asm mips32r1 '"addi $0, $0, 0"' ||
disable mips32r1
fi
fi fi
# MIPS FPU enabled mipsfpu && check_inline_asm_flags mipsfpu '"cvt.d.l $f0, $f2"' '-mhard-float'
if enabled mipsfpu; then enabled mipsfpu && enabled msa && check_inline_asm_flags msa '"addvi.b $w0, $w1, 1"' '-mfp64 -mmsa' && check_header msa.h || disable msa
check_ldflags "-mhard-float" && enabled mipsdsp && check_inline_asm_flags mipsdsp '"addu.qb $t0, $t1, $t2"' '-mdsp'
add_cflags "-mhard-float" && enabled mipsdspr2 && check_inline_asm_flags mipsdspr2 '"absq_s.qb $t0, $t1"' '-mdspr2'
add_asflags "-mhard-float" &&
check_inline_asm mipsfpu '"cvt.d.l $f0, $f2"' ||
disable mipsfpu
fi
# MSA and DSP support require ISA revision level 2 or greater
if enabled mips32r2 || enabled mips64r2 || enabled mips32r6 || enabled mips64r6; then
# MSA must be used with -mfp64 and -mhard-float
if enabled mipsfpu; then
if enabled msa; then
check_ldflags "-mfp64 -mmsa" &&
add_cflags "-mfp64 -mmsa" &&
add_asflags "-mfp64 -mmsa" &&
check_inline_asm msa '"addvi.b $w0, $w1, 1"' &&
check_header msa.h ||
disable msa
fi
else
disable msa
fi
if enabled mipsdsp; then
check_ldflags "-mdsp" &&
add_cflags "-mdsp" &&
add_asflags "-mdsp" &&
check_inline_asm mipsdsp '"addu.qb $t0, $t1, $t2"' ||
disable mipsdsp
fi
if enabled mipsdspr2; then
check_ldflags "-mdspr2" &&
add_cflags "-mdspr2" &&
add_asflags "-mdspr2" &&
check_inline_asm mipsdspr2 '"absq_s.qb $t0, $t1"' ||
disable mipsdspr2
fi
fi
elif enabled parisc; then elif enabled parisc; then
......
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