Skip to content

Commit ab0bb6d

Browse files
topperctopperc
authored
[RISCV][GISel] Update rv32 s64 G_SADDE legalizer test. (#159153)
We were testing 2 s32 G_SADDE instead of a single s64 G_SADDE. Similar for s128 on RV64.
1 parent a264453 commit ab0bb6d

File tree

2 files changed

+85
-60
lines changed

2 files changed

+85
-60
lines changed

‎llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-sadde-rv32.mir‎

Lines changed: 41 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -136,38 +136,49 @@ body: |
136136
; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(s32) = COPY $x13
137137
; CHECK-NEXT: [[COPY4:%[0-9]+]]:_(s32) = COPY $x14
138138
; CHECK-NEXT: [[ADD:%[0-9]+]]:_(s32) = G_ADD [[COPY]], [[COPY2]]
139-
; CHECK-NEXT: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 1
140-
; CHECK-NEXT: [[AND:%[0-9]+]]:_(s32) = G_AND [[COPY4]], [[C]]
141-
; CHECK-NEXT: [[ADD1:%[0-9]+]]:_(s32) = G_ADD [[ADD]], [[AND]]
142-
; CHECK-NEXT: [[COPY5:%[0-9]+]]:_(s32) = COPY [[ADD1]](s32)
143-
; CHECK-NEXT: [[XOR:%[0-9]+]]:_(s32) = G_XOR [[ADD1]], [[COPY]]
144-
; CHECK-NEXT: [[XOR1:%[0-9]+]]:_(s32) = G_XOR [[ADD1]], [[COPY2]]
145-
; CHECK-NEXT: [[AND1:%[0-9]+]]:_(s32) = G_AND [[XOR]], [[XOR1]]
146-
; CHECK-NEXT: [[C1:%[0-9]+]]:_(s32) = G_CONSTANT i32 0
147-
; CHECK-NEXT: [[ICMP:%[0-9]+]]:_(s32) = G_ICMP intpred(slt), [[AND1]](s32), [[C1]]
148-
; CHECK-NEXT: [[ADD2:%[0-9]+]]:_(s32) = G_ADD [[COPY1]], [[COPY3]]
149-
; CHECK-NEXT: [[ADD3:%[0-9]+]]:_(s32) = G_ADD [[ADD2]], [[ICMP]]
150-
; CHECK-NEXT: [[COPY6:%[0-9]+]]:_(s32) = COPY [[ADD3]](s32)
151-
; CHECK-NEXT: [[XOR2:%[0-9]+]]:_(s32) = G_XOR [[ADD3]], [[COPY1]]
152-
; CHECK-NEXT: [[XOR3:%[0-9]+]]:_(s32) = G_XOR [[ADD3]], [[COPY3]]
153-
; CHECK-NEXT: [[AND2:%[0-9]+]]:_(s32) = G_AND [[XOR2]], [[XOR3]]
154-
; CHECK-NEXT: [[ICMP1:%[0-9]+]]:_(s32) = G_ICMP intpred(slt), [[AND2]](s32), [[C1]]
155-
; CHECK-NEXT: $x10 = COPY [[COPY5]](s32)
156-
; CHECK-NEXT: $x11 = COPY [[COPY6]](s32)
157-
; CHECK-NEXT: $x12 = COPY [[ICMP1]](s32)
139+
; CHECK-NEXT: [[ICMP:%[0-9]+]]:_(s32) = G_ICMP intpred(ult), [[ADD]](s32), [[COPY2]]
140+
; CHECK-NEXT: [[COPY5:%[0-9]+]]:_(s32) = COPY [[ADD]](s32)
141+
; CHECK-NEXT: [[ADD1:%[0-9]+]]:_(s32) = G_ADD [[COPY1]], [[COPY3]]
142+
; CHECK-NEXT: [[ADD2:%[0-9]+]]:_(s32) = G_ADD [[ADD1]], [[ICMP]]
143+
; CHECK-NEXT: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 0
144+
; CHECK-NEXT: [[COPY6:%[0-9]+]]:_(s32) = COPY [[ADD2]](s32)
145+
; CHECK-NEXT: [[DEF:%[0-9]+]]:_(s32) = G_IMPLICIT_DEF
146+
; CHECK-NEXT: [[C1:%[0-9]+]]:_(s32) = G_CONSTANT i32 1
147+
; CHECK-NEXT: [[AND:%[0-9]+]]:_(s32) = G_AND [[COPY4]], [[C1]]
148+
; CHECK-NEXT: [[AND1:%[0-9]+]]:_(s32) = G_AND [[DEF]], [[C]]
149+
; CHECK-NEXT: [[ADD3:%[0-9]+]]:_(s32) = G_ADD [[COPY5]], [[AND]]
150+
; CHECK-NEXT: [[ICMP1:%[0-9]+]]:_(s32) = G_ICMP intpred(ult), [[ADD3]](s32), [[AND]]
151+
; CHECK-NEXT: [[COPY7:%[0-9]+]]:_(s32) = COPY [[ADD3]](s32)
152+
; CHECK-NEXT: [[ADD4:%[0-9]+]]:_(s32) = G_ADD [[COPY6]], [[AND1]]
153+
; CHECK-NEXT: [[ADD5:%[0-9]+]]:_(s32) = G_ADD [[ADD4]], [[ICMP1]]
154+
; CHECK-NEXT: [[COPY8:%[0-9]+]]:_(s32) = COPY [[ADD5]](s32)
155+
; CHECK-NEXT: [[XOR:%[0-9]+]]:_(s32) = G_XOR [[COPY7]], [[COPY]]
156+
; CHECK-NEXT: [[XOR1:%[0-9]+]]:_(s32) = G_XOR [[COPY8]], [[COPY1]]
157+
; CHECK-NEXT: [[XOR2:%[0-9]+]]:_(s32) = G_XOR [[COPY7]], [[COPY2]]
158+
; CHECK-NEXT: [[XOR3:%[0-9]+]]:_(s32) = G_XOR [[COPY8]], [[COPY3]]
159+
; CHECK-NEXT: [[AND2:%[0-9]+]]:_(s32) = G_AND [[XOR]], [[XOR2]]
160+
; CHECK-NEXT: [[AND3:%[0-9]+]]:_(s32) = G_AND [[XOR1]], [[XOR3]]
161+
; CHECK-NEXT: [[ICMP2:%[0-9]+]]:_(s32) = G_ICMP intpred(ult), [[AND2]](s32), [[C]]
162+
; CHECK-NEXT: [[ICMP3:%[0-9]+]]:_(s32) = G_ICMP intpred(slt), [[AND3]](s32), [[C]]
163+
; CHECK-NEXT: [[ICMP4:%[0-9]+]]:_(s32) = G_ICMP intpred(eq), [[AND3]](s32), [[C]]
164+
; CHECK-NEXT: [[SELECT:%[0-9]+]]:_(s32) = G_SELECT [[ICMP4]](s32), [[ICMP2]], [[ICMP3]]
165+
; CHECK-NEXT: $x10 = COPY [[COPY7]](s32)
166+
; CHECK-NEXT: $x11 = COPY [[COPY8]](s32)
167+
; CHECK-NEXT: $x12 = COPY [[SELECT]](s32)
158168
; CHECK-NEXT: PseudoRET implicit $x10, implicit $x11, implicit $x12
159169
%0:_(s32) = COPY $x10
160170
%1:_(s32) = COPY $x11
161-
%2:_(s32) = COPY $x12
162-
%3:_(s32) = COPY $x13
163-
%4:_(s32) = COPY $x14
164-
%5:_(s1) = G_TRUNC %4(s32)
165-
%6:_(s32), %7:_(s1) = G_SADDE %0, %2, %5
166-
%8:_(s32), %9:_(s1) = G_SADDE %1, %3, %7
167-
%10:_(s32) = G_ANYEXT %9(s1)
168-
$x10 = COPY %6(s32)
169-
$x11 = COPY %8(s32)
170-
$x12 = COPY %10(s32)
171-
171+
%2:_(s64) = G_MERGE_VALUES %0(s32), %1(s32)
172+
%3:_(s32) = COPY $x12
173+
%4:_(s32) = COPY $x13
174+
%5:_(s64) = G_MERGE_VALUES %3(s32), %4(s32)
175+
%6:_(s32) = COPY $x14
176+
%7:_(s1) = G_TRUNC %6(s32)
177+
%8:_(s64), %9:_(s1) = G_SADDE %2, %5, %7
178+
%10:_(s32), %11:_(s32) = G_UNMERGE_VALUES %8(s64)
179+
%12:_(s32) = G_ANYEXT %9(s1)
180+
$x10 = COPY %10(s32)
181+
$x11 = COPY %11(s32)
182+
$x12 = COPY %12(s32)
172183
PseudoRET implicit $x10, implicit $x11, implicit $x12
173184
...

‎llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-sadde-rv64.mir‎

Lines changed: 44 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -174,38 +174,52 @@ body: |
174174
; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(s64) = COPY $x13
175175
; CHECK-NEXT: [[COPY4:%[0-9]+]]:_(s64) = COPY $x14
176176
; CHECK-NEXT: [[ADD:%[0-9]+]]:_(s64) = G_ADD [[COPY]], [[COPY2]]
177-
; CHECK-NEXT: [[C:%[0-9]+]]:_(s64) = G_CONSTANT i64 1
178-
; CHECK-NEXT: [[AND:%[0-9]+]]:_(s64) = G_AND [[COPY4]], [[C]]
179-
; CHECK-NEXT: [[ADD1:%[0-9]+]]:_(s64) = G_ADD [[ADD]], [[AND]]
180-
; CHECK-NEXT: [[COPY5:%[0-9]+]]:_(s64) = COPY [[ADD1]](s64)
181-
; CHECK-NEXT: [[XOR:%[0-9]+]]:_(s64) = G_XOR [[ADD1]], [[COPY]]
182-
; CHECK-NEXT: [[XOR1:%[0-9]+]]:_(s64) = G_XOR [[ADD1]], [[COPY2]]
183-
; CHECK-NEXT: [[AND1:%[0-9]+]]:_(s64) = G_AND [[XOR]], [[XOR1]]
184-
; CHECK-NEXT: [[C1:%[0-9]+]]:_(s64) = G_CONSTANT i64 0
185-
; CHECK-NEXT: [[ICMP:%[0-9]+]]:_(s64) = G_ICMP intpred(slt), [[AND1]](s64), [[C1]]
186-
; CHECK-NEXT: [[ADD2:%[0-9]+]]:_(s64) = G_ADD [[COPY1]], [[COPY3]]
187-
; CHECK-NEXT: [[ADD3:%[0-9]+]]:_(s64) = G_ADD [[ADD2]], [[ICMP]]
188-
; CHECK-NEXT: [[COPY6:%[0-9]+]]:_(s64) = COPY [[ADD3]](s64)
189-
; CHECK-NEXT: [[XOR2:%[0-9]+]]:_(s64) = G_XOR [[ADD3]], [[COPY1]]
190-
; CHECK-NEXT: [[XOR3:%[0-9]+]]:_(s64) = G_XOR [[ADD3]], [[COPY3]]
191-
; CHECK-NEXT: [[AND2:%[0-9]+]]:_(s64) = G_AND [[XOR2]], [[XOR3]]
192-
; CHECK-NEXT: [[ICMP1:%[0-9]+]]:_(s64) = G_ICMP intpred(slt), [[AND2]](s64), [[C1]]
193-
; CHECK-NEXT: $x10 = COPY [[COPY5]](s64)
194-
; CHECK-NEXT: $x11 = COPY [[COPY6]](s64)
195-
; CHECK-NEXT: $x12 = COPY [[ICMP1]](s64)
177+
; CHECK-NEXT: [[ICMP:%[0-9]+]]:_(s64) = G_ICMP intpred(ult), [[ADD]](s64), [[COPY2]]
178+
; CHECK-NEXT: [[COPY5:%[0-9]+]]:_(s64) = COPY [[ADD]](s64)
179+
; CHECK-NEXT: [[ADD1:%[0-9]+]]:_(s64) = G_ADD [[COPY1]], [[COPY3]]
180+
; CHECK-NEXT: [[ADD2:%[0-9]+]]:_(s64) = G_ADD [[ADD1]], [[ICMP]]
181+
; CHECK-NEXT: [[C:%[0-9]+]]:_(s64) = G_CONSTANT i64 0
182+
; CHECK-NEXT: [[COPY6:%[0-9]+]]:_(s64) = COPY [[ADD2]](s64)
183+
; CHECK-NEXT: [[DEF:%[0-9]+]]:_(s64) = G_IMPLICIT_DEF
184+
; CHECK-NEXT: [[C1:%[0-9]+]]:_(s64) = G_CONSTANT i64 1
185+
; CHECK-NEXT: [[AND:%[0-9]+]]:_(s64) = G_AND [[COPY4]], [[C1]]
186+
; CHECK-NEXT: [[AND1:%[0-9]+]]:_(s64) = G_AND [[DEF]], [[C]]
187+
; CHECK-NEXT: [[ADD3:%[0-9]+]]:_(s64) = G_ADD [[COPY5]], [[AND]]
188+
; CHECK-NEXT: [[ICMP1:%[0-9]+]]:_(s64) = G_ICMP intpred(ult), [[ADD3]](s64), [[AND]]
189+
; CHECK-NEXT: [[COPY7:%[0-9]+]]:_(s64) = COPY [[ADD3]](s64)
190+
; CHECK-NEXT: [[ADD4:%[0-9]+]]:_(s64) = G_ADD [[COPY6]], [[AND1]]
191+
; CHECK-NEXT: [[ADD5:%[0-9]+]]:_(s64) = G_ADD [[ADD4]], [[ICMP1]]
192+
; CHECK-NEXT: [[COPY8:%[0-9]+]]:_(s64) = COPY [[ADD5]](s64)
193+
; CHECK-NEXT: [[XOR:%[0-9]+]]:_(s64) = G_XOR [[COPY7]], [[COPY]]
194+
; CHECK-NEXT: [[XOR1:%[0-9]+]]:_(s64) = G_XOR [[COPY8]], [[COPY1]]
195+
; CHECK-NEXT: [[XOR2:%[0-9]+]]:_(s64) = G_XOR [[COPY7]], [[COPY2]]
196+
; CHECK-NEXT: [[XOR3:%[0-9]+]]:_(s64) = G_XOR [[COPY8]], [[COPY3]]
197+
; CHECK-NEXT: [[AND2:%[0-9]+]]:_(s64) = G_AND [[XOR]], [[XOR2]]
198+
; CHECK-NEXT: [[AND3:%[0-9]+]]:_(s64) = G_AND [[XOR1]], [[XOR3]]
199+
; CHECK-NEXT: [[ICMP2:%[0-9]+]]:_(s64) = G_ICMP intpred(ult), [[AND2]](s64), [[C]]
200+
; CHECK-NEXT: [[ICMP3:%[0-9]+]]:_(s64) = G_ICMP intpred(slt), [[AND3]](s64), [[C]]
201+
; CHECK-NEXT: [[ICMP4:%[0-9]+]]:_(s64) = G_ICMP intpred(eq), [[AND3]](s64), [[C]]
202+
; CHECK-NEXT: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC [[ICMP2]](s64)
203+
; CHECK-NEXT: [[TRUNC1:%[0-9]+]]:_(s32) = G_TRUNC [[ICMP3]](s64)
204+
; CHECK-NEXT: [[SELECT:%[0-9]+]]:_(s32) = G_SELECT [[ICMP4]](s64), [[TRUNC]], [[TRUNC1]]
205+
; CHECK-NEXT: [[ANYEXT:%[0-9]+]]:_(s64) = G_ANYEXT [[SELECT]](s32)
206+
; CHECK-NEXT: $x10 = COPY [[COPY7]](s64)
207+
; CHECK-NEXT: $x11 = COPY [[COPY8]](s64)
208+
; CHECK-NEXT: $x12 = COPY [[ANYEXT]](s64)
196209
; CHECK-NEXT: PseudoRET implicit $x10, implicit $x11, implicit $x12
197210
%0:_(s64) = COPY $x10
198211
%1:_(s64) = COPY $x11
199-
%2:_(s64) = COPY $x12
200-
%3:_(s64) = COPY $x13
201-
%4:_(s64) = COPY $x14
202-
%5:_(s1) = G_TRUNC %4(s64)
203-
%6:_(s64), %7:_(s1) = G_SADDE %0, %2, %5
204-
%8:_(s64), %9:_(s1) = G_SADDE %1, %3, %7
205-
%10:_(s64) = G_ANYEXT %9(s1)
206-
$x10 = COPY %6(s64)
207-
$x11 = COPY %8(s64)
208-
$x12 = COPY %10(s64)
209-
212+
%2:_(s128) = G_MERGE_VALUES %0(s64), %1(s64)
213+
%3:_(s64) = COPY $x12
214+
%4:_(s64) = COPY $x13
215+
%5:_(s128) = G_MERGE_VALUES %3(s64), %4(s64)
216+
%6:_(s64) = COPY $x14
217+
%7:_(s1) = G_TRUNC %6(s64)
218+
%8:_(s128), %9:_(s1) = G_SADDE %2, %5, %7
219+
%10:_(s64), %11:_(s64) = G_UNMERGE_VALUES %8(s128)
220+
%12:_(s64) = G_ANYEXT %9(s1)
221+
$x10 = COPY %10(s64)
222+
$x11 = COPY %11(s64)
223+
$x12 = COPY %12(s64)
210224
PseudoRET implicit $x10, implicit $x11, implicit $x12
211225
...

0 commit comments

Comments
 (0)