Skip to content

Commit d79312b

Browse files
authored
RISCV: Remove faulty assert that ignored subregister uses (#141658)
This was asserting the raw virtual register class was a scalar class, instead of computing the net result of the register class plus the subregister index on the operand. The machine verifier should be checking this was a valid combination in the first place, so just drop the assert.
1 parent 777163c commit d79312b

File tree

2 files changed

+32
-5
lines changed

2 files changed

+32
-5
lines changed

llvm/lib/Target/RISCV/RISCVVLOptimizer.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1298,12 +1298,7 @@ RISCVVLOptimizer::getMinimumVLForUser(const MachineOperand &UserOp) const {
12981298
// Instructions like reductions may use a vector register as a scalar
12991299
// register. In this case, we should treat it as only reading the first lane.
13001300
if (isVectorOpUsedAsScalarOp(UserOp)) {
1301-
[[maybe_unused]] Register R = UserOp.getReg();
1302-
[[maybe_unused]] const TargetRegisterClass *RC = MRI->getRegClass(R);
1303-
assert(RISCV::VRRegClass.hasSubClassEq(RC) &&
1304-
"Expect LMUL 1 register class for vector as scalar operands!");
13051301
LLVM_DEBUG(dbgs() << " Used this operand as a scalar operand\n");
1306-
13071302
return MachineOperand::CreateImm(1);
13081303
}
13091304

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py UTC_ARGS: --version 5
2+
# RUN: llc -mtriple=riscv64 -mattr=+v -run-pass=riscv-vl-optimizer -o - %s | FileCheck %s
3+
# Check that there is no assert on subregister uses.
4+
5+
---
6+
name: vl_optimizer_subreg_assert
7+
tracksRegLiveness: true
8+
body: |
9+
bb.0:
10+
liveins: $v8m2
11+
12+
; CHECK-LABEL: name: vl_optimizer_subreg_assert
13+
; CHECK: liveins: $v8m2
14+
; CHECK-NEXT: {{ $}}
15+
; CHECK-NEXT: [[DEF:%[0-9]+]]:vrm8 = IMPLICIT_DEF
16+
; CHECK-NEXT: [[DEF1:%[0-9]+]]:vmv0 = IMPLICIT_DEF
17+
; CHECK-NEXT: [[DEF2:%[0-9]+]]:vrm8 = IMPLICIT_DEF
18+
; CHECK-NEXT: [[PseudoVMERGE_VVM_M8_:%[0-9]+]]:vrm8nov0 = PseudoVMERGE_VVM_M8 $noreg, killed [[DEF2]], [[DEF]], [[DEF1]], -1, 6 /* e64 */
19+
; CHECK-NEXT: [[PseudoVREDMAXU_VS_M8_E64_:%[0-9]+]]:vr = PseudoVREDMAXU_VS_M8_E64 $noreg, [[PseudoVMERGE_VVM_M8_]], [[PseudoVMERGE_VVM_M8_]].sub_vrm1_0, -1, 6 /* e64 */, 1 /* ta, mu */
20+
; CHECK-NEXT: [[PseudoVMV_X_S:%[0-9]+]]:gpr = PseudoVMV_X_S killed [[PseudoVREDMAXU_VS_M8_E64_]], 6 /* e64 */
21+
; CHECK-NEXT: $x10 = COPY [[PseudoVMV_X_S]]
22+
; CHECK-NEXT: PseudoRET implicit $x10
23+
%0:vrm8 = IMPLICIT_DEF
24+
%1:vmv0 = IMPLICIT_DEF
25+
%2:vrm8 = IMPLICIT_DEF
26+
%3:vrm8nov0 = PseudoVMERGE_VVM_M8 $noreg, killed %2, %0, %1, -1, 6 /* e64 */
27+
%4:vr = PseudoVREDMAXU_VS_M8_E64 $noreg, %3, %3.sub_vrm1_0, -1, 6 /* e64 */, 1 /* ta, mu */
28+
%5:gpr = PseudoVMV_X_S killed %4, 6 /* e64 */
29+
$x10 = COPY %5
30+
PseudoRET implicit $x10
31+
32+
...

0 commit comments

Comments
 (0)