Skip to content

Commit b9995a1

Browse files
authored
[MachineLoopInfo] Fix assertion failure on undef use operands (llvm#100137)
Fixes llvm#100115
1 parent 2bb18e2 commit b9995a1

File tree

3 files changed

+103
-3
lines changed

3 files changed

+103
-3
lines changed

llvm/lib/CodeGen/MachineLoopInfo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ bool MachineLoop::isLoopInvariant(MachineInstr &I,
287287
}
288288
}
289289

290-
if (!MO.isUse())
290+
if (!MO.readsReg())
291291
continue;
292292

293293
assert(MRI->getVRegDef(Reg) &&

llvm/test/CodeGen/AMDGPU/dpp64_combine.ll

+23-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; RUN: llc -mtriple=amdgcn -mcpu=gfx90a -verify-machineinstrs < %s | FileCheck %s -check-prefixes=GCN,DPP64,GFX90A
22
; RUN: llc -mtriple=amdgcn -mcpu=gfx940 -verify-machineinstrs < %s | FileCheck %s -check-prefixes=GCN,DPP64,DPPMOV64
3-
; RUN: llc -mtriple=amdgcn -mcpu=gfx1010 -verify-machineinstrs < %s | FileCheck %s -check-prefixes=GCN,DPP32,GFX10PLUS
4-
; RUN: llc -mtriple=amdgcn -mcpu=gfx1100 -verify-machineinstrs < %s | FileCheck %s -check-prefixes=GCN,DPP32,GFX10PLUS
3+
; RUN: llc -mtriple=amdgcn -mcpu=gfx1010 -verify-machineinstrs < %s | FileCheck %s -check-prefixes=GCN,DPP32,GFX10PLUS,GFX10
4+
; RUN: llc -mtriple=amdgcn -mcpu=gfx1100 -verify-machineinstrs < %s | FileCheck %s -check-prefixes=GCN,DPP32,GFX10PLUS,GFX11
55

66
; GCN-LABEL: {{^}}dpp64_ceil:
77
; GCN: global_load_{{dwordx2|b64}} [[V:v\[[0-9:]+\]]],
@@ -69,6 +69,27 @@ define amdgpu_kernel void @dpp64_div(ptr addrspace(1) %arg, i64 %in1) {
6969
ret void
7070
}
7171

72+
; GCN-LABEL: {{^}}dpp64_loop:
73+
; GCN: v_mov_b32_dpp
74+
; DPP64: v_mov_b32_dpp
75+
; GFX90A: v_add_co_u32_e32
76+
; GFX90A: v_addc_co_u32_e32
77+
; DPPMOV64: v_lshl_add_u64
78+
; GFX10: v_mov_b32_dpp
79+
; GFX10: v_add_co_u32
80+
; GFX10: v_add_co_ci_u32_e32
81+
; GFX11: v_add_co_u32_e64_dpp
82+
; GFX11: v_add_co_ci_u32_e32
83+
define amdgpu_cs void @dpp64_loop(i64 %arg) {
84+
bb:
85+
br label %bb1
86+
bb1:
87+
%i = call i64 @llvm.amdgcn.update.dpp.i64(i64 0, i64 0, i32 0, i32 0, i32 0, i1 false)
88+
%i2 = add i64 %i, %arg
89+
%i3 = atomicrmw add ptr addrspace(1) null, i64 %i2 monotonic, align 8
90+
br label %bb1
91+
}
92+
7293
declare i32 @llvm.amdgcn.workitem.id.x()
7394
declare i64 @llvm.amdgcn.update.dpp.i64(i64, i64, i32, i32, i32, i1) #0
7495
declare double @llvm.ceil.f64(double)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py UTC_ARGS: --version 5
2+
# RUN: llc -mtriple=amdgcn -mcpu=gfx1100 -run-pass=early-machinelicm %s -o - | FileCheck %s
3+
4+
# Issue #100115: test that MachineLICM does not assert on the undef use operand
5+
# of the REG_SEQUENCE instruction.
6+
---
7+
name: test_undef_use
8+
tracksRegLiveness: true
9+
body: |
10+
; CHECK-LABEL: name: test_undef_use
11+
; CHECK: bb.0:
12+
; CHECK-NEXT: successors: %bb.1(0x80000000)
13+
; CHECK-NEXT: liveins: $vgpr0, $vgpr1
14+
; CHECK-NEXT: {{ $}}
15+
; CHECK-NEXT: [[DEF:%[0-9]+]]:vgpr_32 = IMPLICIT_DEF
16+
; CHECK-NEXT: [[DEF1:%[0-9]+]]:sreg_32 = IMPLICIT_DEF
17+
; CHECK-NEXT: {{ $}}
18+
; CHECK-NEXT: bb.1:
19+
; CHECK-NEXT: successors: %bb.3(0x80000000)
20+
; CHECK-NEXT: {{ $}}
21+
; CHECK-NEXT: [[REG_SEQUENCE:%[0-9]+]]:vreg_64 = REG_SEQUENCE undef %3:vgpr_32, %subreg.sub0, undef [[DEF]], %subreg.sub1
22+
; CHECK-NEXT: S_BRANCH %bb.3
23+
; CHECK-NEXT: {{ $}}
24+
; CHECK-NEXT: bb.2:
25+
; CHECK-NEXT: successors: %bb.5(0x04000000), %bb.1(0x7c000000)
26+
; CHECK-NEXT: {{ $}}
27+
; CHECK-NEXT: $vcc_lo = COPY undef [[DEF1]]
28+
; CHECK-NEXT: S_CBRANCH_VCCNZ %bb.5, implicit $vcc_lo
29+
; CHECK-NEXT: S_BRANCH %bb.1
30+
; CHECK-NEXT: {{ $}}
31+
; CHECK-NEXT: bb.3:
32+
; CHECK-NEXT: successors: %bb.4(0x04000000), %bb.3(0x7c000000)
33+
; CHECK-NEXT: {{ $}}
34+
; CHECK-NEXT: S_CBRANCH_SCC1 %bb.3, implicit undef $scc
35+
; CHECK-NEXT: S_BRANCH %bb.4
36+
; CHECK-NEXT: {{ $}}
37+
; CHECK-NEXT: bb.4:
38+
; CHECK-NEXT: successors: %bb.2(0x40000000), %bb.1(0x40000000)
39+
; CHECK-NEXT: {{ $}}
40+
; CHECK-NEXT: SI_LOOP undef [[DEF1]], %bb.1, implicit-def dead $exec, implicit-def dead $scc, implicit $exec
41+
; CHECK-NEXT: S_BRANCH %bb.2
42+
; CHECK-NEXT: {{ $}}
43+
; CHECK-NEXT: bb.5:
44+
; CHECK-NEXT: S_ENDPGM 0
45+
bb.0:
46+
successors: %bb.1(0x80000000)
47+
liveins: $vgpr0, $vgpr1
48+
49+
%0:vgpr_32 = IMPLICIT_DEF
50+
%1:sreg_32 = IMPLICIT_DEF
51+
52+
bb.1:
53+
successors: %bb.3(0x80000000)
54+
55+
%2:vreg_64 = REG_SEQUENCE undef %3:vgpr_32, %subreg.sub0, undef %0, %subreg.sub1
56+
S_BRANCH %bb.3
57+
58+
bb.2:
59+
successors: %bb.5(0x04000000), %bb.1(0x7c000000)
60+
61+
$vcc_lo = COPY undef %1
62+
S_CBRANCH_VCCNZ %bb.5, implicit $vcc
63+
S_BRANCH %bb.1
64+
65+
bb.3:
66+
successors: %bb.4(0x04000000), %bb.3(0x7c000000)
67+
68+
S_CBRANCH_SCC1 %bb.3, implicit undef $scc
69+
S_BRANCH %bb.4
70+
71+
bb.4:
72+
successors: %bb.2(0x40000000), %bb.1(0x40000000)
73+
74+
SI_LOOP undef %1, %bb.1, implicit-def dead $exec, implicit-def dead $scc, implicit $exec
75+
S_BRANCH %bb.2
76+
77+
bb.5:
78+
S_ENDPGM 0
79+
...

0 commit comments

Comments
 (0)