[LoongArch] lower SCALAR_TO_VECTOR to INSERT_VECTOR_ELT #122863

tangaac · 2025-01-14T06:00:20Z

define <16 x i8> @scalar_to_16xi8(i8 %val) {
  %ret = insertelement <16 x i8> undef, i8 %val, i32 0
  ret <16 x i8> %ret
}

before

addi.d	$sp, $sp, -16
st.b	$a0, $sp, 0
vld	$vr0, $sp, 0
addi.d	$sp, $sp, 16
ret

after

vinsgr2vr.b $vr0, $a0, 0
ret

llvmbot · 2025-01-14T06:00:55Z

@llvm/pr-subscribers-backend-loongarch

Author: None (tangaac)

Changes

define &lt;16 x i8&gt; @<!-- -->scalar_to_16xi8(i8 %val) {
  %ret = insertelement &lt;16 x i8&gt; undef, i8 %val, i32 0
  ret &lt;16 x i8&gt; %ret
}

before

addi.d	$sp, $sp, -16
st.b	$a0, $sp, 0
vld	$vr0, $sp, 0
addi.d	$sp, $sp, 16
ret

after

vinsgr2vr.b $vr0, $a0, 0
ret

Full diff: /~https://github.com/llvm/llvm-project/pull/122863.diff

4 Files Affected:

(modified) llvm/lib/Target/LoongArch/LoongArchISelLowering.cpp (+18)
(modified) llvm/lib/Target/LoongArch/LoongArchISelLowering.h (+1)
(added) llvm/test/CodeGen/LoongArch/lasx/scalar-to-vector.ll (+60)
(added) llvm/test/CodeGen/LoongArch/lsx/scalar-to-vector.ll (+60)

