[llvm-branch-commits] [llvm] [RISCV] Add Defs to PseudoTAIL and PseudoTAILX7. (PR #237449)
Craig Topper via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Fri Oct 30 18:05:30 PDT 2026
https://github.com/topperc created https://github.com/llvm/llvm-project/pull/237449
Annonyingly PseudoTAIL can def either X6 or X7 depending on Zicfilp and the version of the assembler being used.
Part of fixing #235697.
>From 18ea4dae12b7ac540e8730b272e0903876d8e80f Mon Sep 17 00:00:00 2001
From: Craig Topper <craig.topper at sifive.com>
Date: Fri, 30 Oct 2026 17:58:31 -0700
Subject: [PATCH] [RISCV] Add Defs to PseudoTAIL and PseudoTAILX7.
Annonyingly PseudoTAIL can def either X6 or X7 depending on Zicfilp
and the version of the assembler being used.
Part of fixing #235697.
---
llvm/lib/Target/RISCV/RISCVInstrInfo.td | 5 +++-
.../RISCV/determine-callee-saves-gpr.mir | 12 +++++-----
.../CodeGen/RISCV/machine-outliner-cfi.mir | 12 +++++-----
.../RISCV/machine-outliner-position.mir | 12 +++++-----
.../test/CodeGen/RISCV/machineoutliner-x5.mir | 8 +++----
llvm/test/CodeGen/RISCV/machineoutliner.mir | 24 +++++++++----------
llvm/test/CodeGen/RISCV/zcmp-cm-popretz.mir | 8 +++----
llvm/test/CodeGen/RISCV/zcmp-cm-push-pop.mir | 8 +++----
8 files changed, 46 insertions(+), 43 deletions(-)
diff --git a/llvm/lib/Target/RISCV/RISCVInstrInfo.td b/llvm/lib/Target/RISCV/RISCVInstrInfo.td
index fed8d973f5bb69..d3bdb1ce202e3b 100644
--- a/llvm/lib/Target/RISCV/RISCVInstrInfo.td
+++ b/llvm/lib/Target/RISCV/RISCVInstrInfo.td
@@ -1957,7 +1957,9 @@ def PseudoRET : Pseudo<(outs), (ins), [(riscv_ret_glue)]>,
// the callee's lpad accepts the incoming branch (lpad rejects X6 but accepts X7).
let isCall = 1, isTerminator = 1, isReturn = 1, isBarrier = 1, Uses = [X2],
Size = 8 in {
-let isCodeGenOnly = 0 in
+// Annoyingly we have to clobber X6 and X7 because the assembler may use Zicfilp
+// to decide which register to use.
+let isCodeGenOnly = 0, Defs = [X6, X7] in
def PseudoTAIL : Pseudo<(outs), (ins call_symbol:$dst), [],
"tail", "$dst">,
Sched<[WriteIALU, WriteJalr, ReadJalr]>;
@@ -1969,6 +1971,7 @@ def PseudoTAILReg : Pseudo<(outs GPR:$rs), (ins tail_call_symbol:$dst), [],
Sched<[WriteIALU, WriteJalr, ReadJalr]>;
// PseudoTAILX7 is CodeGenOnly; used when cf-protection-branch is active.
// Lowered to PseudoTAILReg with X7 in RISCVAsmPrinter.
+let Defs = [X7] in
def PseudoTAILX7 : Pseudo<(outs), (ins call_symbol:$dst), []>,
Sched<[WriteIALU, WriteJalr, ReadJalr]>;
}
diff --git a/llvm/test/CodeGen/RISCV/determine-callee-saves-gpr.mir b/llvm/test/CodeGen/RISCV/determine-callee-saves-gpr.mir
index ab360334ea6d3b..d55d384145560a 100644
--- a/llvm/test/CodeGen/RISCV/determine-callee-saves-gpr.mir
+++ b/llvm/test/CodeGen/RISCV/determine-callee-saves-gpr.mir
@@ -142,7 +142,7 @@ body: |
; RV64I-SR-NEXT: frame-setup CFI_INSTRUCTION offset $x19, -40
; RV64I-SR-NEXT: $x18 = IMPLICIT_DEF
; RV64I-SR-NEXT: $x19 = IMPLICIT_DEF
- ; RV64I-SR-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_4, implicit $x2, implicit-def $x2, implicit-def $x18, implicit-def $x19
+ ; RV64I-SR-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_4, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x2, implicit-def $x18, implicit-def $x19
$x18 = IMPLICIT_DEF
$x19 = IMPLICIT_DEF
PseudoRET
@@ -448,7 +448,7 @@ body: |
; RV64I-SR-NEXT: frame-setup CFI_INSTRUCTION offset $x25, -88
; RV64I-SR-NEXT: frame-setup CFI_INSTRUCTION offset $x26, -96
; RV64I-SR-NEXT: frame-setup CFI_INSTRUCTION offset $x27, -104
- ; RV64I-SR-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_12, implicit $x2, implicit-def $x2, implicit-def $x1, implicit-def $x8, implicit-def $x9, implicit-def $x18, implicit-def $x19, implicit-def $x20, implicit-def $x21, implicit-def $x22, implicit-def $x23, implicit-def $x24, implicit-def $x25, implicit-def $x26, implicit-def $x27
+ ; RV64I-SR-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_12, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x2, implicit-def $x1, implicit-def $x8, implicit-def $x9, implicit-def $x18, implicit-def $x19, implicit-def $x20, implicit-def $x21, implicit-def $x22, implicit-def $x23, implicit-def $x24, implicit-def $x25, implicit-def $x26, implicit-def $x27
PseudoRET
...
@@ -643,7 +643,7 @@ body: |
; RV64I-SR-NEXT: frame-setup CFI_INSTRUCTION def_cfa $x8, 0
; RV64I-SR-NEXT: $x18 = IMPLICIT_DEF
; RV64I-SR-NEXT: frame-destroy CFI_INSTRUCTION def_cfa $x2, 32
- ; RV64I-SR-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_3, implicit $x2, implicit-def $x2, implicit-def $x1, implicit-def $x8, implicit-def $x18
+ ; RV64I-SR-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_3, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x2, implicit-def $x1, implicit-def $x8, implicit-def $x18
$x18 = IMPLICIT_DEF
PseudoRET
...
@@ -799,7 +799,7 @@ body: |
; RV64I-SR-NEXT: frame-destroy CFI_INSTRUCTION def_cfa $x2, 64
; RV64I-SR-NEXT: $x2 = frame-destroy ADDI $x2, 32
; RV64I-SR-NEXT: frame-destroy CFI_INSTRUCTION def_cfa_offset 32
- ; RV64I-SR-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_3, implicit $x2, implicit-def $x2, implicit-def $x1, implicit-def $x8, implicit-def $x9, implicit-def $x18
+ ; RV64I-SR-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_3, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x2, implicit-def $x1, implicit-def $x8, implicit-def $x9, implicit-def $x18
$x18 = IMPLICIT_DEF
PseudoRET
...
@@ -896,7 +896,7 @@ body: |
; RV64I-SR-NEXT: frame-setup CFI_INSTRUCTION def_cfa_offset 96
; RV64I-SR-NEXT: frame-setup CFI_INSTRUCTION offset $x26, -96
; RV64I-SR-NEXT: $x26 = IMPLICIT_DEF
- ; RV64I-SR-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_11, implicit $x2, implicit-def $x2, implicit-def $x26
+ ; RV64I-SR-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_11, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x2, implicit-def $x26
$x26 = IMPLICIT_DEF
PseudoRET
...
@@ -1163,7 +1163,7 @@ body: |
; RV64I-SR-NEXT: $x25 = IMPLICIT_DEF
; RV64I-SR-NEXT: $x26 = IMPLICIT_DEF
; RV64I-SR-NEXT: $x27 = IMPLICIT_DEF
- ; RV64I-SR-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_12, implicit $x2, implicit-def $x2, implicit-def $x18, implicit-def $x19, implicit-def $x20, implicit-def $x21, implicit-def $x22, implicit-def $x23, implicit-def $x24, implicit-def $x25, implicit-def $x26, implicit-def $x27
+ ; RV64I-SR-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_12, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x2, implicit-def $x18, implicit-def $x19, implicit-def $x20, implicit-def $x21, implicit-def $x22, implicit-def $x23, implicit-def $x24, implicit-def $x25, implicit-def $x26, implicit-def $x27
$x18 = IMPLICIT_DEF
$x19 = IMPLICIT_DEF
$x20 = IMPLICIT_DEF
diff --git a/llvm/test/CodeGen/RISCV/machine-outliner-cfi.mir b/llvm/test/CodeGen/RISCV/machine-outliner-cfi.mir
index 78d242b5a28b9e..f13398e16c4cfb 100644
--- a/llvm/test/CodeGen/RISCV/machine-outliner-cfi.mir
+++ b/llvm/test/CodeGen/RISCV/machine-outliner-cfi.mir
@@ -27,12 +27,12 @@ body: |
; RV32I-MO-LABEL: name: funcA
; RV32I-MO: liveins: $x10, $x11
; RV32I-MO-NEXT: {{ $}}
- ; RV32I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV32I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
;
; RV64I-MO-LABEL: name: funcA
; RV64I-MO: liveins: $x10, $x11
; RV64I-MO-NEXT: {{ $}}
- ; RV64I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV64I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
$x10 = ORI $x10, 1023
CFI_INSTRUCTION offset $x1, 0
$x11 = ORI $x11, 1023
@@ -53,12 +53,12 @@ body: |
; RV32I-MO-LABEL: name: funcB
; RV32I-MO: liveins: $x10, $x11
; RV32I-MO-NEXT: {{ $}}
- ; RV32I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV32I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
;
; RV64I-MO-LABEL: name: funcB
; RV64I-MO: liveins: $x10, $x11
; RV64I-MO-NEXT: {{ $}}
- ; RV64I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV64I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
$x10 = ORI $x10, 1023
CFI_INSTRUCTION offset $x1, 0
$x11 = ORI $x11, 1023
@@ -81,12 +81,12 @@ body: |
; RV32I-MO-LABEL: name: funcC
; RV32I-MO: liveins: $x10, $x11
; RV32I-MO-NEXT: {{ $}}
- ; RV32I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV32I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
;
; RV64I-MO-LABEL: name: funcC
; RV64I-MO: liveins: $x10, $x11
; RV64I-MO-NEXT: {{ $}}
- ; RV64I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV64I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
$x10 = ORI $x10, 1023
CFI_INSTRUCTION offset $x1, 0
$x11 = ORI $x11, 1023
diff --git a/llvm/test/CodeGen/RISCV/machine-outliner-position.mir b/llvm/test/CodeGen/RISCV/machine-outliner-position.mir
index 47ec447f61d09c..a4371fa68eeb6f 100644
--- a/llvm/test/CodeGen/RISCV/machine-outliner-position.mir
+++ b/llvm/test/CodeGen/RISCV/machine-outliner-position.mir
@@ -25,14 +25,14 @@ body: |
; RV32I-MO-NEXT: {{ $}}
; RV32I-MO-NEXT: $x10 = ORI $x10, 1023
; RV32I-MO-NEXT: EH_LABEL <mcsymbol .Ltmp0>
- ; RV32I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV32I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
;
; RV64I-MO-LABEL: name: func1
; RV64I-MO: liveins: $x10, $x11
; RV64I-MO-NEXT: {{ $}}
; RV64I-MO-NEXT: $x10 = ORI $x10, 1023
; RV64I-MO-NEXT: EH_LABEL <mcsymbol .Ltmp0>
- ; RV64I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV64I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
$x10 = ORI $x10, 1023
EH_LABEL <mcsymbol .Ltmp0>
$x11 = ORI $x11, 1023
@@ -52,14 +52,14 @@ body: |
; RV32I-MO-NEXT: {{ $}}
; RV32I-MO-NEXT: $x10 = ORI $x10, 1023
; RV32I-MO-NEXT: GC_LABEL <mcsymbol .Ltmp1>
- ; RV32I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV32I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
;
; RV64I-MO-LABEL: name: func2
; RV64I-MO: liveins: $x10, $x11
; RV64I-MO-NEXT: {{ $}}
; RV64I-MO-NEXT: $x10 = ORI $x10, 1023
; RV64I-MO-NEXT: GC_LABEL <mcsymbol .Ltmp1>
- ; RV64I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV64I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
$x10 = ORI $x10, 1023
GC_LABEL <mcsymbol .Ltmp1>
$x11 = ORI $x11, 1023
@@ -79,14 +79,14 @@ body: |
; RV32I-MO-NEXT: {{ $}}
; RV32I-MO-NEXT: $x10 = ORI $x10, 1023
; RV32I-MO-NEXT: ANNOTATION_LABEL <mcsymbol .Ltmp2>
- ; RV32I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV32I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
;
; RV64I-MO-LABEL: name: func3
; RV64I-MO: liveins: $x10, $x11
; RV64I-MO-NEXT: {{ $}}
; RV64I-MO-NEXT: $x10 = ORI $x10, 1023
; RV64I-MO-NEXT: ANNOTATION_LABEL <mcsymbol .Ltmp2>
- ; RV64I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV64I-MO-NEXT: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
$x10 = ORI $x10, 1023
ANNOTATION_LABEL <mcsymbol .Ltmp2>
$x11 = ORI $x11, 1023
diff --git a/llvm/test/CodeGen/RISCV/machineoutliner-x5.mir b/llvm/test/CodeGen/RISCV/machineoutliner-x5.mir
index 14a9cd7f0dcffa..0ccb895c9917da 100644
--- a/llvm/test/CodeGen/RISCV/machineoutliner-x5.mir
+++ b/llvm/test/CodeGen/RISCV/machineoutliner-x5.mir
@@ -18,10 +18,10 @@ body: |
bb.0:
liveins: $x10, $x11, $x5
; RV32I-MO-LABEL: name: outline_tail_1
- ; RV32I-MO: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x5, implicit $x10, implicit $x11
+ ; RV32I-MO: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x5, implicit $x10, implicit $x11
;
; RV64I-MO-LABEL: name: outline_tail_1
- ; RV64I-MO: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x5, implicit $x10, implicit $x11
+ ; RV64I-MO: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x5, implicit $x10, implicit $x11
$x11 = ORI $x11, 1023
$x12 = ADDI $x10, 17
$x10 = ADD $x10, $x5
@@ -37,10 +37,10 @@ body: |
bb.0:
liveins: $x10, $x11, $x5
; RV32I-MO-LABEL: name: outline_tail_2
- ; RV32I-MO: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x5, implicit $x10, implicit $x11
+ ; RV32I-MO: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x5, implicit $x10, implicit $x11
;
; RV64I-MO-LABEL: name: outline_tail_2
- ; RV64I-MO: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x5, implicit $x10, implicit $x11
+ ; RV64I-MO: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x5, implicit $x10, implicit $x11
$x11 = ORI $x11, 1023
$x12 = ADDI $x10, 17
$x10 = ADD $x10, $x5
diff --git a/llvm/test/CodeGen/RISCV/machineoutliner.mir b/llvm/test/CodeGen/RISCV/machineoutliner.mir
index ab12bfbe1fafc4..4e96d00fd7075c 100644
--- a/llvm/test/CodeGen/RISCV/machineoutliner.mir
+++ b/llvm/test/CodeGen/RISCV/machineoutliner.mir
@@ -29,10 +29,10 @@ body: |
bb.0:
liveins: $x10, $x11
; RV32I-MO-LABEL: name: outline_0
- ; RV32I-MO: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV32I-MO: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
;
; RV64I-MO-LABEL: name: outline_0
- ; RV64I-MO: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV64I-MO: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
$x11 = ORI $x11, 1023
$x12 = ADDI $x10, 17
$x11 = AND $x12, $x11
@@ -48,10 +48,10 @@ body: |
bb.0:
liveins: $x10, $x11
; RV32I-MO-LABEL: name: outline_1
- ; RV32I-MO: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV32I-MO: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
;
; RV64I-MO-LABEL: name: outline_1
- ; RV64I-MO: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV64I-MO: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
$x11 = ORI $x11, 1023
$x12 = ADDI $x10, 17
$x11 = AND $x12, $x11
@@ -67,10 +67,10 @@ body: |
bb.0:
liveins: $x10, $x11
; RV32I-MO-LABEL: name: outline_2
- ; RV32I-MO: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV32I-MO: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
;
; RV64I-MO-LABEL: name: outline_2
- ; RV64I-MO: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV64I-MO: PseudoTAIL target-flags(riscv-call) @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
$x11 = ORI $x11, 1023
$x12 = ADDI $x10, 17
$x11 = AND $x12, $x11
@@ -87,11 +87,11 @@ body: |
liveins: $x10, $x11
; RV32I-MO-LABEL: name: dont_outline_0
; RV32I-MO-NOT: $x5 = PseudoCALLReg {{.*}} @OUTLINED_FUNCTION_0
- ; RV32I-MO-NOT: PseudoTAIL @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV32I-MO-NOT: PseudoTAIL @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
;
; RV64I-MO-LABEL: name: dont_outline_0
; RV64I-MO-NOT: $x5 = PseudoCALLReg {{.*}} @OUTLINED_FUNCTION_0
- ; RV64I-MO-NOT: PseudoTAIL @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV64I-MO-NOT: PseudoTAIL @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
$x11 = ORI $x11, 1023
$x12 = ADDI $x10, 17
$x11 = AND $x12, $x11
@@ -108,11 +108,11 @@ body: |
liveins: $x10, $x11
; RV32I-MO-LABEL: name: dont_outline_1
; RV32I-MO-NOT: $x5 = PseudoCALLReg {{.*}} @OUTLINED_FUNCTION_0
- ; RV32I-MO-NOT: PseudoTAIL @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV32I-MO-NOT: PseudoTAIL @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
;
; RV64I-MO-LABEL: name: dont_outline_1
; RV64I-MO-NOT: $x5 = PseudoCALLReg {{.*}} @OUTLINED_FUNCTION_0
- ; RV64I-MO-NOT: PseudoTAIL @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV64I-MO-NOT: PseudoTAIL @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
$x11 = ORI $x11, 1023
$x12 = ADDI $x10, 17
$x11 = AND $x12, $x11
@@ -129,11 +129,11 @@ body: |
liveins: $x10, $x11, $x5
; RV32I-MO-LABEL: name: dont_outline_2
; RV32I-MO-NOT: $x5 = PseudoCALLReg {{.*}} @OUTLINED_FUNCTION_0
- ; RV32I-MO-NOT: PseudoTAIL @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV32I-MO-NOT: PseudoTAIL @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
;
; RV64I-MO-LABEL: name: dont_outline_2
; RV64I-MO-NOT: $x5 = PseudoCALLReg {{.*}} @OUTLINED_FUNCTION_0
- ; RV64I-MO-NOT: PseudoTAIL @OUTLINED_FUNCTION_0, implicit $x2, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
+ ; RV64I-MO-NOT: PseudoTAIL @OUTLINED_FUNCTION_0, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x6, implicit-def $x7, implicit-def $x10, implicit-def $x11, implicit-def $x12, implicit $x2, implicit $x10, implicit $x11
$x11 = ORI $x11, 1023
$x12 = ADDI $x10, 17
$x11 = AND $x12, $x11
diff --git a/llvm/test/CodeGen/RISCV/zcmp-cm-popretz.mir b/llvm/test/CodeGen/RISCV/zcmp-cm-popretz.mir
index 3207a218c7422c..0b77e1c8bd164c 100644
--- a/llvm/test/CodeGen/RISCV/zcmp-cm-popretz.mir
+++ b/llvm/test/CodeGen/RISCV/zcmp-cm-popretz.mir
@@ -38,7 +38,7 @@ body: |
; CHECK-LIBCALL32-NEXT: frame-setup CFI_INSTRUCTION offset $x8, -8
; CHECK-LIBCALL32-NEXT: $x1 = IMPLICIT_DEF
; CHECK-LIBCALL32-NEXT: $x8 = IMPLICIT_DEF
- ; CHECK-LIBCALL32-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_1, implicit $x2, implicit-def $x2, implicit-def $x1, implicit-def $x8
+ ; CHECK-LIBCALL32-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_1, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x2, implicit-def $x1, implicit-def $x8
;
; CHECK-ZCMP64-LABEL: name: popret_rvlist5
; CHECK-ZCMP64: liveins: $x1, $x8
@@ -60,7 +60,7 @@ body: |
; CHECK-LIBCALL64-NEXT: frame-setup CFI_INSTRUCTION offset $x8, -16
; CHECK-LIBCALL64-NEXT: $x1 = IMPLICIT_DEF
; CHECK-LIBCALL64-NEXT: $x8 = IMPLICIT_DEF
- ; CHECK-LIBCALL64-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_1, implicit $x2, implicit-def $x2, implicit-def $x1, implicit-def $x8
+ ; CHECK-LIBCALL64-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_1, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x2, implicit-def $x1, implicit-def $x8
;
; CHECK-NO-ZCMP32-LABEL: name: popret_rvlist5
; CHECK-NO-ZCMP32: liveins: $x1, $x8
@@ -131,7 +131,7 @@ body: |
; CHECK-LIBCALL32-NEXT: $x1 = IMPLICIT_DEF
; CHECK-LIBCALL32-NEXT: $x8 = IMPLICIT_DEF
; CHECK-LIBCALL32-NEXT: $x10 = ADDI $x0, 0
- ; CHECK-LIBCALL32-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_1, implicit $x2, implicit-def $x2, implicit-def $x1, implicit-def $x8, implicit $x10
+ ; CHECK-LIBCALL32-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_1, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x2, implicit-def $x1, implicit-def $x8, implicit $x10
;
; CHECK-ZCMP64-LABEL: name: popretz_rvlist5
; CHECK-ZCMP64: liveins: $x1, $x8
@@ -154,7 +154,7 @@ body: |
; CHECK-LIBCALL64-NEXT: $x1 = IMPLICIT_DEF
; CHECK-LIBCALL64-NEXT: $x8 = IMPLICIT_DEF
; CHECK-LIBCALL64-NEXT: $x10 = ADDI $x0, 0
- ; CHECK-LIBCALL64-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_1, implicit $x2, implicit-def $x2, implicit-def $x1, implicit-def $x8, implicit $x10
+ ; CHECK-LIBCALL64-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_1, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x2, implicit-def $x1, implicit-def $x8, implicit $x10
;
; CHECK-NO-ZCMP32-LABEL: name: popretz_rvlist5
; CHECK-NO-ZCMP32: liveins: $x1, $x8
diff --git a/llvm/test/CodeGen/RISCV/zcmp-cm-push-pop.mir b/llvm/test/CodeGen/RISCV/zcmp-cm-push-pop.mir
index 0ca9595e6af368..ea7d40b79ac88f 100644
--- a/llvm/test/CodeGen/RISCV/zcmp-cm-push-pop.mir
+++ b/llvm/test/CodeGen/RISCV/zcmp-cm-push-pop.mir
@@ -55,7 +55,7 @@ body: |
; CHECK-LIBCALL32-LABEL: name: push_rvlist15
; CHECK-LIBCALL32: liveins: $x1, $x8, $x9, $x18, $x19, $x20, $x21, $x22, $x23, $x24, $x25, $x26, $x27
; CHECK-LIBCALL32-NEXT: {{ $}}
- ; CHECK-LIBCALL32-NEXT: $x5 = frame-setup PseudoCALLReg target-flags(riscv-call) &__riscv_save_12
+ ; CHECK-LIBCALL32-NEXT: $x5 = frame-setup PseudoCALLReg target-flags(riscv-call) &__riscv_save_12, implicit $x2, implicit-def $x2, implicit $x1, implicit $x8, implicit $x9, implicit $x18, implicit $x19, implicit $x20, implicit $x21, implicit $x22, implicit $x23, implicit $x24, implicit $x25, implicit $x26, implicit $x27
; CHECK-LIBCALL32-NEXT: frame-setup CFI_INSTRUCTION def_cfa_offset 64
; CHECK-LIBCALL32-NEXT: frame-setup CFI_INSTRUCTION offset $x1, -4
; CHECK-LIBCALL32-NEXT: frame-setup CFI_INSTRUCTION offset $x8, -8
@@ -83,7 +83,7 @@ body: |
; CHECK-LIBCALL32-NEXT: $x25 = IMPLICIT_DEF
; CHECK-LIBCALL32-NEXT: $x26 = IMPLICIT_DEF
; CHECK-LIBCALL32-NEXT: $x27 = IMPLICIT_DEF
- ; CHECK-LIBCALL32-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_12, implicit $x2
+ ; CHECK-LIBCALL32-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_12, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x2, implicit-def $x1, implicit-def $x8, implicit-def $x9, implicit-def $x18, implicit-def $x19, implicit-def $x20, implicit-def $x21, implicit-def $x22, implicit-def $x23, implicit-def $x24, implicit-def $x25, implicit-def $x26, implicit-def $x27
;
; CHECK-ZCMP64-LABEL: name: push_rvlist15
; CHECK-ZCMP64: liveins: $x1, $x8, $x9, $x18, $x19, $x20, $x21, $x22, $x23, $x24, $x25, $x26, $x27
@@ -122,7 +122,7 @@ body: |
; CHECK-LIBCALL64-LABEL: name: push_rvlist15
; CHECK-LIBCALL64: liveins: $x1, $x8, $x9, $x18, $x19, $x20, $x21, $x22, $x23, $x24, $x25, $x26, $x27
; CHECK-LIBCALL64-NEXT: {{ $}}
- ; CHECK-LIBCALL64-NEXT: $x5 = frame-setup PseudoCALLReg target-flags(riscv-call) &__riscv_save_12
+ ; CHECK-LIBCALL64-NEXT: $x5 = frame-setup PseudoCALLReg target-flags(riscv-call) &__riscv_save_12, implicit $x2, implicit-def $x2, implicit $x1, implicit $x8, implicit $x9, implicit $x18, implicit $x19, implicit $x20, implicit $x21, implicit $x22, implicit $x23, implicit $x24, implicit $x25, implicit $x26, implicit $x27
; CHECK-LIBCALL64-NEXT: frame-setup CFI_INSTRUCTION def_cfa_offset 112
; CHECK-LIBCALL64-NEXT: frame-setup CFI_INSTRUCTION offset $x1, -8
; CHECK-LIBCALL64-NEXT: frame-setup CFI_INSTRUCTION offset $x8, -16
@@ -150,7 +150,7 @@ body: |
; CHECK-LIBCALL64-NEXT: $x25 = IMPLICIT_DEF
; CHECK-LIBCALL64-NEXT: $x26 = IMPLICIT_DEF
; CHECK-LIBCALL64-NEXT: $x27 = IMPLICIT_DEF
- ; CHECK-LIBCALL64-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_12, implicit $x2
+ ; CHECK-LIBCALL64-NEXT: frame-destroy PseudoTAIL target-flags(riscv-call) &__riscv_restore_12, implicit-def $x6, implicit-def $x7, implicit $x2, implicit-def $x2, implicit-def $x1, implicit-def $x8, implicit-def $x9, implicit-def $x18, implicit-def $x19, implicit-def $x20, implicit-def $x21, implicit-def $x22, implicit-def $x23, implicit-def $x24, implicit-def $x25, implicit-def $x26, implicit-def $x27
;
; CHECK-NO-ZCMP32-LABEL: name: push_rvlist15
; CHECK-NO-ZCMP32: liveins: $x1, $x8, $x9, $x18, $x19, $x20, $x21, $x22, $x23, $x24, $x25, $x26, $x27
More information about the llvm-branch-commits
mailing list