diff --git a/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td b/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td index e55bb4034f451..e23179e968748 100644 --- a/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td +++ b/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td @@ -7235,11 +7235,6 @@ foreach vti = AllFloatVectors in { vti.Vector, vti.Vector, vti.Mask, vti.Log2SEW, vti.LMul, vti.RegClass, vti.RegClass, vti.RegClass>; - defm : VPatBinaryCarryInTAIL<"int_riscv_vfmerge", "PseudoVMERGE", "VVM", - vti.Vector, - vti.Vector, vti.Vector, vti.Mask, - vti.Log2SEW, vti.LMul, vti.RegClass, - vti.RegClass, vti.RegClass>; defm : VPatBinaryCarryInTAIL<"int_riscv_vfmerge", "PseudoVFMERGE", "V"#vti.ScalarSuffix#"M", vti.Vector, diff --git a/llvm/test/CodeGen/RISCV/rvv/unmasked-tu.ll b/llvm/test/CodeGen/RISCV/rvv/unmasked-tu.ll index 439301ff40110..1f027aef3103d 100644 --- a/llvm/test/CodeGen/RISCV/rvv/unmasked-tu.ll +++ b/llvm/test/CodeGen/RISCV/rvv/unmasked-tu.ll @@ -2576,21 +2576,21 @@ entry: ret %a } -declare @llvm.riscv.vfmerge.nxv1f16.nxv1f16( +declare @llvm.riscv.vmerge.nxv1f16.nxv1f16( , , , , iXLen); -define @intrinsic_vfmerge_vvm_nxv1f16_nxv1f16_nxv1f16( %0, %1, %2, %3, iXLen %4) nounwind { -; CHECK-LABEL: intrinsic_vfmerge_vvm_nxv1f16_nxv1f16_nxv1f16: +define @intrinsic_vmerge_vvm_nxv1f16_nxv1f16_nxv1f16( %0, %1, %2, %3, iXLen %4) nounwind { +; CHECK-LABEL: intrinsic_vmerge_vvm_nxv1f16_nxv1f16_nxv1f16: ; CHECK: # %bb.0: # %entry ; CHECK-NEXT: vsetvli zero, a0, e16, mf4, tu, ma ; CHECK-NEXT: vmerge.vvm v8, v9, v10, v0 ; CHECK-NEXT: ret entry: - %a = call @llvm.riscv.vfmerge.nxv1f16.nxv1f16( + %a = call @llvm.riscv.vmerge.nxv1f16.nxv1f16( %0, %1, %2, diff --git a/llvm/test/CodeGen/RISCV/rvv/vfmerge.ll b/llvm/test/CodeGen/RISCV/rvv/vfmerge.ll index d9df1d4d30130..e47c2a47d6c64 100644 --- a/llvm/test/CodeGen/RISCV/rvv/vfmerge.ll +++ b/llvm/test/CodeGen/RISCV/rvv/vfmerge.ll @@ -4,21 +4,21 @@ ; RUN: sed 's/iXLen/i64/g' %s | llc -mtriple=riscv64 -mattr=+v,+zfh,+zvfh \ ; RUN: -verify-machineinstrs -target-abi=lp64d | FileCheck %s -declare @llvm.riscv.vfmerge.nxv1f16.nxv1f16( +declare @llvm.riscv.vmerge.nxv1f16.nxv1f16( , , , , iXLen); -define @intrinsic_vfmerge_vvm_nxv1f16_nxv1f16_nxv1f16( %0, %1, %2, iXLen %3) nounwind { -; CHECK-LABEL: intrinsic_vfmerge_vvm_nxv1f16_nxv1f16_nxv1f16: +define @intrinsic_vmerge_vvm_nxv1f16_nxv1f16_nxv1f16( %0, %1, %2, iXLen %3) nounwind { +; CHECK-LABEL: intrinsic_vmerge_vvm_nxv1f16_nxv1f16_nxv1f16: ; CHECK: # %bb.0: # %entry ; CHECK-NEXT: vsetvli zero, a0, e16, mf4, ta, ma ; CHECK-NEXT: vmerge.vvm v8, v8, v9, v0 ; CHECK-NEXT: ret entry: - %a = call @llvm.riscv.vfmerge.nxv1f16.nxv1f16( + %a = call @llvm.riscv.vmerge.nxv1f16.nxv1f16( undef, %0, %1, @@ -52,21 +52,21 @@ entry: ret %a } -declare @llvm.riscv.vfmerge.nxv2f16.nxv2f16( +declare @llvm.riscv.vmerge.nxv2f16.nxv2f16( , , , , iXLen); -define @intrinsic_vfmerge_vvm_nxv2f16_nxv2f16_nxv2f16( %0, %1, %2, iXLen %3) nounwind { -; CHECK-LABEL: intrinsic_vfmerge_vvm_nxv2f16_nxv2f16_nxv2f16: +define @intrinsic_vmerge_vvm_nxv2f16_nxv2f16_nxv2f16( %0, %1, %2, iXLen %3) nounwind { +; CHECK-LABEL: intrinsic_vmerge_vvm_nxv2f16_nxv2f16_nxv2f16: ; CHECK: # %bb.0: # %entry ; CHECK-NEXT: vsetvli zero, a0, e16, mf2, ta, ma ; CHECK-NEXT: vmerge.vvm v8, v8, v9, v0 ; CHECK-NEXT: ret entry: - %a = call @llvm.riscv.vfmerge.nxv2f16.nxv2f16( + %a = call @llvm.riscv.vmerge.nxv2f16.nxv2f16( undef, %0, %1, @@ -100,21 +100,21 @@ entry: ret %a } -declare @llvm.riscv.vfmerge.nxv4f16.nxv4f16( +declare @llvm.riscv.vmerge.nxv4f16.nxv4f16( , , , , iXLen); -define @intrinsic_vfmerge_vvm_nxv4f16_nxv4f16_nxv4f16( %0, %1, %2, iXLen %3) nounwind { -; CHECK-LABEL: intrinsic_vfmerge_vvm_nxv4f16_nxv4f16_nxv4f16: +define @intrinsic_vmerge_vvm_nxv4f16_nxv4f16_nxv4f16( %0, %1, %2, iXLen %3) nounwind { +; CHECK-LABEL: intrinsic_vmerge_vvm_nxv4f16_nxv4f16_nxv4f16: ; CHECK: # %bb.0: # %entry ; CHECK-NEXT: vsetvli zero, a0, e16, m1, ta, ma ; CHECK-NEXT: vmerge.vvm v8, v8, v9, v0 ; CHECK-NEXT: ret entry: - %a = call @llvm.riscv.vfmerge.nxv4f16.nxv4f16( + %a = call @llvm.riscv.vmerge.nxv4f16.nxv4f16( undef, %0, %1, @@ -148,21 +148,21 @@ entry: ret %a } -declare @llvm.riscv.vfmerge.nxv8f16.nxv8f16( +declare @llvm.riscv.vmerge.nxv8f16.nxv8f16( , , , , iXLen); -define @intrinsic_vfmerge_vvm_nxv8f16_nxv8f16_nxv8f16( %0, %1, %2, iXLen %3) nounwind { -; CHECK-LABEL: intrinsic_vfmerge_vvm_nxv8f16_nxv8f16_nxv8f16: +define @intrinsic_vmerge_vvm_nxv8f16_nxv8f16_nxv8f16( %0, %1, %2, iXLen %3) nounwind { +; CHECK-LABEL: intrinsic_vmerge_vvm_nxv8f16_nxv8f16_nxv8f16: ; CHECK: # %bb.0: # %entry ; CHECK-NEXT: vsetvli zero, a0, e16, m2, ta, ma ; CHECK-NEXT: vmerge.vvm v8, v8, v10, v0 ; CHECK-NEXT: ret entry: - %a = call @llvm.riscv.vfmerge.nxv8f16.nxv8f16( + %a = call @llvm.riscv.vmerge.nxv8f16.nxv8f16( undef, %0, %1, @@ -196,21 +196,21 @@ entry: ret %a } -declare @llvm.riscv.vfmerge.nxv16f16.nxv16f16( +declare @llvm.riscv.vmerge.nxv16f16.nxv16f16( , , , , iXLen); -define @intrinsic_vfmerge_vvm_nxv16f16_nxv16f16_nxv16f16( %0, %1, %2, iXLen %3) nounwind { -; CHECK-LABEL: intrinsic_vfmerge_vvm_nxv16f16_nxv16f16_nxv16f16: +define @intrinsic_vmerge_vvm_nxv16f16_nxv16f16_nxv16f16( %0, %1, %2, iXLen %3) nounwind { +; CHECK-LABEL: intrinsic_vmerge_vvm_nxv16f16_nxv16f16_nxv16f16: ; CHECK: # %bb.0: # %entry ; CHECK-NEXT: vsetvli zero, a0, e16, m4, ta, ma ; CHECK-NEXT: vmerge.vvm v8, v8, v12, v0 ; CHECK-NEXT: ret entry: - %a = call @llvm.riscv.vfmerge.nxv16f16.nxv16f16( + %a = call @llvm.riscv.vmerge.nxv16f16.nxv16f16( undef, %0, %1, @@ -244,21 +244,21 @@ entry: ret %a } -declare @llvm.riscv.vfmerge.nxv32f16.nxv32f16( +declare @llvm.riscv.vmerge.nxv32f16.nxv32f16( , , , , iXLen); -define @intrinsic_vfmerge_vvm_nxv32f16_nxv32f16_nxv32f16( %0, %1, %2, iXLen %3) nounwind { -; CHECK-LABEL: intrinsic_vfmerge_vvm_nxv32f16_nxv32f16_nxv32f16: +define @intrinsic_vmerge_vvm_nxv32f16_nxv32f16_nxv32f16( %0, %1, %2, iXLen %3) nounwind { +; CHECK-LABEL: intrinsic_vmerge_vvm_nxv32f16_nxv32f16_nxv32f16: ; CHECK: # %bb.0: # %entry ; CHECK-NEXT: vsetvli zero, a0, e16, m8, ta, ma ; CHECK-NEXT: vmerge.vvm v8, v8, v16, v0 ; CHECK-NEXT: ret entry: - %a = call @llvm.riscv.vfmerge.nxv32f16.nxv32f16( + %a = call @llvm.riscv.vmerge.nxv32f16.nxv32f16( undef, %0, %1, @@ -292,21 +292,21 @@ entry: ret %a } -declare @llvm.riscv.vfmerge.nxv1f32.nxv1f32( +declare @llvm.riscv.vmerge.nxv1f32.nxv1f32( , , , , iXLen); -define @intrinsic_vfmerge_vvm_nxv1f32_nxv1f32_nxv1f32( %0, %1, %2, iXLen %3) nounwind { -; CHECK-LABEL: intrinsic_vfmerge_vvm_nxv1f32_nxv1f32_nxv1f32: +define @intrinsic_vmerge_vvm_nxv1f32_nxv1f32_nxv1f32( %0, %1, %2, iXLen %3) nounwind { +; CHECK-LABEL: intrinsic_vmerge_vvm_nxv1f32_nxv1f32_nxv1f32: ; CHECK: # %bb.0: # %entry ; CHECK-NEXT: vsetvli zero, a0, e32, mf2, ta, ma ; CHECK-NEXT: vmerge.vvm v8, v8, v9, v0 ; CHECK-NEXT: ret entry: - %a = call @llvm.riscv.vfmerge.nxv1f32.nxv1f32( + %a = call @llvm.riscv.vmerge.nxv1f32.nxv1f32( undef, %0, %1, @@ -340,21 +340,21 @@ entry: ret %a } -declare @llvm.riscv.vfmerge.nxv2f32.nxv2f32( +declare @llvm.riscv.vmerge.nxv2f32.nxv2f32( , , , , iXLen); -define @intrinsic_vfmerge_vvm_nxv2f32_nxv2f32_nxv2f32( %0, %1, %2, iXLen %3) nounwind { -; CHECK-LABEL: intrinsic_vfmerge_vvm_nxv2f32_nxv2f32_nxv2f32: +define @intrinsic_vmerge_vvm_nxv2f32_nxv2f32_nxv2f32( %0, %1, %2, iXLen %3) nounwind { +; CHECK-LABEL: intrinsic_vmerge_vvm_nxv2f32_nxv2f32_nxv2f32: ; CHECK: # %bb.0: # %entry ; CHECK-NEXT: vsetvli zero, a0, e32, m1, ta, ma ; CHECK-NEXT: vmerge.vvm v8, v8, v9, v0 ; CHECK-NEXT: ret entry: - %a = call @llvm.riscv.vfmerge.nxv2f32.nxv2f32( + %a = call @llvm.riscv.vmerge.nxv2f32.nxv2f32( undef, %0, %1, @@ -388,21 +388,21 @@ entry: ret %a } -declare @llvm.riscv.vfmerge.nxv4f32.nxv4f32( +declare @llvm.riscv.vmerge.nxv4f32.nxv4f32( , , , , iXLen); -define @intrinsic_vfmerge_vvm_nxv4f32_nxv4f32_nxv4f32( %0, %1, %2, iXLen %3) nounwind { -; CHECK-LABEL: intrinsic_vfmerge_vvm_nxv4f32_nxv4f32_nxv4f32: +define @intrinsic_vmerge_vvm_nxv4f32_nxv4f32_nxv4f32( %0, %1, %2, iXLen %3) nounwind { +; CHECK-LABEL: intrinsic_vmerge_vvm_nxv4f32_nxv4f32_nxv4f32: ; CHECK: # %bb.0: # %entry ; CHECK-NEXT: vsetvli zero, a0, e32, m2, ta, ma ; CHECK-NEXT: vmerge.vvm v8, v8, v10, v0 ; CHECK-NEXT: ret entry: - %a = call @llvm.riscv.vfmerge.nxv4f32.nxv4f32( + %a = call @llvm.riscv.vmerge.nxv4f32.nxv4f32( undef, %0, %1, @@ -436,21 +436,21 @@ entry: ret %a } -declare @llvm.riscv.vfmerge.nxv8f32.nxv8f32( +declare @llvm.riscv.vmerge.nxv8f32.nxv8f32( , , , , iXLen); -define @intrinsic_vfmerge_vvm_nxv8f32_nxv8f32_nxv8f32( %0, %1, %2, iXLen %3) nounwind { -; CHECK-LABEL: intrinsic_vfmerge_vvm_nxv8f32_nxv8f32_nxv8f32: +define @intrinsic_vmerge_vvm_nxv8f32_nxv8f32_nxv8f32( %0, %1, %2, iXLen %3) nounwind { +; CHECK-LABEL: intrinsic_vmerge_vvm_nxv8f32_nxv8f32_nxv8f32: ; CHECK: # %bb.0: # %entry ; CHECK-NEXT: vsetvli zero, a0, e32, m4, ta, ma ; CHECK-NEXT: vmerge.vvm v8, v8, v12, v0 ; CHECK-NEXT: ret entry: - %a = call @llvm.riscv.vfmerge.nxv8f32.nxv8f32( + %a = call @llvm.riscv.vmerge.nxv8f32.nxv8f32( undef, %0, %1, @@ -484,21 +484,21 @@ entry: ret %a } -declare @llvm.riscv.vfmerge.nxv16f32.nxv16f32( +declare @llvm.riscv.vmerge.nxv16f32.nxv16f32( , , , , iXLen); -define @intrinsic_vfmerge_vvm_nxv16f32_nxv16f32_nxv16f32( %0, %1, %2, iXLen %3) nounwind { -; CHECK-LABEL: intrinsic_vfmerge_vvm_nxv16f32_nxv16f32_nxv16f32: +define @intrinsic_vmerge_vvm_nxv16f32_nxv16f32_nxv16f32( %0, %1, %2, iXLen %3) nounwind { +; CHECK-LABEL: intrinsic_vmerge_vvm_nxv16f32_nxv16f32_nxv16f32: ; CHECK: # %bb.0: # %entry ; CHECK-NEXT: vsetvli zero, a0, e32, m8, ta, ma ; CHECK-NEXT: vmerge.vvm v8, v8, v16, v0 ; CHECK-NEXT: ret entry: - %a = call @llvm.riscv.vfmerge.nxv16f32.nxv16f32( + %a = call @llvm.riscv.vmerge.nxv16f32.nxv16f32( undef, %0, %1, @@ -532,21 +532,21 @@ entry: ret %a } -declare @llvm.riscv.vfmerge.nxv1f64.nxv1f64( +declare @llvm.riscv.vmerge.nxv1f64.nxv1f64( , , , , iXLen); -define @intrinsic_vfmerge_vvm_nxv1f64_nxv1f64_nxv1f64( %0, %1, %2, iXLen %3) nounwind { -; CHECK-LABEL: intrinsic_vfmerge_vvm_nxv1f64_nxv1f64_nxv1f64: +define @intrinsic_vmerge_vvm_nxv1f64_nxv1f64_nxv1f64( %0, %1, %2, iXLen %3) nounwind { +; CHECK-LABEL: intrinsic_vmerge_vvm_nxv1f64_nxv1f64_nxv1f64: ; CHECK: # %bb.0: # %entry ; CHECK-NEXT: vsetvli zero, a0, e64, m1, ta, ma ; CHECK-NEXT: vmerge.vvm v8, v8, v9, v0 ; CHECK-NEXT: ret entry: - %a = call @llvm.riscv.vfmerge.nxv1f64.nxv1f64( + %a = call @llvm.riscv.vmerge.nxv1f64.nxv1f64( undef, %0, %1, @@ -587,14 +587,14 @@ declare @llvm.riscv.vfmerge.nxv2f64.nxv2f64( , iXLen); -define @intrinsic_vfmerge_vvm_nxv2f64_nxv2f64_nxv2f64( %0, %1, %2, iXLen %3) nounwind { -; CHECK-LABEL: intrinsic_vfmerge_vvm_nxv2f64_nxv2f64_nxv2f64: +define @intrinsic_vmerge_vvm_nxv2f64_nxv2f64_nxv2f64( %0, %1, %2, iXLen %3) nounwind { +; CHECK-LABEL: intrinsic_vmerge_vvm_nxv2f64_nxv2f64_nxv2f64: ; CHECK: # %bb.0: # %entry ; CHECK-NEXT: vsetvli zero, a0, e64, m2, ta, ma ; CHECK-NEXT: vmerge.vvm v8, v8, v10, v0 ; CHECK-NEXT: ret entry: - %a = call @llvm.riscv.vfmerge.nxv2f64.nxv2f64( + %a = call @llvm.riscv.vmerge.nxv2f64.nxv2f64( undef, %0, %1, @@ -628,21 +628,21 @@ entry: ret %a } -declare @llvm.riscv.vfmerge.nxv4f64.nxv4f64( +declare @llvm.riscv.vmerge.nxv4f64.nxv4f64( , , , , iXLen); -define @intrinsic_vfmerge_vvm_nxv4f64_nxv4f64_nxv4f64( %0, %1, %2, iXLen %3) nounwind { -; CHECK-LABEL: intrinsic_vfmerge_vvm_nxv4f64_nxv4f64_nxv4f64: +define @intrinsic_vmerge_vvm_nxv4f64_nxv4f64_nxv4f64( %0, %1, %2, iXLen %3) nounwind { +; CHECK-LABEL: intrinsic_vmerge_vvm_nxv4f64_nxv4f64_nxv4f64: ; CHECK: # %bb.0: # %entry ; CHECK-NEXT: vsetvli zero, a0, e64, m4, ta, ma ; CHECK-NEXT: vmerge.vvm v8, v8, v12, v0 ; CHECK-NEXT: ret entry: - %a = call @llvm.riscv.vfmerge.nxv4f64.nxv4f64( + %a = call @llvm.riscv.vmerge.nxv4f64.nxv4f64( undef, %0, %1, @@ -676,21 +676,21 @@ entry: ret %a } -declare @llvm.riscv.vfmerge.nxv8f64.nxv8f64( +declare @llvm.riscv.vmerge.nxv8f64.nxv8f64( , , , , iXLen); -define @intrinsic_vfmerge_vvm_nxv8f64_nxv8f64_nxv8f64( %0, %1, %2, iXLen %3) nounwind { -; CHECK-LABEL: intrinsic_vfmerge_vvm_nxv8f64_nxv8f64_nxv8f64: +define @intrinsic_vmerge_vvm_nxv8f64_nxv8f64_nxv8f64( %0, %1, %2, iXLen %3) nounwind { +; CHECK-LABEL: intrinsic_vmerge_vvm_nxv8f64_nxv8f64_nxv8f64: ; CHECK: # %bb.0: # %entry ; CHECK-NEXT: vsetvli zero, a0, e64, m8, ta, ma ; CHECK-NEXT: vmerge.vvm v8, v8, v16, v0 ; CHECK-NEXT: ret entry: - %a = call @llvm.riscv.vfmerge.nxv8f64.nxv8f64( + %a = call @llvm.riscv.vmerge.nxv8f64.nxv8f64( undef, %0, %1,