From: Chenghui Pan Date: Fri, 22 Dec 2023 08:22:03 +0000 (+0800) Subject: LoongArch: Fix insn output of vec_concat templates for LASX. X-Git-Tag: basepoints/gcc-15~3291 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=183a51935cc9ba1aa0b78f8339edb5f1290320c5;p=thirdparty%2Fgcc.git LoongArch: Fix insn output of vec_concat templates for LASX. When investigaing failure of gcc.dg/vect/slp-reduc-sad.c, following instruction block are being generated by vec_concatv32qi (which is generated by vec_initv32qiv16qi) at entrance of foo() function: vldx $vr3,$r5,$r6 vld $vr2,$r5,0 xvpermi.q $xr2,$xr3,0x20 causes the reversion of vec_initv32qiv16qi operation's high and low 128-bit part. According to other target's similar impl and LSX impl for following RTL representation, current definition in lasx.md of "vec_concat" are wrong: (set (op0) (vec_concat (op1) (op2))) For correct behavior, the last argument of xvpermi.q should be 0x02 instead of 0x20. This patch fixes this issue and cleanup the vec_concat template impl. gcc/ChangeLog: * config/loongarch/lasx.md (vec_concatv4di): Delete. (vec_concatv8si): Delete. (vec_concatv16hi): Delete. (vec_concatv32qi): Delete. (vec_concatv4df): Delete. (vec_concatv8sf): Delete. (vec_concat): New template with insn output fixed. --- diff --git a/gcc/config/loongarch/lasx.md b/gcc/config/loongarch/lasx.md index 9ca3f92786c2..46150f2fbf9c 100644 --- a/gcc/config/loongarch/lasx.md +++ b/gcc/config/loongarch/lasx.md @@ -577,77 +577,17 @@ [(set_attr "type" "simd_insert") (set_attr "mode" "")]) -(define_insn "vec_concatv4di" - [(set (match_operand:V4DI 0 "register_operand" "=f") - (vec_concat:V4DI - (match_operand:V2DI 1 "register_operand" "0") - (match_operand:V2DI 2 "register_operand" "f")))] - "ISA_HAS_LASX" -{ - return "xvpermi.q\t%u0,%u2,0x20"; -} - [(set_attr "type" "simd_splat") - (set_attr "mode" "V4DI")]) - -(define_insn "vec_concatv8si" - [(set (match_operand:V8SI 0 "register_operand" "=f") - (vec_concat:V8SI - (match_operand:V4SI 1 "register_operand" "0") - (match_operand:V4SI 2 "register_operand" "f")))] - "ISA_HAS_LASX" -{ - return "xvpermi.q\t%u0,%u2,0x20"; -} - [(set_attr "type" "simd_splat") - (set_attr "mode" "V4DI")]) - -(define_insn "vec_concatv16hi" - [(set (match_operand:V16HI 0 "register_operand" "=f") - (vec_concat:V16HI - (match_operand:V8HI 1 "register_operand" "0") - (match_operand:V8HI 2 "register_operand" "f")))] - "ISA_HAS_LASX" -{ - return "xvpermi.q\t%u0,%u2,0x20"; -} - [(set_attr "type" "simd_splat") - (set_attr "mode" "V4DI")]) - -(define_insn "vec_concatv32qi" - [(set (match_operand:V32QI 0 "register_operand" "=f") - (vec_concat:V32QI - (match_operand:V16QI 1 "register_operand" "0") - (match_operand:V16QI 2 "register_operand" "f")))] - "ISA_HAS_LASX" -{ - return "xvpermi.q\t%u0,%u2,0x20"; -} - [(set_attr "type" "simd_splat") - (set_attr "mode" "V4DI")]) - -(define_insn "vec_concatv4df" - [(set (match_operand:V4DF 0 "register_operand" "=f") - (vec_concat:V4DF - (match_operand:V2DF 1 "register_operand" "0") - (match_operand:V2DF 2 "register_operand" "f")))] - "ISA_HAS_LASX" -{ - return "xvpermi.q\t%u0,%u2,0x20"; -} - [(set_attr "type" "simd_splat") - (set_attr "mode" "V4DF")]) - -(define_insn "vec_concatv8sf" - [(set (match_operand:V8SF 0 "register_operand" "=f") - (vec_concat:V8SF - (match_operand:V4SF 1 "register_operand" "0") - (match_operand:V4SF 2 "register_operand" "f")))] +(define_insn "vec_concat" + [(set (match_operand:LASX 0 "register_operand" "=f") + (vec_concat:LASX + (match_operand: 1 "register_operand" "0") + (match_operand: 2 "register_operand" "f")))] "ISA_HAS_LASX" { - return "xvpermi.q\t%u0,%u2,0x20"; + return "xvpermi.q\t%u0,%u2,0x02"; } [(set_attr "type" "simd_splat") - (set_attr "mode" "V4DI")]) + (set_attr "mode" "")]) ;; xshuf.w (define_insn "lasx_xvperm_"