diff --git a/llvm/lib/Target/LoongArch/LoongArchISelLowering.cpp b/llvm/lib/Target/LoongArch/LoongArchISelLowering.cpp
index 96e6f71344a787..af8566680b2a07 100644
--- a/llvm/lib/Target/LoongArch/LoongArchISelLowering.cpp
+++ b/llvm/lib/Target/LoongArch/LoongArchISelLowering.cpp
@@ -255,6 +255,7 @@ LoongArchTargetLowering::LoongArchTargetLowering(const TargetMachine &TM,
       setOperationAction(ISD::SETCC, VT, Legal);
       setOperationAction(ISD::VSELECT, VT, Legal);
       setOperationAction(ISD::VECTOR_SHUFFLE, VT, Custom);
+      setOperationAction(ISD::SCALAR_TO_VECTOR, VT, Custom);
     }
     for (MVT VT : {MVT::v16i8, MVT::v8i16, MVT::v4i32, MVT::v2i64}) {
       setOperationAction({ISD::ADD, ISD::SUB}, VT, Legal);
@@ -311,6 +312,7 @@ LoongArchTargetLowering::LoongArchTargetLowering(const TargetMachine &TM,
       setOperationAction(ISD::SETCC, VT, Legal);
       setOperationAction(ISD::VSELECT, VT, Legal);
       setOperationAction(ISD::VECTOR_SHUFFLE, VT, Custom);
+      setOperationAction(ISD::SCALAR_TO_VECTOR, VT, Custom);
     }
     for (MVT VT : {MVT::v4i64, MVT::v8i32, MVT::v16i16, MVT::v32i8}) {
       setOperationAction({ISD::ADD, ISD::SUB}, VT, Legal);
@@ -446,10 +448,26 @@ SDValue LoongArchTargetLowering::LowerOperation(SDValue Op,
     return lowerVECTOR_SHUFFLE(Op, DAG);
   case ISD::BITREVERSE:
     return lowerBITREVERSE(Op, DAG);
+  case ISD::SCALAR_TO_VECTOR:
+    return lowerSCALAR_TO_VECTOR(Op, DAG);
   }
   return SDValue();
 }
 
+SDValue
+LoongArchTargetLowering::lowerSCALAR_TO_VECTOR(SDValue Op,
+                                               SelectionDAG &DAG) const {
+  SDLoc DL(Op);
+  MVT OpVT = Op.getSimpleValueType();
+
+  SDValue Vector = DAG.getUNDEF(OpVT);
+  SDValue Val = Op.getOperand(0);
+  SDValue Idx = DAG.getConstant(0, DL, Subtarget.getGRLenVT());
+
+  Vector = DAG.getNode(ISD::INSERT_VECTOR_ELT, DL, OpVT, Vector, Val, Idx);
+  return Vector;
+}
+
 SDValue LoongArchTargetLowering::lowerBITREVERSE(SDValue Op,
                                                  SelectionDAG &DAG) const {
   EVT ResTy = Op->getValueType(0);
diff --git a/llvm/lib/Target/LoongArch/LoongArchISelLowering.h b/llvm/lib/Target/LoongArch/LoongArchISelLowering.h
index e619cb69f33325..a14d5d49ee9d1b 100644
--- a/llvm/lib/Target/LoongArch/LoongArchISelLowering.h
+++ b/llvm/lib/Target/LoongArch/LoongArchISelLowering.h
@@ -336,6 +336,7 @@ class LoongArchTargetLowering : public TargetLowering {
   SDValue lowerBUILD_VECTOR(SDValue Op, SelectionDAG &DAG) const;
   SDValue lowerVECTOR_SHUFFLE(SDValue Op, SelectionDAG &DAG) const;
   SDValue lowerBITREVERSE(SDValue Op, SelectionDAG &DAG) const;
+  SDValue lowerSCALAR_TO_VECTOR(SDValue Op, SelectionDAG &DAG) const;
 
   bool isFPImmLegal(const APFloat &Imm, EVT VT,
                     bool ForCodeSize) const override;
diff --git a/llvm/test/CodeGen/LoongArch/lasx/scalar-to-vector.ll b/llvm/test/CodeGen/LoongArch/lasx/scalar-to-vector.ll
new file mode 100644
index 00000000000000..9020db76738f6a
--- /dev/null
+++ b/llvm/test/CodeGen/LoongArch/lasx/scalar-to-vector.ll
@@ -0,0 +1,60 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
+; RUN: llc --mtriple=loongarch64 --mattr=+lasx < %s | FileCheck %s
+
+; Test scalar_to_vector expansion.
+
+define <32 x i8> @scalar_to_32xi8(i8 %val) {
+; CHECK-LABEL: scalar_to_32xi8:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    vinsgr2vr.b $vr0, $a0, 0
+; CHECK-NEXT:    ret
+  %ret = insertelement <32 x i8> undef, i8 %val, i32 0
+  ret <32 x i8> %ret
+}
+
+define <16 x i16> @scalar_to_16xi16(i16 %val) {
+; CHECK-LABEL: scalar_to_16xi16:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    vinsgr2vr.h $vr0, $a0, 0
+; CHECK-NEXT:    ret
+  %ret = insertelement <16 x i16> undef, i16 %val, i32 0
+  ret <16 x i16> %ret
+}
+
+define <8 x i32> @scalar_to_8xi32(i32 %val) {
+; CHECK-LABEL: scalar_to_8xi32:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    xvinsgr2vr.w $xr0, $a0, 0
+; CHECK-NEXT:    ret
+  %ret = insertelement <8 x i32> undef, i32 %val, i32 0
+  ret <8 x i32> %ret
+}
+
+define <4 x i64> @scalar_to_4xi64(i64 %val) {
+; CHECK-LABEL: scalar_to_4xi64:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    xvinsgr2vr.d $xr0, $a0, 0
+; CHECK-NEXT:    ret
+  %ret = insertelement <4 x i64> undef, i64 %val, i32 0
+  ret <4 x i64> %ret
+}
+
+define <8 x float> @scalar_to_8xf32(float %val) {
+; CHECK-LABEL: scalar_to_8xf32:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    movfr2gr.s $a0, $fa0
+; CHECK-NEXT:    xvinsgr2vr.w $xr0, $a0, 0
+; CHECK-NEXT:    ret
+  %ret = insertelement <8 x float> undef, float %val, i32 0
+  ret <8 x float> %ret
+}
+
+define <4 x double> @scalar_to_4xf64(double %val) {
+; CHECK-LABEL: scalar_to_4xf64:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    movfr2gr.d $a0, $fa0
+; CHECK-NEXT:    xvinsgr2vr.d $xr0, $a0, 0
+; CHECK-NEXT:    ret
+  %ret = insertelement <4 x double> undef, double %val, i32 0
+  ret <4 x double> %ret
+}
diff --git a/llvm/test/CodeGen/LoongArch/lsx/scalar-to-vector.ll b/llvm/test/CodeGen/LoongArch/lsx/scalar-to-vector.ll
new file mode 100644
index 00000000000000..4a9471bbf552b0
--- /dev/null
+++ b/llvm/test/CodeGen/LoongArch/lsx/scalar-to-vector.ll
@@ -0,0 +1,60 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
+; RUN: llc --mtriple=loongarch64 --mattr=+lsx < %s | FileCheck %s
+
+; Test scalar_to_vector expansion.
+
+define <16 x i8> @scalar_to_16xi8(i8 %val) {
+; CHECK-LABEL: scalar_to_16xi8:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    vinsgr2vr.b $vr0, $a0, 0
+; CHECK-NEXT:    ret
+  %ret = insertelement <16 x i8> undef, i8 %val, i32 0
+  ret <16 x i8> %ret
+}
+
+define <8 x i16> @scalar_to_8xi16(i16 %val) {
+; CHECK-LABEL: scalar_to_8xi16:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    vinsgr2vr.h $vr0, $a0, 0
+; CHECK-NEXT:    ret
+  %ret = insertelement <8 x i16> undef, i16 %val, i32 0
+  ret <8 x i16> %ret
+}
+
+define <4 x i32> @scalar_to_4xi32(i32 %val) {
+; CHECK-LABEL: scalar_to_4xi32:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    vinsgr2vr.w $vr0, $a0, 0
+; CHECK-NEXT:    ret
+  %ret = insertelement <4 x i32> undef, i32 %val, i32 0
+  ret <4 x i32> %ret
+}
+
+define <2 x i64> @scalar_to_2xi64(i64 %val) {
+; CHECK-LABEL: scalar_to_2xi64:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    vinsgr2vr.d $vr0, $a0, 0
+; CHECK-NEXT:    ret
+  %ret = insertelement <2 x i64> undef, i64 %val, i32 0
+  ret <2 x i64> %ret
+}
+
+define <4 x float> @scalar_to_4xf32(float %val) {
+; CHECK-LABEL: scalar_to_4xf32:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    movfr2gr.s $a0, $fa0
+; CHECK-NEXT:    vinsgr2vr.w $vr0, $a0, 0
+; CHECK-NEXT:    ret
+  %ret = insertelement <4 x float> undef, float %val, i32 0
+  ret <4 x float> %ret
+}
+
+define <2 x double> @scalar_to_2xf64(double %val) {
+; CHECK-LABEL: scalar_to_2xf64:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    movfr2gr.d $a0, $fa0
+; CHECK-NEXT:    vinsgr2vr.d $vr0, $a0, 0
+; CHECK-NEXT:    ret
+  %ret = insertelement <2 x double> undef, double %val, i32 0
+  ret <2 x double> %ret
+}

github-actions · 2025-01-14T06:03:45Z

✅ With the latest revision this PR passed the undef deprecator.

…to scalar-to-vector

llvm/lib/Target/LoongArch/LoongArchISelLowering.cpp

llvm/test/CodeGen/LoongArch/lasx/scalar-to-vector.ll

llvm/test/CodeGen/LoongArch/lsx/scalar-to-vector.ll

llvm/test/CodeGen/LoongArch/lasx/scalar-to-vector.ll

SixWeining · 2025-01-16T12:28:47Z

llvm/lib/Target/LoongArch/LoongArchISelLowering.cpp

@@ -255,6 +255,7 @@ LoongArchTargetLowering::LoongArchTargetLowering(const TargetMachine &TM,
      setOperationAction(ISD::SETCC, VT, Legal);
      setOperationAction(ISD::VSELECT, VT, Legal);
      setOperationAction(ISD::VECTOR_SHUFFLE, VT, Custom);
+      setOperationAction(ISD::SCALAR_TO_VECTOR, VT, Custom);


Why not make it Legal and define patterns in .td files.

Why not make it Legal and define patterns in .td files.

Hi @SixWeining, I thought that in .td files, we can only lower operations to machine instructions. However, if this is done during ISel lowering, it gets canonicalized into a different standard SDNode. Could there be potential benefits if we incorporate some DAGCombine patterns in this approach?

Why not make it Legal and define patterns in .td files.

def : Pat<(v16i8 (scalar_to_vector GRLenVT:$rj)), (VINSGR2VR_B ?, GRLenVT:$rj, 0)>;

We cannot replace scalar_to_vector with the VINSGR2VR instruction because of the unknown ?.

Yes, I agree.

For the test case in the commit message, we do too many transforms: insert_vector_elt -> BUILD_VECTOR -> scalar_to_vector -> insert_vector_elt. Could we do: insert_vector_elt -> BUILD_VECTOR -> insert_vector_elt ?

Maybe we should change: LoongArchTargetLowering::lowerBUILD_VECTOR() or SelectionDAGLegalize::ExpandBUILD_VECTOR().

SixWeining

Which one should we use: movgr2fr or vinsgr2vr?

SixWeining · 2025-01-17T03:00:42Z

llvm/test/CodeGen/LoongArch/lsx/scalar-to-vector.ll

+  ret <2 x i64> %ret
+}
+
+define <4 x float> @scalar_to_4xf32(float %val) {


Seems these could be empty because FR overlap with the lower part of the SIMD register.

vector_insert in .td files cannot deal with this.
We could make v4f32, v2f64 Legal, and process scalar_to_vector in .td files like this,

def : Pat<(v4f32 (scalar_to_vector FPR32:$fj)), (SUBREG_TO_REG (i64 0), FPR32:$fj, sub_32)>; def : Pat<(v2f64 (scalar_to_vector FPR64:$fj)), (SUBREG_TO_REG (i64 0), FPR64:$fj, sub_64)>;

SixWeining

Beyond this PR: If the insertion index is non-zero and the vector is undef or poison, stack store and load could also be replaced with vinsgr2vr.

llvm/lib/Target/LoongArch/LoongArchLASXInstrInfo.td

llvm/lib/Target/LoongArch/LoongArchLSXInstrInfo.td

tangaac · 2025-01-20T01:33:20Z

Beyond this PR: If the insertion index is non-zero and the vector is undef or poison, stack store and load could also be replaced with vinsgr2vr.

Yes
It seems we should handle a vector that is undef or poison in a better way.
I will try in another PR.

Co-authored-by: Lu Weining <luweining@loongson.cn>

SixWeining

LGTM. Let's handle the non-zero case in a separate PR.

llvmbot added the backend:loongarch label Jan 14, 2025

lower SCALAR_TO_VECTOR to INSERT_VECTOR_ELT

7e36c8d

tangaac force-pushed the scalar-to-vector branch from 2b3fd87 to 7e36c8d Compare January 14, 2025 06:15

tangaac added 2 commits January 14, 2025 16:58

lower SCALAR_TO_VECTOR to INSERT_VECTOR_ELT

d574316

Merge branch 'scalar-to-vector' of github.com:tangaac/llvm-project in…

6d36284

…to scalar-to-vector

zhaoqi5 reviewed Jan 15, 2025

View reviewed changes

llvm/lib/Target/LoongArch/LoongArchISelLowering.cpp Outdated Show resolved Hide resolved

zhaoqi5 reviewed Jan 15, 2025

View reviewed changes

llvm/test/CodeGen/LoongArch/lasx/scalar-to-vector.ll Outdated Show resolved Hide resolved

minor changes

deae039

inclyc reviewed Jan 16, 2025

View reviewed changes

llvm/test/CodeGen/LoongArch/lsx/scalar-to-vector.ll Outdated Show resolved Hide resolved

llvm/test/CodeGen/LoongArch/lasx/scalar-to-vector.ll Outdated Show resolved Hide resolved

replace undef with poison

4bba81b

inclyc approved these changes Jan 16, 2025

View reviewed changes

inclyc requested a review from SixWeining January 16, 2025 11:53

SixWeining reviewed Jan 16, 2025

View reviewed changes

SixWeining reviewed Jan 17, 2025

View reviewed changes

simplify scalar_to_vector for float vector types

5cf9af0

SixWeining reviewed Jan 17, 2025

View reviewed changes

llvm/lib/Target/LoongArch/LoongArchLASXInstrInfo.td Outdated Show resolved Hide resolved

llvm/lib/Target/LoongArch/LoongArchLSXInstrInfo.td Outdated Show resolved Hide resolved

tangaac and others added 2 commits January 20, 2025 09:33

Update llvm/lib/Target/LoongArch/LoongArchLSXInstrInfo.td

a71a98f

Co-authored-by: Lu Weining <luweining@loongson.cn>

Update llvm/lib/Target/LoongArch/LoongArchLASXInstrInfo.td

948416e

Co-authored-by: Lu Weining <luweining@loongson.cn>

SixWeining approved these changes Jan 22, 2025

View reviewed changes

SixWeining merged commit dedf014 into llvm:main Jan 22, 2025
8 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[LoongArch] lower SCALAR_TO_VECTOR to INSERT_VECTOR_ELT #122863

[LoongArch] lower SCALAR_TO_VECTOR to INSERT_VECTOR_ELT #122863

tangaac commented Jan 14, 2025

llvmbot commented Jan 14, 2025

github-actions bot commented Jan 14, 2025 •

edited

Loading

SixWeining Jan 16, 2025

inclyc Jan 16, 2025

tangaac Jan 17, 2025

SixWeining Jan 17, 2025

SixWeining left a comment

SixWeining Jan 17, 2025

tangaac Jan 17, 2025

SixWeining left a comment

tangaac commented Jan 20, 2025 •

edited

Loading

SixWeining left a comment

[LoongArch] lower SCALAR_TO_VECTOR to INSERT_VECTOR_ELT #122863

[LoongArch] lower SCALAR_TO_VECTOR to INSERT_VECTOR_ELT #122863

Conversation

tangaac commented Jan 14, 2025

llvmbot commented Jan 14, 2025

github-actions bot commented Jan 14, 2025 • edited Loading

SixWeining Jan 16, 2025

Choose a reason for hiding this comment

inclyc Jan 16, 2025

Choose a reason for hiding this comment

tangaac Jan 17, 2025

Choose a reason for hiding this comment

SixWeining Jan 17, 2025

Choose a reason for hiding this comment

SixWeining left a comment

Choose a reason for hiding this comment

SixWeining Jan 17, 2025

Choose a reason for hiding this comment

tangaac Jan 17, 2025

Choose a reason for hiding this comment

SixWeining left a comment

Choose a reason for hiding this comment

tangaac commented Jan 20, 2025 • edited Loading

SixWeining left a comment

Choose a reason for hiding this comment

github-actions bot commented Jan 14, 2025 •

edited

Loading

tangaac commented Jan 20, 2025 •

edited

Loading