Skip to content

Commit c7198e0

Browse files
authored
[DAG] Fold insert_subvector(N0, extract_subvector(N0, N2), N2) --> N0 (#86487)
Handle the case where we've ended up inserting back into the source vector we extracted the subvector from.
1 parent 77cbc9b commit c7198e0

File tree

3 files changed

+380
-393
lines changed

3 files changed

+380
-393
lines changed

llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26137,6 +26137,13 @@ SDValue DAGCombiner::visitINSERT_SUBVECTOR(SDNode *N) {
2613726137
}
2613826138
}
2613926139

26140+
// Handle case where we've ended up inserting back into the source vector
26141+
// we extracted the subvector from.
26142+
// insert_subvector(N0, extract_subvector(N0, N2), N2) --> N0
26143+
if (N1.getOpcode() == ISD::EXTRACT_SUBVECTOR && N1.getOperand(0) == N0 &&
26144+
N1.getOperand(1) == N2)
26145+
return N0;
26146+
2614026147
// Simplify scalar inserts into an undef vector:
2614126148
// insert_subvector undef, (splat X), N2 -> splat X
2614226149
if (N0.isUndef() && N1.getOpcode() == ISD::SPLAT_VECTOR)

llvm/test/CodeGen/RISCV/rvv/vector-interleave-store.ll

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -101,40 +101,36 @@ define void @vector_interleave_store_nxv16i64_nxv8i64(<vscale x 8 x i64> %a, <vs
101101
; CHECK-NEXT: slli a1, a1, 4
102102
; CHECK-NEXT: sub sp, sp, a1
103103
; CHECK-NEXT: .cfi_escape 0x0f, 0x0d, 0x72, 0x00, 0x11, 0x10, 0x22, 0x11, 0x10, 0x92, 0xa2, 0x38, 0x00, 0x1e, 0x22 # sp + 16 + 16 * vlenb
104-
; CHECK-NEXT: csrr a1, vlenb
105-
; CHECK-NEXT: slli a1, a1, 3
106-
; CHECK-NEXT: add a1, sp, a1
107-
; CHECK-NEXT: addi a1, a1, 16
104+
; CHECK-NEXT: addi a1, sp, 16
108105
; CHECK-NEXT: vs8r.v v8, (a1) # Unknown-size Folded Spill
109106
; CHECK-NEXT: csrr a1, vlenb
110107
; CHECK-NEXT: srli a2, a1, 1
111108
; CHECK-NEXT: vsetvli a3, zero, e16, m2, ta, mu
112109
; CHECK-NEXT: vid.v v24
113110
; CHECK-NEXT: vand.vi v26, v24, 1
114-
; CHECK-NEXT: vmsne.vi v0, v26, 0
115-
; CHECK-NEXT: vsrl.vi v6, v24, 1
116-
; CHECK-NEXT: csrr a3, vlenb
117-
; CHECK-NEXT: slli a3, a3, 3
118-
; CHECK-NEXT: add a3, sp, a3
119-
; CHECK-NEXT: addi a3, a3, 16
120-
; CHECK-NEXT: vl8r.v v8, (a3) # Unknown-size Folded Reload
121-
; CHECK-NEXT: vadd.vx v6, v6, a2, v0.t
111+
; CHECK-NEXT: vmsne.vi v28, v26, 0
112+
; CHECK-NEXT: vsrl.vi v24, v24, 1
113+
; CHECK-NEXT: vmv1r.v v0, v28
114+
; CHECK-NEXT: vadd.vx v24, v24, a2, v0.t
122115
; CHECK-NEXT: vmv4r.v v12, v16
123116
; CHECK-NEXT: vsetvli zero, zero, e64, m8, ta, ma
124-
; CHECK-NEXT: vrgatherei16.vv v24, v8, v6
125-
; CHECK-NEXT: addi a2, sp, 16
126-
; CHECK-NEXT: vs8r.v v24, (a2) # Unknown-size Folded Spill
117+
; CHECK-NEXT: vrgatherei16.vv v0, v8, v24
127118
; CHECK-NEXT: csrr a2, vlenb
128119
; CHECK-NEXT: slli a2, a2, 3
129120
; CHECK-NEXT: add a2, sp, a2
130121
; CHECK-NEXT: addi a2, a2, 16
122+
; CHECK-NEXT: vs8r.v v0, (a2) # Unknown-size Folded Spill
123+
; CHECK-NEXT: addi a2, sp, 16
131124
; CHECK-NEXT: vl8r.v v8, (a2) # Unknown-size Folded Reload
132125
; CHECK-NEXT: vmv4r.v v16, v12
133-
; CHECK-NEXT: vrgatherei16.vv v8, v16, v6
126+
; CHECK-NEXT: vrgatherei16.vv v8, v16, v24
134127
; CHECK-NEXT: slli a1, a1, 3
135128
; CHECK-NEXT: add a1, a0, a1
136129
; CHECK-NEXT: vs8r.v v8, (a1)
137-
; CHECK-NEXT: addi a1, sp, 16
130+
; CHECK-NEXT: csrr a1, vlenb
131+
; CHECK-NEXT: slli a1, a1, 3
132+
; CHECK-NEXT: add a1, sp, a1
133+
; CHECK-NEXT: addi a1, a1, 16
138134
; CHECK-NEXT: vl8r.v v8, (a1) # Unknown-size Folded Reload
139135
; CHECK-NEXT: vs8r.v v8, (a0)
140136
; CHECK-NEXT: csrr a0, vlenb

0 commit comments

Comments
 (0)