Skip to content

Commit a45f20b

Browse files
asbasb
authored
[RISCV][test] Add additional check-prefixes to fix conflicts in tests (#160689)
These are all cases where check lines were being silently dropped prior to #159321 which added proper warnings. I did `find llvm/test/CodeGen/RISCV -name "*.ll" -exec ./llvm/utils/update_llc_test_checks.py --llc-bin=./remote-llc -u {} \;` and went through all cases that emitted the new warning. `idiv_large.ll` is a case that seems to not be generated by update_llc_test_checks but still has the comment indicating it was (presumably it was hand-edited after generation).
1 parent 5abb4b2 commit a45f20b

File tree

10 files changed

+6096
-74
lines changed

10 files changed

+6096
-74
lines changed

‎llvm/test/CodeGen/RISCV/GlobalISel/float-intrinsics.ll‎

Lines changed: 376 additions & 1 deletion
Large diffs are not rendered by default.

‎llvm/test/CodeGen/RISCV/cmov-branch-opt.ll‎

Lines changed: 110 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
; RUN: llc -mtriple=riscv64 -mattr=+conditional-cmv-fusion,+c,+zicond -verify-machineinstrs < %s \
77
; RUN: | FileCheck -check-prefixes=CMOV,CMOV-ZICOND %s
88
; RUN: llc -mtriple=riscv64 -mattr=+short-forward-branch-opt -verify-machineinstrs < %s \
9-
; RUN: | FileCheck -check-prefixes=SHORT_FORWARD,SFB-NOZICOND %s
9+
; RUN: | FileCheck -check-prefixes=SHORT_FORWARD,SFB-NOZICOND,SFB-NOZICOND-NOC %s
1010
; RUN: llc -mtriple=riscv64 -mattr=+short-forward-branch-opt,+c -verify-machineinstrs < %s \
11-
; RUN: | FileCheck -check-prefixes=SHORT_FORWARD,SFB-NOZICOND %s
11+
; RUN: | FileCheck -check-prefixes=SHORT_FORWARD,SFB-NOZICOND,SFB-NOZICOND-C %s
1212
; RUN: llc -mtriple=riscv64 -mattr=+short-forward-branch-opt,+zicond -verify-machineinstrs < %s \
1313
; RUN: | FileCheck -check-prefixes=SHORT_FORWARD,SFB-ZICOND %s
1414

@@ -263,6 +263,24 @@ define i32 @select_xor_2(i32 %A, i32 %B, i8 %cond) {
263263
; CMOV-NEXT: .LBB6_2: # %entry
264264
; CMOV-NEXT: ret
265265
;
266+
; SFB-NOZICOND-NOC-LABEL: select_xor_2:
267+
; SFB-NOZICOND-NOC: # %bb.0: # %entry
268+
; SFB-NOZICOND-NOC-NEXT: andi a2, a2, 1
269+
; SFB-NOZICOND-NOC-NEXT: beqz a2, .LBB6_2
270+
; SFB-NOZICOND-NOC-NEXT: # %bb.1: # %entry
271+
; SFB-NOZICOND-NOC-NEXT: xor a0, a1, a0
272+
; SFB-NOZICOND-NOC-NEXT: .LBB6_2: # %entry
273+
; SFB-NOZICOND-NOC-NEXT: ret
274+
;
275+
; SFB-NOZICOND-C-LABEL: select_xor_2:
276+
; SFB-NOZICOND-C: # %bb.0: # %entry
277+
; SFB-NOZICOND-C-NEXT: andi a2, a2, 1
278+
; SFB-NOZICOND-C-NEXT: beqz a2, .LBB6_2
279+
; SFB-NOZICOND-C-NEXT: # %bb.1: # %entry
280+
; SFB-NOZICOND-C-NEXT: xor a0, a0, a1
281+
; SFB-NOZICOND-C-NEXT: .LBB6_2: # %entry
282+
; SFB-NOZICOND-C-NEXT: ret
283+
;
266284
; SFB-ZICOND-LABEL: select_xor_2:
267285
; SFB-ZICOND: # %bb.0: # %entry
268286
; SFB-ZICOND-NEXT: andi a2, a2, 1
@@ -300,6 +318,24 @@ define i32 @select_xor_2b(i32 %A, i32 %B, i8 %cond) {
300318
; CMOV-NEXT: .LBB7_2: # %entry
301319
; CMOV-NEXT: ret
302320
;
321+
; SFB-NOZICOND-NOC-LABEL: select_xor_2b:
322+
; SFB-NOZICOND-NOC: # %bb.0: # %entry
323+
; SFB-NOZICOND-NOC-NEXT: andi a2, a2, 1
324+
; SFB-NOZICOND-NOC-NEXT: beqz a2, .LBB7_2
325+
; SFB-NOZICOND-NOC-NEXT: # %bb.1: # %entry
326+
; SFB-NOZICOND-NOC-NEXT: xor a0, a1, a0
327+
; SFB-NOZICOND-NOC-NEXT: .LBB7_2: # %entry
328+
; SFB-NOZICOND-NOC-NEXT: ret
329+
;
330+
; SFB-NOZICOND-C-LABEL: select_xor_2b:
331+
; SFB-NOZICOND-C: # %bb.0: # %entry
332+
; SFB-NOZICOND-C-NEXT: andi a2, a2, 1
333+
; SFB-NOZICOND-C-NEXT: beqz a2, .LBB7_2
334+
; SFB-NOZICOND-C-NEXT: # %bb.1: # %entry
335+
; SFB-NOZICOND-C-NEXT: xor a0, a0, a1
336+
; SFB-NOZICOND-C-NEXT: .LBB7_2: # %entry
337+
; SFB-NOZICOND-C-NEXT: ret
338+
;
303339
; SFB-ZICOND-LABEL: select_xor_2b:
304340
; SFB-ZICOND: # %bb.0: # %entry
305341
; SFB-ZICOND-NEXT: andi a2, a2, 1
@@ -335,6 +371,24 @@ define i32 @select_or(i32 %A, i32 %B, i8 %cond) {
335371
; CMOV-NEXT: .LBB8_2: # %entry
336372
; CMOV-NEXT: ret
337373
;
374+
; SFB-NOZICOND-NOC-LABEL: select_or:
375+
; SFB-NOZICOND-NOC: # %bb.0: # %entry
376+
; SFB-NOZICOND-NOC-NEXT: andi a2, a2, 1
377+
; SFB-NOZICOND-NOC-NEXT: beqz a2, .LBB8_2
378+
; SFB-NOZICOND-NOC-NEXT: # %bb.1: # %entry
379+
; SFB-NOZICOND-NOC-NEXT: or a0, a1, a0
380+
; SFB-NOZICOND-NOC-NEXT: .LBB8_2: # %entry
381+
; SFB-NOZICOND-NOC-NEXT: ret
382+
;
383+
; SFB-NOZICOND-C-LABEL: select_or:
384+
; SFB-NOZICOND-C: # %bb.0: # %entry
385+
; SFB-NOZICOND-C-NEXT: andi a2, a2, 1
386+
; SFB-NOZICOND-C-NEXT: beqz a2, .LBB8_2
387+
; SFB-NOZICOND-C-NEXT: # %bb.1: # %entry
388+
; SFB-NOZICOND-C-NEXT: or a0, a0, a1
389+
; SFB-NOZICOND-C-NEXT: .LBB8_2: # %entry
390+
; SFB-NOZICOND-C-NEXT: ret
391+
;
338392
; SFB-ZICOND-LABEL: select_or:
339393
; SFB-ZICOND: # %bb.0: # %entry
340394
; SFB-ZICOND-NEXT: andi a2, a2, 1
@@ -372,6 +426,24 @@ define i32 @select_or_b(i32 %A, i32 %B, i8 %cond) {
372426
; CMOV-NEXT: .LBB9_2: # %entry
373427
; CMOV-NEXT: ret
374428
;
429+
; SFB-NOZICOND-NOC-LABEL: select_or_b:
430+
; SFB-NOZICOND-NOC: # %bb.0: # %entry
431+
; SFB-NOZICOND-NOC-NEXT: andi a2, a2, 1
432+
; SFB-NOZICOND-NOC-NEXT: beqz a2, .LBB9_2
433+
; SFB-NOZICOND-NOC-NEXT: # %bb.1: # %entry
434+
; SFB-NOZICOND-NOC-NEXT: or a0, a1, a0
435+
; SFB-NOZICOND-NOC-NEXT: .LBB9_2: # %entry
436+
; SFB-NOZICOND-NOC-NEXT: ret
437+
;
438+
; SFB-NOZICOND-C-LABEL: select_or_b:
439+
; SFB-NOZICOND-C: # %bb.0: # %entry
440+
; SFB-NOZICOND-C-NEXT: andi a2, a2, 1
441+
; SFB-NOZICOND-C-NEXT: beqz a2, .LBB9_2
442+
; SFB-NOZICOND-C-NEXT: # %bb.1: # %entry
443+
; SFB-NOZICOND-C-NEXT: or a0, a0, a1
444+
; SFB-NOZICOND-C-NEXT: .LBB9_2: # %entry
445+
; SFB-NOZICOND-C-NEXT: ret
446+
;
375447
; SFB-ZICOND-LABEL: select_or_b:
376448
; SFB-ZICOND: # %bb.0: # %entry
377449
; SFB-ZICOND-NEXT: andi a2, a2, 1
@@ -407,6 +479,24 @@ define i32 @select_or_1(i32 %A, i32 %B, i32 %cond) {
407479
; CMOV-NEXT: .LBB10_2: # %entry
408480
; CMOV-NEXT: ret
409481
;
482+
; SFB-NOZICOND-NOC-LABEL: select_or_1:
483+
; SFB-NOZICOND-NOC: # %bb.0: # %entry
484+
; SFB-NOZICOND-NOC-NEXT: andi a2, a2, 1
485+
; SFB-NOZICOND-NOC-NEXT: beqz a2, .LBB10_2
486+
; SFB-NOZICOND-NOC-NEXT: # %bb.1: # %entry
487+
; SFB-NOZICOND-NOC-NEXT: or a0, a1, a0
488+
; SFB-NOZICOND-NOC-NEXT: .LBB10_2: # %entry
489+
; SFB-NOZICOND-NOC-NEXT: ret
490+
;
491+
; SFB-NOZICOND-C-LABEL: select_or_1:
492+
; SFB-NOZICOND-C: # %bb.0: # %entry
493+
; SFB-NOZICOND-C-NEXT: andi a2, a2, 1
494+
; SFB-NOZICOND-C-NEXT: beqz a2, .LBB10_2
495+
; SFB-NOZICOND-C-NEXT: # %bb.1: # %entry
496+
; SFB-NOZICOND-C-NEXT: or a0, a0, a1
497+
; SFB-NOZICOND-C-NEXT: .LBB10_2: # %entry
498+
; SFB-NOZICOND-C-NEXT: ret
499+
;
410500
; SFB-ZICOND-LABEL: select_or_1:
411501
; SFB-ZICOND: # %bb.0: # %entry
412502
; SFB-ZICOND-NEXT: andi a2, a2, 1
@@ -444,6 +534,24 @@ define i32 @select_or_1b(i32 %A, i32 %B, i32 %cond) {
444534
; CMOV-NEXT: .LBB11_2: # %entry
445535
; CMOV-NEXT: ret
446536
;
537+
; SFB-NOZICOND-NOC-LABEL: select_or_1b:
538+
; SFB-NOZICOND-NOC: # %bb.0: # %entry
539+
; SFB-NOZICOND-NOC-NEXT: andi a2, a2, 1
540+
; SFB-NOZICOND-NOC-NEXT: beqz a2, .LBB11_2
541+
; SFB-NOZICOND-NOC-NEXT: # %bb.1: # %entry
542+
; SFB-NOZICOND-NOC-NEXT: or a0, a1, a0
543+
; SFB-NOZICOND-NOC-NEXT: .LBB11_2: # %entry
544+
; SFB-NOZICOND-NOC-NEXT: ret
545+
;
546+
; SFB-NOZICOND-C-LABEL: select_or_1b:
547+
; SFB-NOZICOND-C: # %bb.0: # %entry
548+
; SFB-NOZICOND-C-NEXT: andi a2, a2, 1
549+
; SFB-NOZICOND-C-NEXT: beqz a2, .LBB11_2
550+
; SFB-NOZICOND-C-NEXT: # %bb.1: # %entry
551+
; SFB-NOZICOND-C-NEXT: or a0, a0, a1
552+
; SFB-NOZICOND-C-NEXT: .LBB11_2: # %entry
553+
; SFB-NOZICOND-C-NEXT: ret
554+
;
447555
; SFB-ZICOND-LABEL: select_or_1b:
448556
; SFB-ZICOND: # %bb.0: # %entry
449557
; SFB-ZICOND-NEXT: andi a2, a2, 1

‎llvm/test/CodeGen/RISCV/double-select-fcmp.ll‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
22
; RUN: llc -mtriple=riscv32 -mattr=+d -verify-machineinstrs < %s \
3-
; RUN: -target-abi=ilp32d | FileCheck %s
3+
; RUN: -target-abi=ilp32d | FileCheck --check-prefixes=CHECK,RV32D %s
44
; RUN: llc -mtriple=riscv64 -mattr=+d -verify-machineinstrs < %s \
5-
; RUN: -target-abi=lp64d | FileCheck %s
5+
; RUN: -target-abi=lp64d | FileCheck --check-prefixes=CHECK,RV64D %s
66
; RUN: llc -mtriple=riscv32 -mattr=+zdinx -verify-machineinstrs < %s \
77
; RUN: -target-abi=ilp32 | FileCheck --check-prefix=CHECKRV32ZDINX %s
88
; RUN: llc -mtriple=riscv64 -mattr=+zdinx -verify-machineinstrs < %s \
@@ -640,6 +640,39 @@ define signext i32 @select_fcmp_uge_1_2(double %a, double %b) nounwind {
640640
}
641641

642642
define double @CascadedSelect(double noundef %a) {
643+
; RV32D-LABEL: CascadedSelect:
644+
; RV32D: # %bb.0: # %entry
645+
; RV32D-NEXT: lui a0, %hi(.LCPI20_0)
646+
; RV32D-NEXT: fld fa5, %lo(.LCPI20_0)(a0)
647+
; RV32D-NEXT: flt.d a0, fa5, fa0
648+
; RV32D-NEXT: bnez a0, .LBB20_3
649+
; RV32D-NEXT: # %bb.1: # %entry
650+
; RV32D-NEXT: fcvt.d.w fa5, zero
651+
; RV32D-NEXT: flt.d a0, fa0, fa5
652+
; RV32D-NEXT: bnez a0, .LBB20_3
653+
; RV32D-NEXT: # %bb.2: # %entry
654+
; RV32D-NEXT: fmv.d fa5, fa0
655+
; RV32D-NEXT: .LBB20_3: # %entry
656+
; RV32D-NEXT: fmv.d fa0, fa5
657+
; RV32D-NEXT: ret
658+
;
659+
; RV64D-LABEL: CascadedSelect:
660+
; RV64D: # %bb.0: # %entry
661+
; RV64D-NEXT: li a0, 1023
662+
; RV64D-NEXT: slli a0, a0, 52
663+
; RV64D-NEXT: fmv.d.x fa5, a0
664+
; RV64D-NEXT: flt.d a0, fa5, fa0
665+
; RV64D-NEXT: bnez a0, .LBB20_3
666+
; RV64D-NEXT: # %bb.1: # %entry
667+
; RV64D-NEXT: fmv.d.x fa5, zero
668+
; RV64D-NEXT: flt.d a0, fa0, fa5
669+
; RV64D-NEXT: bnez a0, .LBB20_3
670+
; RV64D-NEXT: # %bb.2: # %entry
671+
; RV64D-NEXT: fmv.d fa5, fa0
672+
; RV64D-NEXT: .LBB20_3: # %entry
673+
; RV64D-NEXT: fmv.d fa0, fa5
674+
; RV64D-NEXT: ret
675+
;
643676
; CHECKRV32ZDINX-LABEL: CascadedSelect:
644677
; CHECKRV32ZDINX: # %bb.0: # %entry
645678
; CHECKRV32ZDINX-NEXT: lui a3, %hi(.LCPI20_0)

0 commit comments

Comments
 (0)