From: liuhongt Date: Mon, 14 Oct 2024 05:09:59 +0000 (+0800) Subject: Canonicalize (vec_merge (fma: op2 op1 op3) (match_dup 1)) mask) to (vec_merge (fma... X-Git-Tag: basepoints/gcc-16~5154 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edf4db8355dead3413bad64f6a89bae82dabd0ad;p=thirdparty%2Fgcc.git Canonicalize (vec_merge (fma: op2 op1 op3) (match_dup 1)) mask) to (vec_merge (fma: op1 op2 op3) (match_dup 1)) mask) For masked FMA, there're 2 forms of RTL representation 1) (vec_merge (fma: op2 op1 op3) op1) mask) 2) (vec_merge (fma: op1 op2 op3) op1) mask) It's because op1 op2 are communatative in RTL(the second op1 is written as (match_dup 1)) we once tried to replace (match_dup 1) with (match_operand:VFH_AVX512VL 5 "nonimmediate_operand" "0,0")), but trigger an ICE in reload(reload can handle at most one operand with "0" constraint). So the patch do the canonicalizaton for the backend part. gcc/ChangeLog: PR target/117072 * config/i386/sse.md (_fmadd__mask): Relax predicates of fma operands from register_operand to nonimmediate_operand. (_fmadd__mask3): Ditto. (_fmsub__mask): Ditto. (_fmsub__mask3): Ditto. (_fnmadd__mask): Ditto. (_fnmadd__mask3): Ditto. (_fnmsub__mask): Ditto. (_fnmsub__mask3): Ditto. (_fmaddsub__mask3): Ditto. (_fmsubadd__mask): Ditto. (_fmsubadd__mask3): Ditto. (avx512f_vmfmadd__mask): Ditto. (avx512f_vmfmadd__mask3): Ditto. (avx512f_vmfmadd__maskz_1): Ditto. (*avx512f_vmfmsub__mask): Ditto. (avx512f_vmfmsub__mask3): Ditto. (*avx512f_vmfmsub__maskz_1): Ditto. (avx512f_vmfnmadd__mask): Ditto. (avx512f_vmfnmadd__mask3): Ditto. (avx512f_vmfnmadd__maskz_1): Ditto. (*avx512f_vmfnmsub__mask): Ditto. (*avx512f_vmfnmsub__mask3): Ditto. (*avx512f_vmfnmsub__maskz_1): Ditto. (avx10_2_fmaddnepbf16__mask3): Ditto. (avx10_2_fnmaddnepbf16__mask3): Ditto. (avx10_2_fmsubnepbf16__mask3): Ditto. (avx10_2_fnmsubnepbf16__mask3): Ditto. (fmai_vmfmadd_): Swap operands[1] and operands[2]. (fmai_vmfmsub_): Ditto. (fmai_vmfnmadd_): Ditto. (fmai_vmfnmsub_): Ditto. (*fmai_fmadd_): Swap operands[1] and operands[2] adjust operands[1] predicates from register_operand to nonimmediate_operand. (*fmai_fmsub_): Ditto. (*fmai_fnmadd_): Ditto. (*fmai_fnmsub_): Ditto. --- diff --git a/gcc/config/i386/sse.md b/gcc/config/i386/sse.md index 7be31334667..d8a05e223b3 100644 --- a/gcc/config/i386/sse.md +++ b/gcc/config/i386/sse.md @@ -5895,7 +5895,7 @@ [(set (match_operand:VFH_AVX512VL 0 "register_operand" "=v,v") (vec_merge:VFH_AVX512VL (fma:VFH_AVX512VL - (match_operand:VFH_AVX512VL 1 "register_operand" "0,0") + (match_operand:VFH_AVX512VL 1 "nonimmediate_operand" "0,0") (match_operand:VFH_AVX512VL 2 "" ",v") (match_operand:VFH_AVX512VL 3 "" "v,")) (match_dup 1) @@ -5914,7 +5914,7 @@ (fma:VFH_AVX512VL (match_operand:VFH_AVX512VL 1 "" "%v") (match_operand:VFH_AVX512VL 2 "" "") - (match_operand:VFH_AVX512VL 3 "register_operand" "0")) + (match_operand:VFH_AVX512VL 3 "nonimmediate_operand" "0")) (match_dup 3) (match_operand: 4 "register_operand" "Yk")))] "TARGET_AVX512F && " @@ -5999,7 +5999,7 @@ [(set (match_operand:VFH_AVX512VL 0 "register_operand" "=v,v") (vec_merge:VFH_AVX512VL (fma:VFH_AVX512VL - (match_operand:VFH_AVX512VL 1 "register_operand" "0,0") + (match_operand:VFH_AVX512VL 1 "nonimmediate_operand" "0,0") (match_operand:VFH_AVX512VL 2 "" ",v") (neg:VFH_AVX512VL (match_operand:VFH_AVX512VL 3 "" "v,"))) @@ -6020,7 +6020,7 @@ (match_operand:VFH_AVX512VL 1 "" "%v") (match_operand:VFH_AVX512VL 2 "" "") (neg:VFH_AVX512VL - (match_operand:VFH_AVX512VL 3 "register_operand" "0"))) + (match_operand:VFH_AVX512VL 3 "nonimmediate_operand" "0"))) (match_dup 3) (match_operand: 4 "register_operand" "Yk")))] "TARGET_AVX512F && " @@ -6106,7 +6106,7 @@ (vec_merge:VFH_AVX512VL (fma:VFH_AVX512VL (neg:VFH_AVX512VL - (match_operand:VFH_AVX512VL 1 "register_operand" "0,0")) + (match_operand:VFH_AVX512VL 1 "nonimmediate_operand" "0,0")) (match_operand:VFH_AVX512VL 2 "" ",v") (match_operand:VFH_AVX512VL 3 "" "v,")) (match_dup 1) @@ -6126,7 +6126,7 @@ (neg:VFH_AVX512VL (match_operand:VFH_AVX512VL 1 "" "%v")) (match_operand:VFH_AVX512VL 2 "" "") - (match_operand:VFH_AVX512VL 3 "register_operand" "0")) + (match_operand:VFH_AVX512VL 3 "nonimmediate_operand" "0")) (match_dup 3) (match_operand: 4 "register_operand" "Yk")))] "TARGET_AVX512F && " @@ -6215,7 +6215,7 @@ (vec_merge:VFH_AVX512VL (fma:VFH_AVX512VL (neg:VFH_AVX512VL - (match_operand:VFH_AVX512VL 1 "register_operand" "0,0")) + (match_operand:VFH_AVX512VL 1 "nonimmediate_operand" "0,0")) (match_operand:VFH_AVX512VL 2 "" ",v") (neg:VFH_AVX512VL (match_operand:VFH_AVX512VL 3 "" "v,"))) @@ -6237,7 +6237,7 @@ (match_operand:VFH_AVX512VL 1 "" "%v")) (match_operand:VFH_AVX512VL 2 "" "") (neg:VFH_AVX512VL - (match_operand:VFH_AVX512VL 3 "register_operand" "0"))) + (match_operand:VFH_AVX512VL 3 "nonimmediate_operand" "0"))) (match_dup 3) (match_operand: 4 "register_operand" "Yk")))] "TARGET_AVX512F && " @@ -6369,9 +6369,9 @@ [(set (match_operand:VFH_AVX512VL 0 "register_operand" "=v") (vec_merge:VFH_AVX512VL (unspec:VFH_AVX512VL - [(match_operand:VFH_AVX512VL 1 "register_operand" "v") + [(match_operand:VFH_AVX512VL 1 "nonimmediate_operand" "v") (match_operand:VFH_AVX512VL 2 "" "") - (match_operand:VFH_AVX512VL 3 "register_operand" "0")] + (match_operand:VFH_AVX512VL 3 "nonimmediate_operand" "0")] UNSPEC_FMADDSUB) (match_dup 3) (match_operand: 4 "register_operand" "Yk")))] @@ -6421,7 +6421,7 @@ [(set (match_operand:VFH_AVX512VL 0 "register_operand" "=v,v") (vec_merge:VFH_AVX512VL (unspec:VFH_AVX512VL - [(match_operand:VFH_AVX512VL 1 "register_operand" "0,0") + [(match_operand:VFH_AVX512VL 1 "nonimmediate_operand" "0,0") (match_operand:VFH_AVX512VL 2 "" ",v") (neg:VFH_AVX512VL (match_operand:VFH_AVX512VL 3 "" "v,"))] @@ -6440,10 +6440,10 @@ [(set (match_operand:VFH_AVX512VL 0 "register_operand" "=v") (vec_merge:VFH_AVX512VL (unspec:VFH_AVX512VL - [(match_operand:VFH_AVX512VL 1 "register_operand" "v") + [(match_operand:VFH_AVX512VL 1 "nonimmediate_operand" "v") (match_operand:VFH_AVX512VL 2 "" "") (neg:VFH_AVX512VL - (match_operand:VFH_AVX512VL 3 "register_operand" "0"))] + (match_operand:VFH_AVX512VL 3 "nonimmediate_operand" "0"))] UNSPEC_FMADDSUB) (match_dup 3) (match_operand: 4 "register_operand" "Yk")))] @@ -6460,7 +6460,7 @@ [(set (match_operand:VFH_128 0 "register_operand") (vec_merge:VFH_128 (fma:VFH_128 - (match_operand:VFH_128 1 "register_operand") + (match_operand:VFH_128 1 "nonimmediate_operand") (match_operand:VFH_128 2 "") (match_operand:VFH_128 3 "")) (match_dup 1) @@ -6471,7 +6471,7 @@ [(set (match_operand:VFH_128 0 "register_operand") (vec_merge:VFH_128 (fma:VFH_128 - (match_operand:VFH_128 1 "register_operand") + (match_operand:VFH_128 1 "nonimmediate_operand") (match_operand:VFH_128 2 "") (neg:VFH_128 (match_operand:VFH_128 3 ""))) @@ -6484,8 +6484,8 @@ (vec_merge:VFH_128 (fma:VFH_128 (neg:VFH_128 - (match_operand:VFH_128 2 "")) - (match_operand:VFH_128 1 "register_operand") + (match_operand:VFH_128 1 "nonimmediate_operand")) + (match_operand:VFH_128 2 "") (match_operand:VFH_128 3 "")) (match_dup 1) (const_int 1)))] @@ -6496,8 +6496,8 @@ (vec_merge:VFH_128 (fma:VFH_128 (neg:VFH_128 - (match_operand:VFH_128 2 "")) - (match_operand:VFH_128 1 "register_operand") + (match_operand:VFH_128 1 "nonimmediate_operand")) + (match_operand:VFH_128 2 "") (neg:VFH_128 (match_operand:VFH_128 3 ""))) (match_dup 1) @@ -6508,7 +6508,7 @@ [(set (match_operand:VFH_128 0 "register_operand" "=v,v") (vec_merge:VFH_128 (fma:VFH_128 - (match_operand:VFH_128 1 "register_operand" "0,0") + (match_operand:VFH_128 1 "nonimmediate_operand" "0,0") (match_operand:VFH_128 2 "" ", v") (match_operand:VFH_128 3 "" "v,")) (match_dup 1) @@ -6525,7 +6525,7 @@ [(set (match_operand:VFH_128 0 "register_operand" "=v,v") (vec_merge:VFH_128 (fma:VFH_128 - (match_operand:VFH_128 1 "register_operand" "0,0") + (match_operand:VFH_128 1 "nonimmediate_operand" "0,0") (match_operand:VFH_128 2 "" ",v") (neg:VFH_128 (match_operand:VFH_128 3 "" "v,"))) @@ -6544,8 +6544,8 @@ (vec_merge:VFH_128 (fma:VFH_128 (neg:VFH_128 - (match_operand:VFH_128 2 "" ",v")) - (match_operand:VFH_128 1 "register_operand" "0,0") + (match_operand:VFH_128 1 "nonimmediate_operand" "0,0")) + (match_operand:VFH_128 2 "" ",v") (match_operand:VFH_128 3 "" "v,")) (match_dup 1) (const_int 1)))] @@ -6562,8 +6562,8 @@ (vec_merge:VFH_128 (fma:VFH_128 (neg:VFH_128 - (match_operand:VFH_128 2 "" ",v")) - (match_operand:VFH_128 1 "register_operand" "0,0") + (match_operand:VFH_128 1 "nonimmediate_operand" "0,0")) + (match_operand:VFH_128 2 "" ",v") (neg:VFH_128 (match_operand:VFH_128 3 "" "v,"))) (match_dup 1) @@ -6581,7 +6581,7 @@ (vec_merge:VFH_128 (vec_merge:VFH_128 (fma:VFH_128 - (match_operand:VFH_128 1 "register_operand" "0,0") + (match_operand:VFH_128 1 "nonimmediate_operand" "0,0") (match_operand:VFH_128 2 "" ",v") (match_operand:VFH_128 3 "" "v,")) (match_dup 1) @@ -6603,7 +6603,7 @@ (fma:VFH_128 (match_operand:VFH_128 1 "" "%v") (match_operand:VFH_128 2 "" "") - (match_operand:VFH_128 3 "register_operand" "0")) + (match_operand:VFH_128 3 "nonimmediate_operand" "0")) (match_dup 3) (match_operand:QI 4 "register_operand" "Yk")) (match_dup 3) @@ -6633,7 +6633,7 @@ (vec_merge:VFH_128 (vec_merge:VFH_128 (fma:VFH_128 - (match_operand:VFH_128 1 "register_operand" "0,0") + (match_operand:VFH_128 1 "nonimmediate_operand" "0,0") (match_operand:VFH_128 2 "" ",v") (match_operand:VFH_128 3 "" "v,")) (match_operand:VFH_128 4 "const0_operand") @@ -6653,7 +6653,7 @@ (vec_merge:VFH_128 (vec_merge:VFH_128 (fma:VFH_128 - (match_operand:VFH_128 1 "register_operand" "0,0") + (match_operand:VFH_128 1 "nonimmediate_operand" "0,0") (match_operand:VFH_128 2 "" ",v") (neg:VFH_128 (match_operand:VFH_128 3 "" "v,"))) @@ -6677,7 +6677,7 @@ (match_operand:VFH_128 1 "" "%v") (match_operand:VFH_128 2 "" "") (neg:VFH_128 - (match_operand:VFH_128 3 "register_operand" "0"))) + (match_operand:VFH_128 3 "nonimmediate_operand" "0"))) (match_dup 3) (match_operand:QI 4 "register_operand" "Yk")) (match_dup 3) @@ -6693,7 +6693,7 @@ (vec_merge:VFH_128 (vec_merge:VFH_128 (fma:VFH_128 - (match_operand:VFH_128 1 "register_operand" "0,0") + (match_operand:VFH_128 1 "nonimmediate_operand" "0,0") (match_operand:VFH_128 2 "" ",v") (neg:VFH_128 (match_operand:VFH_128 3 "" "v,"))) @@ -6715,8 +6715,8 @@ (vec_merge:VFH_128 (fma:VFH_128 (neg:VFH_128 - (match_operand:VFH_128 2 "" ",v")) - (match_operand:VFH_128 1 "register_operand" "0,0") + (match_operand:VFH_128 1 "nonimmediate_operand" "0,0")) + (match_operand:VFH_128 2 "" ",v") (match_operand:VFH_128 3 "" "v,")) (match_dup 1) (match_operand:QI 4 "register_operand" "Yk,Yk")) @@ -6738,7 +6738,7 @@ (neg:VFH_128 (match_operand:VFH_128 2 "" "")) (match_operand:VFH_128 1 "" "%v") - (match_operand:VFH_128 3 "register_operand" "0")) + (match_operand:VFH_128 3 "nonimmediate_operand" "0")) (match_dup 3) (match_operand:QI 4 "register_operand" "Yk")) (match_dup 3) @@ -6770,7 +6770,7 @@ (fma:VFH_128 (neg:VFH_128 (match_operand:VFH_128 2 "" ",v")) - (match_operand:VFH_128 1 "register_operand" "0,0") + (match_operand:VFH_128 1 "nonimmediate_operand" "0,0") (match_operand:VFH_128 3 "" "v,")) (match_operand:VFH_128 4 "const0_operand") (match_operand:QI 5 "register_operand" "Yk,Yk")) @@ -6790,8 +6790,8 @@ (vec_merge:VFH_128 (fma:VFH_128 (neg:VFH_128 - (match_operand:VFH_128 2 "" ",v")) - (match_operand:VFH_128 1 "register_operand" "0,0") + (match_operand:VFH_128 1 "nonimmediate_operand" "0,0")) + (match_operand:VFH_128 2 "" ",v") (neg:VFH_128 (match_operand:VFH_128 3 "" "v,"))) (match_dup 1) @@ -6815,7 +6815,7 @@ (match_operand:VFH_128 2 "" "")) (match_operand:VFH_128 1 "" "%v") (neg:VFH_128 - (match_operand:VFH_128 3 "register_operand" "0"))) + (match_operand:VFH_128 3 "nonimmediate_operand" "0"))) (match_dup 3) (match_operand:QI 4 "register_operand" "Yk")) (match_dup 3) @@ -6833,7 +6833,7 @@ (fma:VFH_128 (neg:VFH_128 (match_operand:VFH_128 2 "" ",v")) - (match_operand:VFH_128 1 "register_operand" "0,0") + (match_operand:VFH_128 1 "nonimmediate_operand" "0,0") (neg:VFH_128 (match_operand:VFH_128 3 "" "v,"))) (match_operand:VFH_128 4 "const0_operand") @@ -32055,7 +32055,7 @@ (fma:VBF_AVX10_2 (match_operand:VBF_AVX10_2 1 "nonimmediate_operand" "%v") (match_operand:VBF_AVX10_2 2 "nonimmediate_operand" "vm") - (match_operand:VBF_AVX10_2 3 "register_operand" "0")) + (match_operand:VBF_AVX10_2 3 "nonimmediate_operand" "0")) (match_dup 3) (match_operand: 4 "register_operand" "Yk")))] "TARGET_AVX10_2_256" @@ -32120,7 +32120,7 @@ (neg:VBF_AVX10_2 (match_operand:VBF_AVX10_2 1 "nonimmediate_operand" "%v")) (match_operand:VBF_AVX10_2 2 "nonimmediate_operand" "vm") - (match_operand:VBF_AVX10_2 3 "register_operand" "0")) + (match_operand:VBF_AVX10_2 3 "nonimmediate_operand" "0")) (match_dup 3) (match_operand: 4 "register_operand" "Yk")))] "TARGET_AVX10_2_256" @@ -32185,7 +32185,7 @@ (match_operand:VBF_AVX10_2 1 "nonimmediate_operand" "%v") (match_operand:VBF_AVX10_2 2 "nonimmediate_operand" "vm") (neg:VBF_AVX10_2 - (match_operand:VBF_AVX10_2 3 "register_operand" "0"))) + (match_operand:VBF_AVX10_2 3 "nonimmediate_operand" "0"))) (match_dup 3) (match_operand: 4 "register_operand" "Yk")))] "TARGET_AVX10_2_256" @@ -32253,7 +32253,7 @@ (match_operand:VBF_AVX10_2 1 "nonimmediate_operand" "%v")) (match_operand:VBF_AVX10_2 2 "nonimmediate_operand" "vm") (neg:VBF_AVX10_2 - (match_operand:VBF_AVX10_2 3 "register_operand" "0"))) + (match_operand:VBF_AVX10_2 3 "nonimmediate_operand" "0"))) (match_dup 3) (match_operand: 4 "register_operand" "Yk")))] "TARGET_AVX10_2_256"