[llvm] [RISCV] Fix crash when trying to remove segment (PR #146524)
via llvm-commits
llvm-commits at lists.llvm.org
Tue Jul 1 08:51:33 PDT 2025
https://github.com/sc-clulzze updated https://github.com/llvm/llvm-project/pull/146524
>From a809af511ea893b05833645d50edab944213d778 Mon Sep 17 00:00:00 2001
From: sc-cluzze <d.marakulin at syntacore.com>
Date: Tue, 1 Jul 2025 12:50:33 +0000
Subject: [PATCH 1/2] [RISCV] Fix crash when trying to remove segment
---
llvm/lib/Target/RISCV/RISCVInsertVSETVLI.cpp | 5 +-
llvm/test/CodeGen/RISCV/rvv/vleff-crash.ll | 58 ++++++++++++++++++++
2 files changed, 61 insertions(+), 2 deletions(-)
create mode 100644 llvm/test/CodeGen/RISCV/rvv/vleff-crash.ll
diff --git a/llvm/lib/Target/RISCV/RISCVInsertVSETVLI.cpp b/llvm/lib/Target/RISCV/RISCVInsertVSETVLI.cpp
index 78d64ea67324f..bc4bf94d16042 100644
--- a/llvm/lib/Target/RISCV/RISCVInsertVSETVLI.cpp
+++ b/llvm/lib/Target/RISCV/RISCVInsertVSETVLI.cpp
@@ -1768,8 +1768,9 @@ void RISCVInsertVSETVLI::insertReadVL(MachineBasicBlock &MBB) {
SlotIndex NewDefSI =
LIS->InsertMachineInstrInMaps(*ReadVLMI).getRegSlot();
LiveInterval &DefLI = LIS->getInterval(VLOutput);
- VNInfo *DefVNI = DefLI.getVNInfoAt(DefLI.beginIndex());
- DefLI.removeSegment(DefLI.beginIndex(), NewDefSI);
+ const auto *DefSeg = DefLI.getSegmentContaining(NewDefSI);
+ VNInfo *DefVNI = DefLI.getVNInfoAt(DefSeg->start);
+ DefLI.removeSegment(DefSeg->start, NewDefSI);
DefVNI->def = NewDefSI;
}
}
diff --git a/llvm/test/CodeGen/RISCV/rvv/vleff-crash.ll b/llvm/test/CodeGen/RISCV/rvv/vleff-crash.ll
new file mode 100644
index 0000000000000..0da62d5a80046
--- /dev/null
+++ b/llvm/test/CodeGen/RISCV/rvv/vleff-crash.ll
@@ -0,0 +1,58 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
+; RUN: llc -mtriple=riscv64 -mattr=+zve64d,+f,+d,+zfh,+zvfh -verify-machineinstrs < %s | FileCheck %s
+
+define i64 @strlen16_vec(ptr %s) {
+; CHECK-LABEL: strlen16_vec:
+; CHECK: # %bb.0: # %entry
+; CHECK-NEXT: li a1, 0
+; CHECK-NEXT: li a2, 16
+; CHECK-NEXT: li a3, -1
+; CHECK-NEXT: li a4, 16
+; CHECK-NEXT: j .LBB0_2
+; CHECK-NEXT: .LBB0_1: # %while.body
+; CHECK-NEXT: # in Loop: Header=BB0_2 Depth=1
+; CHECK-NEXT: add a1, a6, a1
+; CHECK-NEXT: bne a5, a3, .LBB0_5
+; CHECK-NEXT: .LBB0_2: # %while.cond
+; CHECK-NEXT: # =>This Inner Loop Header: Depth=1
+; CHECK-NEXT: bne a4, a2, .LBB0_5
+; CHECK-NEXT: # %bb.3: # %while.body
+; CHECK-NEXT: # in Loop: Header=BB0_2 Depth=1
+; CHECK-NEXT: vsetivli zero, 16, e16, m1, ta, ma
+; CHECK-NEXT: vle16ff.v v8, (a0)
+; CHECK-NEXT: csrr a4, vl
+; CHECK-NEXT: vmseq.vi v8, v8, 0
+; CHECK-NEXT: vfirst.m a5, v8
+; CHECK-NEXT: mv a6, a4
+; CHECK-NEXT: beq a5, a3, .LBB0_1
+; CHECK-NEXT: # %bb.4: # %while.body
+; CHECK-NEXT: # in Loop: Header=BB0_2 Depth=1
+; CHECK-NEXT: mv a6, a5
+; CHECK-NEXT: j .LBB0_1
+; CHECK-NEXT: .LBB0_5: # %while.end
+; CHECK-NEXT: mv a0, a1
+; CHECK-NEXT: ret
+entry:
+ br label %while.cond
+
+while.cond: ; preds = %while.body, %entry
+ %new_vl.0 = phi i64 [ 16, %entry ], [ %2, %while.body ]
+ %len.0 = phi i64 [ 0, %entry ], [ %len.1, %while.body ]
+ %cmp = icmp eq i64 %new_vl.0, 16
+ br i1 %cmp, label %while.body, label %while.end
+
+while.body: ; preds = %while.cond
+ %0 = tail call { <vscale x 4 x i16>, i64 } @llvm.riscv.vleff.nxv4i16.i64(<vscale x 4 x i16> poison, ptr %s, i64 16)
+ %1 = extractvalue { <vscale x 4 x i16>, i64 } %0, 0
+ %2 = extractvalue { <vscale x 4 x i16>, i64 } %0, 1
+ %3 = tail call <vscale x 4 x i1> @llvm.riscv.vmseq.nxv4i16.i16.i64(<vscale x 4 x i16> %1, i16 0, i64 %2)
+ %4 = tail call i64 @llvm.riscv.vfirst.nxv4i1.i64(<vscale x 4 x i1> %3, i64 %2)
+ %cmp1 = icmp eq i64 %4, -1
+ %.13 = select i1 %cmp1, i64 %2, i64 %4
+ %len.1 = add i64 %.13, %len.0
+ br i1 %cmp1, label %while.cond, label %while.end
+
+while.end: ; preds = %while.body, %while.cond
+ %len.2 = phi i64 [ %len.1, %while.body ], [ %len.0, %while.cond ]
+ ret i64 %len.2
+}
>From c1b6e129983c104c261738c6e8761276a59d9c34 Mon Sep 17 00:00:00 2001
From: sc-cluzze <d.marakulin at syntacore.com>
Date: Tue, 1 Jul 2025 15:44:41 +0000
Subject: [PATCH 2/2] Reduced and moved vleff-crash.ll to vsetvli-insert.ll
---
llvm/test/CodeGen/RISCV/rvv/vleff-crash.ll | 58 -------------------
llvm/test/CodeGen/RISCV/rvv/vsetvli-insert.ll | 32 ++++++++++
2 files changed, 32 insertions(+), 58 deletions(-)
delete mode 100644 llvm/test/CodeGen/RISCV/rvv/vleff-crash.ll
diff --git a/llvm/test/CodeGen/RISCV/rvv/vleff-crash.ll b/llvm/test/CodeGen/RISCV/rvv/vleff-crash.ll
deleted file mode 100644
index 0da62d5a80046..0000000000000
--- a/llvm/test/CodeGen/RISCV/rvv/vleff-crash.ll
+++ /dev/null
@@ -1,58 +0,0 @@
-; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
-; RUN: llc -mtriple=riscv64 -mattr=+zve64d,+f,+d,+zfh,+zvfh -verify-machineinstrs < %s | FileCheck %s
-
-define i64 @strlen16_vec(ptr %s) {
-; CHECK-LABEL: strlen16_vec:
-; CHECK: # %bb.0: # %entry
-; CHECK-NEXT: li a1, 0
-; CHECK-NEXT: li a2, 16
-; CHECK-NEXT: li a3, -1
-; CHECK-NEXT: li a4, 16
-; CHECK-NEXT: j .LBB0_2
-; CHECK-NEXT: .LBB0_1: # %while.body
-; CHECK-NEXT: # in Loop: Header=BB0_2 Depth=1
-; CHECK-NEXT: add a1, a6, a1
-; CHECK-NEXT: bne a5, a3, .LBB0_5
-; CHECK-NEXT: .LBB0_2: # %while.cond
-; CHECK-NEXT: # =>This Inner Loop Header: Depth=1
-; CHECK-NEXT: bne a4, a2, .LBB0_5
-; CHECK-NEXT: # %bb.3: # %while.body
-; CHECK-NEXT: # in Loop: Header=BB0_2 Depth=1
-; CHECK-NEXT: vsetivli zero, 16, e16, m1, ta, ma
-; CHECK-NEXT: vle16ff.v v8, (a0)
-; CHECK-NEXT: csrr a4, vl
-; CHECK-NEXT: vmseq.vi v8, v8, 0
-; CHECK-NEXT: vfirst.m a5, v8
-; CHECK-NEXT: mv a6, a4
-; CHECK-NEXT: beq a5, a3, .LBB0_1
-; CHECK-NEXT: # %bb.4: # %while.body
-; CHECK-NEXT: # in Loop: Header=BB0_2 Depth=1
-; CHECK-NEXT: mv a6, a5
-; CHECK-NEXT: j .LBB0_1
-; CHECK-NEXT: .LBB0_5: # %while.end
-; CHECK-NEXT: mv a0, a1
-; CHECK-NEXT: ret
-entry:
- br label %while.cond
-
-while.cond: ; preds = %while.body, %entry
- %new_vl.0 = phi i64 [ 16, %entry ], [ %2, %while.body ]
- %len.0 = phi i64 [ 0, %entry ], [ %len.1, %while.body ]
- %cmp = icmp eq i64 %new_vl.0, 16
- br i1 %cmp, label %while.body, label %while.end
-
-while.body: ; preds = %while.cond
- %0 = tail call { <vscale x 4 x i16>, i64 } @llvm.riscv.vleff.nxv4i16.i64(<vscale x 4 x i16> poison, ptr %s, i64 16)
- %1 = extractvalue { <vscale x 4 x i16>, i64 } %0, 0
- %2 = extractvalue { <vscale x 4 x i16>, i64 } %0, 1
- %3 = tail call <vscale x 4 x i1> @llvm.riscv.vmseq.nxv4i16.i16.i64(<vscale x 4 x i16> %1, i16 0, i64 %2)
- %4 = tail call i64 @llvm.riscv.vfirst.nxv4i1.i64(<vscale x 4 x i1> %3, i64 %2)
- %cmp1 = icmp eq i64 %4, -1
- %.13 = select i1 %cmp1, i64 %2, i64 %4
- %len.1 = add i64 %.13, %len.0
- br i1 %cmp1, label %while.cond, label %while.end
-
-while.end: ; preds = %while.body, %while.cond
- %len.2 = phi i64 [ %len.1, %while.body ], [ %len.0, %while.cond ]
- ret i64 %len.2
-}
diff --git a/llvm/test/CodeGen/RISCV/rvv/vsetvli-insert.ll b/llvm/test/CodeGen/RISCV/rvv/vsetvli-insert.ll
index 8b48dc43eca29..7f441ad303b91 100644
--- a/llvm/test/CodeGen/RISCV/rvv/vsetvli-insert.ll
+++ b/llvm/test/CodeGen/RISCV/rvv/vsetvli-insert.ll
@@ -722,3 +722,35 @@ define i64 @avl_undef2() {
%1 = tail call i64 @llvm.riscv.vsetvli(i64 poison, i64 2, i64 7)
ret i64 %1
}
+
+define i64 @vsetvli_vleff() {
+; CHECK-LABEL: vsetvli_vleff:
+; CHECK: # %bb.0: # %entry
+; CHECK-NEXT: vsetvli a1, zero, e16, m1, ta, ma
+; CHECK-NEXT: vmv.v.i v8, 0
+; CHECK-NEXT: .LBB37_1: # %while.body
+; CHECK-NEXT: # =>This Inner Loop Header: Depth=1
+; CHECK-NEXT: vsetivli zero, 0, e16, m1, tu, ma
+; CHECK-NEXT: vmv1r.v v9, v8
+; CHECK-NEXT: vle16ff.v v9, (zero)
+; CHECK-NEXT: csrr a0, vl
+; CHECK-NEXT: beqz a0, .LBB37_1
+; CHECK-NEXT: # %bb.2: # %while.end
+; CHECK-NEXT: li a0, 0
+; CHECK-NEXT: ret
+entry:
+ br label %while.cond
+
+while.cond:
+ %new_vl.0 = phi i64 [ 0, %entry ], [ %1, %while.body ]
+ %cmp = icmp eq i64 %new_vl.0, 0
+ br i1 %cmp, label %while.body, label %while.end
+
+while.body:
+ %0 = tail call { <vscale x 4 x i16>, i64 } @llvm.riscv.vleff.nxv4i16.i64(<vscale x 4 x i16> zeroinitializer, ptr null, i64 0)
+ %1 = extractvalue { <vscale x 4 x i16>, i64 } %0, 1
+ br label %while.cond
+
+while.end:
+ ret i64 0
+}
More information about the llvm-commits
mailing list