[llvm] d391e4f - [X86] Update RET/LRET instruction to use the same naming convention as IRET (PR36876). NFC

Simon Pilgrim via llvm-commits llvm-commits at lists.llvm.org
Sun Nov 7 07:09:01 PST 2021


Author: Simon Pilgrim
Date: 2021-11-07T15:06:54Z
New Revision: d391e4fe841d4289137b6cb1463fce2d1853a5eb

URL: https://github.com/llvm/llvm-project/commit/d391e4fe841d4289137b6cb1463fce2d1853a5eb
DIFF: https://github.com/llvm/llvm-project/commit/d391e4fe841d4289137b6cb1463fce2d1853a5eb.diff

LOG: [X86] Update RET/LRET instruction to use the same naming convention as IRET (PR36876). NFC

Be more consistent in the naming convention for the various RET instructions to specify in terms of bitwidth.

Helps prevent future scheduler model mismatches like those that were only addressed in D44687.

Differential Revision: https://reviews.llvm.org/D113302

Added: 
    

Modified: 
    llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
    llvm/lib/Target/X86/X86ExpandPseudo.cpp
    llvm/lib/Target/X86/X86FastISel.cpp
    llvm/lib/Target/X86/X86IndirectThunks.cpp
    llvm/lib/Target/X86/X86InstrControl.td
    llvm/lib/Target/X86/X86InstrInfo.cpp
    llvm/lib/Target/X86/X86LoadValueInjectionRetHardening.cpp
    llvm/lib/Target/X86/X86MCInstLower.cpp
    llvm/lib/Target/X86/X86RegisterInfo.cpp
    llvm/lib/Target/X86/X86SchedBroadwell.td
    llvm/lib/Target/X86/X86SchedHaswell.td
    llvm/lib/Target/X86/X86SchedIceLake.td
    llvm/lib/Target/X86/X86SchedSandyBridge.td
    llvm/lib/Target/X86/X86SchedSkylakeClient.td
    llvm/lib/Target/X86/X86SchedSkylakeServer.td
    llvm/lib/Target/X86/X86ScheduleAtom.td
    llvm/lib/Target/X86/X86ScheduleZnver1.td
    llvm/lib/Target/X86/X86ScheduleZnver2.td
    llvm/test/CodeGen/Generic/MIRDebugify/check-line-and-variables.mir
    llvm/test/CodeGen/MIR/X86/auto-successor.mir
    llvm/test/CodeGen/MIR/X86/basic-block-liveins.mir
    llvm/test/CodeGen/MIR/X86/basic-block-not-at-start-of-line-error.mir
    llvm/test/CodeGen/MIR/X86/block-address-operands.mir
    llvm/test/CodeGen/MIR/X86/branch-probabilities.mir
    llvm/test/CodeGen/MIR/X86/callee-saved-info.mir
    llvm/test/CodeGen/MIR/X86/cfi-def-cfa-offset.mir
    llvm/test/CodeGen/MIR/X86/cfi-offset.mir
    llvm/test/CodeGen/MIR/X86/constant-pool-item-redefinition-error.mir
    llvm/test/CodeGen/MIR/X86/constant-pool.mir
    llvm/test/CodeGen/MIR/X86/constant-value-error.mir
    llvm/test/CodeGen/MIR/X86/dbg-value-list.mir
    llvm/test/CodeGen/MIR/X86/dead-register-flag.mir
    llvm/test/CodeGen/MIR/X86/def-register-already-tied-error.mir
    llvm/test/CodeGen/MIR/X86/duplicate-memory-operand-flag.mir
    llvm/test/CodeGen/MIR/X86/duplicate-register-flag-error.mir
    llvm/test/CodeGen/MIR/X86/early-clobber-register-flag.mir
    llvm/test/CodeGen/MIR/X86/expected-align-in-memory-operand.mir
    llvm/test/CodeGen/MIR/X86/expected-alignment-after-align-in-memory-operand.mir
    llvm/test/CodeGen/MIR/X86/expected-basic-block-at-start-of-body.mir
    llvm/test/CodeGen/MIR/X86/expected-block-reference-in-blockaddress.mir
    llvm/test/CodeGen/MIR/X86/expected-comma-after-cfi-register.mir
    llvm/test/CodeGen/MIR/X86/expected-comma-after-memory-operand.mir
    llvm/test/CodeGen/MIR/X86/expected-different-implicit-operand.mir
    llvm/test/CodeGen/MIR/X86/expected-different-implicit-register-flag.mir
    llvm/test/CodeGen/MIR/X86/expected-function-reference-after-blockaddress.mir
    llvm/test/CodeGen/MIR/X86/expected-global-value-after-blockaddress.mir
    llvm/test/CodeGen/MIR/X86/expected-integer-after-offset-sign.mir
    llvm/test/CodeGen/MIR/X86/expected-integer-after-tied-def.mir
    llvm/test/CodeGen/MIR/X86/expected-integer-in-successor-weight.mir
    llvm/test/CodeGen/MIR/X86/expected-load-or-store-in-memory-operand.mir
    llvm/test/CodeGen/MIR/X86/expected-machine-operand.mir
    llvm/test/CodeGen/MIR/X86/expected-metadata-node-after-debug-location.mir
    llvm/test/CodeGen/MIR/X86/expected-metadata-node-after-exclaim.mir
    llvm/test/CodeGen/MIR/X86/expected-metadata-node-in-stack-object.mir
    llvm/test/CodeGen/MIR/X86/expected-named-register-in-allocation-hint.mir
    llvm/test/CodeGen/MIR/X86/expected-named-register-in-callee-saved-register.mir
    llvm/test/CodeGen/MIR/X86/expected-named-register-in-functions-livein.mir
    llvm/test/CodeGen/MIR/X86/expected-named-register-livein.mir
    llvm/test/CodeGen/MIR/X86/expected-newline-at-end-of-list.mir
    llvm/test/CodeGen/MIR/X86/expected-number-after-bb.mir
    llvm/test/CodeGen/MIR/X86/expected-offset-after-cfi-operand.mir
    llvm/test/CodeGen/MIR/X86/expected-pointer-value-in-memory-operand.mir
    llvm/test/CodeGen/MIR/X86/expected-positive-alignment-after-align.mir
    llvm/test/CodeGen/MIR/X86/expected-register-after-cfi-operand.mir
    llvm/test/CodeGen/MIR/X86/expected-register-after-flags.mir
    llvm/test/CodeGen/MIR/X86/expected-size-integer-after-memory-operation.mir
    llvm/test/CodeGen/MIR/X86/expected-size-integer-after-memory-operation2.mir
    llvm/test/CodeGen/MIR/X86/expected-stack-object.mir
    llvm/test/CodeGen/MIR/X86/expected-subregister-after-colon.mir
    llvm/test/CodeGen/MIR/X86/expected-target-flag-name.mir
    llvm/test/CodeGen/MIR/X86/expected-tied-def-after-lparen.mir
    llvm/test/CodeGen/MIR/X86/expected-value-in-memory-operand.mir
    llvm/test/CodeGen/MIR/X86/expected-virtual-register-in-functions-livein.mir
    llvm/test/CodeGen/MIR/X86/external-symbol-operands.mir
    llvm/test/CodeGen/MIR/X86/fixed-stack-memory-operands.mir
    llvm/test/CodeGen/MIR/X86/fixed-stack-object-redefinition-error.mir
    llvm/test/CodeGen/MIR/X86/fixed-stack-objects.mir
    llvm/test/CodeGen/MIR/X86/frame-info-save-restore-points.mir
    llvm/test/CodeGen/MIR/X86/frame-info-stack-references.mir
    llvm/test/CodeGen/MIR/X86/frame-setup-instruction-flag.mir
    llvm/test/CodeGen/MIR/X86/function-liveins.mir
    llvm/test/CodeGen/MIR/X86/global-value-operands.mir
    llvm/test/CodeGen/MIR/X86/immediate-operands.mir
    llvm/test/CodeGen/MIR/X86/implicit-register-flag.mir
    llvm/test/CodeGen/MIR/X86/inline-asm-registers.mir
    llvm/test/CodeGen/MIR/X86/instr-symbols-and-mcsymbol-operands.mir
    llvm/test/CodeGen/MIR/X86/instructions-debug-location.mir
    llvm/test/CodeGen/MIR/X86/invalid-constant-pool-item.mir
    llvm/test/CodeGen/MIR/X86/invalid-target-flag-name.mir
    llvm/test/CodeGen/MIR/X86/invalid-tied-def-index-error.mir
    llvm/test/CodeGen/MIR/X86/jump-table-info.mir
    llvm/test/CodeGen/MIR/X86/jump-table-redefinition-error.mir
    llvm/test/CodeGen/MIR/X86/killed-register-flag.mir
    llvm/test/CodeGen/MIR/X86/large-cfi-offset-number-error.mir
    llvm/test/CodeGen/MIR/X86/large-immediate-operand-error.mir
    llvm/test/CodeGen/MIR/X86/large-index-number-error.mir
    llvm/test/CodeGen/MIR/X86/large-offset-number-error.mir
    llvm/test/CodeGen/MIR/X86/large-size-in-memory-operand-error.mir
    llvm/test/CodeGen/MIR/X86/liveout-register-mask.mir
    llvm/test/CodeGen/MIR/X86/load-with-max-alignment.mir
    llvm/test/CodeGen/MIR/X86/machine-basic-block-operands.mir
    llvm/test/CodeGen/MIR/X86/machine-instructions.mir
    llvm/test/CodeGen/MIR/X86/machine-verifier.mir
    llvm/test/CodeGen/MIR/X86/memory-operands.mir
    llvm/test/CodeGen/MIR/X86/metadata-operands.mir
    llvm/test/CodeGen/MIR/X86/missing-closing-quote.mir
    llvm/test/CodeGen/MIR/X86/missing-comma.mir
    llvm/test/CodeGen/MIR/X86/missing-implicit-operand.mir
    llvm/test/CodeGen/MIR/X86/named-registers.mir
    llvm/test/CodeGen/MIR/X86/newline-handling.mir
    llvm/test/CodeGen/MIR/X86/null-register-operands.mir
    llvm/test/CodeGen/MIR/X86/register-mask-operands.mir
    llvm/test/CodeGen/MIR/X86/register-operands-target-flag-error.mir
    llvm/test/CodeGen/MIR/X86/renamable-register-flag.mir
    llvm/test/CodeGen/MIR/X86/roundtrip.mir
    llvm/test/CodeGen/MIR/X86/simple-register-allocation-hints.mir
    llvm/test/CodeGen/MIR/X86/spill-slot-fixed-stack-object-aliased.mir
    llvm/test/CodeGen/MIR/X86/spill-slot-fixed-stack-object-immutable.mir
    llvm/test/CodeGen/MIR/X86/spill-slot-fixed-stack-objects.mir
    llvm/test/CodeGen/MIR/X86/stack-object-invalid-name.mir
    llvm/test/CodeGen/MIR/X86/stack-object-operand-name-mismatch-error.mir
    llvm/test/CodeGen/MIR/X86/stack-object-operands.mir
    llvm/test/CodeGen/MIR/X86/stack-object-redefinition-error.mir
    llvm/test/CodeGen/MIR/X86/stack-objects.mir
    llvm/test/CodeGen/MIR/X86/standalone-register-error.mir
    llvm/test/CodeGen/MIR/X86/subregister-index-operands.mir
    llvm/test/CodeGen/MIR/X86/subregister-operands.mir
    llvm/test/CodeGen/MIR/X86/successor-basic-blocks-weights.mir
    llvm/test/CodeGen/MIR/X86/successor-basic-blocks.mir
    llvm/test/CodeGen/MIR/X86/tied-def-operand-invalid.mir
    llvm/test/CodeGen/MIR/X86/tied-physical-regs-match.mir
    llvm/test/CodeGen/MIR/X86/undef-register-flag.mir
    llvm/test/CodeGen/MIR/X86/undefined-fixed-stack-object.mir
    llvm/test/CodeGen/MIR/X86/undefined-global-value.mir
    llvm/test/CodeGen/MIR/X86/undefined-ir-block-in-blockaddress.mir
    llvm/test/CodeGen/MIR/X86/undefined-ir-block-slot-in-blockaddress.mir
    llvm/test/CodeGen/MIR/X86/undefined-jump-table-id.mir
    llvm/test/CodeGen/MIR/X86/undefined-named-global-value.mir
    llvm/test/CodeGen/MIR/X86/undefined-register-class.mir
    llvm/test/CodeGen/MIR/X86/undefined-stack-object.mir
    llvm/test/CodeGen/MIR/X86/undefined-value-in-memory-operand.mir
    llvm/test/CodeGen/MIR/X86/undefined-virtual-register.mir
    llvm/test/CodeGen/MIR/X86/unknown-machine-basic-block.mir
    llvm/test/CodeGen/MIR/X86/unknown-metadata-keyword.mir
    llvm/test/CodeGen/MIR/X86/unknown-metadata-node.mir
    llvm/test/CodeGen/MIR/X86/unknown-named-machine-basic-block.mir
    llvm/test/CodeGen/MIR/X86/unknown-register.mir
    llvm/test/CodeGen/MIR/X86/unknown-subregister-index-op.mir
    llvm/test/CodeGen/MIR/X86/unknown-subregister-index.mir
    llvm/test/CodeGen/MIR/X86/unrecognized-character.mir
    llvm/test/CodeGen/MIR/X86/variable-sized-stack-object-size-error.mir
    llvm/test/CodeGen/MIR/X86/variable-sized-stack-objects.mir
    llvm/test/CodeGen/MIR/X86/virtual-register-redefinition-error.mir
    llvm/test/CodeGen/MIR/X86/virtual-registers.mir
    llvm/test/CodeGen/X86/basic-block-sections-mir-parse.mir
    llvm/test/CodeGen/X86/block-placement.mir
    llvm/test/CodeGen/X86/bug47278.mir
    llvm/test/CodeGen/X86/dbg-changes-codegen-branch-folding2.mir
    llvm/test/CodeGen/X86/dbg-value-superreg-copy.mir
    llvm/test/CodeGen/X86/evex-to-vex-compress.mir
    llvm/test/CodeGen/X86/expand-call-rvmarker.mir
    llvm/test/CodeGen/X86/expand-vr64-gr64-copy.mir
    llvm/test/CodeGen/X86/fast-regalloc-live-out-debug-values.mir
    llvm/test/CodeGen/X86/fixup-bw-copy.mir
    llvm/test/CodeGen/X86/fixup-bw-inst.mir
    llvm/test/CodeGen/X86/implicit-null-checks.mir
    llvm/test/CodeGen/X86/implicit-null-chk-reg-rewrite.mir
    llvm/test/CodeGen/X86/instr-symbols.mir
    llvm/test/CodeGen/X86/invalid-liveness.mir
    llvm/test/CodeGen/X86/leaFixup32.mir
    llvm/test/CodeGen/X86/leaFixup64.mir
    llvm/test/CodeGen/X86/machine-copy-dbgvalue.mir
    llvm/test/CodeGen/X86/machine-outliner-cfi-tail-some.mir
    llvm/test/CodeGen/X86/machine-outliner-cfi-tail.mir
    llvm/test/CodeGen/X86/optimize-compare.mir
    llvm/test/CodeGen/X86/patchpoint-verifiable.mir
    llvm/test/CodeGen/X86/phielim-undef.mir
    llvm/test/CodeGen/X86/post-ra-sched-with-debug.mir
    llvm/test/CodeGen/X86/prologue-epilogue-remarks.mir
    llvm/test/CodeGen/X86/scavenger.mir
    llvm/test/CodeGen/X86/tail-merge-after-mbp.mir
    llvm/test/CodeGen/X86/tied-depbreak.mir
    llvm/test/CodeGen/X86/twoaddr-dbg-value.mir
    llvm/test/CodeGen/X86/update-terminator.mir
    llvm/test/CodeGen/X86/win64-eh-empty-block-2.mir
    llvm/test/CodeGen/X86/xray-multiplerets-in-blocks.mir
    llvm/test/DebugInfo/MIR/InstrRef/dbg-phi-subregister-location.mir
    llvm/test/DebugInfo/MIR/InstrRef/dbg-phis-in-ldv.mir
    llvm/test/DebugInfo/MIR/InstrRef/dbg-phis-merging-in-ldv.mir
    llvm/test/DebugInfo/MIR/InstrRef/dbg-phis-with-loops.mir
    llvm/test/DebugInfo/MIR/InstrRef/follow-spill-of-live-value.mir
    llvm/test/DebugInfo/MIR/InstrRef/ignore-dbg-value-list.mir
    llvm/test/DebugInfo/MIR/InstrRef/instr-ref-roundtrip.mir
    llvm/test/DebugInfo/MIR/InstrRef/livedebugvalues_instrref_tolocs.mir
    llvm/test/DebugInfo/MIR/InstrRef/livedebugvalues_recover_clobbers.mir
    llvm/test/DebugInfo/MIR/InstrRef/livedebugvalues_stackslot_subregs.mir
    llvm/test/DebugInfo/MIR/InstrRef/livedebugvalues_subreg_substitutions.mir
    llvm/test/DebugInfo/MIR/InstrRef/memory-operand-tracking.mir
    llvm/test/DebugInfo/MIR/InstrRef/no-duplicates.mir
    llvm/test/DebugInfo/MIR/InstrRef/no-metainstrs.mir
    llvm/test/DebugInfo/MIR/InstrRef/phi-coalesce-subreg.mir
    llvm/test/DebugInfo/MIR/InstrRef/phi-coalescing.mir
    llvm/test/DebugInfo/MIR/InstrRef/pick-vphi-in-shifting-loop.mir
    llvm/test/DebugInfo/MIR/InstrRef/restore-to-rsp-crash.mir
    llvm/test/DebugInfo/MIR/InstrRef/substitusions-roundtrip.mir
    llvm/test/DebugInfo/MIR/InstrRef/survives-livedebugvars.mir
    llvm/test/DebugInfo/MIR/InstrRef/x86-fixup-bw-inst-subreb.mir
    llvm/test/DebugInfo/MIR/InstrRef/x86-lea-fixup-2.mir
    llvm/test/DebugInfo/MIR/InstrRef/x86-lea-fixup.mir
    llvm/test/DebugInfo/MIR/X86/backup-entry-values-usage.mir
    llvm/test/DebugInfo/MIR/X86/bit-piece-dh.mir
    llvm/test/DebugInfo/MIR/X86/call-site-gnu-vs-dwarf5-attrs.mir
    llvm/test/DebugInfo/MIR/X86/clobbered-fragments.mir
    llvm/test/DebugInfo/MIR/X86/complex-entryvalue.mir
    llvm/test/DebugInfo/MIR/X86/dbg-call-site-spilled-arg-multiple-defs.mir
    llvm/test/DebugInfo/MIR/X86/dbg-call-site-spilled-arg.mir
    llvm/test/DebugInfo/MIR/X86/dbg-stack-value-range.mir
    llvm/test/DebugInfo/MIR/X86/dbgcall-site-copy-super-sub.mir
    llvm/test/DebugInfo/MIR/X86/dbgcall-site-interpretation.mir
    llvm/test/DebugInfo/MIR/X86/dbgcall-site-lea-interpretation.mir
    llvm/test/DebugInfo/MIR/X86/dbgcall-site-partial-describe.mir
    llvm/test/DebugInfo/MIR/X86/dbgcall-site-reference.mir
    llvm/test/DebugInfo/MIR/X86/dbgcall-site-reg-shuffle.mir
    llvm/test/DebugInfo/MIR/X86/dbgcall-site-two-fwd-reg-defs.mir
    llvm/test/DebugInfo/MIR/X86/debug-call-site-param.mir
    llvm/test/DebugInfo/MIR/X86/debug-entry-value-operation.mir
    llvm/test/DebugInfo/MIR/X86/dvl-livedebugvalues-clobber.mir
    llvm/test/DebugInfo/MIR/X86/dvl-livedebugvalues-join.mir
    llvm/test/DebugInfo/MIR/X86/dvl-livedebugvalues-movements.mir
    llvm/test/DebugInfo/MIR/X86/dvl-livedebugvalues-spillrestore.mir
    llvm/test/DebugInfo/MIR/X86/dvl-livedebugvars-movements.mir
    llvm/test/DebugInfo/MIR/X86/dvl-livedebugvars-stackptr.mir
    llvm/test/DebugInfo/MIR/X86/empty-inline.mir
    llvm/test/DebugInfo/MIR/X86/entry-value-of-modified-param.mir
    llvm/test/DebugInfo/MIR/X86/entry-values-diamond-bbs.mir
    llvm/test/DebugInfo/MIR/X86/kill-after-spill.mir
    llvm/test/DebugInfo/MIR/X86/kill-entry-value-after-diamond-bbs.mir
    llvm/test/DebugInfo/MIR/X86/live-debug-values-3preds.mir
    llvm/test/DebugInfo/MIR/X86/live-debug-values-bad-transfer.mir
    llvm/test/DebugInfo/MIR/X86/live-debug-values-cutoffs.mir
    llvm/test/DebugInfo/MIR/X86/live-debug-values-entry-transfer.mir
    llvm/test/DebugInfo/MIR/X86/live-debug-values-fragments.mir
    llvm/test/DebugInfo/MIR/X86/live-debug-values-restore-collide.mir
    llvm/test/DebugInfo/MIR/X86/live-debug-values-restore.mir
    llvm/test/DebugInfo/MIR/X86/live-debug-values-spill.mir
    llvm/test/DebugInfo/MIR/X86/live-debug-values-stack-clobber.mir
    llvm/test/DebugInfo/MIR/X86/live-debug-values.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues-ignores-metaInstructions.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond_match_clobber.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond_match_move.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond_one_clobber.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond_one_move.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_loop.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_bb_to_bb.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_bb_to_bb_clobbered.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_bb_to_bb_move_to_clobber.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_load_in_loop.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_break.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_break_clobbered.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_clobbered.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_diamond.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_diamond_clobber.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_diamond_move.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_early_clobber.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_terminated.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_two_backedge.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_two_backedge_clobbered.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_within_loop.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_within_loop_clobbered.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_within_loop_moved.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_within_loop_outer_moved.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvalues_many_loop_heads.mir
    llvm/test/DebugInfo/MIR/X86/livedebugvars-crossbb-interval.mir
    llvm/test/DebugInfo/MIR/X86/multiple-param-dbg-value-entry.mir
    llvm/test/DebugInfo/MIR/X86/piece-entryval.mir
    llvm/test/DebugInfo/MIR/X86/propagate-entry-value-cross-bbs.mir
    llvm/test/DebugInfo/MIR/X86/remove-entry-value-from-loop.mir
    llvm/test/DebugInfo/MIR/X86/remove-redundant-dbg-vals.mir
    llvm/test/DebugInfo/MIR/X86/unreachable-block-call-site.mir
    llvm/test/DebugInfo/X86/bbjoin.ll
    llvm/test/DebugInfo/X86/dbg_entity_calc_ignores_KILL_instruction_at_return.mir
    llvm/test/DebugInfo/X86/dbg_entity_calc_ignores_KILL_instruction_still_clobbers.mir
    llvm/test/DebugInfo/X86/dbg_value_list_clobbers.mir
    llvm/test/DebugInfo/X86/dbg_value_list_emission.mir
    llvm/test/DebugInfo/X86/debug-loc-asan.mir
    llvm/test/DebugInfo/X86/debug-loc-offset.mir
    llvm/test/DebugInfo/X86/dw_op_constu.mir
    llvm/test/DebugInfo/X86/dw_op_minus.mir
    llvm/test/DebugInfo/X86/live-debug-values-constprop.mir
    llvm/test/DebugInfo/X86/location-range-inlined-xblock.mir
    llvm/test/DebugInfo/X86/location-range.mir
    llvm/test/DebugInfo/X86/pr19307.mir
    llvm/test/DebugInfo/X86/pr34545.ll
    llvm/test/DebugInfo/X86/single-location-2.mir
    llvm/test/DebugInfo/X86/single-location-inlined-param.mir
    llvm/test/DebugInfo/X86/single-location-interrupted-scope.mir
    llvm/test/DebugInfo/X86/trim-var-locs.mir
    llvm/test/Transforms/SampleProfile/pseudo-probe.mir
    llvm/unittests/CodeGen/InstrRefLDVTest.cpp
    llvm/unittests/tools/llvm-exegesis/X86/SnippetRepetitorTest.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp b/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
index 88b993fb827c8..f4a553365b02f 100644
--- a/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
+++ b/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
@@ -4095,12 +4095,12 @@ void X86AsmParser::applyLVICFIMitigation(MCInst &Inst, MCStreamer &Out) {
   // be found here:
   // https://software.intel.com/security-software-guidance/insights/deep-dive-load-value-injection#specialinstructions
   switch (Inst.getOpcode()) {
-  case X86::RETW:
-  case X86::RETL:
-  case X86::RETQ:
-  case X86::RETIL:
-  case X86::RETIQ:
-  case X86::RETIW: {
+  case X86::RET16:
+  case X86::RET32:
+  case X86::RET64:
+  case X86::RETI16:
+  case X86::RETI32:
+  case X86::RETI64: {
     MCInst ShlInst, FenceInst;
     bool Parse32 = is32BitMode() || Code16GCC;
     unsigned Basereg =

diff  --git a/llvm/lib/Target/X86/X86ExpandPseudo.cpp b/llvm/lib/Target/X86/X86ExpandPseudo.cpp
index 7382cd07be820..01dc509df7956 100644
--- a/llvm/lib/Target/X86/X86ExpandPseudo.cpp
+++ b/llvm/lib/Target/X86/X86ExpandPseudo.cpp
@@ -394,10 +394,10 @@ bool X86ExpandPseudo::ExpandMI(MachineBasicBlock &MBB,
     MachineInstrBuilder MIB;
     if (StackAdj == 0) {
       MIB = BuildMI(MBB, MBBI, DL,
-                    TII->get(STI->is64Bit() ? X86::RETQ : X86::RETL));
+                    TII->get(STI->is64Bit() ? X86::RET64 : X86::RET32));
     } else if (isUInt<16>(StackAdj)) {
       MIB = BuildMI(MBB, MBBI, DL,
-                    TII->get(STI->is64Bit() ? X86::RETIQ : X86::RETIL))
+                    TII->get(STI->is64Bit() ? X86::RETI64 : X86::RETI32))
                 .addImm(StackAdj);
     } else {
       assert(!STI->is64Bit() &&
@@ -407,7 +407,7 @@ bool X86ExpandPseudo::ExpandMI(MachineBasicBlock &MBB,
       BuildMI(MBB, MBBI, DL, TII->get(X86::POP32r)).addReg(X86::ECX, RegState::Define);
       X86FL->emitSPUpdate(MBB, MBBI, DL, StackAdj, /*InEpilogue=*/true);
       BuildMI(MBB, MBBI, DL, TII->get(X86::PUSH32r)).addReg(X86::ECX);
-      MIB = BuildMI(MBB, MBBI, DL, TII->get(X86::RETL));
+      MIB = BuildMI(MBB, MBBI, DL, TII->get(X86::RET32));
     }
     for (unsigned I = 1, E = MBBI->getNumOperands(); I != E; ++I)
       MIB.add(MBBI->getOperand(I));

diff  --git a/llvm/lib/Target/X86/X86FastISel.cpp b/llvm/lib/Target/X86/X86FastISel.cpp
index d5e7e2f10820d..d87e9782699b5 100644
--- a/llvm/lib/Target/X86/X86FastISel.cpp
+++ b/llvm/lib/Target/X86/X86FastISel.cpp
@@ -1304,11 +1304,11 @@ bool X86FastISel::X86SelectRet(const Instruction *I) {
   MachineInstrBuilder MIB;
   if (X86MFInfo->getBytesToPopOnReturn()) {
     MIB = BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DbgLoc,
-                  TII.get(Subtarget->is64Bit() ? X86::RETIQ : X86::RETIL))
+                  TII.get(Subtarget->is64Bit() ? X86::RETI64 : X86::RETI32))
               .addImm(X86MFInfo->getBytesToPopOnReturn());
   } else {
     MIB = BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DbgLoc,
-                  TII.get(Subtarget->is64Bit() ? X86::RETQ : X86::RETL));
+                  TII.get(Subtarget->is64Bit() ? X86::RET64 : X86::RET32));
   }
   for (unsigned i = 0, e = RetRegs.size(); i != e; ++i)
     MIB.addReg(RetRegs[i], RegState::Implicit);

diff  --git a/llvm/lib/Target/X86/X86IndirectThunks.cpp b/llvm/lib/Target/X86/X86IndirectThunks.cpp
index 3d96d198b4096..e08b4b7c03c65 100644
--- a/llvm/lib/Target/X86/X86IndirectThunks.cpp
+++ b/llvm/lib/Target/X86/X86IndirectThunks.cpp
@@ -212,7 +212,7 @@ void RetpolineThunkInserter::populateThunk(MachineFunction &MF) {
   MF.push_back(CallTarget);
 
   const unsigned CallOpc = Is64Bit ? X86::CALL64pcrel32 : X86::CALLpcrel32;
-  const unsigned RetOpc = Is64Bit ? X86::RETQ : X86::RETL;
+  const unsigned RetOpc = Is64Bit ? X86::RET64 : X86::RET32;
 
   Entry->addLiveIn(ThunkReg);
   BuildMI(Entry, DebugLoc(), TII->get(CallOpc)).addSym(TargetSym);

diff  --git a/llvm/lib/Target/X86/X86InstrControl.td b/llvm/lib/Target/X86/X86InstrControl.td
index 680389662aa87..6d969962afffa 100644
--- a/llvm/lib/Target/X86/X86InstrControl.td
+++ b/llvm/lib/Target/X86/X86InstrControl.td
@@ -20,30 +20,30 @@
 // ST1 arguments when returning values on the x87 stack.
 let isTerminator = 1, isReturn = 1, isBarrier = 1,
     hasCtrlDep = 1, FPForm = SpecialFP, SchedRW = [WriteJumpLd] in {
-  def RETL   : I   <0xC3, RawFrm, (outs), (ins variable_ops),
+  def RET32  : I   <0xC3, RawFrm, (outs), (ins variable_ops),
                     "ret{l}", []>, OpSize32, Requires<[Not64BitMode]>;
-  def RETQ   : I   <0xC3, RawFrm, (outs), (ins variable_ops),
+  def RET64  : I   <0xC3, RawFrm, (outs), (ins variable_ops),
                     "ret{q}", []>, OpSize32, Requires<[In64BitMode]>;
-  def RETW   : I   <0xC3, RawFrm, (outs), (ins),
+  def RET16  : I   <0xC3, RawFrm, (outs), (ins),
                     "ret{w}", []>, OpSize16;
-  def RETIL  : Ii16<0xC2, RawFrm, (outs), (ins i16imm:$amt, variable_ops),
+  def RETI32 : Ii16<0xC2, RawFrm, (outs), (ins i16imm:$amt, variable_ops),
                     "ret{l}\t$amt", []>, OpSize32, Requires<[Not64BitMode]>;
-  def RETIQ  : Ii16<0xC2, RawFrm, (outs), (ins i16imm:$amt, variable_ops),
+  def RETI64 : Ii16<0xC2, RawFrm, (outs), (ins i16imm:$amt, variable_ops),
                     "ret{q}\t$amt", []>, OpSize32, Requires<[In64BitMode]>;
-  def RETIW  : Ii16<0xC2, RawFrm, (outs), (ins i16imm:$amt),
+  def RETI16 : Ii16<0xC2, RawFrm, (outs), (ins i16imm:$amt),
                     "ret{w}\t$amt", []>, OpSize16;
-  def LRETL  : I   <0xCB, RawFrm, (outs), (ins),
+  def LRET32 : I   <0xCB, RawFrm, (outs), (ins),
                     "{l}ret{l|f}", []>, OpSize32;
-  def LRETQ  : RI  <0xCB, RawFrm, (outs), (ins),
+  def LRET64 : RI  <0xCB, RawFrm, (outs), (ins),
                     "{l}ret{|f}q", []>, Requires<[In64BitMode]>;
-  def LRETW  : I   <0xCB, RawFrm, (outs), (ins),
+  def LRET16 : I   <0xCB, RawFrm, (outs), (ins),
                     "{l}ret{w|f}", []>, OpSize16;
-  def LRETIL : Ii16<0xCA, RawFrm, (outs), (ins i16imm:$amt),
-                    "{l}ret{l|f}\t$amt", []>, OpSize32;
-  def LRETIQ : RIi16<0xCA, RawFrm, (outs), (ins i16imm:$amt),
-                    "{l}ret{|f}q\t$amt", []>, Requires<[In64BitMode]>;
-  def LRETIW : Ii16<0xCA, RawFrm, (outs), (ins i16imm:$amt),
-                    "{l}ret{w|f}\t$amt", []>, OpSize16;
+  def LRETI32 : Ii16<0xCA, RawFrm, (outs), (ins i16imm:$amt),
+                     "{l}ret{l|f}\t$amt", []>, OpSize32;
+  def LRETI64 : RIi16<0xCA, RawFrm, (outs), (ins i16imm:$amt),
+                      "{l}ret{|f}q\t$amt", []>, Requires<[In64BitMode]>;
+  def LRETI16 : Ii16<0xCA, RawFrm, (outs), (ins i16imm:$amt),
+                     "{l}ret{w|f}\t$amt", []>, OpSize16;
 
   // The machine return from interrupt instruction, but sometimes we need to
   // perform a post-epilogue stack adjustment. Codegen emits the pseudo form

diff  --git a/llvm/lib/Target/X86/X86InstrInfo.cpp b/llvm/lib/Target/X86/X86InstrInfo.cpp
index 33d45310af7db..e6fa8f03ffd76 100644
--- a/llvm/lib/Target/X86/X86InstrInfo.cpp
+++ b/llvm/lib/Target/X86/X86InstrInfo.cpp
@@ -82,7 +82,7 @@ X86InstrInfo::X86InstrInfo(X86Subtarget &STI)
                       (STI.isTarget64BitLP64() ? X86::ADJCALLSTACKUP64
                                                : X86::ADJCALLSTACKUP32),
                       X86::CATCHRET,
-                      (STI.is64Bit() ? X86::RETQ : X86::RETL)),
+                      (STI.is64Bit() ? X86::RET64 : X86::RET32)),
       Subtarget(STI), RI(STI.getTargetTriple()) {
 }
 
@@ -9363,7 +9363,7 @@ void X86InstrInfo::buildOutlinedFrame(MachineBasicBlock &MBB,
 
   // We're a normal call, so our sequence doesn't have a return instruction.
   // Add it in.
-  MachineInstr *retq = BuildMI(MF, DebugLoc(), get(X86::RETQ));
+  MachineInstr *retq = BuildMI(MF, DebugLoc(), get(X86::RET64));
   MBB.insert(MBB.end(), retq);
 }
 

diff  --git a/llvm/lib/Target/X86/X86LoadValueInjectionRetHardening.cpp b/llvm/lib/Target/X86/X86LoadValueInjectionRetHardening.cpp
index 7b6276c1d87e0..e562748c98fe8 100644
--- a/llvm/lib/Target/X86/X86LoadValueInjectionRetHardening.cpp
+++ b/llvm/lib/Target/X86/X86LoadValueInjectionRetHardening.cpp
@@ -76,7 +76,7 @@ bool X86LoadValueInjectionRetHardeningPass::runOnMachineFunction(
   bool Modified = false;
   for (auto &MBB : MF) {
     for (auto MBBI = MBB.begin(); MBBI != MBB.end(); ++MBBI) {
-      if (MBBI->getOpcode() != X86::RETQ)
+      if (MBBI->getOpcode() != X86::RET64)
         continue;
 
       unsigned ClobberReg = TRI->findDeadCallerSavedReg(MBB, MBBI);

diff  --git a/llvm/lib/Target/X86/X86MCInstLower.cpp b/llvm/lib/Target/X86/X86MCInstLower.cpp
index 9e1812a9c8b46..882f7af224a1d 100644
--- a/llvm/lib/Target/X86/X86MCInstLower.cpp
+++ b/llvm/lib/Target/X86/X86MCInstLower.cpp
@@ -421,7 +421,7 @@ static void SimplifyShortMoveForm(X86AsmPrinter &Printer, MCInst &Inst,
 }
 
 static unsigned getRetOpcode(const X86Subtarget &Subtarget) {
-  return Subtarget.is64Bit() ? X86::RETQ : X86::RETL;
+  return Subtarget.is64Bit() ? X86::RET64 : X86::RET32;
 }
 
 Optional<MCOperand>

diff  --git a/llvm/lib/Target/X86/X86RegisterInfo.cpp b/llvm/lib/Target/X86/X86RegisterInfo.cpp
index c4748423baeaf..130cb61cdde24 100644
--- a/llvm/lib/Target/X86/X86RegisterInfo.cpp
+++ b/llvm/lib/Target/X86/X86RegisterInfo.cpp
@@ -816,10 +816,10 @@ unsigned X86RegisterInfo::findDeadCallerSavedReg(
     return 0;
   case TargetOpcode::PATCHABLE_RET:
   case X86::RET:
-  case X86::RETL:
-  case X86::RETQ:
-  case X86::RETIL:
-  case X86::RETIQ:
+  case X86::RET32:
+  case X86::RET64:
+  case X86::RETI32:
+  case X86::RETI64:
   case X86::TCRETURNdi:
   case X86::TCRETURNri:
   case X86::TCRETURNmi:

diff  --git a/llvm/lib/Target/X86/X86SchedBroadwell.td b/llvm/lib/Target/X86/X86SchedBroadwell.td
index 8dcef8900be2f..2827981b7fb0a 100644
--- a/llvm/lib/Target/X86/X86SchedBroadwell.td
+++ b/llvm/lib/Target/X86/X86SchedBroadwell.td
@@ -1110,7 +1110,7 @@ def BWWriteResGroup84 : SchedWriteRes<[BWPort6,BWPort23,BWPort0156]> {
   let NumMicroOps = 3;
   let ResourceCycles = [1,1,1];
 }
-def: InstRW<[BWWriteResGroup84], (instrs LRETQ, RETQ)>;
+def: InstRW<[BWWriteResGroup84], (instrs LRET64, RET64)>;
 
 def BWWriteResGroup87 : SchedWriteRes<[BWPort4,BWPort23,BWPort237,BWPort06]> {
   let Latency = 7;

diff  --git a/llvm/lib/Target/X86/X86SchedHaswell.td b/llvm/lib/Target/X86/X86SchedHaswell.td
index 4feb8a866ffd1..68961d6245abd 100644
--- a/llvm/lib/Target/X86/X86SchedHaswell.td
+++ b/llvm/lib/Target/X86/X86SchedHaswell.td
@@ -710,7 +710,7 @@ def HWWriteRETI : SchedWriteRes<[HWPort23, HWPort6, HWPort015]> {
   let NumMicroOps = 4;
   let ResourceCycles = [1, 2, 1];
 }
-def : InstRW<[HWWriteRETI], (instregex "RETI(L|Q|W)", "LRETI(L|Q|W)")>;
+def : InstRW<[HWWriteRETI], (instregex "RETI(16|32|64)", "LRETI(16|32|64)")>;
 
 // BOUND.
 // r,m.
@@ -1188,7 +1188,7 @@ def HWWriteResGroup41 : SchedWriteRes<[HWPort6,HWPort23,HWPort0156]> {
   let NumMicroOps = 3;
   let ResourceCycles = [1,1,1];
 }
-def: InstRW<[HWWriteResGroup41], (instrs LRETQ, RETL, RETQ)>;
+def: InstRW<[HWWriteResGroup41], (instrs LRET64, RET32, RET64)>;
 
 def HWWriteResGroup44 : SchedWriteRes<[HWPort4,HWPort6,HWPort237,HWPort0156]> {
   let Latency = 3;

diff  --git a/llvm/lib/Target/X86/X86SchedIceLake.td b/llvm/lib/Target/X86/X86SchedIceLake.td
index 5561ccf0361f3..889b9b7fa6666 100644
--- a/llvm/lib/Target/X86/X86SchedIceLake.td
+++ b/llvm/lib/Target/X86/X86SchedIceLake.td
@@ -1444,7 +1444,7 @@ def ICXWriteResGroup104 : SchedWriteRes<[ICXPort6,ICXPort23,ICXPort0156]> {
   let NumMicroOps = 3;
   let ResourceCycles = [1,1,1];
 }
-def: InstRW<[ICXWriteResGroup104], (instrs LRETQ, RETQ)>;
+def: InstRW<[ICXWriteResGroup104], (instrs LRET64, RET64)>;
 
 def ICXWriteResGroup106 : SchedWriteRes<[ICXPort4,ICXPort5,ICXPort237]> {
   let Latency = 7;

diff  --git a/llvm/lib/Target/X86/X86SchedSandyBridge.td b/llvm/lib/Target/X86/X86SchedSandyBridge.td
index 1a55f7cda70d0..c8d7b0f72c1c9 100644
--- a/llvm/lib/Target/X86/X86SchedSandyBridge.td
+++ b/llvm/lib/Target/X86/X86SchedSandyBridge.td
@@ -606,7 +606,7 @@ def SBWriteResGroup2 : SchedWriteRes<[SBPort5]> {
 def: InstRW<[SBWriteResGroup2], (instrs FDECSTP, FINCSTP, FFREE, FFREEP, FNOP,
                                         LD_Frr, ST_Frr, ST_FPrr)>;
 def: InstRW<[SBWriteResGroup2], (instrs LOOP, LOOPE, LOOPNE)>; // FIXME: This seems wrong compared to other Intel CPUs.
-def: InstRW<[SBWriteResGroup2], (instrs RETQ)>;
+def: InstRW<[SBWriteResGroup2], (instrs RET64)>;
 
 def SBWriteResGroup4 : SchedWriteRes<[SBPort05]> {
   let Latency = 1;

diff  --git a/llvm/lib/Target/X86/X86SchedSkylakeClient.td b/llvm/lib/Target/X86/X86SchedSkylakeClient.td
index ba0f4a7088d9d..7d3229c3b023b 100644
--- a/llvm/lib/Target/X86/X86SchedSkylakeClient.td
+++ b/llvm/lib/Target/X86/X86SchedSkylakeClient.td
@@ -1175,7 +1175,7 @@ def SKLWriteResGroup98 : SchedWriteRes<[SKLPort6,SKLPort23,SKLPort0156]> {
   let NumMicroOps = 3;
   let ResourceCycles = [1,1,1];
 }
-def: InstRW<[SKLWriteResGroup98], (instrs LRETQ, RETQ)>;
+def: InstRW<[SKLWriteResGroup98], (instrs LRET64, RET64)>;
 
 def SKLWriteResGroup100 : SchedWriteRes<[SKLPort4,SKLPort23,SKLPort237,SKLPort06]> {
   let Latency = 7;

diff  --git a/llvm/lib/Target/X86/X86SchedSkylakeServer.td b/llvm/lib/Target/X86/X86SchedSkylakeServer.td
index 0287e00c4bfa2..1d8417aef41e3 100644
--- a/llvm/lib/Target/X86/X86SchedSkylakeServer.td
+++ b/llvm/lib/Target/X86/X86SchedSkylakeServer.td
@@ -1436,7 +1436,7 @@ def SKXWriteResGroup104 : SchedWriteRes<[SKXPort6,SKXPort23,SKXPort0156]> {
   let NumMicroOps = 3;
   let ResourceCycles = [1,1,1];
 }
-def: InstRW<[SKXWriteResGroup104], (instrs LRETQ, RETQ)>;
+def: InstRW<[SKXWriteResGroup104], (instrs LRET64, RET64)>;
 
 def SKXWriteResGroup106 : SchedWriteRes<[SKXPort4,SKXPort5,SKXPort237]> {
   let Latency = 7;

diff  --git a/llvm/lib/Target/X86/X86ScheduleAtom.td b/llvm/lib/Target/X86/X86ScheduleAtom.td
index 97dcef4ed380e..6fd98280f560c 100644
--- a/llvm/lib/Target/X86/X86ScheduleAtom.td
+++ b/llvm/lib/Target/X86/X86ScheduleAtom.td
@@ -540,7 +540,7 @@ def : InstRW<[AtomWrite0_1_1], (instrs POP32r, POP64r,
                                        PUSH16rmr, PUSH32rmr, PUSH64rmr,
                                        PUSH16i8, PUSH32i8, PUSH64i8, PUSH64i32,
                                        XCH_F)>;
-def : InstRW<[AtomWrite0_1_1], (instregex "RETI(L|Q|W)$",
+def : InstRW<[AtomWrite0_1_1], (instregex "RETI(16|32|64)$",
                                           "IRET(16|32|64)?")>;
 
 def AtomWrite0_1_5 : SchedWriteRes<[AtomPort0, AtomPort1]> {
@@ -819,8 +819,8 @@ def AtomWrite01_79 : SchedWriteRes<[AtomPort01]> {
   let Latency = 79;
   let ResourceCycles = [79];
 }
-def : InstRW<[AtomWrite01_79], (instregex "RET(L|Q|W)?$",
-                                          "LRETI?(L|Q|W)")>;
+def : InstRW<[AtomWrite01_79], (instregex "RET(16|32|64)?$",
+                                          "LRETI?(16|32|64)")>;
 
 def AtomWrite01_92 : SchedWriteRes<[AtomPort01]> {
   let Latency = 92;

diff  --git a/llvm/lib/Target/X86/X86ScheduleZnver1.td b/llvm/lib/Target/X86/X86ScheduleZnver1.td
index 1fb015c7fc538..8e30e5e10ca80 100644
--- a/llvm/lib/Target/X86/X86ScheduleZnver1.td
+++ b/llvm/lib/Target/X86/X86ScheduleZnver1.td
@@ -697,7 +697,7 @@ def : InstRW<[WriteMicrocoded], (instregex "CALL(16|32)m")>;
 def ZnWriteRET : SchedWriteRes<[ZnALU03]> {
   let NumMicroOps = 2;
 }
-def : InstRW<[ZnWriteRET], (instregex "RET(L|Q|W)", "LRET(L|Q|W)",
+def : InstRW<[ZnWriteRET], (instregex "RET(16|32|64)", "LRET(16|32|64)",
                             "IRET(16|32|64)")>;
 
 //-- Logic instructions --//

diff  --git a/llvm/lib/Target/X86/X86ScheduleZnver2.td b/llvm/lib/Target/X86/X86ScheduleZnver2.td
index 44d873f763b05..a83c89e2f28a0 100644
--- a/llvm/lib/Target/X86/X86ScheduleZnver2.td
+++ b/llvm/lib/Target/X86/X86ScheduleZnver2.td
@@ -697,7 +697,7 @@ def : InstRW<[WriteMicrocoded], (instregex "CALL(16|32)m")>;
 def Zn2WriteRET : SchedWriteRes<[Zn2ALU03]> {
   let NumMicroOps = 2;
 }
-def : InstRW<[Zn2WriteRET], (instregex "RET(L|Q|W)", "LRET(L|Q|W)",
+def : InstRW<[Zn2WriteRET], (instregex "RET(16|32|64)", "LRET(16|32|64)",
                             "IRET(16|32|64)")>;
 
 //-- Logic instructions --//

diff  --git a/llvm/test/CodeGen/Generic/MIRDebugify/check-line-and-variables.mir b/llvm/test/CodeGen/Generic/MIRDebugify/check-line-and-variables.mir
index 3c412a19fecc7..d1fb9cd409fea 100644
--- a/llvm/test/CodeGen/Generic/MIRDebugify/check-line-and-variables.mir
+++ b/llvm/test/CodeGen/Generic/MIRDebugify/check-line-and-variables.mir
@@ -62,7 +62,7 @@ body:             |
     MOV32mr $noreg, 1, $noreg, @ga, $noreg, killed %8 :: (store (s32) into @ga)
     %5:gr32 = MOV32rm %stack.2.c, 1, $noreg, 0, $noreg :: (load (s32) from %ir.c)
     $eax = COPY %5
-    RETQ implicit $eax
+    RET64 implicit $eax
 
     ;CHECK:      WARNING: Missing line 9
     ;CHECK-NEXT: Machine IR debug info check: FAIL

diff  --git a/llvm/test/CodeGen/MIR/X86/auto-successor.mir b/llvm/test/CodeGen/MIR/X86/auto-successor.mir
index 22128b3724dfb..ef9ed5c7c231c 100644
--- a/llvm/test/CodeGen/MIR/X86/auto-successor.mir
+++ b/llvm/test/CodeGen/MIR/X86/auto-successor.mir
@@ -12,7 +12,7 @@
 # CHECK-NOT: successors
 # CHECK: JCC_1 %bb.1, 4, implicit undef $eflags
 # CHECK: bb.3:
-# CHECK: RETQ undef $eax
+# CHECK: RET64 undef $eax
 name: func0
 body: |
   bb.0:
@@ -28,7 +28,7 @@ body: |
     JCC_1 %bb.4, 4, implicit undef $eflags   ; condjump+fallthrough to same block
 
   bb.4:
-    RETQ undef $eax
+    RET64 undef $eax
 ...
 ---
 # Some cases that need explicit successors:
@@ -56,6 +56,6 @@ body: |
 
   bb.3:
     ; CHECK: bb.3:
-    ; CHECK: RETQ undef $eax
-    RETQ undef $eax
+    ; CHECK: RET64 undef $eax
+    RET64 undef $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/basic-block-liveins.mir b/llvm/test/CodeGen/MIR/X86/basic-block-liveins.mir
index 7212dceb744fe..40bd1a86990be 100644
--- a/llvm/test/CodeGen/MIR/X86/basic-block-liveins.mir
+++ b/llvm/test/CodeGen/MIR/X86/basic-block-liveins.mir
@@ -31,7 +31,7 @@ body: |
     liveins: $edi, $esi
 
     $eax = LEA64_32r killed $rdi, 1, killed $rsi, 0, _
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 name: test2
@@ -47,7 +47,7 @@ body: |
     liveins: $esi
 
     $eax = LEA64_32r killed $rdi, 1, killed $rsi, 0, _
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 name: test3
@@ -61,5 +61,5 @@ body: |
     liveins:
 
     $eax = MOV32r0 implicit-def dead $eflags
-    RETQ killed $eax
+    RET64 killed $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/basic-block-not-at-start-of-line-error.mir b/llvm/test/CodeGen/MIR/X86/basic-block-not-at-start-of-line-error.mir
index ee10a174fba56..9358c7c19c418 100644
--- a/llvm/test/CodeGen/MIR/X86/basic-block-not-at-start-of-line-error.mir
+++ b/llvm/test/CodeGen/MIR/X86/basic-block-not-at-start-of-line-error.mir
@@ -31,11 +31,11 @@ body: |
   ; CHECK: [[@LINE+1]]:8: basic block definition should be located at the start of the line
   less bb.1:
     $eax = MOV32r0 implicit-def dead $eflags
-    RETQ killed $eax
+    RET64 killed $eax
 
   bb.2.exit:
     liveins: $edi
 
     $eax = COPY killed $edi
-    RETQ killed $eax
+    RET64 killed $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/block-address-operands.mir b/llvm/test/CodeGen/MIR/X86/block-address-operands.mir
index 4d72fe84c0b24..397cea0bdd447 100644
--- a/llvm/test/CodeGen/MIR/X86/block-address-operands.mir
+++ b/llvm/test/CodeGen/MIR/X86/block-address-operands.mir
@@ -63,7 +63,7 @@ body: |
     JMP64m $rip, 1, _, @addr, _
 
   bb.1.block (address-taken):
-    RETQ
+    RET64
 ...
 ---
 name:            test2
@@ -77,7 +77,7 @@ body: |
     JMP64m $rip, 1, _, @addr, _
 
   bb.1 (address-taken):
-    RETQ
+    RET64
 ...
 ---
 name:            slot_in_other_function
@@ -89,7 +89,7 @@ body: |
   ; CHECK: $rax = LEA64r $rip, 1, $noreg, blockaddress(@test3, %ir-block.0), $noreg
     $rax = LEA64r $rip, 1, _, blockaddress(@test3, %ir-block.0), _
     MOV64mr killed $rdi, 1, _, 0, _, killed $rax
-    RETQ
+    RET64
 ...
 ---
 name:            test3
@@ -104,7 +104,7 @@ body: |
     JMP64m $rip, 1, _, @addr, _
 
   bb.1 (address-taken):
-    RETQ
+    RET64
 ...
 ---
 name:            test4
@@ -117,5 +117,5 @@ body: |
     JMP64m $rip, 1, _, @addr, _
 
   bb.1.block (address-taken):
-    RETQ
+    RET64
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/branch-probabilities.mir b/llvm/test/CodeGen/MIR/X86/branch-probabilities.mir
index 40e463850ef2b..6732b5c509588 100644
--- a/llvm/test/CodeGen/MIR/X86/branch-probabilities.mir
+++ b/llvm/test/CodeGen/MIR/X86/branch-probabilities.mir
@@ -14,5 +14,5 @@ body: |
     NOOP
 
   bb.2:
-    RETQ undef $eax
+    RET64 undef $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/callee-saved-info.mir b/llvm/test/CodeGen/MIR/X86/callee-saved-info.mir
index a6b2ea1c9e723..606abdd156578 100644
--- a/llvm/test/CodeGen/MIR/X86/callee-saved-info.mir
+++ b/llvm/test/CodeGen/MIR/X86/callee-saved-info.mir
@@ -39,7 +39,7 @@ body: |
     liveins: $edi
 
     $eax = COPY killed $edi
-    RETQ killed $eax
+    RET64 killed $eax
 ...
 ---
 name:            func
@@ -92,5 +92,5 @@ body: |
     $eax = MOV32r0 implicit-def dead $eflags
     $rsp = ADD64ri8 $rsp, 16, implicit-def dead $eflags
     $rbx = POP64r implicit-def $rsp, implicit $rsp
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/cfi-def-cfa-offset.mir b/llvm/test/CodeGen/MIR/X86/cfi-def-cfa-offset.mir
index e6a36bb3dd58a..2ef5eb3ecc371 100644
--- a/llvm/test/CodeGen/MIR/X86/cfi-def-cfa-offset.mir
+++ b/llvm/test/CodeGen/MIR/X86/cfi-def-cfa-offset.mir
@@ -24,6 +24,6 @@ body: |
     ; CHECK: CFI_INSTRUCTION def_cfa_offset 4048
     CFI_INSTRUCTION def_cfa_offset 4048
     $rsp = ADD64ri32 $rsp, 4040, implicit-def dead $eflags
-    RETQ
+    RET64
 ...
 

diff  --git a/llvm/test/CodeGen/MIR/X86/cfi-offset.mir b/llvm/test/CodeGen/MIR/X86/cfi-offset.mir
index b8d9e3150810f..1e1a8ad2011bd 100644
--- a/llvm/test/CodeGen/MIR/X86/cfi-offset.mir
+++ b/llvm/test/CodeGen/MIR/X86/cfi-offset.mir
@@ -42,6 +42,6 @@ body: |
     CALL64pcrel32 @foo, csr_64, implicit $rsp, implicit $edi, implicit-def $rsp
     $eax = LEA64_32r killed $rbx, 1, $rbx, 0, _
     $rbx = POP64r implicit-def $rsp, implicit $rsp
-    RETQ $eax
+    RET64 $eax
 ...
 

diff  --git a/llvm/test/CodeGen/MIR/X86/constant-pool-item-redefinition-error.mir b/llvm/test/CodeGen/MIR/X86/constant-pool-item-redefinition-error.mir
index 2f016a7599e36..acae12b07de31 100644
--- a/llvm/test/CodeGen/MIR/X86/constant-pool-item-redefinition-error.mir
+++ b/llvm/test/CodeGen/MIR/X86/constant-pool-item-redefinition-error.mir
@@ -20,6 +20,6 @@ constants:
 body: |
   bb.0.entry:
     %xmm0 = ADDSDrm killed %xmm0, %rip, 1, _, %const.0, _
-    RETQ %xmm0
+    RET64 %xmm0
 ...
 

diff  --git a/llvm/test/CodeGen/MIR/X86/constant-pool.mir b/llvm/test/CodeGen/MIR/X86/constant-pool.mir
index 85b2071632f7a..e367c2658cbaa 100644
--- a/llvm/test/CodeGen/MIR/X86/constant-pool.mir
+++ b/llvm/test/CodeGen/MIR/X86/constant-pool.mir
@@ -67,7 +67,7 @@ body: |
     $xmm1 = ADDSSrm killed $xmm1, $rip, 1, _, %const.1, _, implicit $mxcsr
     $xmm1 = CVTSS2SDrr killed $xmm1, implicit $mxcsr
     $xmm0 = MULSDrr killed $xmm0, killed $xmm1, implicit $mxcsr
-    RETQ $xmm0
+    RET64 $xmm0
 ...
 ---
 # Verify that alignment can be inferred:
@@ -93,7 +93,7 @@ body: |
     $xmm1 = ADDSSrm killed $xmm1, $rip, 1, _, %const.1, _, implicit $mxcsr
     $xmm1 = CVTSS2SDrr killed $xmm1, implicit $mxcsr
     $xmm0 = MULSDrr killed $xmm0, killed $xmm1, implicit $mxcsr
-    RETQ $xmm0
+    RET64 $xmm0
 ...
 ---
 # Verify that the non-standard alignments are respected:
@@ -123,7 +123,7 @@ body: |
     $xmm1 = ADDSSrm killed $xmm1, $rip, 1, _, %const.1, _, implicit $mxcsr
     $xmm1 = CVTSS2SDrr killed $xmm1, implicit $mxcsr
     $xmm0 = MULSDrr killed $xmm0, killed $xmm1, implicit $mxcsr
-    RETQ $xmm0
+    RET64 $xmm0
 ...
 ---
 # CHECK:  name:  test4
@@ -141,5 +141,5 @@ body: |
     $xmm1 = ADDSSrm killed $xmm1, $rip, 1, _, %const.0 + 8, _, implicit $mxcsr
     $xmm1 = CVTSS2SDrr killed $xmm1, implicit $mxcsr
     $xmm0 = MULSDrr killed $xmm0, killed $xmm1, implicit $mxcsr
-    RETQ $xmm0
+    RET64 $xmm0
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/constant-value-error.mir b/llvm/test/CodeGen/MIR/X86/constant-value-error.mir
index baf933a87105e..ca5b78984c81e 100644
--- a/llvm/test/CodeGen/MIR/X86/constant-value-error.mir
+++ b/llvm/test/CodeGen/MIR/X86/constant-value-error.mir
@@ -20,6 +20,6 @@ constants:
 body: |
   bb.0.entry:
     %xmm0 = ADDSDrm killed %xmm0, %rip, 1, _, %const.0, _
-    RETQ %xmm0
+    RET64 %xmm0
 ...
 

diff  --git a/llvm/test/CodeGen/MIR/X86/dbg-value-list.mir b/llvm/test/CodeGen/MIR/X86/dbg-value-list.mir
index 268a8d9e21e67..c419638be6697 100644
--- a/llvm/test/CodeGen/MIR/X86/dbg-value-list.mir
+++ b/llvm/test/CodeGen/MIR/X86/dbg-value-list.mir
@@ -58,7 +58,7 @@ body:             |
     DBG_VALUE $esi, $noreg, !13, !DIExpression(), debug-location !15
     DBG_VALUE $eax, $noreg, !12, !DIExpression(), debug-location !15
     renamable $eax = nsw IMUL32rr killed renamable $eax, killed renamable $esi, implicit-def dead $eflags, debug-location !16
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 
 ...
 

diff  --git a/llvm/test/CodeGen/MIR/X86/dead-register-flag.mir b/llvm/test/CodeGen/MIR/X86/dead-register-flag.mir
index 19920e9560199..e01fd8d2b0824 100644
--- a/llvm/test/CodeGen/MIR/X86/dead-register-flag.mir
+++ b/llvm/test/CodeGen/MIR/X86/dead-register-flag.mir
@@ -20,5 +20,5 @@ body: |
   bb.0.body:
     ; CHECK: $eax = IMUL32rri8 $edi, 11, implicit-def dead $eflags
     $eax = IMUL32rri8 $edi, 11, implicit-def dead $eflags
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/def-register-already-tied-error.mir b/llvm/test/CodeGen/MIR/X86/def-register-already-tied-error.mir
index 53fb4c6e59bc1..765d2e09ba823 100644
--- a/llvm/test/CodeGen/MIR/X86/def-register-already-tied-error.mir
+++ b/llvm/test/CodeGen/MIR/X86/def-register-already-tied-error.mir
@@ -20,5 +20,5 @@ body: |
   ; CHECK: [[@LINE+1]]:83: the tied-def operand #3 is already tied with another register operand
     INLINEASM &"$foo", 1, 2818058, def $rdi, 2147483657, killed $rdi(tied-def 3), killed $rdi(tied-def 3)
     $rax = COPY killed $rdi
-    RETQ killed $rax
+    RET64 killed $rax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/duplicate-memory-operand-flag.mir b/llvm/test/CodeGen/MIR/X86/duplicate-memory-operand-flag.mir
index 13229dc70db74..6f6d8377b8517 100644
--- a/llvm/test/CodeGen/MIR/X86/duplicate-memory-operand-flag.mir
+++ b/llvm/test/CodeGen/MIR/X86/duplicate-memory-operand-flag.mir
@@ -23,5 +23,5 @@ body: |
     $eax = MOV32rm $rdi, 1, _, 0, _ :: (volatile volatile load (s32) from %ir.x)
     $eax = INC32r killed $eax, implicit-def dead $eflags
     MOV32mr killed $rdi, 1, _, 0, _, $eax :: (volatile store (s32) into %ir.x)
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/duplicate-register-flag-error.mir b/llvm/test/CodeGen/MIR/X86/duplicate-register-flag-error.mir
index b43dd2689b290..b7d7221fb790f 100644
--- a/llvm/test/CodeGen/MIR/X86/duplicate-register-flag-error.mir
+++ b/llvm/test/CodeGen/MIR/X86/duplicate-register-flag-error.mir
@@ -27,9 +27,9 @@ body: |
 
   bb.1.less:
     $eax = MOV32r0 implicit-def $eflags
-    RETQ $eax
+    RET64 $eax
 
   bb.2.exit:
     $eax = COPY $edi
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/early-clobber-register-flag.mir b/llvm/test/CodeGen/MIR/X86/early-clobber-register-flag.mir
index 87ea82623ee9f..aff96f49c9aa2 100644
--- a/llvm/test/CodeGen/MIR/X86/early-clobber-register-flag.mir
+++ b/llvm/test/CodeGen/MIR/X86/early-clobber-register-flag.mir
@@ -40,5 +40,5 @@ body: |
     $edi = COPY killed $ecx
     CALL64pcrel32 @foo, csr_64, implicit $rsp, implicit $edi, implicit-def $rsp
     $rax = POP64r implicit-def $rsp, implicit $rsp
-    RETQ
+    RET64
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-align-in-memory-operand.mir b/llvm/test/CodeGen/MIR/X86/expected-align-in-memory-operand.mir
index 2cda984eba8c0..94c06fea3419b 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-align-in-memory-operand.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-align-in-memory-operand.mir
@@ -26,5 +26,5 @@ body: |
     $xmm1 = MOVSSrr killed $xmm1, killed $xmm2
     MOVAPSmr $rdi, 1, _, 0, _, killed $xmm0 :: (store (s128) into %ir.vec, align 32)
     MOVAPSmr killed $rdi, 1, _, 16, _, killed $xmm1 :: (store (s128) into %ir.vec + 16, basealign 32)
-    RETQ
+    RET64
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-alignment-after-align-in-memory-operand.mir b/llvm/test/CodeGen/MIR/X86/expected-alignment-after-align-in-memory-operand.mir
index db09b558fdbcf..bc7eb83cbc2d0 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-alignment-after-align-in-memory-operand.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-alignment-after-align-in-memory-operand.mir
@@ -26,5 +26,5 @@ body: |
     $xmm1 = MOVSSrr killed $xmm1, killed $xmm2
     MOVAPSmr $rdi, 1, _, 0, _, killed $xmm0 :: (store (s128) into %ir.vec, align 32)
     MOVAPSmr killed $rdi, 1, _, 16, _, killed $xmm1 :: (store (s128) into %ir.vec + 16, basealign 32)
-    RETQ
+    RET64
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-basic-block-at-start-of-body.mir b/llvm/test/CodeGen/MIR/X86/expected-basic-block-at-start-of-body.mir
index a712fb189664a..a4e19a4ec96b6 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-basic-block-at-start-of-body.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-basic-block-at-start-of-body.mir
@@ -30,11 +30,11 @@ body: |
 
   bb.1.less:
     $eax = MOV32r0 implicit-def dead $eflags
-    RETQ killed $eax
+    RET64 killed $eax
 
   bb.2.exit:
     liveins: $edi
 
     $eax = COPY killed $edi
-    RETQ killed $eax
+    RET64 killed $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-block-reference-in-blockaddress.mir b/llvm/test/CodeGen/MIR/X86/expected-block-reference-in-blockaddress.mir
index cad3d529df1ac..1d7f69df1a30a 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-block-reference-in-blockaddress.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-block-reference-in-blockaddress.mir
@@ -26,5 +26,5 @@ body: |
     JMP64m $rip, 1, _, @addr, _
 
   bb.1.block (address-taken):
-    RETQ
+    RET64
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-comma-after-cfi-register.mir b/llvm/test/CodeGen/MIR/X86/expected-comma-after-cfi-register.mir
index f861689b5e9f8..a0d9dcd84ee5b 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-comma-after-cfi-register.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-comma-after-cfi-register.mir
@@ -38,5 +38,5 @@ body: |
     CALL64pcrel32 @foo, csr_64, implicit $rsp, implicit $edi, implicit-def $rsp
     $eax = LEA64_32r killed $rbx, 1, $rbx, 0, _
     $rbx = POP64r implicit-def $rsp, implicit $rsp
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-comma-after-memory-operand.mir b/llvm/test/CodeGen/MIR/X86/expected-comma-after-memory-operand.mir
index 5a32c4f58faff..eba584e129eb3 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-comma-after-memory-operand.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-comma-after-memory-operand.mir
@@ -21,5 +21,5 @@ body: |
     liveins: $rdi
   ; CHECK: [[@LINE+1]]:91: expected ',' before the next machine memory operand
     INC32m killed $rdi, 1, _, 0, _, implicit-def dead $eflags :: (store (s32) into %ir.a) (load (s32) from %ir.a)
-    RETQ
+    RET64
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-
diff erent-implicit-operand.mir b/llvm/test/CodeGen/MIR/X86/expected-
diff erent-implicit-operand.mir
index 0e4dcf4dd94b3..98a6173937028 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-
diff erent-implicit-operand.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-
diff erent-implicit-operand.mir
@@ -30,5 +30,5 @@ body: |
     $eax = MOV32r0 implicit-def $eflags
 
   bb.2.exit:
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-
diff erent-implicit-register-flag.mir b/llvm/test/CodeGen/MIR/X86/expected-
diff erent-implicit-register-flag.mir
index f185c39ff6848..5bfff0a776a03 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-
diff erent-implicit-register-flag.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-
diff erent-implicit-register-flag.mir
@@ -30,5 +30,5 @@ body: |
     $eax = MOV32r0 implicit-def $eflags
 
   bb.2.exit:
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-function-reference-after-blockaddress.mir b/llvm/test/CodeGen/MIR/X86/expected-function-reference-after-blockaddress.mir
index 067cc5230e4f0..a67faa601497c 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-function-reference-after-blockaddress.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-function-reference-after-blockaddress.mir
@@ -26,5 +26,5 @@ body: |
     JMP64m $rip, 1, _, @addr, _
 
   bb.1.block (address-taken):
-    RETQ
+    RET64
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-global-value-after-blockaddress.mir b/llvm/test/CodeGen/MIR/X86/expected-global-value-after-blockaddress.mir
index a7e8763039515..d13c7d5072867 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-global-value-after-blockaddress.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-global-value-after-blockaddress.mir
@@ -26,5 +26,5 @@ body: |
     JMP64m $rip, 1, _, @addr, _
 
   bb.1.block (address-taken):
-    RETQ
+    RET64
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-integer-after-offset-sign.mir b/llvm/test/CodeGen/MIR/X86/expected-integer-after-offset-sign.mir
index 3f492a94e2c2b..6870b860c191d 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-integer-after-offset-sign.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-integer-after-offset-sign.mir
@@ -20,5 +20,5 @@ body: |
     $rax = MOV64rm $rip, 1, _, @G + , _
     $eax = MOV32rm $rax, 1, _, 0, _
     $eax = INC32r $eax, implicit-def $eflags
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-integer-after-tied-def.mir b/llvm/test/CodeGen/MIR/X86/expected-integer-after-tied-def.mir
index 23f64aee32ebf..f8b6baddd41d5 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-integer-after-tied-def.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-integer-after-tied-def.mir
@@ -20,5 +20,5 @@ body: |
   ; CHECK: [[@LINE+1]]:78: expected tied-def or low-level type after '('
     INLINEASM &"$foo", 1, 2818058, def $rdi, 2147483657, killed $rdi(tied-def)
     $rax = COPY killed $rdi
-    RETQ killed $rax
+    RET64 killed $rax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-integer-in-successor-weight.mir b/llvm/test/CodeGen/MIR/X86/expected-integer-in-successor-weight.mir
index 0db170a94dbe3..4a9c425fbfda0 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-integer-in-successor-weight.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-integer-in-successor-weight.mir
@@ -28,11 +28,11 @@ body: |
 
   bb.1.less:
     $eax = MOV32r0 implicit-def dead $eflags
-    RETQ killed $eax
+    RET64 killed $eax
 
   bb.2.exit:
     liveins: $edi
 
     $eax = COPY killed $edi
-    RETQ killed $eax
+    RET64 killed $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-load-or-store-in-memory-operand.mir b/llvm/test/CodeGen/MIR/X86/expected-load-or-store-in-memory-operand.mir
index 6be0a902ec908..4d262ef398e38 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-load-or-store-in-memory-operand.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-load-or-store-in-memory-operand.mir
@@ -19,5 +19,5 @@ body: |
     liveins: $rdi
   ; CHECK: [[@LINE+1]]:48: expected 'load' or 'store' memory operation
     $eax = MOV32rm killed $rdi, 1, _, 0, _ :: (4 from %ir.a)
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-machine-operand.mir b/llvm/test/CodeGen/MIR/X86/expected-machine-operand.mir
index 89bec0e5bb3bf..db927be80bc02 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-machine-operand.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-machine-operand.mir
@@ -14,6 +14,6 @@ body: |
   bb.0.entry:
     ; CHECK: [[@LINE+1]]:20: expected a machine operand
     $eax = XOR32rr =
-    RETQ $eax
+    RET64 $eax
 ...
 

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-metadata-node-after-debug-location.mir b/llvm/test/CodeGen/MIR/X86/expected-metadata-node-after-debug-location.mir
index b21a12c3ee645..9478786d55678 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-metadata-node-after-debug-location.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-metadata-node-after-debug-location.mir
@@ -53,5 +53,5 @@ body: |
     DBG_VALUE _, 0, !12, !13, debug-location 14
     MOV32mr $stack.x.addr, 1, _, 0, _, %0
     $eax = COPY %0
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-metadata-node-after-exclaim.mir b/llvm/test/CodeGen/MIR/X86/expected-metadata-node-after-exclaim.mir
index 418127078497a..d04ef11cbfb84 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-metadata-node-after-exclaim.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-metadata-node-after-exclaim.mir
@@ -53,5 +53,5 @@ body: |
     DBG_VALUE _, 0, !12, ! _
     MOV32mr %stack.0.x.addr, 1, _, 0, _, %0
     $eax = COPY %0
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-metadata-node-in-stack-object.mir b/llvm/test/CodeGen/MIR/X86/expected-metadata-node-in-stack-object.mir
index d35bf538f871a..fe5785038beac 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-metadata-node-in-stack-object.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-metadata-node-in-stack-object.mir
@@ -22,5 +22,5 @@ body: |
 
     MOV32mr $rsp, 1, _, -4, _, $edi :: (store (s32) into %ir.xa)
     $eax = COPY killed $edi
-    RETQ killed $eax
+    RET64 killed $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-named-register-in-allocation-hint.mir b/llvm/test/CodeGen/MIR/X86/expected-named-register-in-allocation-hint.mir
index bca4aa1729f30..7ed390570adc7 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-named-register-in-allocation-hint.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-named-register-in-allocation-hint.mir
@@ -26,5 +26,5 @@ body: |
     %2 = COPY $edi
     %2 = IMUL32rr %2, %1, implicit-def dead $eflags
     $eax = COPY %2
-    RETQ killed $eax
+    RET64 killed $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-named-register-in-callee-saved-register.mir b/llvm/test/CodeGen/MIR/X86/expected-named-register-in-callee-saved-register.mir
index 2b83732e585d8..05836e7bab2eb 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-named-register-in-callee-saved-register.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-named-register-in-callee-saved-register.mir
@@ -37,7 +37,7 @@ body: |
     liveins: $edi
 
     $eax = COPY killed $edi
-    RETQ killed $eax
+    RET64 killed $eax
 ...
 ---
 name:            func
@@ -84,5 +84,5 @@ body: |
     $eax = MOV32r0 implicit-def dead $eflags
     $rsp = ADD64ri8 $rsp, 16, implicit-def dead $eflags
     $rbx = POP64r implicit-def $rsp, implicit $rsp
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-named-register-in-functions-livein.mir b/llvm/test/CodeGen/MIR/X86/expected-named-register-in-functions-livein.mir
index af563bd672add..b0c5b979277e2 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-named-register-in-functions-livein.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-named-register-in-functions-livein.mir
@@ -22,5 +22,5 @@ body: |
 
     %0 = COPY %edi
     %eax = COPY %0
-    RETQ %eax
+    RET64 %eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-named-register-livein.mir b/llvm/test/CodeGen/MIR/X86/expected-named-register-livein.mir
index f2e2eaea6516f..9257807d2879d 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-named-register-livein.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-named-register-livein.mir
@@ -16,5 +16,5 @@ body: |
     liveins: %0
 
     $eax = COPY $edi
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-newline-at-end-of-list.mir b/llvm/test/CodeGen/MIR/X86/expected-newline-at-end-of-list.mir
index f40dc2f6dd17b..dd0f4d39b09ac 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-newline-at-end-of-list.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-newline-at-end-of-list.mir
@@ -31,11 +31,11 @@ body: |
 
   bb.1.less:
     $eax = MOV32r0 implicit-def dead $eflags
-    RETQ killed $eax
+    RET64 killed $eax
 
   bb.2.exit:
     liveins: $edi
 
     $eax = COPY killed $edi
-    RETQ killed $eax
+    RET64 killed $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-number-after-bb.mir b/llvm/test/CodeGen/MIR/X86/expected-number-after-bb.mir
index f4a20d688487c..e9a1a9e4ee875 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-number-after-bb.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-number-after-bb.mir
@@ -29,5 +29,5 @@ body: |
     $eax = MOV32r0 implicit-def $eflags
 
   bb.2.nah:
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-offset-after-cfi-operand.mir b/llvm/test/CodeGen/MIR/X86/expected-offset-after-cfi-operand.mir
index 1cadbecac1f08..44ebcbc8a4461 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-offset-after-cfi-operand.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-offset-after-cfi-operand.mir
@@ -22,6 +22,6 @@ body: |
     ; CHECK: [[@LINE+1]]:36: expected a cfi offset
     CFI_INSTRUCTION def_cfa_offset _
     $rsp = ADD64ri32 $rsp, 4040, implicit-def dead $eflags
-    RETQ
+    RET64
 ...
 

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-pointer-value-in-memory-operand.mir b/llvm/test/CodeGen/MIR/X86/expected-pointer-value-in-memory-operand.mir
index 3951943b98f55..d94dc3ffb7e0c 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-pointer-value-in-memory-operand.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-pointer-value-in-memory-operand.mir
@@ -19,6 +19,6 @@ body: |
     liveins: $rdi
   ; CHECK: [[@LINE+1]]:64: expected a pointer IR value
     $eax = MOV32rm killed $rdi, 1, _, 0, _ :: (load (s32) from %ir.b)
-    RETQ $eax
+    RET64 $eax
 ...
 

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-positive-alignment-after-align.mir b/llvm/test/CodeGen/MIR/X86/expected-positive-alignment-after-align.mir
index 1596fe3813734..1f033c5d7d52b 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-positive-alignment-after-align.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-positive-alignment-after-align.mir
@@ -26,5 +26,5 @@ body: |
     $xmm1 = MOVSSrr killed $xmm1, killed $xmm2
     MOVAPSmr $rdi, 1, _, 0, _, killed $xmm0 :: (store (s128) into %ir.vec, align 32)
     MOVAPSmr killed $rdi, 1, _, 16, _, killed $xmm1 :: (store (s128) into %ir.vec + 16, basealign 32)
-    RETQ
+    RET64
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-register-after-cfi-operand.mir b/llvm/test/CodeGen/MIR/X86/expected-register-after-cfi-operand.mir
index f47fcee4d33cd..65f2c0b63879e 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-register-after-cfi-operand.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-register-after-cfi-operand.mir
@@ -38,5 +38,5 @@ body: |
     CALL64pcrel32 @foo, csr_64, implicit $rsp, implicit $edi, implicit-def $rsp
     $eax = LEA64_32r killed $rbx, 1, $rbx, 0, _
     $rbx = POP64r implicit-def $rsp, implicit $rsp
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-register-after-flags.mir b/llvm/test/CodeGen/MIR/X86/expected-register-after-flags.mir
index cc2cd4af19fe3..d507de9531188 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-register-after-flags.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-register-after-flags.mir
@@ -16,5 +16,5 @@ body: |
   bb.0.entry:
     ; CHECK: [[@LINE+1]]:33: expected a register after register flags
     $eax = MOV32r0 implicit-def 2
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-size-integer-after-memory-operation.mir b/llvm/test/CodeGen/MIR/X86/expected-size-integer-after-memory-operation.mir
index 537f25e8b067f..ff9dfba5cd1cc 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-size-integer-after-memory-operation.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-size-integer-after-memory-operation.mir
@@ -19,6 +19,6 @@ body: |
     liveins: $rdi
   ; CHECK: [[@LINE+1]]:53: expected an atomic scope, ordering or a size specification
     $eax = MOV32rm killed $rdi, 1, _, 0, _ :: (load from %ir.a)
-    RETQ $eax
+    RET64 $eax
 ...
 

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-size-integer-after-memory-operation2.mir b/llvm/test/CodeGen/MIR/X86/expected-size-integer-after-memory-operation2.mir
index b7533f266bae1..71edc242f1662 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-size-integer-after-memory-operation2.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-size-integer-after-memory-operation2.mir
@@ -19,6 +19,6 @@ body: |
     liveins: $rdi
   ; CHECK: [[@LINE+1]]:53: expected memory LLT, the size integer literal or 'unknown-size' after memory operation
     $eax = MOV32rm killed $rdi, 1, _, 0, _ :: (load . from %ir.a)
-    RETQ $eax
+    RET64 $eax
 ...
 

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-stack-object.mir b/llvm/test/CodeGen/MIR/X86/expected-stack-object.mir
index 213f18611a4cc..c9f6c9902b492 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-stack-object.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-stack-object.mir
@@ -63,5 +63,5 @@ body: |
     CMP64rm killed $rbx, $rsp, 1, _, 24, _, implicit-def $eflags
     $rsp = ADD64ri8 $rsp, 32, implicit-def dead $eflags
     $rbx = POP64r implicit-def $rsp, implicit $rsp
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-subregister-after-colon.mir b/llvm/test/CodeGen/MIR/X86/expected-subregister-after-colon.mir
index c06e4601480ae..25a352a06d20d 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-subregister-after-colon.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-subregister-after-colon.mir
@@ -22,5 +22,5 @@ body: |
     %1 = COPY %0 . 42
     %2 = AND8ri %1, 1, implicit-def $eflags
     $al = COPY %2
-    RETQ $al
+    RET64 $al
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-target-flag-name.mir b/llvm/test/CodeGen/MIR/X86/expected-target-flag-name.mir
index 02e18434d191d..b2fe4c009d5cd 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-target-flag-name.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-target-flag-name.mir
@@ -20,5 +20,5 @@ body: |
     $rax = MOV64rm $rip, 1, _, target-flags( ) @G, _
     $eax = MOV32rm killed $rax, 1, _, 0, _
     $eax = INC32r killed $eax, implicit-def dead $eflags
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-tied-def-after-lparen.mir b/llvm/test/CodeGen/MIR/X86/expected-tied-def-after-lparen.mir
index ff97bd9f0a1fa..f15db555f33f5 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-tied-def-after-lparen.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-tied-def-after-lparen.mir
@@ -20,5 +20,5 @@ body: |
   ; CHECK: [[@LINE+1]]:70: expected tied-def or low-level type after '('
     INLINEASM &"$foo", 1, 2818058, def $rdi, 2147483657, killed $rdi(3)
     $rax = COPY killed $rdi
-    RETQ killed $rax
+    RET64 killed $rax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-value-in-memory-operand.mir b/llvm/test/CodeGen/MIR/X86/expected-value-in-memory-operand.mir
index 02dd5b2337c7c..5d1c750227930 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-value-in-memory-operand.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-value-in-memory-operand.mir
@@ -19,6 +19,6 @@ body: |
     liveins: $rdi
   ; CHECK: [[@LINE+1]]:64: expected an IR value reference
     $eax = MOV32rm killed $rdi, 1, _, 0, _ :: (load (s32) from a)
-    RETQ $eax
+    RET64 $eax
 ...
 

diff  --git a/llvm/test/CodeGen/MIR/X86/expected-virtual-register-in-functions-livein.mir b/llvm/test/CodeGen/MIR/X86/expected-virtual-register-in-functions-livein.mir
index 1f4f836017825..6b56f39c7e2d6 100644
--- a/llvm/test/CodeGen/MIR/X86/expected-virtual-register-in-functions-livein.mir
+++ b/llvm/test/CodeGen/MIR/X86/expected-virtual-register-in-functions-livein.mir
@@ -22,5 +22,5 @@ body: |
 
     %0 = COPY $edi
     $eax = COPY %0
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/external-symbol-operands.mir b/llvm/test/CodeGen/MIR/X86/external-symbol-operands.mir
index c5e314307c212..ff5c8d4dbc3fa 100644
--- a/llvm/test/CodeGen/MIR/X86/external-symbol-operands.mir
+++ b/llvm/test/CodeGen/MIR/X86/external-symbol-operands.mir
@@ -46,7 +46,7 @@ body: |
     liveins: $eax
 
     $rsp = ADD64ri32 $rsp, 520, implicit-def $eflags
-    RETQ $eax
+    RET64 $eax
 
   bb.2.entry:
     ; CHECK:      CALL64pcrel32 &__stack_chk_fail,

diff  --git a/llvm/test/CodeGen/MIR/X86/fixed-stack-memory-operands.mir b/llvm/test/CodeGen/MIR/X86/fixed-stack-memory-operands.mir
index cb31d32d1cefd..fa99421460dc6 100644
--- a/llvm/test/CodeGen/MIR/X86/fixed-stack-memory-operands.mir
+++ b/llvm/test/CodeGen/MIR/X86/fixed-stack-memory-operands.mir
@@ -35,5 +35,5 @@ body: |
     $eax = MOV32rm $esp, 1, _, 8, _ :: (load (s32) from %fixed-stack.0, align 16)
     MOV32mr $esp, 1, _, 0, _, $eax :: (store (s32) into %ir.b)
     $edx = POP32r implicit-def $esp, implicit $esp
-    RETL $eax
+    RET32 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/fixed-stack-object-redefinition-error.mir b/llvm/test/CodeGen/MIR/X86/fixed-stack-object-redefinition-error.mir
index 7116bb809b28e..2ce41fdada600 100644
--- a/llvm/test/CodeGen/MIR/X86/fixed-stack-object-redefinition-error.mir
+++ b/llvm/test/CodeGen/MIR/X86/fixed-stack-object-redefinition-error.mir
@@ -24,5 +24,5 @@ body: |
   bb.0.entry:
     $eax = MOV32rm $esp, 1, _, 4, _
     $eax = ADD32rm killed $eax, $esp, 1, _, 8, _, implicit-def dead $eflags
-    RETL $eax
+    RET32 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/fixed-stack-objects.mir b/llvm/test/CodeGen/MIR/X86/fixed-stack-objects.mir
index 0882378e1a954..9eba3eaf4bade 100644
--- a/llvm/test/CodeGen/MIR/X86/fixed-stack-objects.mir
+++ b/llvm/test/CodeGen/MIR/X86/fixed-stack-objects.mir
@@ -30,5 +30,5 @@ body: |
   bb.0.entry:
     $eax = MOV32rm $esp, 1, _, 8, _
     MOV32mr $esp, 1, _, 0, _, $eax
-    RETL $eax
+    RET32 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/frame-info-save-restore-points.mir b/llvm/test/CodeGen/MIR/X86/frame-info-save-restore-points.mir
index ba991fcc510eb..cb804b3cbfabb 100644
--- a/llvm/test/CodeGen/MIR/X86/frame-info-save-restore-points.mir
+++ b/llvm/test/CodeGen/MIR/X86/frame-info-save-restore-points.mir
@@ -69,5 +69,5 @@ body: |
   bb.3.false:
     liveins: $eax
 
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/frame-info-stack-references.mir b/llvm/test/CodeGen/MIR/X86/frame-info-stack-references.mir
index 01e619a783347..8c4583ade6328 100644
--- a/llvm/test/CodeGen/MIR/X86/frame-info-stack-references.mir
+++ b/llvm/test/CodeGen/MIR/X86/frame-info-stack-references.mir
@@ -72,7 +72,7 @@ body: |
 
     $rsp = ADD64ri8 $rsp, 32, implicit-def dead $eflags
     $rbx = POP64r implicit-def $rsp, implicit $rsp
-    RETQ $eax
+    RET64 $eax
 
   bb.2.entry:
     CALL64pcrel32 &__stack_chk_fail, csr_64, implicit $rsp, implicit-def $rsp

diff  --git a/llvm/test/CodeGen/MIR/X86/frame-setup-instruction-flag.mir b/llvm/test/CodeGen/MIR/X86/frame-setup-instruction-flag.mir
index 2e6d48c4647df..01341b3a6da6c 100644
--- a/llvm/test/CodeGen/MIR/X86/frame-setup-instruction-flag.mir
+++ b/llvm/test/CodeGen/MIR/X86/frame-setup-instruction-flag.mir
@@ -21,7 +21,7 @@ name:            compute
 body: |
   bb.0.body:
     $eax = IMUL32rri8 $edi, 11, implicit-def $eflags
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 name:            foo
@@ -36,5 +36,5 @@ body: |
     $rdx = frame-setup frame-destroy POP64r implicit-def $rsp, implicit $rsp
     ; CHECK: $rdx = frame-setup frame-destroy POP64r
     $rdx = frame-destroy frame-setup POP64r implicit-def $rsp, implicit $rsp
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/function-liveins.mir b/llvm/test/CodeGen/MIR/X86/function-liveins.mir
index 2f3cb6d11ee33..7e71d2e05f166 100644
--- a/llvm/test/CodeGen/MIR/X86/function-liveins.mir
+++ b/llvm/test/CodeGen/MIR/X86/function-liveins.mir
@@ -32,5 +32,5 @@ body: |
     %0 = COPY $edi
     %2 = ADD32rr %0, %1, implicit-def dead $eflags
     $eax = COPY %2
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/global-value-operands.mir b/llvm/test/CodeGen/MIR/X86/global-value-operands.mir
index 7b55cb4f14ea4..526f939d0ce5b 100644
--- a/llvm/test/CodeGen/MIR/X86/global-value-operands.mir
+++ b/llvm/test/CodeGen/MIR/X86/global-value-operands.mir
@@ -68,7 +68,7 @@ body: |
     $rax = MOV64rm $rip, 1, _, @G, _
     $eax = MOV32rm $rax, 1, _, 0, _
     $eax = INC32r $eax, implicit-def $eflags
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 # CHECK: name: inc2
@@ -79,7 +79,7 @@ body: |
     $rax = MOV64rm $rip, 1, _, @0, _
     $eax = MOV32rm $rax, 1, _, 0, _
     $eax = INC32r $eax, implicit-def $eflags
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 name:            test
@@ -97,7 +97,7 @@ body: |
     $eax = MOV32rm killed $rax, 1, _, 0, _
     $rcx = MOV64rm $rip, 1, _, @$.-B, _
     MOV32mr killed $rcx, 1, _, 0, _, $eax
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 name:            test2
@@ -106,7 +106,7 @@ body: |
     ; CHECK: , @"\01Hello@$%09 \\ World,",
     $rax = MOV64rm $rip, 1, _, @"\01Hello@$%09 \\ World,", _
     $eax = MOV32rm killed $rax, 1, _, 0, _
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 # CHECK: name: test3
@@ -125,7 +125,7 @@ body: |
     $eax = MOV32rm killed $rax, 1, _, 0, _
     $rcx = MOV64rm $rip, 1, _, @$.-B - 8, _
     MOV32mr killed $rcx, 1, _, 0, _, $eax
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 # CHECK: name: tf
@@ -136,5 +136,5 @@ body: |
     $rax = MOV64rm $rip, 1, _, target-flags(x86-gotpcrel) @G, _
     $eax = MOV32rm $rax, 1, _, 0, _
     $eax = INC32r $eax, implicit-def $eflags
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/immediate-operands.mir b/llvm/test/CodeGen/MIR/X86/immediate-operands.mir
index 05aa89cb8e3f6..2fef51ca2305f 100644
--- a/llvm/test/CodeGen/MIR/X86/immediate-operands.mir
+++ b/llvm/test/CodeGen/MIR/X86/immediate-operands.mir
@@ -20,9 +20,9 @@ name:            foo
 body: |
   bb.0.entry:
     ; CHECK:      $eax = MOV32ri 42
-    ; CHECK-NEXT: RETQ $eax
+    ; CHECK-NEXT: RET64 $eax
     $eax = MOV32ri 42
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 # CHECK: name: bar
@@ -30,7 +30,7 @@ name:            bar
 body: |
   bb.0.entry:
     ; CHECK:      $eax = MOV32ri -11
-    ; CHECK-NEXT: RETQ $eax
+    ; CHECK-NEXT: RET64 $eax
     $eax = MOV32ri -11
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/implicit-register-flag.mir b/llvm/test/CodeGen/MIR/X86/implicit-register-flag.mir
index e5fc11531f530..61c4b6c98a73c 100644
--- a/llvm/test/CodeGen/MIR/X86/implicit-register-flag.mir
+++ b/llvm/test/CodeGen/MIR/X86/implicit-register-flag.mir
@@ -40,11 +40,11 @@ body: |
   bb.1.less:
     ; CHECK: $eax = MOV32r0 implicit-def $eflags
     $eax = MOV32r0 implicit-def $eflags
-    RETQ $eax
+    RET64 $eax
 
   bb.2.exit:
     $eax = COPY $edi
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 name:            implicit_subregister1
@@ -55,7 +55,7 @@ body: |
   ; CHECK-LABEL: name: implicit_subregister1
   ; CHECK: dead $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags, implicit-def $al
     dead $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags, implicit-def $al
-    RETQ killed $al
+    RET64 killed $al
 ...
 ---
 name:            implicit_subregister2
@@ -64,5 +64,5 @@ body: |
   ; CHECK-LABEL: name: implicit_subregister2
   ; CHECK: dead $r15 = XOR64rr undef $r15, undef $r15, implicit-def dead $eflags, implicit-def $r15w
     dead $r15 = XOR64rr undef $r15, undef $r15, implicit-def dead $eflags, implicit-def $r15w
-    RETQ killed $r15w
+    RET64 killed $r15w
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/inline-asm-registers.mir b/llvm/test/CodeGen/MIR/X86/inline-asm-registers.mir
index d5bbb2dfbd539..44705cbcfac48 100644
--- a/llvm/test/CodeGen/MIR/X86/inline-asm-registers.mir
+++ b/llvm/test/CodeGen/MIR/X86/inline-asm-registers.mir
@@ -31,7 +31,7 @@ body: |
   ; CHECK: INLINEASM &foo, 0 /* attdialect */, 4390922 /* regdef:GR64 */, def $rsi, 4390922 /* regdef:GR64 */, def dead $rdi,
     INLINEASM &foo, 0, 4390922, def $rsi, 4390922, def dead $rdi, 2147549193, killed $rdi, 2147483657, killed $rsi, 12, implicit-def dead early-clobber $eflags
     $rax = MOV64rr killed $rsi
-    RETQ killed $rax
+    RET64 killed $rax
 ...
 ---
 name:            test2
@@ -48,5 +48,5 @@ body: |
   ; CHECK: INLINEASM &foo, 0 /* attdialect */, 4390922 /* regdef:GR64 */, def $rsi, 4390922 /* regdef:GR64 */, def dead $rdi, 2147549193 /* reguse tiedto:$1 */, killed $rdi(tied-def 5), 2147483657 /* reguse tiedto:$0 */, killed $rsi(tied-def 3), 12 /* clobber */, implicit-def dead early-clobber $eflags
     INLINEASM &foo, 0, 4390922, def $rsi, 4390922, def dead $rdi, 2147549193, killed $rdi(tied-def 5), 2147483657, killed $rsi(tied-def 3), 12, implicit-def dead early-clobber $eflags
     $rax = MOV64rr killed $rsi
-    RETQ killed $rax
+    RET64 killed $rax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/instr-symbols-and-mcsymbol-operands.mir b/llvm/test/CodeGen/MIR/X86/instr-symbols-and-mcsymbol-operands.mir
index 34a9236c16bca..aade832755449 100644
--- a/llvm/test/CodeGen/MIR/X86/instr-symbols-and-mcsymbol-operands.mir
+++ b/llvm/test/CodeGen/MIR/X86/instr-symbols-and-mcsymbol-operands.mir
@@ -77,6 +77,6 @@ body: |
     %7:gr64 = ADD64rr killed %4, killed %5, implicit-def $eflags
     %8:gr64 = ADD64rr killed %6, killed %7, implicit-def $eflags
     $rax = COPY %8
-    RETQ implicit $rax
+    RET64 implicit $rax
 
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/instructions-debug-location.mir b/llvm/test/CodeGen/MIR/X86/instructions-debug-location.mir
index 9c6fe3aa708a6..9abe47991f322 100644
--- a/llvm/test/CodeGen/MIR/X86/instructions-debug-location.mir
+++ b/llvm/test/CodeGen/MIR/X86/instructions-debug-location.mir
@@ -75,7 +75,7 @@ body: |
     ; CHECK: DBG_VALUE $noreg, 0, !11, !DIExpression(), debug-location !12
     ; CHECK: DBG_VALUE $noreg, 0, !11, !DIExpression(), debug-location !12
     ; CHECK: $eax = COPY %0, debug-location !13
-    ; CHECK: RETQ $eax, debug-location !13
+    ; CHECK: RET64 $eax, debug-location !13
     %0 = COPY $edi
     DBG_VALUE _, 0, !12, !DIExpression(), debug-location !13
     ; Test whether debug-use is still recognized for compatibility with old
@@ -83,7 +83,7 @@ body: |
     DBG_VALUE debug-use _, 0, !12, !DIExpression(), debug-location !13
     MOV32mr %stack.0.x.addr, 1, _, 0, _, %0
     $eax = COPY %0, debug-location !14
-    RETQ $eax, debug-location !14
+    RET64 $eax, debug-location !14
 ...
 ---
 name:            test_typed_immediates
@@ -107,7 +107,7 @@ body: |
     DBG_VALUE _, i128 123492148938512984928424384934328985928, !12, !DIExpression(), debug-location !13
     MOV32mr %stack.0.x.addr, 1, _, 0, _, %0
     $eax = COPY %0
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 name:            test_mir_created
@@ -135,5 +135,5 @@ body: |
     MOV32mr %stack.0.x.addr, 1, _, 0, _, %0, debug-location !DILocation(line: 4, scope: !15, inlinedAt: !16)
     MOV32mr %stack.0.x.addr, 1, _, 0, _, %0, debug-location !DILocation(line: 5, scope: !15, inlinedAt: !DILocation(line: 4, scope: !15))
     $eax = COPY %0
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/invalid-constant-pool-item.mir b/llvm/test/CodeGen/MIR/X86/invalid-constant-pool-item.mir
index 45c0b813acb5c..bcfdc6a316fa5 100644
--- a/llvm/test/CodeGen/MIR/X86/invalid-constant-pool-item.mir
+++ b/llvm/test/CodeGen/MIR/X86/invalid-constant-pool-item.mir
@@ -20,6 +20,6 @@ body: |
   bb.0.entry:
     ; CHECK: [[@LINE+1]]:47: use of undefined constant '%const.10'
     $xmm0 = ADDSDrm killed $xmm0, $rip, 1, _, %const.10, _
-    RETQ $xmm0
+    RET64 $xmm0
 ...
 

diff  --git a/llvm/test/CodeGen/MIR/X86/invalid-target-flag-name.mir b/llvm/test/CodeGen/MIR/X86/invalid-target-flag-name.mir
index 9e65f2ae2bd1c..a3d4a3857434b 100644
--- a/llvm/test/CodeGen/MIR/X86/invalid-target-flag-name.mir
+++ b/llvm/test/CodeGen/MIR/X86/invalid-target-flag-name.mir
@@ -20,5 +20,5 @@ body: |
     $rax = MOV64rm $rip, 1, _, target-flags(x86-test) @G, _
     $eax = MOV32rm killed $rax, 1, _, 0, _
     $eax = INC32r killed $eax, implicit-def dead $eflags
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/invalid-tied-def-index-error.mir b/llvm/test/CodeGen/MIR/X86/invalid-tied-def-index-error.mir
index abfa5682ec824..65aab15442a56 100644
--- a/llvm/test/CodeGen/MIR/X86/invalid-tied-def-index-error.mir
+++ b/llvm/test/CodeGen/MIR/X86/invalid-tied-def-index-error.mir
@@ -20,5 +20,5 @@ body: |
   ; CHECK: [[@LINE+1]]:58: use of invalid tied-def operand index '300'; instruction has only 6 operands
     INLINEASM &"$foo", 1, 2818058, def $rdi, 2147483657, killed $rdi(tied-def 300)
     $rax = COPY killed $rdi
-    RETQ killed $rax
+    RET64 killed $rax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/jump-table-info.mir b/llvm/test/CodeGen/MIR/X86/jump-table-info.mir
index af7e520df89bd..8bbfb96a81906 100644
--- a/llvm/test/CodeGen/MIR/X86/jump-table-info.mir
+++ b/llvm/test/CodeGen/MIR/X86/jump-table-info.mir
@@ -86,23 +86,23 @@ body: |
 
   bb.2.def:
     $eax = MOV32r0 implicit-def $eflags
-    RETQ $eax
+    RET64 $eax
 
   bb.3.lbl1:
     $eax = MOV32ri 1
-    RETQ $eax
+    RET64 $eax
 
   bb.4.lbl2:
     $eax = MOV32ri 2
-    RETQ $eax
+    RET64 $eax
 
   bb.5.lbl3:
     $eax = MOV32ri 4
-    RETQ $eax
+    RET64 $eax
 
   bb.6.lbl4:
     $eax = MOV32ri 8
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 name:            test_jumptable2
@@ -130,21 +130,21 @@ body: |
 
   bb.2.def:
     $eax = MOV32r0 implicit-def $eflags
-    RETQ $eax
+    RET64 $eax
 
   bb.3.lbl1:
     $eax = MOV32ri 1
-    RETQ $eax
+    RET64 $eax
 
   bb.4.lbl2:
     $eax = MOV32ri 2
-    RETQ $eax
+    RET64 $eax
 
   bb.5.lbl3:
     $eax = MOV32ri 4
-    RETQ $eax
+    RET64 $eax
 
   bb.6.lbl4:
     $eax = MOV32ri 8
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/jump-table-redefinition-error.mir b/llvm/test/CodeGen/MIR/X86/jump-table-redefinition-error.mir
index fade2fd1230c5..a965f9938b2c1 100644
--- a/llvm/test/CodeGen/MIR/X86/jump-table-redefinition-error.mir
+++ b/llvm/test/CodeGen/MIR/X86/jump-table-redefinition-error.mir
@@ -56,21 +56,21 @@ body: |
 
   bb.2.def:
     $eax = MOV32r0 implicit-def $eflags
-    RETQ $eax
+    RET64 $eax
 
   bb.3.lbl1:
     $eax = MOV32ri 1
-    RETQ $eax
+    RET64 $eax
 
   bb.4.lbl2:
     $eax = MOV32ri 2
-    RETQ $eax
+    RET64 $eax
 
   bb.5.lbl3:
     $eax = MOV32ri 4
-    RETQ $eax
+    RET64 $eax
 
   bb.6.lbl4:
     $eax = MOV32ri 8
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/killed-register-flag.mir b/llvm/test/CodeGen/MIR/X86/killed-register-flag.mir
index 38b524782e0d1..6641848c75be6 100644
--- a/llvm/test/CodeGen/MIR/X86/killed-register-flag.mir
+++ b/llvm/test/CodeGen/MIR/X86/killed-register-flag.mir
@@ -28,13 +28,13 @@ body: |
 
   bb.1.less:
     ; CHECK:      $eax = MOV32r0
-    ; CHECK-NEXT: RETQ killed $eax
+    ; CHECK-NEXT: RET64 killed $eax
     $eax = MOV32r0 implicit-def $eflags
-    RETQ killed $eax
+    RET64 killed $eax
 
   bb.2.exit:
     ; CHECK:      $eax = COPY killed $edi
-    ; CHECK-NEXT: RETQ killed $eax
+    ; CHECK-NEXT: RET64 killed $eax
     $eax = COPY killed $edi
-    RETQ killed $eax
+    RET64 killed $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/large-cfi-offset-number-error.mir b/llvm/test/CodeGen/MIR/X86/large-cfi-offset-number-error.mir
index c36a67670dcc5..1d53de61d4356 100644
--- a/llvm/test/CodeGen/MIR/X86/large-cfi-offset-number-error.mir
+++ b/llvm/test/CodeGen/MIR/X86/large-cfi-offset-number-error.mir
@@ -22,6 +22,6 @@ body: |
     ; CHECK: [[@LINE+1]]:36: expected a 32 bit integer (the cfi offset is too large)
     CFI_INSTRUCTION def_cfa_offset 123456789123456
     $rsp = ADD64ri32 $rsp, 4040, implicit-def dead $eflags
-    RETQ
+    RET64
 ...
 

diff  --git a/llvm/test/CodeGen/MIR/X86/large-immediate-operand-error.mir b/llvm/test/CodeGen/MIR/X86/large-immediate-operand-error.mir
index a59527230f4df..84e1c4fa8c12c 100644
--- a/llvm/test/CodeGen/MIR/X86/large-immediate-operand-error.mir
+++ b/llvm/test/CodeGen/MIR/X86/large-immediate-operand-error.mir
@@ -14,5 +14,5 @@ body: |
   bb.0.entry:
   ; CHECK: [[@LINE+1]]:20: integer literal is too large to be an immediate operand
     $eax = MOV32ri 12346127502983478823754212949184914
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/large-index-number-error.mir b/llvm/test/CodeGen/MIR/X86/large-index-number-error.mir
index d7bf528265c9d..ba68680089793 100644
--- a/llvm/test/CodeGen/MIR/X86/large-index-number-error.mir
+++ b/llvm/test/CodeGen/MIR/X86/large-index-number-error.mir
@@ -29,5 +29,5 @@ body: |
     $eax = MOV32r0 implicit-def $eflags
 
   bb.2:
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/large-offset-number-error.mir b/llvm/test/CodeGen/MIR/X86/large-offset-number-error.mir
index 0c0f5d87b2e5a..2063f4ca98cb8 100644
--- a/llvm/test/CodeGen/MIR/X86/large-offset-number-error.mir
+++ b/llvm/test/CodeGen/MIR/X86/large-offset-number-error.mir
@@ -20,5 +20,5 @@ body: |
     $rax = MOV64rm $rip, 1, _, @G + 123456789123456789123456789, _
     $eax = MOV32rm $rax, 1, _, 0, _
     $eax = INC32r $eax implicit-def $eflags
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/large-size-in-memory-operand-error.mir b/llvm/test/CodeGen/MIR/X86/large-size-in-memory-operand-error.mir
index 59bd717aeadd4..b0fae40f7fdf1 100644
--- a/llvm/test/CodeGen/MIR/X86/large-size-in-memory-operand-error.mir
+++ b/llvm/test/CodeGen/MIR/X86/large-size-in-memory-operand-error.mir
@@ -19,6 +19,6 @@ body: |
     liveins: $rdi
   ; CHECK: [[@LINE+1]]:53: expected 64-bit integer (too large)
     $eax = MOV32rm killed $rdi, 1, _, 0, _ :: (load 12345678912345678924218574857 from %ir.a)
-    RETQ $eax
+    RET64 $eax
 ...
 

diff  --git a/llvm/test/CodeGen/MIR/X86/liveout-register-mask.mir b/llvm/test/CodeGen/MIR/X86/liveout-register-mask.mir
index 6db52cdaee0dd..956a436a8557c 100644
--- a/llvm/test/CodeGen/MIR/X86/liveout-register-mask.mir
+++ b/llvm/test/CodeGen/MIR/X86/liveout-register-mask.mir
@@ -38,5 +38,5 @@ body: |
   ; CHECK: PATCHPOINT 5, 5, 0, 2, 0, $rdi, $rsi, csr_64, liveout($esp, $rsp, $sp, $spl),
     PATCHPOINT 5, 5, 0, 2, 0, $rdi, $rsi, csr_64, liveout($esp, $rsp, $sp, $spl), implicit-def dead early-clobber $r11, implicit-def $rsp, implicit-def dead $rax
     $rbp = POP64r implicit-def $rsp, implicit $rsp
-    RETQ
+    RET64
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/load-with-max-alignment.mir b/llvm/test/CodeGen/MIR/X86/load-with-max-alignment.mir
index adb4059eb7e3d..fc6a81fcef02d 100644
--- a/llvm/test/CodeGen/MIR/X86/load-with-max-alignment.mir
+++ b/llvm/test/CodeGen/MIR/X86/load-with-max-alignment.mir
@@ -21,7 +21,7 @@ body:             |
     liveins: $rdi
 
     renamable $eax = MOV32rm killed renamable $rdi, 1, $noreg, 0, $noreg :: (load (s32) from unknown-address, align 4294967296)
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -39,6 +39,6 @@ body:             |
     liveins: $rdi
 
     renamable $eax = MOV32rm killed renamable $rdi, 1, $noreg, 0, $noreg :: (load (s32) from unknown-address + 4, basealign 4294967296)
-    RETQ $eax
+    RET64 $eax
 
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/machine-basic-block-operands.mir b/llvm/test/CodeGen/MIR/X86/machine-basic-block-operands.mir
index 027482debe18c..e4e3a52d23117 100644
--- a/llvm/test/CodeGen/MIR/X86/machine-basic-block-operands.mir
+++ b/llvm/test/CodeGen/MIR/X86/machine-basic-block-operands.mir
@@ -49,7 +49,7 @@ body: |
     $eax = MOV32r0 implicit-def $eflags
 
   bb.2.exit:
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 # CHECK: name: bar
@@ -69,5 +69,5 @@ body: |
     $eax = MOV32r0 implicit-def $eflags
 
   bb.3:
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/machine-instructions.mir b/llvm/test/CodeGen/MIR/X86/machine-instructions.mir
index 1989ee35fb507..38d80ebf304ab 100644
--- a/llvm/test/CodeGen/MIR/X86/machine-instructions.mir
+++ b/llvm/test/CodeGen/MIR/X86/machine-instructions.mir
@@ -17,7 +17,7 @@ name:            inc
 body: |
   bb.0.entry:
     ; CHECK:      MOV32rr
-    ; CHECK-NEXT: RETQ
+    ; CHECK-NEXT: RET64
     $eax = MOV32rr $eax
-     RETQ $eax
+     RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/machine-verifier.mir b/llvm/test/CodeGen/MIR/X86/machine-verifier.mir
index 17aa16b4a4316..5cf5e8f0adc92 100644
--- a/llvm/test/CodeGen/MIR/X86/machine-verifier.mir
+++ b/llvm/test/CodeGen/MIR/X86/machine-verifier.mir
@@ -19,5 +19,5 @@ body: |
    ; CHECK: instruction: COPY
    ; CHECK: 2 operands expected, but 0 given.
     COPY
-    RETQ
+    RET64
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/memory-operands.mir b/llvm/test/CodeGen/MIR/X86/memory-operands.mir
index 483764a915e22..b136ef0a01370 100644
--- a/llvm/test/CodeGen/MIR/X86/memory-operands.mir
+++ b/llvm/test/CodeGen/MIR/X86/memory-operands.mir
@@ -205,7 +205,7 @@ body: |
   ; CHECK-NEXT: MOV32mi killed $rdi, 1, $noreg, 0, $noreg, 42 :: (store (s32) into %ir.a)
     $eax = MOV32rm $rdi, 1, _, 0, _ :: (load (s32) from %ir.a)
     MOV32mi killed $rdi, 1, _, 0, _, 42 :: (store (s32) into %ir.a)
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 name:            test2
@@ -217,7 +217,7 @@ body: |
     liveins: $rdi
   ; CHECK: INC32m killed $rdi, 1, $noreg, 0, $noreg, implicit-def dead $eflags :: (store (s32) into %ir."a value"), (load (s32) from %ir."a value")
     INC32m killed $rdi, 1, _, 0, _, implicit-def dead $eflags :: (store (s32) into %ir."a value"), (load (s32) from %ir."a value")
-    RETQ
+    RET64
 ...
 ---
 name:            test3
@@ -238,7 +238,7 @@ body: |
     $eax = MOV32rm killed $rdi, 1, _, 0, _ :: (load (s32) from %ir.0)
     $eax = INC32r killed $eax, implicit-def dead $eflags
     MOV32mr $rsp, 1, _, -4, _, killed $eax :: (store (s32) into %ir.1)
-    RETQ
+    RET64
 ...
 ---
 name:            volatile_inc
@@ -254,7 +254,7 @@ body: |
     $eax = MOV32rm $rdi, 1, _, 0, _ :: (volatile load (s32) from %ir.x)
     $eax = INC32r killed $eax, implicit-def dead $eflags
     MOV32mr killed $rdi, 1, _, 0, _, $eax :: (volatile store (s32) into %ir.x)
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 name:            non_temporal_store
@@ -268,7 +268,7 @@ body: |
   ; CHECK: name: non_temporal_store
   ; CHECK: MOVNTImr killed $rdi, 1, $noreg, 0, $noreg, killed $esi :: (non-temporal store (s32) into %ir.a)
     MOVNTImr killed $rdi, 1, _, 0, _, killed $esi :: (non-temporal store (s32) into %ir.a)
-    RETQ
+    RET64
 ...
 ---
 name:            invariant_load
@@ -281,7 +281,7 @@ body: |
   ; CHECK: name: invariant_load
   ; CHECK: $eax = MOV32rm killed $rdi, 1, $noreg, 0, $noreg :: (invariant load (s32) from %ir.x)
     $eax = MOV32rm killed $rdi, 1, _, 0, _ :: (invariant load (s32) from %ir.x)
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 name:            memory_offset
@@ -302,7 +302,7 @@ body: |
     $xmm1 = MOVSSrr killed $xmm1, killed $xmm2
     MOVAPSmr $rdi, 1, _, 0, _, killed $xmm0 :: (store (s128) into %ir.vec)
     MOVAPSmr killed $rdi, 1, _, 16, _, killed $xmm1 :: (store (s128) into %ir.vec + 16)
-    RETQ
+    RET64
 ...
 ---
 name:            memory_alignment
@@ -331,7 +331,7 @@ body: |
     MOVAPSmr $rdi, 1, _, 16, _, killed $xmm1 :: (store (s128) into %ir.vec + 16, basealign 64)
     MOVAPSmr $rdi, 1, _, 32, _, killed $xmm2 :: (store (s128) into %ir.vec + 32, align 32, basealign 64)
     MOVAPSmr killed $rdi, 1, _, 48, _, killed $xmm3 :: (store (s128) into %ir.vec + 48, basealign 64)
-    RETQ
+    RET64
 ...
 ---
 name:            constant_pool_psv
@@ -349,7 +349,7 @@ body: |
   ; CHECK-NEXT: $xmm0 = ADDSDrm killed $xmm0, $rip, 1, $noreg, %const.0, $noreg, implicit $mxcsr :: (load (s64) from constant-pool + 8)
     $xmm0 = ADDSDrm killed $xmm0, $rip, 1, _, %const.0, _, implicit $mxcsr :: (load (s64) from constant-pool)
     $xmm0 = ADDSDrm killed $xmm0, $rip, 1, _, %const.0, _, implicit $mxcsr :: (load (s64) from constant-pool + 8)
-    RETQ $xmm0
+    RET64 $xmm0
 ...
 ---
 name:            stack_psv
@@ -372,7 +372,7 @@ body: |
     ST_FP80m $rsp, 1, _, 0, _, implicit-def dead $fpsw, implicit $fpcw :: (store (s80) into stack, align 16)
     CALL64pcrel32 &cosl, csr_64, implicit $rsp, implicit-def $rsp, implicit-def $fp0
     $rsp = ADD64ri8 $rsp, 24, implicit-def dead $eflags
-    RETQ
+    RET64
 ...
 ---
 name:            got_psv
@@ -384,7 +384,7 @@ body: |
     $rax = MOV64rm $rip, 1, _, @G, _ :: (load (s64) from got)
     $eax = MOV32rm killed $rax, 1, _, 0, _
     $eax = INC32r killed $eax, implicit-def dead $eflags
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 name:            global_value
@@ -399,7 +399,7 @@ body: |
     $rcx = MOV64rm $rip, 1, _, @0, _
     $ecx = MOV32rm killed $rcx, 1, _, 0, _, implicit-def $rcx :: (load (s32) from @0)
     $eax = LEA64_32r killed $rax, 1, killed $rcx, 1, _
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 name:            jumptable_psv
@@ -433,23 +433,23 @@ body: |
 
   bb.2.def:
     $eax = MOV32r0 implicit-def dead $eflags
-    RETQ $eax
+    RET64 $eax
 
   bb.3.lbl1:
     $eax = MOV32ri 1
-    RETQ $eax
+    RET64 $eax
 
   bb.4.lbl2:
     $eax = MOV32ri 2
-    RETQ $eax
+    RET64 $eax
 
   bb.5.lbl3:
     $eax = MOV32ri 4
-    RETQ $eax
+    RET64 $eax
 
   bb.6.lbl4:
     $eax = MOV32ri 8
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 name:            tbaa_metadata
@@ -462,7 +462,7 @@ body: |
   ; CHECK-NEXT: $eax = MOV32rm killed $rax, 1, $noreg, 0, $noreg :: (load (s32) from %ir.total_len2, !tbaa !6)
     $eax = MOV32rm killed $rax, 1, _, 0, _, implicit-def $rax :: (load (s32) from @a, !tbaa !2)
     $eax = MOV32rm killed $rax, 1, _, 0, _ :: (load (s32) from %ir.total_len2, !tbaa !6)
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 name:            aa_scope
@@ -480,7 +480,7 @@ body: |
     MOVSSmr $rdi, 1, _, 20, _, killed $xmm0 :: (store (s32) into %ir.arrayidx.i, !noalias !9)
     $xmm0 = MOVSSrm_alt killed $rsi, 1, _, 0, _ :: (load (s32) from %ir.c)
     MOVSSmr killed $rdi, 1, _, 28, _, killed $xmm0 :: (store (s32) into %ir.arrayidx)
-    RETQ
+    RET64
 ...
 ---
 name:            range_metadata
@@ -493,7 +493,7 @@ body: |
   ; CHECK-LABEL: name: range_metadata
   ; CHECK: $al = MOV8rm killed $rdi, 1, $noreg, 0, $noreg :: (load (s8) from %ir.x, !range !11)
     $al = MOV8rm killed $rdi, 1, _, 0, _ :: (load (s8) from %ir.x, !range !11)
-    RETQ $al
+    RET64 $al
 ...
 ---
 name:            gep_value
@@ -508,7 +508,7 @@ body: |
   ; CHECK-LABEL: gep_value
   ; CHECK: MOV32mr killed $rax, 1, $noreg, 0, $noreg, $edi, implicit killed $rdi :: (store (s32) into `i32* getelementptr inbounds ([50 x %st], [50 x %st]* @values, i64 0, i64 0, i32 0)`, align 16)
     MOV32mr killed $rax, 1, _, 0, _, $edi, implicit killed $rdi :: (store (s32) into `i32* getelementptr inbounds ([50 x %st], [50 x %st]* @values, i64 0, i64 0, i32 0)`, align 16)
-    RETQ
+    RET64
 ...
 ---
 name:            undef_value
@@ -518,7 +518,7 @@ body: |
   ; CHECK-LABEL: name: undef_value
   ; CHECK: $rax = MOV64rm undef $rax, 1, $noreg, 0, $noreg :: (load (s64) from `i8** undef`)
     $rax = MOV64rm undef $rax, 1, _, 0, _ :: (load (s64) from `i8** undef`)
-    RETQ $rax
+    RET64 $rax
 ...
 ---
 # Test memory operand without associated value.
@@ -529,7 +529,7 @@ tracksRegLiveness: true
 body: |
   bb.0:
     $rax = MOV64rm undef $rax, 1, _, 0, _ :: (load (s64))
-    RETQ $rax
+    RET64 $rax
 ...
 ---
 # Test parsing of stack references in machine memory operands.
@@ -542,7 +542,7 @@ stack:
 body: |
   bb.0:
     $rax = MOV64rm $rsp, 1, _, 0, _ :: (load (s64) from %stack.0)
-    RETQ $rax
+    RET64 $rax
 ...
 ---
 # Test parsing of unknown size in machine memory operands without alignment.
@@ -555,7 +555,7 @@ stack:
 body: |
   bb.0:
     $rax = MOV64rm $rsp, 1, _, 0, _ :: (load unknown-size from %stack.0)
-    RETQ $rax
+    RET64 $rax
 ...
 ---
 # Test parsing of unknown size in machine memory operands with alignment.
@@ -568,5 +568,5 @@ stack:
 body: |
   bb.0:
     $rax = MOV64rm $rsp, 1, _, 0, _ :: (load unknown-size from %stack.0, align 4)
-    RETQ $rax
+    RET64 $rax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/metadata-operands.mir b/llvm/test/CodeGen/MIR/X86/metadata-operands.mir
index 5375485d320ce..fe1f21efacd7c 100644
--- a/llvm/test/CodeGen/MIR/X86/metadata-operands.mir
+++ b/llvm/test/CodeGen/MIR/X86/metadata-operands.mir
@@ -56,5 +56,5 @@ body: |
     DBG_VALUE _, 0, !12, !DIExpression(), debug-location !13
     MOV32mr %stack.0.x.addr, 1, _, 0, _, %0
     $eax = COPY %0
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/missing-closing-quote.mir b/llvm/test/CodeGen/MIR/X86/missing-closing-quote.mir
index 22f8ede90ba2f..ffbbf4f6591e4 100644
--- a/llvm/test/CodeGen/MIR/X86/missing-closing-quote.mir
+++ b/llvm/test/CodeGen/MIR/X86/missing-closing-quote.mir
@@ -18,5 +18,5 @@ body: |
     ; CHECK: [[@LINE+1]]:48: end of machine instruction reached before the closing '"'
     $rax = MOV64rm $rip, 1, _, @"quoted name, _
     $eax = MOV32rm killed $rax, 1, _, 0, _
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/missing-comma.mir b/llvm/test/CodeGen/MIR/X86/missing-comma.mir
index c87f5e476df7b..3500f05966fc5 100644
--- a/llvm/test/CodeGen/MIR/X86/missing-comma.mir
+++ b/llvm/test/CodeGen/MIR/X86/missing-comma.mir
@@ -14,6 +14,6 @@ body: |
   bb.0.entry:
     ; CHECK: [[@LINE+1]]:25: expected ',' before the next machine operand
     $eax = XOR32rr $eax $eflags
-    RETQ $eax
+    RET64 $eax
 ...
 

diff  --git a/llvm/test/CodeGen/MIR/X86/missing-implicit-operand.mir b/llvm/test/CodeGen/MIR/X86/missing-implicit-operand.mir
index 4bb1c25574333..4bc09b6a4a3f9 100644
--- a/llvm/test/CodeGen/MIR/X86/missing-implicit-operand.mir
+++ b/llvm/test/CodeGen/MIR/X86/missing-implicit-operand.mir
@@ -34,5 +34,5 @@ body: |
     $eax = MOV32r0 implicit-def $eflags
 
   bb.2.exit:
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/named-registers.mir b/llvm/test/CodeGen/MIR/X86/named-registers.mir
index 1bb67225d38b7..9d4dd8b8427a7 100644
--- a/llvm/test/CodeGen/MIR/X86/named-registers.mir
+++ b/llvm/test/CodeGen/MIR/X86/named-registers.mir
@@ -15,7 +15,7 @@ name:            foo
 body: |
   bb.0.entry:
     ; CHECK:      $eax = MOV32r0
-    ; CHECK-NEXT: RETQ $eax
+    ; CHECK-NEXT: RET64 $eax
     $eax = MOV32r0 implicit-def $eflags
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/newline-handling.mir b/llvm/test/CodeGen/MIR/X86/newline-handling.mir
index f8acb61bf2757..8b425a2f98cce 100644
--- a/llvm/test/CodeGen/MIR/X86/newline-handling.mir
+++ b/llvm/test/CodeGen/MIR/X86/newline-handling.mir
@@ -42,12 +42,12 @@ liveins:
 
 # CHECK:      bb.1.less:
 # CHECK-NEXT: $eax = MOV32r0 implicit-def dead $eflags
-# CHECK-NEXT: RETQ killed $eax
+# CHECK-NEXT: RET64 killed $eax
 
 # CHECK:      bb.2.exit:
 # CHECK-NEXT: liveins: $edi
 # CHECK:      $eax = COPY killed $edi
-# CHECK-NEXT: RETQ killed $eax
+# CHECK-NEXT: RET64 killed $eax
 body: |
   bb.0.entry:
     successors: %bb.1, %bb.2
@@ -62,13 +62,13 @@ body: |
 
 
     $eax = MOV32r0 implicit-def dead $eflags
-    RETQ killed $eax
+    RET64 killed $eax
   bb.2.exit:
 
 
     liveins: $edi
     $eax = COPY killed $edi
-    RETQ killed $eax
+    RET64 killed $eax
 
 ...
 ---
@@ -86,12 +86,12 @@ liveins:
 
 # CHECK:      bb.1.less:
 # CHECK-NEXT: $eax = MOV32r0 implicit-def dead $eflags
-# CHECK-NEXT: RETQ killed $eax
+# CHECK-NEXT: RET64 killed $eax
 
 # CHECK:      bb.2.exit:
 # CHECK-NEXT: liveins: $edi
 # CHECK:      $eax = COPY killed $edi
-# CHECK-NEXT: RETQ killed $eax
+# CHECK-NEXT: RET64 killed $eax
 body: |
 
   bb.0.entry:
@@ -100,10 +100,10 @@ body: |
     CMP32ri8 $edi, 10, implicit-def $eflags
     JCC_1 %bb.2, 15, implicit killed $eflags
   bb.1.less:  $eax = MOV32r0 implicit-def dead $eflags
-              RETQ killed $eax
+              RET64 killed $eax
 
   bb.2.exit:  liveins: $edi
     $eax = COPY killed $edi
-    RETQ killed $eax
+    RET64 killed $eax
 
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/null-register-operands.mir b/llvm/test/CodeGen/MIR/X86/null-register-operands.mir
index 35b02cf3464d5..f64ba1b78721a 100644
--- a/llvm/test/CodeGen/MIR/X86/null-register-operands.mir
+++ b/llvm/test/CodeGen/MIR/X86/null-register-operands.mir
@@ -16,7 +16,7 @@ name:            deref
 body: |
   bb.0.entry:
     ; CHECK:      $eax = MOV32rm $rdi, 1, $noreg, 0, $noreg
-    ; CHECK-NEXT: RETQ $eax
+    ; CHECK-NEXT: RET64 $eax
     $eax = MOV32rm $rdi, 1, _, 0, $noreg
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/register-mask-operands.mir b/llvm/test/CodeGen/MIR/X86/register-mask-operands.mir
index 7e88b28d07898..761d44d84ffb4 100644
--- a/llvm/test/CodeGen/MIR/X86/register-mask-operands.mir
+++ b/llvm/test/CodeGen/MIR/X86/register-mask-operands.mir
@@ -23,7 +23,7 @@ name:            compute
 body: |
   bb.0.body:
     $eax = IMUL32rri8 $edi, 11, implicit-def $eflags
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 # CHECK: name: foo
@@ -35,5 +35,5 @@ body: |
     PUSH64r $rax, implicit-def $rsp, implicit $rsp
     CALL64pcrel32 @compute, csr_64, implicit $rsp, implicit $edi, implicit-def $rsp, implicit-def $eax
     $rdx = POP64r implicit-def $rsp, implicit $rsp
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/register-operands-target-flag-error.mir b/llvm/test/CodeGen/MIR/X86/register-operands-target-flag-error.mir
index 530a3bff97a59..b6bcb778bb96b 100644
--- a/llvm/test/CodeGen/MIR/X86/register-operands-target-flag-error.mir
+++ b/llvm/test/CodeGen/MIR/X86/register-operands-target-flag-error.mir
@@ -20,5 +20,5 @@ body: |
     $rax = MOV64rm target-flags(x86-got) $rip, 1, _, @G, _
     $eax = MOV32rm killed $rax, 1, _, 0, _
     $eax = INC32r killed $eax, implicit-def dead $eflags
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/renamable-register-flag.mir b/llvm/test/CodeGen/MIR/X86/renamable-register-flag.mir
index 5b2f482449ce8..3a773b1320862 100644
--- a/llvm/test/CodeGen/MIR/X86/renamable-register-flag.mir
+++ b/llvm/test/CodeGen/MIR/X86/renamable-register-flag.mir
@@ -12,5 +12,5 @@ body: |
   bb.0:
     ; CHECK: renamable $eax = IMUL32rri8 $edi, 11, implicit-def dead $eflags
     renamable $eax = IMUL32rri8 $edi, 11, implicit-def dead $eflags
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/roundtrip.mir b/llvm/test/CodeGen/MIR/X86/roundtrip.mir
index b703be0a827ee..46f08ad1a214d 100644
--- a/llvm/test/CodeGen/MIR/X86/roundtrip.mir
+++ b/llvm/test/CodeGen/MIR/X86/roundtrip.mir
@@ -9,12 +9,12 @@
 # CHECK:     %0:gr32 = MOV32r0 implicit-def $eflags
 # CHECK:     dead %1:gr32 = COPY %0
 # CHECK:     MOV32mr undef $rcx, 1, $noreg, 0, $noreg, killed %0 :: (volatile store (s32))
-# CHECK:     RETQ undef $eax
+# CHECK:     RET64 undef $eax
 name: func0
 body: |
   bb.0:
     %0 : gr32 = MOV32r0 implicit-def $eflags
     dead %1 : gr32 = COPY %0
     MOV32mr undef $rcx, 1, _, 0, _, killed %0 :: (volatile store (s32))
-    RETQ undef $eax
+    RET64 undef $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/simple-register-allocation-hints.mir b/llvm/test/CodeGen/MIR/X86/simple-register-allocation-hints.mir
index 5cae2a20c3a5b..84d298dbd4070 100644
--- a/llvm/test/CodeGen/MIR/X86/simple-register-allocation-hints.mir
+++ b/llvm/test/CodeGen/MIR/X86/simple-register-allocation-hints.mir
@@ -30,5 +30,5 @@ body: |
     %2 = COPY $edi
     %2 = IMUL32rr %2, %1, implicit-def dead $eflags
     $eax = COPY %2
-    RETQ killed $eax
+    RET64 killed $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/spill-slot-fixed-stack-object-aliased.mir b/llvm/test/CodeGen/MIR/X86/spill-slot-fixed-stack-object-aliased.mir
index 13c252316777c..9063d296f93a2 100644
--- a/llvm/test/CodeGen/MIR/X86/spill-slot-fixed-stack-object-aliased.mir
+++ b/llvm/test/CodeGen/MIR/X86/spill-slot-fixed-stack-object-aliased.mir
@@ -26,5 +26,5 @@ body: |
   bb.0.entry:
     MOV32mr %rsp, 1, _, -4, _, %edi
     %eax = COPY %edi
-    RETQ %eax
+    RET64 %eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/spill-slot-fixed-stack-object-immutable.mir b/llvm/test/CodeGen/MIR/X86/spill-slot-fixed-stack-object-immutable.mir
index dba4a0b42a680..430f0143c78b1 100644
--- a/llvm/test/CodeGen/MIR/X86/spill-slot-fixed-stack-object-immutable.mir
+++ b/llvm/test/CodeGen/MIR/X86/spill-slot-fixed-stack-object-immutable.mir
@@ -26,5 +26,5 @@ body: |
   bb.0.entry:
     MOV32mr %rsp, 1, _, -4, _, %edi
     %eax = COPY %edi
-    RETQ %eax
+    RET64 %eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/spill-slot-fixed-stack-objects.mir b/llvm/test/CodeGen/MIR/X86/spill-slot-fixed-stack-objects.mir
index f17a42359ab11..1f7c200848a89 100644
--- a/llvm/test/CodeGen/MIR/X86/spill-slot-fixed-stack-objects.mir
+++ b/llvm/test/CodeGen/MIR/X86/spill-slot-fixed-stack-objects.mir
@@ -30,5 +30,5 @@ body: |
   bb.0.entry:
     MOV32mr $rsp, 1, _, -4, _, $edi
     $eax = COPY $edi
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/stack-object-invalid-name.mir b/llvm/test/CodeGen/MIR/X86/stack-object-invalid-name.mir
index 3a72dc4521e0b..54d01563db451 100644
--- a/llvm/test/CodeGen/MIR/X86/stack-object-invalid-name.mir
+++ b/llvm/test/CodeGen/MIR/X86/stack-object-invalid-name.mir
@@ -24,5 +24,5 @@ body: |
   bb.0.entry:
     MOV32mr $rsp, 1, _, -4, _, $edi
     $eax = MOV32rm $rsp, 1, _, -4, _
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/stack-object-operand-name-mismatch-error.mir b/llvm/test/CodeGen/MIR/X86/stack-object-operand-name-mismatch-error.mir
index 91b7951bf3680..66d84017e4975 100644
--- a/llvm/test/CodeGen/MIR/X86/stack-object-operand-name-mismatch-error.mir
+++ b/llvm/test/CodeGen/MIR/X86/stack-object-operand-name-mismatch-error.mir
@@ -28,5 +28,5 @@ body: |
     ; CHECK: [[@LINE+1]]:13: the name of the stack object '%stack.0' isn't 'x'
     MOV32mr %stack.0.x, 1, _, 0, _, %0
     $eax = COPY %0
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/stack-object-operands.mir b/llvm/test/CodeGen/MIR/X86/stack-object-operands.mir
index 76be7e074cdd8..d6dac85f21cb4 100644
--- a/llvm/test/CodeGen/MIR/X86/stack-object-operands.mir
+++ b/llvm/test/CodeGen/MIR/X86/stack-object-operands.mir
@@ -37,11 +37,11 @@ body: |
     ; CHECK: MOV32mi %stack.1, 1, $noreg, 0, $noreg, 2
     ; CHECK: [[MOV32rm1:%[0-9]+]]:gr32 = MOV32rm %stack.0.b, 1, $noreg, 0, $noreg
     ; CHECK: $eax = COPY [[MOV32rm1]]
-    ; CHECK: RETL $eax
+    ; CHECK: RET32 $eax
     %0 = MOV32rm %fixed-stack.0, 1, _, 0, _
     MOV32mr %stack.0.b, 1, _, 0, _, %0
     MOV32mi %stack.1, 1, _, 0, _, 2
     %1 = MOV32rm %stack.0, 1, _, 0, _
     $eax = COPY %1
-    RETL $eax
+    RET32 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/stack-object-redefinition-error.mir b/llvm/test/CodeGen/MIR/X86/stack-object-redefinition-error.mir
index 4e734d7416351..ad6b9da529843 100644
--- a/llvm/test/CodeGen/MIR/X86/stack-object-redefinition-error.mir
+++ b/llvm/test/CodeGen/MIR/X86/stack-object-redefinition-error.mir
@@ -33,5 +33,5 @@ body: |
     MOV32mr $rsp, 1, _, -4, _, killed $edi
     MOV64mi32 $rsp, 1, _, -16, _, 2
     $eax = MOV32rm $rsp, 1, _, -4, _
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/stack-objects.mir b/llvm/test/CodeGen/MIR/X86/stack-objects.mir
index ec3c099646ccc..282c6102ffb7d 100644
--- a/llvm/test/CodeGen/MIR/X86/stack-objects.mir
+++ b/llvm/test/CodeGen/MIR/X86/stack-objects.mir
@@ -39,5 +39,5 @@ body: |
     MOV32mr $rsp, 1, _, -4, _, $edi
     MOV64mi32 $rsp, 1, _, -16, _, 2
     $eax = MOV32rm $rsp, 1, _, -4, _
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/standalone-register-error.mir b/llvm/test/CodeGen/MIR/X86/standalone-register-error.mir
index 009e514e770e1..30df44da56c65 100644
--- a/llvm/test/CodeGen/MIR/X86/standalone-register-error.mir
+++ b/llvm/test/CodeGen/MIR/X86/standalone-register-error.mir
@@ -19,5 +19,5 @@ body: |
 
     %0 = COPY $edi
     $eax = COPY %0
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/subregister-index-operands.mir b/llvm/test/CodeGen/MIR/X86/subregister-index-operands.mir
index b1e96779c3f71..383499f3650f9 100644
--- a/llvm/test/CodeGen/MIR/X86/subregister-index-operands.mir
+++ b/llvm/test/CodeGen/MIR/X86/subregister-index-operands.mir
@@ -25,10 +25,10 @@ body: |
     ; CHECK: [[INSERT_SUBREG:%[0-9]+]]:gr32 = INSERT_SUBREG $edi, $al, %subreg.sub_8bit
     ; CHECK: [[EXTRACT_SUBREG:%[0-9]+]]:gr8 = EXTRACT_SUBREG $eax, %subreg.sub_8bit_hi
     ; CHECK: $ax = REG_SEQUENCE [[EXTRACT_SUBREG]], %subreg.sub_8bit, [[EXTRACT_SUBREG]], %subreg.sub_8bit_hi
-    ; CHECK: RETQ $ax
+    ; CHECK: RET64 $ax
     %0 = INSERT_SUBREG $edi, $al, %subreg.sub_8bit
     %1 = EXTRACT_SUBREG $eax, %subreg.sub_8bit_hi
     $ax = REG_SEQUENCE %1, %subreg.sub_8bit, %1, %subreg.sub_8bit_hi
-    RETQ $ax
+    RET64 $ax
 ...
 

diff  --git a/llvm/test/CodeGen/MIR/X86/subregister-operands.mir b/llvm/test/CodeGen/MIR/X86/subregister-operands.mir
index 3361deb437c02..a7d854fde1ed5 100644
--- a/llvm/test/CodeGen/MIR/X86/subregister-operands.mir
+++ b/llvm/test/CodeGen/MIR/X86/subregister-operands.mir
@@ -27,11 +27,11 @@ body: |
     ; CHECK: [[COPY1:%[0-9]+]]:gr8 = COPY [[COPY]].sub_8bit
     ; CHECK: [[AND8ri:%[0-9]+]]:gr8 = AND8ri [[COPY1]], 1, implicit-def $eflags
     ; CHECK: $al = COPY [[AND8ri]]
-    ; CHECK: RETQ $al
+    ; CHECK: RET64 $al
     %0 = COPY $edi
     %1 = COPY %0.sub_8bit
     %2 = AND8ri %1, 1, implicit-def $eflags
     $al = COPY %2
-    RETQ $al
+    RET64 $al
 ...
 

diff  --git a/llvm/test/CodeGen/MIR/X86/successor-basic-blocks-weights.mir b/llvm/test/CodeGen/MIR/X86/successor-basic-blocks-weights.mir
index dd6dcef5ef1e5..54fbd01eae7a5 100644
--- a/llvm/test/CodeGen/MIR/X86/successor-basic-blocks-weights.mir
+++ b/llvm/test/CodeGen/MIR/X86/successor-basic-blocks-weights.mir
@@ -32,11 +32,11 @@ body: |
 
   bb.1.less:
     $eax = MOV32r0 implicit-def dead $eflags
-    RETQ killed $eax
+    RET64 killed $eax
 
   bb.2.exit:
     liveins: $edi
 
     $eax = COPY killed $edi
-    RETQ killed $eax
+    RET64 killed $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/successor-basic-blocks.mir b/llvm/test/CodeGen/MIR/X86/successor-basic-blocks.mir
index 0f541aa03b2fa..d08919692a49d 100644
--- a/llvm/test/CodeGen/MIR/X86/successor-basic-blocks.mir
+++ b/llvm/test/CodeGen/MIR/X86/successor-basic-blocks.mir
@@ -42,13 +42,13 @@ body: |
 
   bb.1.less:
     $eax = MOV32r0 implicit-def dead $eflags
-    RETQ killed $eax
+    RET64 killed $eax
 
   bb.2.exit:
     liveins: $edi
 
     $eax = COPY killed $edi
-    RETQ killed $eax
+    RET64 killed $eax
 ...
 ---
 name:            bar
@@ -72,11 +72,11 @@ body: |
   bb.1:
     successors:
     $eax = MOV32r0 implicit-def dead $eflags
-    RETQ killed $eax
+    RET64 killed $eax
 
   bb.2:
     liveins: $edi
 
     $eax = COPY killed $edi
-    RETQ killed $eax
+    RET64 killed $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/tied-def-operand-invalid.mir b/llvm/test/CodeGen/MIR/X86/tied-def-operand-invalid.mir
index 412db1dfd2215..7509b31964e5a 100644
--- a/llvm/test/CodeGen/MIR/X86/tied-def-operand-invalid.mir
+++ b/llvm/test/CodeGen/MIR/X86/tied-def-operand-invalid.mir
@@ -20,5 +20,5 @@ body: |
   ; CHECK: [[@LINE+1]]:58: use of invalid tied-def operand index '0'; the operand #0 isn't a defined register
     INLINEASM &"$foo", 1, 2818058, def $rdi, 2147483657, killed $rdi(tied-def 0)
     $rax = COPY killed $rdi
-    RETQ killed $rax
+    RET64 killed $rax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/tied-physical-regs-match.mir b/llvm/test/CodeGen/MIR/X86/tied-physical-regs-match.mir
index 3d842f66f0aa7..1e4104e8ebda0 100644
--- a/llvm/test/CodeGen/MIR/X86/tied-physical-regs-match.mir
+++ b/llvm/test/CodeGen/MIR/X86/tied-physical-regs-match.mir
@@ -18,5 +18,5 @@ body: |
 
     ; CHECK: Tied physical registers must match.
     $rbx = AND64rm killed $rdx, killed $rdi, 1, _, 0, _, implicit-def dead $eflags
-    RETQ $rbx
+    RET64 $rbx
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/undef-register-flag.mir b/llvm/test/CodeGen/MIR/X86/undef-register-flag.mir
index 2464959db6255..e0220cfdb706e 100644
--- a/llvm/test/CodeGen/MIR/X86/undef-register-flag.mir
+++ b/llvm/test/CodeGen/MIR/X86/undef-register-flag.mir
@@ -24,7 +24,7 @@ name:            compute
 body: |
   bb.0.body:
     $eax = IMUL32rri8 $edi, 11, implicit-def $eflags
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 name:            foo
@@ -34,5 +34,5 @@ body: |
     PUSH64r undef $rax, implicit-def $rsp, implicit $rsp
     CALL64pcrel32 @compute, csr_64, implicit $rsp, implicit $edi, implicit-def $rsp, implicit-def $eax
     $rdx = POP64r implicit-def $rsp, implicit $rsp
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/undefined-fixed-stack-object.mir b/llvm/test/CodeGen/MIR/X86/undefined-fixed-stack-object.mir
index 7462290472ae9..d7344cb02f6e5 100644
--- a/llvm/test/CodeGen/MIR/X86/undefined-fixed-stack-object.mir
+++ b/llvm/test/CodeGen/MIR/X86/undefined-fixed-stack-object.mir
@@ -33,5 +33,5 @@ body: |
     MOV32mi %stack.1, 1, _, 0, _, 2
     %1 = MOV32rm %stack.0, 1, _, 0, _
     $eax = COPY %1
-    RETL $eax
+    RET32 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/undefined-global-value.mir b/llvm/test/CodeGen/MIR/X86/undefined-global-value.mir
index 881e114b25ab9..ec27a408933a2 100644
--- a/llvm/test/CodeGen/MIR/X86/undefined-global-value.mir
+++ b/llvm/test/CodeGen/MIR/X86/undefined-global-value.mir
@@ -22,5 +22,5 @@ body: |
     $rax = MOV64rm $rip, 1, _, @2, _
     $eax = MOV32rm $rax, 1, _, 0, _
     $eax = INC32r $eax
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/undefined-ir-block-in-blockaddress.mir b/llvm/test/CodeGen/MIR/X86/undefined-ir-block-in-blockaddress.mir
index e5fde201fb91e..8ee9cb282d0fd 100644
--- a/llvm/test/CodeGen/MIR/X86/undefined-ir-block-in-blockaddress.mir
+++ b/llvm/test/CodeGen/MIR/X86/undefined-ir-block-in-blockaddress.mir
@@ -26,5 +26,5 @@ body: |
     JMP64m $rip, 1, _, @addr, _
 
   bb.1.block (address-taken):
-    RETQ
+    RET64
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/undefined-ir-block-slot-in-blockaddress.mir b/llvm/test/CodeGen/MIR/X86/undefined-ir-block-slot-in-blockaddress.mir
index be0690b02a428..2ee485eb90751 100644
--- a/llvm/test/CodeGen/MIR/X86/undefined-ir-block-slot-in-blockaddress.mir
+++ b/llvm/test/CodeGen/MIR/X86/undefined-ir-block-slot-in-blockaddress.mir
@@ -25,5 +25,5 @@ body: |
     JMP64m $rip, 1, _, @addr, _
 
   bb.1 (address-taken):
-    RETQ
+    RET64
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/undefined-jump-table-id.mir b/llvm/test/CodeGen/MIR/X86/undefined-jump-table-id.mir
index 9672bc76a0d52..246b0c9964614 100644
--- a/llvm/test/CodeGen/MIR/X86/undefined-jump-table-id.mir
+++ b/llvm/test/CodeGen/MIR/X86/undefined-jump-table-id.mir
@@ -53,21 +53,21 @@ body: |
 
   bb.2.def:
     $eax = MOV32r0 implicit-def $eflags
-    RETQ $eax
+    RET64 $eax
 
   bb.3.lbl1:
     $eax = MOV32ri 1
-    RETQ $eax
+    RET64 $eax
 
   bb.4.lbl2:
     $eax = MOV32ri 2
-    RETQ $eax
+    RET64 $eax
 
   bb.5.lbl3:
     $eax = MOV32ri 4
-    RETQ $eax
+    RET64 $eax
 
   bb.6.lbl4:
     $eax = MOV32ri 8
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/undefined-named-global-value.mir b/llvm/test/CodeGen/MIR/X86/undefined-named-global-value.mir
index 43c8d1414324c..8d0e129515407 100644
--- a/llvm/test/CodeGen/MIR/X86/undefined-named-global-value.mir
+++ b/llvm/test/CodeGen/MIR/X86/undefined-named-global-value.mir
@@ -22,5 +22,5 @@ body: |
     $rax = MOV64rm $rip, 1, _, @GG, _
     $eax = MOV32rm $rax, 1, _, 0, _
     $eax = INC32r $eax
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/undefined-register-class.mir b/llvm/test/CodeGen/MIR/X86/undefined-register-class.mir
index f17fc7e8ef9c0..8fb9dbc2c5680 100644
--- a/llvm/test/CodeGen/MIR/X86/undefined-register-class.mir
+++ b/llvm/test/CodeGen/MIR/X86/undefined-register-class.mir
@@ -18,6 +18,6 @@ registers:
   - {id: 0, class: 'gr3200'}
 body: |
   bb.0.entry:
-    RETQ %eax
+    RET64 %eax
 ...
 

diff  --git a/llvm/test/CodeGen/MIR/X86/undefined-stack-object.mir b/llvm/test/CodeGen/MIR/X86/undefined-stack-object.mir
index aeb6b2abfe853..bf3f5fa2eae5f 100644
--- a/llvm/test/CodeGen/MIR/X86/undefined-stack-object.mir
+++ b/llvm/test/CodeGen/MIR/X86/undefined-stack-object.mir
@@ -25,5 +25,5 @@ body: |
     ; CHECK: [[@LINE+1]]:13: use of undefined stack object '%stack.2'
     MOV32mr %stack.2, 1, _, 0, _, %0
     $eax = COPY %0
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/undefined-value-in-memory-operand.mir b/llvm/test/CodeGen/MIR/X86/undefined-value-in-memory-operand.mir
index e56873d52d607..6069e48def4b1 100644
--- a/llvm/test/CodeGen/MIR/X86/undefined-value-in-memory-operand.mir
+++ b/llvm/test/CodeGen/MIR/X86/undefined-value-in-memory-operand.mir
@@ -19,6 +19,6 @@ body: |
     liveins: $rdi
   ; CHECK: [[@LINE+1]]:64: use of undefined IR value '%ir.c'
     $eax = MOV32rm killed $rdi, 1, _, 0, _ :: (load (s32) from %ir.c)
-    RETQ $eax
+    RET64 $eax
 ...
 

diff  --git a/llvm/test/CodeGen/MIR/X86/undefined-virtual-register.mir b/llvm/test/CodeGen/MIR/X86/undefined-virtual-register.mir
index 665e37fc15c2c..c31735a52eb68 100644
--- a/llvm/test/CodeGen/MIR/X86/undefined-virtual-register.mir
+++ b/llvm/test/CodeGen/MIR/X86/undefined-virtual-register.mir
@@ -20,6 +20,6 @@ body: |
     %0 = COPY $edi
     ; CHECK: Cannot determine class/bank of virtual register 1 in function 'test'
     $eax = COPY %1
-    RETQ $eax
+    RET64 $eax
 ...
 

diff  --git a/llvm/test/CodeGen/MIR/X86/unknown-machine-basic-block.mir b/llvm/test/CodeGen/MIR/X86/unknown-machine-basic-block.mir
index 65c0b8d7f1b8e..0c5a58e467cee 100644
--- a/llvm/test/CodeGen/MIR/X86/unknown-machine-basic-block.mir
+++ b/llvm/test/CodeGen/MIR/X86/unknown-machine-basic-block.mir
@@ -32,5 +32,5 @@ body: |
     $eax = MOV32r0 implicit-def $eflags
 
   bb.2:
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/unknown-metadata-keyword.mir b/llvm/test/CodeGen/MIR/X86/unknown-metadata-keyword.mir
index 85abb2fcfdffe..45d39c399660c 100644
--- a/llvm/test/CodeGen/MIR/X86/unknown-metadata-keyword.mir
+++ b/llvm/test/CodeGen/MIR/X86/unknown-metadata-keyword.mir
@@ -21,5 +21,5 @@ body: |
     $eax = MOV32rm $rdi, 1, _, 0, _ :: (load (s32) from %ir.x, !tba !0)
     $eax = INC32r killed $eax, implicit-def dead $eflags
     MOV32mr killed $rdi, 1, _, 0, _, $eax :: (store (s32) into %ir.x)
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/unknown-metadata-node.mir b/llvm/test/CodeGen/MIR/X86/unknown-metadata-node.mir
index a6152701c8f57..260b0a0a15d54 100644
--- a/llvm/test/CodeGen/MIR/X86/unknown-metadata-node.mir
+++ b/llvm/test/CodeGen/MIR/X86/unknown-metadata-node.mir
@@ -53,5 +53,5 @@ body: |
     DBG_VALUE _, 0, !42, !13
     MOV32mr %stack.0.x.addr, 1, _, 0, _, %0
     $eax = COPY %0
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/unknown-named-machine-basic-block.mir b/llvm/test/CodeGen/MIR/X86/unknown-named-machine-basic-block.mir
index 17bbce438a89a..11d894dbeff59 100644
--- a/llvm/test/CodeGen/MIR/X86/unknown-named-machine-basic-block.mir
+++ b/llvm/test/CodeGen/MIR/X86/unknown-named-machine-basic-block.mir
@@ -31,5 +31,5 @@ body: |
     $eax = MOV32r0 implicit-def $eflags
 
   bb.2.exit:
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/unknown-register.mir b/llvm/test/CodeGen/MIR/X86/unknown-register.mir
index 37c30f6cb3167..cdd85f0b1b369 100644
--- a/llvm/test/CodeGen/MIR/X86/unknown-register.mir
+++ b/llvm/test/CodeGen/MIR/X86/unknown-register.mir
@@ -16,5 +16,5 @@ body: |
   bb.0.entry:
     ; CHECK: [[@LINE+1]]:5: unknown register name 'xax'
     $xax = MOV32r0
-    RETQ $xax
+    RET64 $xax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/unknown-subregister-index-op.mir b/llvm/test/CodeGen/MIR/X86/unknown-subregister-index-op.mir
index 18eb3e7356626..30ec530fad3db 100644
--- a/llvm/test/CodeGen/MIR/X86/unknown-subregister-index-op.mir
+++ b/llvm/test/CodeGen/MIR/X86/unknown-subregister-index-op.mir
@@ -21,5 +21,5 @@ body: |
   bb.0.entry:
     ; CHECK: [[@LINE+1]]:35: unknown subregister index 'bit8'
     %0 = INSERT_SUBREG $edi, $al, %subreg.bit8
-    RETQ %0
+    RET64 %0
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/unknown-subregister-index.mir b/llvm/test/CodeGen/MIR/X86/unknown-subregister-index.mir
index d5cbb06aac5bc..6db338dc9fcae 100644
--- a/llvm/test/CodeGen/MIR/X86/unknown-subregister-index.mir
+++ b/llvm/test/CodeGen/MIR/X86/unknown-subregister-index.mir
@@ -24,5 +24,5 @@ body: |
     %1 = COPY %0.bit8
     %2 = AND8ri %1, 1, implicit-def $eflags
     $al = COPY %2
-    RETQ $al
+    RET64 $al
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/unrecognized-character.mir b/llvm/test/CodeGen/MIR/X86/unrecognized-character.mir
index 4b6631099716a..15817d06a28a9 100644
--- a/llvm/test/CodeGen/MIR/X86/unrecognized-character.mir
+++ b/llvm/test/CodeGen/MIR/X86/unrecognized-character.mir
@@ -13,5 +13,5 @@ name:            foo
 body: |
   bb.0.entry:
     ; CHECK: [[@LINE+1]]:5: unexpected character '\'
-    \ RETQ
+    \ RET64
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/variable-sized-stack-object-size-error.mir b/llvm/test/CodeGen/MIR/X86/variable-sized-stack-object-size-error.mir
index ce3e846c03c06..77562620f1eb0 100644
--- a/llvm/test/CodeGen/MIR/X86/variable-sized-stack-object-size-error.mir
+++ b/llvm/test/CodeGen/MIR/X86/variable-sized-stack-object-size-error.mir
@@ -30,5 +30,5 @@ body: |
     MOV32mr %rsp, 1, _, -4, _, %edi
     MOV64mi32 %rsp, 1, _, -16, _, 2
     %eax = MOV32rm %rsp, 1, _, -4, _
-    RETQ %eax
+    RET64 %eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/variable-sized-stack-objects.mir b/llvm/test/CodeGen/MIR/X86/variable-sized-stack-objects.mir
index e251ddac5f3b8..81c2b99fc0684 100644
--- a/llvm/test/CodeGen/MIR/X86/variable-sized-stack-objects.mir
+++ b/llvm/test/CodeGen/MIR/X86/variable-sized-stack-objects.mir
@@ -40,5 +40,5 @@ body: |
     MOV32mr $rsp, 1, _, -4, _, $edi
     MOV64mi32 $rsp, 1, _, -16, _, 2
     $eax = MOV32rm $rsp, 1, _, -4, _
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/MIR/X86/virtual-register-redefinition-error.mir b/llvm/test/CodeGen/MIR/X86/virtual-register-redefinition-error.mir
index 6ecfabc1b30f7..423e892da4a49 100644
--- a/llvm/test/CodeGen/MIR/X86/virtual-register-redefinition-error.mir
+++ b/llvm/test/CodeGen/MIR/X86/virtual-register-redefinition-error.mir
@@ -21,6 +21,6 @@ body: |
 
     %0 = COPY %edi
     %eax = COPY %0
-    RETQ %eax
+    RET64 %eax
 ...
 

diff  --git a/llvm/test/CodeGen/MIR/X86/virtual-registers.mir b/llvm/test/CodeGen/MIR/X86/virtual-registers.mir
index 56a475de783a1..e317746e08a18 100644
--- a/llvm/test/CodeGen/MIR/X86/virtual-registers.mir
+++ b/llvm/test/CodeGen/MIR/X86/virtual-registers.mir
@@ -56,11 +56,11 @@ body: |
     ; CHECK-NEXT: $eax = COPY %2
     %2 = MOV32r0 implicit-def $eflags
     $eax = COPY %2
-    RETQ $eax
+    RET64 $eax
 
   bb.2.exit:
     $eax = COPY %0
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 name:            foo
@@ -90,10 +90,10 @@ body: |
     ; CHECK-NEXT: $eax = COPY %2
     %10 = MOV32r0 implicit-def $eflags
     $eax = COPY %10
-    RETQ $eax
+    RET64 $eax
 
   bb.2.exit:
     ; CHECK: $eax = COPY %0
     $eax = COPY %2
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/X86/basic-block-sections-mir-parse.mir b/llvm/test/CodeGen/X86/basic-block-sections-mir-parse.mir
index 3006647f6bae5..ab284955e4955 100644
--- a/llvm/test/CodeGen/X86/basic-block-sections-mir-parse.mir
+++ b/llvm/test/CodeGen/X86/basic-block-sections-mir-parse.mir
@@ -118,7 +118,7 @@ body:             |
     renamable $eax = MOV32rm $rbp, 1, $noreg, -8, $noreg :: (load (s32) from %ir.2)
     $rbp = frame-destroy POP64r implicit-def $rsp, implicit $rsp
     CFI_INSTRUCTION def_cfa $rsp, 8
-    RETQ implicit $eax
+    RET64 implicit $eax
 
 ...
 

diff  --git a/llvm/test/CodeGen/X86/block-placement.mir b/llvm/test/CodeGen/X86/block-placement.mir
index 315669403c51f..81d58effbdc2c 100644
--- a/llvm/test/CodeGen/X86/block-placement.mir
+++ b/llvm/test/CodeGen/X86/block-placement.mir
@@ -73,7 +73,7 @@ body:             |
     liveins: $rdi, $eax
   
     $rcx = POP64r implicit-def $rsp, implicit $rsp
-    RETQ $eax
+    RET64 $eax
 
   bb.2.null:
     liveins: $rdi

diff  --git a/llvm/test/CodeGen/X86/bug47278.mir b/llvm/test/CodeGen/X86/bug47278.mir
index c7387c915972c..70390cbb04361 100644
--- a/llvm/test/CodeGen/X86/bug47278.mir
+++ b/llvm/test/CodeGen/X86/bug47278.mir
@@ -24,7 +24,7 @@ body:             |
     ; CHECK: $cl = IMPLICIT_DEF
     ; CHECK: renamable $eax = COPY renamable $edx
     ; CHECK: dead renamable $eax = SHRD32rrCL renamable $eax, killed renamable $edx, implicit-def dead $eflags, implicit killed $cl
-    ; CHECK: RETL
+    ; CHECK: RET32
     %0:gr32 = IMPLICIT_DEF
     %1:gr32 = MOVZX32rm8 %0, 1, $noreg, 0, $noreg :: (load (s8) from `i168* undef` + 20, align 4, basealign 16)
     %2:gr32 = MOV32rm %0, 1, $noreg, 0, $noreg :: (load (s32) from `i168* undef` + 12, basealign 16)
@@ -40,6 +40,6 @@ body:             |
     $cl = IMPLICIT_DEF
     %8:gr32 = COPY %1
     %8:gr32 = SHRD32rrCL %8, %1, implicit-def dead $eflags, implicit $cl
-    RETL
+    RET32
 
 ...

diff  --git a/llvm/test/CodeGen/X86/dbg-changes-codegen-branch-folding2.mir b/llvm/test/CodeGen/X86/dbg-changes-codegen-branch-folding2.mir
index e0412817a04da..84f205ad77458 100644
--- a/llvm/test/CodeGen/X86/dbg-changes-codegen-branch-folding2.mir
+++ b/llvm/test/CodeGen/X86/dbg-changes-codegen-branch-folding2.mir
@@ -109,7 +109,7 @@ body:             |
   
   bb.3.for.cond.cleanup:
     liveins: $rdi, $xmm3, $xmm4, $xmm5, $xmm6, $xmm7, $xmm9, $xmm13, $xmm14
-    RETQ
+    RET64
   
   bb.4.for.body:
     successors: %bb.1, %bb.5

diff  --git a/llvm/test/CodeGen/X86/dbg-value-superreg-copy.mir b/llvm/test/CodeGen/X86/dbg-value-superreg-copy.mir
index 0a8af06b9abd1..3b41f412a697e 100644
--- a/llvm/test/CodeGen/X86/dbg-value-superreg-copy.mir
+++ b/llvm/test/CodeGen/X86/dbg-value-superreg-copy.mir
@@ -44,7 +44,7 @@ body:             |
   bb.2:
     $ax = COPY %1
     $dx = COPY %2
-    RETQ killed $ax, killed $dx
+    RET64 killed $ax, killed $dx
 ...
 
 # This test case was created as a reproducer for a bug when we got incorrect

diff  --git a/llvm/test/CodeGen/X86/evex-to-vex-compress.mir b/llvm/test/CodeGen/X86/evex-to-vex-compress.mir
index fbfb58d75b71e..e64fa2c21490e 100755
--- a/llvm/test/CodeGen/X86/evex-to-vex-compress.mir
+++ b/llvm/test/CodeGen/X86/evex-to-vex-compress.mir
@@ -914,7 +914,7 @@ body: |
   ; CHECK: $ymm0 = VPERM2I128rr                $ymm0, $ymm1, 32
   $ymm0 = VSHUFI64X2Z256rri                    $ymm0, $ymm1, 228
 
-  RETQ
+  RET64
 ...
 ---
   # CHECK-LABEL: name: evex_z128_to_vex_test
@@ -1800,7 +1800,7 @@ body: |
   ; CHECK: $xmm0 = VROUNDPSr                   $xmm0, 15, implicit $mxcsr
   $xmm0 = VRNDSCALEPSZ128rri                   $xmm0, 15, implicit $mxcsr
 
-  RETQ
+  RET64
 ...
 ---
   # CHECK-LABEL: name: evex_scalar_to_vex_test
@@ -2371,7 +2371,7 @@ body: |
   ; CHECK: $xmm0 = VROUNDSSr_Int               $xmm0, $xmm1, 15, implicit $mxcsr
   $xmm0 = VRNDSCALESSZr_Int                    $xmm0, $xmm1, 15, implicit $mxcsr
 
-  RETQ
+  RET64
 ...
 ---
   # CHECK-LABEL: name: evex_z256_to_evex_test
@@ -3285,7 +3285,7 @@ body: |
   ; CHECK: $ymm16 = VSHUFI64X2Z256rri          $ymm16, $ymm1, 228
   $ymm16 = VSHUFI64X2Z256rri                   $ymm16, $ymm1, 228
 
-  RETQ
+  RET64
 ...                                            
 ---                                            
   # CHECK-LABEL: name: evex_z128_to_evex_test
@@ -4179,7 +4179,7 @@ body: |
   ; CHECK: $xmm0 = VRNDSCALEPSZ128rri          $xmm0, 31, implicit $mxcsr
   $xmm0 = VRNDSCALEPSZ128rri                   $xmm0, 31, implicit $mxcsr
     
-  RETQ
+  RET64
 ...
 ---
   # CHECK-LABEL: name: evex_scalar_to_evex_test
@@ -4761,5 +4761,5 @@ body: |
   ; CHECK: $xmm0 = VRNDSCALESSZr_Int           $xmm0, $xmm1, 31, implicit $mxcsr
   $xmm0 = VRNDSCALESSZr_Int                    $xmm0, $xmm1, 31, implicit $mxcsr
   
-  RETQ
+  RET64
 ...

diff  --git a/llvm/test/CodeGen/X86/expand-call-rvmarker.mir b/llvm/test/CodeGen/X86/expand-call-rvmarker.mir
index e83090e22f7e4..7124d9934d9ca 100644
--- a/llvm/test/CodeGen/X86/expand-call-rvmarker.mir
+++ b/llvm/test/CodeGen/X86/expand-call-rvmarker.mir
@@ -34,7 +34,7 @@
 # CHECK-NEXT:   $rdi = MOV64rr $rax
 # CHECK-NEXT:   CALL64pcrel32 @objc_retainAutoreleasedReturnValue, csr_64, implicit $rsp, implicit $ssp, implicit-def $rax
 # CHECK-NEXT:   $rcx = frame-destroy POP64r implicit-def $rsp, implicit $rsp
-# CHECK-NEXT:   RETQ
+# CHECK-NEXT:   RET64
 #
 
 name:            test_objc_retainAutoreleaseReturnedValue
@@ -66,7 +66,7 @@ body:             |
 # CHECK-NEXT:   $rdi = MOV64rr $rax
 # CHECK-NEXT:   CALL64pcrel32 @objc_unsafeClaimAutoreleasedReturnValue, csr_64, implicit $rsp, implicit $ssp, implicit-def $rax
 # CHECK-NEXT:   $rcx = frame-destroy POP64r implicit-def $rsp, implicit $rsp
-# CHECK-NEXT:   RETQ
+# CHECK-NEXT:   RET64
 #
 name:            test_objc_unsafeClaimAutoreleasedReturnValue
 alignment:       16
@@ -99,7 +99,7 @@ body:             |
 # CHECK-NEXT:   $rdi = MOV64rr $rax
 # CHECK-NEXT:   CALL64pcrel32 @objc_retainAutoreleasedReturnValue, csr_64, implicit $rsp, implicit $ssp, implicit-def dead $rax
 # CHECK-NEXT:   $rax = frame-destroy POP64r implicit-def $rsp, implicit $rsp
-# CHECK-NEXT:   RETQ
+# CHECK-NEXT:   RET64
 #
 name:            test_objc_unsafeClaimAutoreleasedReturnValue_2_args
 alignment:       16
@@ -133,7 +133,7 @@ body:             |
 # CHECK-NEXT:   $rdi = MOV64rr $rax
 # CHECK-NEXT:   CALL64pcrel32 @objc_retainAutoreleasedReturnValue, csr_64, implicit $rsp, implicit $ssp, implicit-def dead $rax
 # CHECK-NEXT:   $rax = frame-destroy POP64r implicit-def $rsp, implicit $rsp
-# CHECK-NEXT:   RETQ
+# CHECK-NEXT:   RET64
 #
 name:            test_ret_void
 alignment:       16

diff  --git a/llvm/test/CodeGen/X86/expand-vr64-gr64-copy.mir b/llvm/test/CodeGen/X86/expand-vr64-gr64-copy.mir
index 59e767d16416f..800af1ce5432e 100644
--- a/llvm/test/CodeGen/X86/expand-vr64-gr64-copy.mir
+++ b/llvm/test/CodeGen/X86/expand-vr64-gr64-copy.mir
@@ -32,5 +32,5 @@ body: |
     MMX_MOVQ64mr $rsp, 1, $noreg, -16, $noreg, killed $mm0
     $xmm0 = MOVQI2PQIrm $rsp, 1, $noreg, -16, $noreg
     $xmm0 = PSHUFDri killed $xmm0, -44
-    RETQ $xmm0
+    RET64 $xmm0
 ...

diff  --git a/llvm/test/CodeGen/X86/fast-regalloc-live-out-debug-values.mir b/llvm/test/CodeGen/X86/fast-regalloc-live-out-debug-values.mir
index 2b2192a409e5e..6b26359b9b8f1 100644
--- a/llvm/test/CodeGen/X86/fast-regalloc-live-out-debug-values.mir
+++ b/llvm/test/CodeGen/X86/fast-regalloc-live-out-debug-values.mir
@@ -181,7 +181,7 @@ body:             |
   ; CHECK:   $rbx = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !45
   ; CHECK:   $rbp = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !45
   ; CHECK:   CFI_INSTRUCTION def_cfa $rsp, 8, debug-location !45
-  ; CHECK:   RETQ implicit killed $eax, debug-location !45
+  ; CHECK:   RET64 implicit killed $eax, debug-location !45
   bb.0.entry:
     liveins: $edi
 
@@ -217,6 +217,6 @@ body:             |
     %7:gr64_nosp = IMPLICIT_DEF
     %8:gr32 = MOV32rm %3, 4, %7, 0, $noreg, debug-location !44 :: (load (s32) from %ir.arrayidx3)
     $eax = COPY %8, debug-location !45
-    RETQ implicit $eax, debug-location !45
+    RET64 implicit $eax, debug-location !45
 
 ...

diff  --git a/llvm/test/CodeGen/X86/fixup-bw-copy.mir b/llvm/test/CodeGen/X86/fixup-bw-copy.mir
index d9dc5f23b03d8..7d9dee748d415 100644
--- a/llvm/test/CodeGen/X86/fixup-bw-copy.mir
+++ b/llvm/test/CodeGen/X86/fixup-bw-copy.mir
@@ -47,7 +47,7 @@ body:             |
 
     ; CHECK: $eax = MOV32rr undef $edi, implicit $dil
     $al = MOV8rr killed $dil
-    RETQ killed $al
+    RET64 killed $al
 
 ...
 
@@ -62,7 +62,7 @@ body:             |
 
     ; CHECK: $eax = MOV32rr undef $edi, implicit $dil
     $al = MOV8rr $dil, implicit $edi
-    RETQ killed $al
+    RET64 killed $al
 
 ...
 
@@ -77,7 +77,7 @@ body:             |
 
     ; CHECK: $eax = MOV32rr undef $edi, implicit $dil, implicit-def $rax
     $al = MOV8rr $dil, implicit-def $rax
-    RETQ killed $al
+    RET64 killed $al
 
 ...
 
@@ -92,7 +92,7 @@ body:             |
 
     ; CHECK: $eax = MOV32rr undef $edi, implicit $dil
     $al = MOV8rr $dil, implicit-def $eax
-    RETQ killed $al
+    RET64 killed $al
 
 ...
 
@@ -107,7 +107,7 @@ body:             |
 
     ; CHECK: $eax = MOV32rr undef $edi, implicit $dil
     $al = MOV8rr $dil, implicit-def $ax
-    RETQ killed $al
+    RET64 killed $al
 
 ...
 
@@ -122,7 +122,7 @@ body:             |
 
     ; CHECK: $eax = MOV32rr undef $edi, implicit $di
     $ax = MOV16rr $di, implicit-def $eax
-    RETQ killed $ax
+    RET64 killed $ax
 
 ...
 
@@ -137,6 +137,6 @@ body:             |
 
     ; CHECK: $eax = MOV32rr undef $edi, implicit $di, implicit-def $rax
     $ax = MOV16rr $di, implicit-def $rax
-    RETQ killed $ax
+    RET64 killed $ax
 
 ...

diff  --git a/llvm/test/CodeGen/X86/fixup-bw-inst.mir b/llvm/test/CodeGen/X86/fixup-bw-inst.mir
index 83cd81ca7151c..4e997c15152f0 100644
--- a/llvm/test/CodeGen/X86/fixup-bw-inst.mir
+++ b/llvm/test/CodeGen/X86/fixup-bw-inst.mir
@@ -55,7 +55,7 @@ body:             |
     $ax = MOV16rm killed $rax, 1, $noreg, 0, $noreg
     ; CHECK: $eax = MOVZX32rm16 killed $rax
 
-    RETQ $ax
+    RET64 $ax
 
 ...
 ---
@@ -76,7 +76,7 @@ body:             |
   bb.1:
     liveins: $rcx
 
-    RETQ $cl
+    RET64 $cl
 
 ...
 ---
@@ -105,12 +105,12 @@ body:             |
     $ax = MOV16rm killed $rdi, 1, $noreg, 0, $noreg, implicit-def $eax :: (load (s16) from %ir.p)
     ; CHECK: $eax = MOVZX32rm16 killed $rdi, 1, $noreg, 0, $noreg, implicit-def $eax :: (load (s16) from %ir.p)
     $ax = KILL $ax, implicit killed $eax
-    RETQ $ax
+    RET64 $ax
 
   bb.1:
     $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags
     $ax = KILL $ax, implicit killed $eax
-    RETQ $ax
+    RET64 $ax
 
 ...
 ---
@@ -130,7 +130,7 @@ body:             |
     ; CHECK: $r9b = MOV8rr undef $r10b, implicit-def $r9d, implicit killed $r9d, implicit-def $eflags
 
     $ax = OR16rr undef $ax, $r9w, implicit-def $eflags
-    RETQ $ax
+    RET64 $ax
 
 ...
 ---
@@ -147,6 +147,6 @@ body:             |
     $cl = MOV8rr $bl, implicit-def $cx, implicit killed $ch, implicit-def $eflags
     ; CHECK: $cl = MOV8rr $bl, implicit-def $cx, implicit killed $ch, implicit-def $eflags
 
-    RETQ $cx
+    RET64 $cx
 
 ...

diff  --git a/llvm/test/CodeGen/X86/implicit-null-checks.mir b/llvm/test/CodeGen/X86/implicit-null-checks.mir
index 5ba9caff35c63..d5a5b256a5067 100644
--- a/llvm/test/CodeGen/X86/implicit-null-checks.mir
+++ b/llvm/test/CodeGen/X86/implicit-null-checks.mir
@@ -427,15 +427,15 @@ body:             |
 
   bb.2.ret_200:
     $eax = MOV32ri 200
-    RETQ $eax
+    RET64 $eax
 
   bb.3.is_null:
     $eax = MOV32ri 42
-    RETQ $eax
+    RET64 $eax
 
   bb.4.ret_100:
     $eax = MOV32ri 100
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -474,11 +474,11 @@ body:             |
   bb.3.is_null:
     liveins: $eax, $ah, $al, $ax, $bh, $bl, $bp, $bpl, $bx, $eax, $ebp, $ebx, $rax, $rbp, $rbx, $r12, $r13, $r14, $r15, $r12b, $r13b, $r14b, $r15b, $r12d, $r13d, $r14d, $r15d, $r12w, $r13w, $r14w, $r15w
 
-    RETQ $eax
+    RET64 $eax
 
   bb.4.ret_100:
     $eax = MOV32ri 100
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -511,15 +511,15 @@ body:             |
 
   bb.2.ret_200:
     $eax = MOV32ri 200
-    RETQ $eax
+    RET64 $eax
 
   bb.3.is_null:
     $eax = MOV32ri 42
-    RETQ $eax
+    RET64 $eax
 
   bb.4.ret_100:
     $eax = MOV32ri 100
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -551,15 +551,15 @@ body:             |
 
   bb.2.ret_200:
     $eax = MOV32ri 200
-    RETQ $eax
+    RET64 $eax
 
   bb.3.is_null:
     $eax = MOV32ri 42
-    RETQ $eax
+    RET64 $eax
 
   bb.4.ret_100:
     $eax = MOV32ri 100
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -592,15 +592,15 @@ body:             |
 
   bb.2.ret_200:
     $eax = MOV32ri 200
-    RETQ $eax
+    RET64 $eax
 
   bb.3.is_null:
     $eax = MOV32ri 42
-    RETQ $eax
+    RET64 $eax
 
   bb.4.ret_100:
     $eax = MOV32ri 100
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -635,12 +635,12 @@ body:             |
     CALL64pcrel32 @f, csr_64, implicit $rsp, implicit-def $rsp
     $eax = MOV32rm killed $rbx, 1, $noreg, 0, $noreg :: (load (s32) from %ir.ptr)
     $rbx = POP64r implicit-def $rsp, implicit $rsp
-    RETQ $eax
+    RET64 $eax
 
   bb.2.leave:
     $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags
     $rbx = POP64r implicit-def $rsp, implicit $rsp
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -673,11 +673,11 @@ body:             |
     $esi = MOV32ri 3076
     $eax = BEXTR32rm killed $rdi, 1, $noreg, 0, $noreg, killed $esi, implicit-def dead $eflags :: (load (s32) from %ir.ptr)
     $eax = ADD32rm killed $eax, killed $rcx, 1, $noreg, 0, $noreg, implicit-def dead $eflags :: (load (s32) from %ir.val)
-    RETQ $eax
+    RET64 $eax
 
   bb.2.is_null:
     $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -706,11 +706,11 @@ body:             |
     $rcx = MOV64rm killed $rsi, 1, $noreg, 0, $noreg
     $rcx = AND64rm killed $rcx, $rdi, 1, $noreg, 0, $noreg, implicit-def dead $eflags
     $rax = MOV64rm killed $rdi, 1, $noreg, 0, $noreg
-    RETQ $eax
+    RET64 $eax
 
   bb.2.is_null:
     $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -737,11 +737,11 @@ body:             |
     $rsi = ADD64rr $rsi, $rdi, implicit-def dead $eflags
     $eax = MOV32rm killed $rdi, 1, $noreg, 0, $noreg, implicit-def $rax :: (load (s32) from %ir.x)
     $eax = LEA64_32r killed $rax, 1, killed $rsi, 4, $noreg
-    RETQ $eax
+    RET64 $eax
   
   bb.1.is_null:
     $eax = MOV32ri 42
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -769,11 +769,11 @@ body:             |
     $rsi = ADD64rr $rsi, $rdi, implicit-def dead $eflags
     $esi = AND32rm killed $esi, $rdi, 1, $noreg, 0, $noreg, implicit-def dead $eflags
     $eax = MOV32rr $esi
-    RETQ $eax
+    RET64 $eax
   
   bb.1.is_null:
     $eax = MOV32ri 42
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -800,10 +800,10 @@ body:             |
     liveins: $rdi, $rsi
 
     MOV64mr killed $rdi, 1, $noreg, 0, $noreg, killed $rsi
-    RETQ
+    RET64
 
   bb.2.is_null:
-    RETQ
+    RET64
 
 ...
 ---
@@ -830,10 +830,10 @@ body:             |
     liveins: $rdi, $rsi
 
     MOV64mr killed $rdi, 1, $noreg, 16, $noreg, killed $rsi
-    RETQ
+    RET64
 
   bb.2.is_null:
-    RETQ
+    RET64
 
 ...
 ---
@@ -863,10 +863,10 @@ body:             |
 
     $esi = ADD32rr killed $esi, killed $esi, implicit-def dead $eflags
     MOV32mr killed $rdi, 1, $noreg, 16, $noreg, killed $esi
-    RETQ
+    RET64
 
   bb.2.is_null:
-    RETQ
+    RET64
 
 ...
 ---
@@ -895,13 +895,13 @@ body:             |
     $esi = ADD32rr $esi, $esi, implicit-def dead $eflags
     MOV32mr killed $rdi, 1, $noreg, 0, $noreg, $esi
     $eax = MOV32rr killed $esi
-    RETQ $eax
+    RET64 $eax
 
   bb.2.is_null:
     liveins: $rsi
     
     $eax = MOV32rr killed $esi
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -928,10 +928,10 @@ body:             |
     liveins: $rdi, $rsi
 
     MOV32mr killed $rdi, 1, $noreg, 0, $noreg, killed $esi :: (volatile store (s32) into %ir.ptr)
-    RETQ
+    RET64
 
   bb.2.is_null:
-    RETQ
+    RET64
 
 ...
 ---
@@ -960,10 +960,10 @@ body:             |
     $esi = ADD32rr killed $esi, killed $esi, implicit-def dead $eflags
     $esi = ADD32ri killed $esi, 15, implicit-def dead $eflags
     MOV32mr killed $rdi, 1, $noreg, 16, $noreg, killed $esi
-    RETQ
+    RET64
 
   bb.2.is_null:
-    RETQ
+    RET64
 
 ...
 ---
@@ -991,10 +991,10 @@ body:             |
 
     $rdi = ADD64rr killed $rdi, killed $rdi, implicit-def dead $eflags
     MOV32mr killed $rdi, 1, $noreg, 16, $noreg, killed $esi
-    RETQ
+    RET64
 
   bb.2.is_null:
-    RETQ
+    RET64
 
 ...
 ---
@@ -1022,11 +1022,11 @@ body:             |
 
     $rax = MOV64rr $rdi
     MOV32mr killed $rdi, 1, $noreg, 16, $noreg, killed $esi
-    RETQ $eax
+    RET64 $eax
 
   bb.2.is_null:
     $rax = XOR64rr undef $rax, undef $rax, implicit-def dead $eflags
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -1063,12 +1063,12 @@ body:             |
     MOV32mi $rbx, 1, $noreg, 0, $noreg, 20
     $rax = MOV64rr killed $rbx
     $rbx = POP64r implicit-def $rsp, implicit $rsp
-    RETQ $eax
+    RET64 $eax
 
   bb.2.is_null:
     $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags
     $rbx = POP64r implicit-def $rsp, implicit $rsp
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -1097,11 +1097,11 @@ body:             |
     $eax = MOV32rr $esi
     $esi = ADD32ri killed $esi, 15, implicit-def dead $eflags
     MOV32mr killed $rdi, 1, $noreg, 0, $noreg, killed $esi
-    RETQ $eax
+    RET64 $eax
 
   bb.2.is_null:
     $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -1129,11 +1129,11 @@ body:             |
 
     MOV32mi killed $rsi, 1, $noreg, 0, $noreg, 2
     $eax = MOV32rm killed $rdi, 1, $noreg, 0, $noreg 
-    RETQ $eax
+    RET64 $eax
 
   bb.2.is_null:
     $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -1161,11 +1161,11 @@ body:             |
 
     $eax = MOV32rm killed $rsi, 1, $noreg, 0, $noreg 
     MOV32mi killed $rdi, 1, $noreg, 0, $noreg, 2
-    RETQ $eax
+    RET64 $eax
 
   bb.2.is_null:
     $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -1193,10 +1193,10 @@ body:             |
 
     MOV32mi killed $rsi, 1, $noreg, 0, $noreg, 3 
     MOV32mi killed $rdi, 1, $noreg, 0, $noreg, 2
-    RETQ
+    RET64
 
   bb.2.is_null:
-    RETQ
+    RET64
 
 ...
 ---
@@ -1224,10 +1224,10 @@ body:             |
 
     $esi = ADD32rr $esi, $esi, implicit-def dead $eflags
     ADD32mr killed $rdi, 1, $noreg, 0, $noreg, killed $esi, implicit-def dead $eflags
-    RETQ
+    RET64
 
   bb.2.is_null:
-    RETQ
+    RET64
 
 ...
 ---
@@ -1255,11 +1255,11 @@ body:             |
 
     MOV32mi killed $rsi, 1, $noreg, 0, $noreg, 3 :: (store (s32) into %ir.ptr2)
     $eax = MOV32rm killed $rdi, 1, $noreg, 0, $noreg :: (load (s32) from %ir.ptr)
-    RETQ $eax
+    RET64 $eax
 
   bb.2.is_null:
     $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -1287,11 +1287,11 @@ body:             |
 
     MOV32mi killed $rsi, 1, $noreg, 0, $noreg, 3 :: (store (s32) into %ir.ptr2)
     $eax = MOV32rm killed $rdi, 1, $noreg, 0, $noreg :: (load (s32) from %ir.ptr)
-    RETQ $eax
+    RET64 $eax
 
   bb.2.is_null:
     $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -1325,11 +1325,11 @@ body:             |
     MOV64mr $rsp, 1, $noreg, 0, $noreg, $rdi :: (store (s64) into %stack.0)
     $edi = MOV32rm $rdi, 1, $noreg, 8, $noreg :: (load (s32) from %ir.ptr)
     $eax = MOV32rr $edi
-    RETQ $eax
+    RET64 $eax
 
   bb.2.is_null:
     $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -1354,10 +1354,10 @@ body:             |
   
     $rcx = MOV64ri -9223372036854775808
     $eax = MOV32rm killed $rdi, 2, $rcx, 0, $noreg, implicit-def $rax
-    RETQ $eax
+    RET64 $eax
   
   bb.1.is_null:
     $eax = MOV32ri 42
-    RETQ $eax
+    RET64 $eax
 
 ...

diff  --git a/llvm/test/CodeGen/X86/implicit-null-chk-reg-rewrite.mir b/llvm/test/CodeGen/X86/implicit-null-chk-reg-rewrite.mir
index 6e83b207c2c99..6330e8c2564d8 100644
--- a/llvm/test/CodeGen/X86/implicit-null-chk-reg-rewrite.mir
+++ b/llvm/test/CodeGen/X86/implicit-null-chk-reg-rewrite.mir
@@ -41,9 +41,9 @@ body:             |
     liveins: $rdi, $rsi
     
     $rax = MOV64rm renamable $rdi, 1, $noreg, 4, $noreg
-    RETQ $eax
+    RET64 $eax
 
   bb.2.is_null:
     $eax = MOV32ri 200
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/X86/instr-symbols.mir b/llvm/test/CodeGen/X86/instr-symbols.mir
index eb1f1f1d1bd07..a900288d70869 100644
--- a/llvm/test/CodeGen/X86/instr-symbols.mir
+++ b/llvm/test/CodeGen/X86/instr-symbols.mir
@@ -69,6 +69,6 @@ body: |
     %7:gr64 = ADD64rr killed %4, killed %5, implicit-def $eflags
     %8:gr64 = ADD64rr killed %6, killed %7, implicit-def $eflags
     $rax = COPY %8
-    RETQ implicit $rax
+    RET64 implicit $rax
 
 ...

diff  --git a/llvm/test/CodeGen/X86/invalid-liveness.mir b/llvm/test/CodeGen/X86/invalid-liveness.mir
index 416921ddcd013..039bb6bc79c75 100644
--- a/llvm/test/CodeGen/X86/invalid-liveness.mir
+++ b/llvm/test/CodeGen/X86/invalid-liveness.mir
@@ -25,5 +25,5 @@ body: |
 
   bb.3:
     $eax = COPY %0
-    RETQ $eax
+    RET64 $eax
 ...

diff  --git a/llvm/test/CodeGen/X86/leaFixup32.mir b/llvm/test/CodeGen/X86/leaFixup32.mir
index 9fe5b190c1542..c929df8acfc1f 100644
--- a/llvm/test/CodeGen/X86/leaFixup32.mir
+++ b/llvm/test/CodeGen/X86/leaFixup32.mir
@@ -110,9 +110,9 @@ body:             |
     ; CHECK: liveins: $eax, $ebp
     ; CHECK: $eax = ADD32rr $eax, $ebp, implicit-def $eflags
     ; CHECK: $eax = ADD32ri8 $eax, -5, implicit-def $eflags
-    ; CHECK: RETQ $eax
+    ; CHECK: RET64 $eax
     $eax = LEA32r killed $eax, 1, killed $ebp, -5, $noreg
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -148,9 +148,9 @@ body:             |
     ; CHECK: liveins: $eax, $ebp
     ; CHECK: $ebp = ADD32rr $ebp, $eax, implicit-def $eflags
     ; CHECK: $ebp = ADD32ri8 $ebp, -5, implicit-def $eflags
-    ; CHECK: RETQ $ebp
+    ; CHECK: RET64 $ebp
     $ebp = LEA32r killed $ebp, 1, killed $eax, -5, $noreg
-    RETQ $ebp
+    RET64 $ebp
 
 ...
 ---
@@ -185,9 +185,9 @@ body:             |
     ; CHECK-LABEL: name: test1add_ebp_32
     ; CHECK: liveins: $eax, $ebp
     ; CHECK: $ebp = ADD32rr $ebp, $eax, implicit-def $eflags
-    ; CHECK: RETQ $ebp
+    ; CHECK: RET64 $ebp
     $ebp = LEA32r killed $ebp, 1, killed $eax, 0, $noreg
-    RETQ $ebp
+    RET64 $ebp
 
 ...
 ---
@@ -224,9 +224,9 @@ body:             |
     ; CHECK: liveins: $eax, $ebp, $esi
     ; CHECK: $ebx = LEA32r killed $eax, 1, killed $ebp, 0, $noreg
     ; CHECK: $ebx = ADD32ri8 $ebx, -5, implicit-def $eflags
-    ; CHECK: RETQ $ebx
+    ; CHECK: RET64 $ebx
     $ebx = LEA32r killed $eax, 1, killed $ebp, -5, $noreg
-    RETQ $ebx
+    RET64 $ebx
 
 ...
 ---
@@ -263,9 +263,9 @@ body:             |
     ; CHECK: liveins: $eax, $ebp
     ; CHECK: $ebx = LEA32r killed $eax, 1, killed $ebp, 0, $noreg
     ; CHECK: $ebx = ADD32ri8 $ebx, -5, implicit-def $eflags
-    ; CHECK: RETQ $ebx
+    ; CHECK: RET64 $ebx
     $ebx = LEA32r killed $ebp, 1, killed $eax, -5, $noreg
-    RETQ $ebx
+    RET64 $ebx
 
 ...
 ---
@@ -301,9 +301,9 @@ body:             |
     ; CHECK-LABEL: name: test1lea_ebp_32
     ; CHECK: liveins: $eax, $ebp
     ; CHECK: $ebx = LEA32r killed $eax, 1, killed $ebp, 0, $noreg
-    ; CHECK: RETQ $ebx
+    ; CHECK: RET64 $ebx
     $ebx = LEA32r killed $ebp, 1, killed $eax, 0, $noreg
-    RETQ $ebx
+    RET64 $ebx
 
 ...
 ---
@@ -339,9 +339,9 @@ body:             |
     ; CHECK: liveins: $eax, $ebp
     ; CHECK: $eax = ADD32rr $eax, $ebp, implicit-def $eflags
     ; CHECK: $eax = ADD32ri $eax, 129, implicit-def $eflags
-    ; CHECK: RETQ $eax
+    ; CHECK: RET64 $eax
     $eax = LEA32r killed $eax, 1, killed $ebp, 129, $noreg
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -378,9 +378,9 @@ body:             |
     ; CHECK: liveins: $eax, $ebp, $ebx
     ; CHECK: $ebx = MOV32rr $ebp
     ; CHECK: $ebx = ADD32rr $ebx, $ebp, implicit-def $eflags
-    ; CHECK: RETQ $ebx
+    ; CHECK: RET64 $ebx
     $ebx = LEA32r killed $ebp, 1, $ebp, 0, $noreg
-    RETQ $ebx
+    RET64 $ebx
 
 ...
 ---
@@ -416,9 +416,9 @@ body:             |
     ; CHECK: liveins: $eax, $ebp, $ebx
     ; CHECK: $ebx = LEA32r $noreg, 1, $ebp, 5, $noreg
     ; CHECK: $ebx = ADD32rr $ebx, $ebp, implicit-def $eflags
-    ; CHECK: RETQ $ebx
+    ; CHECK: RET64 $ebx
     $ebx = LEA32r $ebp, 1, $ebp, 5, $noreg
-    RETQ $ebx
+    RET64 $ebx
 
 ...
 ---
@@ -454,9 +454,9 @@ body:             |
     ; CHECK: liveins: $eax, $ebp, $ebx
     ; CHECK: $ebx = LEA32r $noreg, 4, $ebp, 5, $noreg
     ; CHECK: $ebx = ADD32rr $ebx, $ebp, implicit-def $eflags
-    ; CHECK: RETQ $ebx
+    ; CHECK: RET64 $ebx
     $ebx = LEA32r $ebp, 4, $ebp, 5, $noreg
-    RETQ $ebx
+    RET64 $ebx
 
 ...
 ---
@@ -491,9 +491,9 @@ body:             |
     ; CHECK-LABEL: name: test_skip_opt_32
     ; CHECK: liveins: $eax, $ebp, $ebx
     ; CHECK: $ebp = LEA32r killed $ebp, 4, killed $ebp, 0, $noreg
-    ; CHECK: RETQ $ebp
+    ; CHECK: RET64 $ebp
     $ebp = LEA32r killed $ebp, 4, killed $ebp, 0, $noreg
-    RETQ $ebp
+    RET64 $ebp
 
 ...
 ---
@@ -529,23 +529,23 @@ body:             |
   ; CHECK:   CMP32rr $eax, killed $ebx, implicit-def $eflags
   ; CHECK:   $ebx = LEA32r killed $eax, 4, killed $eax, 5, $noreg
   ; CHECK:   JCC_1 %bb.1, 4, implicit $eflags
-  ; CHECK:   RETQ $ebx
+  ; CHECK:   RET64 $ebx
   ; CHECK: bb.1:
   ; CHECK:   liveins: $eax, $ebp, $ebx
   ; CHECK:   $ebp = LEA32r killed $ebx, 4, killed $ebx, 0, $noreg
   ; CHECK:   $ebp = ADD32ri8 $ebp, 5, implicit-def $eflags
-  ; CHECK:   RETQ $ebp
+  ; CHECK:   RET64 $ebp
   bb.0 (%ir-block.0):
     liveins: $eax, $ebp, $ebx
 
     CMP32rr   $eax, killed $ebx, implicit-def $eflags
     $ebx = LEA32r killed $eax, 4, killed $eax, 5, $noreg
     JCC_1 %bb.1, 4, implicit $eflags
-    RETQ $ebx
+    RET64 $ebx
   bb.1:
     liveins: $eax, $ebp, $ebx
     $ebp = LEA32r killed $ebx, 4, killed $ebx, 5, $noreg
-    RETQ $ebp
+    RET64 $ebp
 
 ...
 

diff  --git a/llvm/test/CodeGen/X86/leaFixup64.mir b/llvm/test/CodeGen/X86/leaFixup64.mir
index 7fdf582055c24..2bab3c10e78e3 100644
--- a/llvm/test/CodeGen/X86/leaFixup64.mir
+++ b/llvm/test/CodeGen/X86/leaFixup64.mir
@@ -187,9 +187,9 @@ body:             |
     ; CHECK: liveins: $rax, $rbp
     ; CHECK: $eax = ADD32rr $eax, $ebp, implicit-def $eflags, implicit $rax, implicit $rbp
     ; CHECK: $eax = ADD32ri8 $eax, -5, implicit-def $eflags
-    ; CHECK: RETQ $eax
+    ; CHECK: RET64 $eax
     $eax = LEA64_32r killed $rax, 1, killed $rbp, -5, $noreg
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -225,9 +225,9 @@ body:             |
     ; CHECK: liveins: $rax, $rbp
     ; CHECK: $ebp = ADD32rr $ebp, $eax, implicit-def $eflags, implicit $rbp, implicit $rax
     ; CHECK: $ebp = ADD32ri8 $ebp, -5, implicit-def $eflags
-    ; CHECK: RETQ $ebp
+    ; CHECK: RET64 $ebp
     $ebp = LEA64_32r killed $rbp, 1, killed $rax, -5, $noreg
-    RETQ $ebp
+    RET64 $ebp
 
 ...
 ---
@@ -262,9 +262,9 @@ body:             |
     ; CHECK-LABEL: name: test1lea_rbp_64_32_1
     ; CHECK: liveins: $rax, $rbp
     ; CHECK: $ebp = ADD32rr $ebp, $eax, implicit-def $eflags, implicit $rbp, implicit $rax
-    ; CHECK: RETQ $ebp
+    ; CHECK: RET64 $ebp
     $ebp = LEA64_32r killed $rbp, 1, killed $rax, 0, $noreg
-    RETQ $ebp
+    RET64 $ebp
 
 ...
 ---
@@ -300,9 +300,9 @@ body:             |
     ; CHECK: liveins: $rax, $rbp
     ; CHECK: $rax = ADD64rr $rax, $rbp, implicit-def $eflags
     ; CHECK: $rax = ADD64ri8 $rax, -5, implicit-def $eflags
-    ; CHECK: RETQ $eax
+    ; CHECK: RET64 $eax
     $rax = LEA64r killed $rax, 1, killed $rbp, -5, $noreg
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -338,9 +338,9 @@ body:             |
     ; CHECK: liveins: $rax, $rbp
     ; CHECK: $rbp = ADD64rr $rbp, $rax, implicit-def $eflags
     ; CHECK: $rbp = ADD64ri8 $rbp, -5, implicit-def $eflags
-    ; CHECK: RETQ $ebp
+    ; CHECK: RET64 $ebp
     $rbp = LEA64r killed $rbp, 1, killed $rax, -5, $noreg
-    RETQ $ebp
+    RET64 $ebp
 
 ...
 ---
@@ -375,9 +375,9 @@ body:             |
     ; CHECK-LABEL: name: test1add_rbp_64
     ; CHECK: liveins: $rax, $rbp
     ; CHECK: $rbp = ADD64rr $rbp, $rax, implicit-def $eflags
-    ; CHECK: RETQ $ebp
+    ; CHECK: RET64 $ebp
     $rbp = LEA64r killed $rbp, 1, killed $rax, 0, $noreg
-    RETQ $ebp
+    RET64 $ebp
 
 ...
 ---
@@ -414,9 +414,9 @@ body:             |
     ; CHECK: liveins: $rax, $rbp
     ; CHECK: $ebx = LEA64_32r killed $rax, 1, killed $rbp, 0, $noreg
     ; CHECK: $ebx = ADD32ri8 $ebx, -5, implicit-def $eflags
-    ; CHECK: RETQ $ebx
+    ; CHECK: RET64 $ebx
     $ebx = LEA64_32r killed $rax, 1, killed $rbp, -5, $noreg
-    RETQ $ebx
+    RET64 $ebx
 
 ...
 ---
@@ -453,9 +453,9 @@ body:             |
     ; CHECK: liveins: $rax, $rbp
     ; CHECK: $ebx = LEA64_32r killed $rax, 1, killed $rbp, 0, $noreg
     ; CHECK: $ebx = ADD32ri8 $ebx, -5, implicit-def $eflags
-    ; CHECK: RETQ $ebx
+    ; CHECK: RET64 $ebx
     $ebx = LEA64_32r killed $rbp, 1, killed $rax, -5, $noreg
-    RETQ $ebx
+    RET64 $ebx
 
 ...
 ---
@@ -491,9 +491,9 @@ body:             |
     ; CHECK-LABEL: name: test1lea_rbp_64_32
     ; CHECK: liveins: $rax, $rbp
     ; CHECK: $ebx = LEA64_32r killed $rax, 1, killed $rbp, 0, $noreg
-    ; CHECK: RETQ $ebx
+    ; CHECK: RET64 $ebx
     $ebx = LEA64_32r killed $rbp, 1, killed $rax, 0, $noreg
-    RETQ $ebx
+    RET64 $ebx
 
 ...
 ---
@@ -530,9 +530,9 @@ body:             |
     ; CHECK: liveins: $rax, $rbp
     ; CHECK: $rbx = LEA64r killed $rax, 1, killed $rbp, 0, $noreg
     ; CHECK: $rbx = ADD64ri8 $rbx, -5, implicit-def $eflags
-    ; CHECK: RETQ $ebx
+    ; CHECK: RET64 $ebx
     $rbx = LEA64r killed $rax, 1, killed $rbp, -5, $noreg
-    RETQ $ebx
+    RET64 $ebx
 
 ...
 ---
@@ -569,9 +569,9 @@ body:             |
     ; CHECK: liveins: $rax, $rbp
     ; CHECK: $rbx = LEA64r killed $rax, 1, killed $rbp, 0, $noreg
     ; CHECK: $rbx = ADD64ri8 $rbx, -5, implicit-def $eflags
-    ; CHECK: RETQ $ebx
+    ; CHECK: RET64 $ebx
     $rbx = LEA64r killed $rbp, 1, killed $rax, -5, $noreg
-    RETQ $ebx
+    RET64 $ebx
 
 ...
 ---
@@ -607,9 +607,9 @@ body:             |
     ; CHECK-LABEL: name: test1lea_rbp_64
     ; CHECK: liveins: $rax, $rbp
     ; CHECK: $rbx = LEA64r killed $rax, 1, killed $rbp, 0, $noreg
-    ; CHECK: RETQ $ebx
+    ; CHECK: RET64 $ebx
     $rbx = LEA64r killed $rbp, 1, killed $rax, 0, $noreg
-    RETQ $ebx
+    RET64 $ebx
 
 ...
 ---
@@ -646,11 +646,11 @@ body:             |
     ; CHECK: $r13 = KILL $rdi, implicit-def $r13
     ; CHECK: $r12 = LEA64r $noreg, 2, killed $r13, 5, $noreg
     ; CHECK: $r12 = ADD64rr $r12, killed $rbp, implicit-def $eflags
-    ; CHECK: RETQ $r12
+    ; CHECK: RET64 $r12
     $rbp = KILL $rbp, implicit-def $rbp
     $r13 = KILL $rdi, implicit-def $r13
     $r12 = LEA64r killed $rbp, 2, killed $r13, 5, $noreg
-    RETQ $r12
+    RET64 $r12
 
 ...
 ---
@@ -686,9 +686,9 @@ body:             |
     ; CHECK: liveins: $rax, $rbp
     ; CHECK: $eax = ADD32rr $eax, $ebp, implicit-def $eflags, implicit $rax, implicit $rbp
     ; CHECK: $eax = ADD32ri $eax, 129, implicit-def $eflags
-    ; CHECK: RETQ $eax
+    ; CHECK: RET64 $eax
     $eax = LEA64_32r killed $rax, 1, killed $rbp, 129, $noreg
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -723,9 +723,9 @@ body:             |
     ; CHECK-LABEL: name: test1mov1add_rbp_64_32
     ; CHECK: liveins: $rax, $rbp, $rbx
     ; CHECK: $ebx = LEA64_32r killed $rbp, 1, killed $rbp, 0, $noreg
-    ; CHECK: RETQ $ebx
+    ; CHECK: RET64 $ebx
     $ebx = LEA64_32r killed $rbp, 1, killed $rbp, 0, $noreg
-    RETQ $ebx
+    RET64 $ebx
 
 ...
 ---
@@ -760,9 +760,9 @@ body:             |
     ; CHECK-LABEL: name: testleaadd_rbp_index_64_32
     ; CHECK: liveins: $rax, $rbp, $rbx
     ; CHECK: $ebx = LEA64_32r killed $rbp, 1, killed $rbp, 5, $noreg
-    ; CHECK: RETQ $ebx
+    ; CHECK: RET64 $ebx
     $ebx = LEA64_32r killed $rbp, 1, killed $rbp, 5, $noreg
-    RETQ $ebx
+    RET64 $ebx
 
 ...
 ---
@@ -797,9 +797,9 @@ body:             |
     ; CHECK-LABEL: name: testleaadd_rbp_index2_64_32
     ; CHECK: liveins: $eax, $ebp, $ebx
     ; CHECK: $ebx = LEA64_32r killed $rbp, 4, killed $rbp, 5, $noreg
-    ; CHECK: RETQ $ebx
+    ; CHECK: RET64 $ebx
     $ebx = LEA64_32r killed $rbp, 4, killed $rbp, 5, $noreg
-    RETQ $ebx
+    RET64 $ebx
 
 ...
 ---
@@ -835,9 +835,9 @@ body:             |
     ; CHECK: liveins: $rax, $rbp
     ; CHECK: $rax = ADD64rr $rax, $rbp, implicit-def $eflags
     ; CHECK: $rax = ADD64ri32 $rax, 129, implicit-def $eflags
-    ; CHECK: RETQ $eax
+    ; CHECK: RET64 $eax
     $rax = LEA64r killed $rax, 1, killed $rbp, 129, $noreg
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -873,9 +873,9 @@ body:             |
     ; CHECK: liveins: $rax, $rbp, $rbx
     ; CHECK: $rbx = MOV64rr $rbp
     ; CHECK: $rbx = ADD64rr $rbx, $rbp, implicit-def $eflags
-    ; CHECK: RETQ $ebx
+    ; CHECK: RET64 $ebx
     $rbx = LEA64r killed $rbp, 1, $rbp, 0, $noreg
-    RETQ $ebx
+    RET64 $ebx
 
 ...
 ---
@@ -911,9 +911,9 @@ body:             |
     ; CHECK: liveins: $rax, $rbp, $rbx
     ; CHECK: $rbx = LEA64r $noreg, 1, $rbp, 5, $noreg
     ; CHECK: $rbx = ADD64rr $rbx, $rbp, implicit-def $eflags
-    ; CHECK: RETQ $ebx
+    ; CHECK: RET64 $ebx
     $rbx = LEA64r $rbp, 1, $rbp, 5, $noreg
-    RETQ $ebx
+    RET64 $ebx
 
 ...
 ---
@@ -949,9 +949,9 @@ body:             |
     ; CHECK: liveins: $rax, $rbp, $rbx
     ; CHECK: $rbx = LEA64r $noreg, 4, $rbp, 5, $noreg
     ; CHECK: $rbx = ADD64rr $rbx, $rbp, implicit-def $eflags
-    ; CHECK: RETQ $ebx
+    ; CHECK: RET64 $ebx
     $rbx = LEA64r $rbp, 4,  $rbp, 5, $noreg
-    RETQ $ebx
+    RET64 $ebx
 
 ...
 ---
@@ -986,9 +986,9 @@ body:             |
     ; CHECK-LABEL: name: test_skip_opt_64
     ; CHECK: liveins: $rax, $rbp, $rbx
     ; CHECK: $rbp = LEA64r killed $rbp, 4, killed $rbp, 0, $noreg
-    ; CHECK: RETQ $ebp
+    ; CHECK: RET64 $ebp
     $rbp = LEA64r killed $rbp, 4, killed $rbp, 0, $noreg
-    RETQ $ebp
+    RET64 $ebp
 
 ...
 ---
@@ -1024,23 +1024,23 @@ body:             |
   ; CHECK:   CMP64rr $rax, killed $rbx, implicit-def $eflags
   ; CHECK:   $rbx = LEA64r killed $rax, 4, killed $rax, 5, $noreg
   ; CHECK:   JCC_1 %bb.1, 4, implicit $eflags
-  ; CHECK:   RETQ $ebx
+  ; CHECK:   RET64 $ebx
   ; CHECK: bb.1:
   ; CHECK:   liveins: $rax, $rbp, $rbx
   ; CHECK:   $rbp = LEA64r killed $rbx, 4, killed $rbx, 0, $noreg
   ; CHECK:   $rbp = ADD64ri8 $rbp, 5, implicit-def $eflags
-  ; CHECK:   RETQ $ebp
+  ; CHECK:   RET64 $ebp
   bb.0 (%ir-block.0):
     liveins: $rax, $rbp, $rbx
 
     CMP64rr   $rax, killed $rbx, implicit-def $eflags
     $rbx = LEA64r killed $rax, 4, killed $rax, 5, $noreg
     JCC_1 %bb.1, 4, implicit $eflags
-    RETQ $ebx
+    RET64 $ebx
   bb.1:
     liveins: $rax, $rbp, $rbx
     $rbp = LEA64r killed $rbx, 4, killed $rbx, 5, $noreg
-    RETQ $ebp
+    RET64 $ebp
 
 ...
 ---
@@ -1075,9 +1075,9 @@ body:             |
     ; CHECK-LABEL: name: test_skip_opt_64_32
     ; CHECK: liveins: $rax, $rbp, $rbx
     ; CHECK: $ebp = LEA64_32r killed $rbp, 4, killed $rbp, 0, $noreg
-    ; CHECK: RETQ $ebp
+    ; CHECK: RET64 $ebp
     $ebp = LEA64_32r killed $rbp, 4, killed $rbp, 0, $noreg
-    RETQ $ebp
+    RET64 $ebp
 
 ...
 ---
@@ -1113,23 +1113,23 @@ body:             |
   ; CHECK:   CMP64rr $rax, killed $rbx, implicit-def $eflags
   ; CHECK:   $ebx = LEA64_32r killed $rax, 4, killed $rax, 5, $noreg
   ; CHECK:   JCC_1 %bb.1, 4, implicit $eflags
-  ; CHECK:   RETQ $ebx
+  ; CHECK:   RET64 $ebx
   ; CHECK: bb.1:
   ; CHECK:   liveins: $rax, $rbp, $rbx
   ; CHECK:   $ebp = LEA64_32r killed $rbx, 4, killed $rbx, 0, $noreg
   ; CHECK:   $ebp = ADD32ri8 $ebp, 5, implicit-def $eflags
-  ; CHECK:   RETQ $ebp
+  ; CHECK:   RET64 $ebp
   bb.0 (%ir-block.0):
     liveins: $rax, $rbp, $rbx
 
     CMP64rr   $rax, killed $rbx, implicit-def $eflags
     $ebx = LEA64_32r killed $rax, 4, killed $rax, 5, $noreg
     JCC_1 %bb.1, 4, implicit $eflags
-    RETQ $ebx
+    RET64 $ebx
   bb.1:
     liveins: $rax, $rbp, $rbx
     $ebp = LEA64_32r killed $rbx, 4, killed $rbx, 5, $noreg
-    RETQ $ebp
+    RET64 $ebp
 
 ...
 ---
@@ -1173,7 +1173,7 @@ body:             |
     ; CHECK: NOOP
     ; CHECK: NOOP
     ; CHECK: NOOP
-    ; CHECK: RETQ $ebp
+    ; CHECK: RET64 $ebp
     DBG_VALUE 0, $noreg
     NOOP
     NOOP
@@ -1184,7 +1184,7 @@ body:             |
     NOOP
     NOOP
     NOOP
-    RETQ $ebp
+    RET64 $ebp
 
 ...
 ...

diff  --git a/llvm/test/CodeGen/X86/machine-copy-dbgvalue.mir b/llvm/test/CodeGen/X86/machine-copy-dbgvalue.mir
index 914beab052dbc..95665c0ce1146 100644
--- a/llvm/test/CodeGen/X86/machine-copy-dbgvalue.mir
+++ b/llvm/test/CodeGen/X86/machine-copy-dbgvalue.mir
@@ -8,7 +8,7 @@
 # CHECK-NEXT: $rax = MOV64ri 31
 # CHECK-NEXT: DBG_VALUE $rax
 # CHECK-NEXT: DBG_VALUE_LIST 0, !DIExpression(DW_OP_LLVM_arg, 0, DW_OP_LLVM_arg, 1, DW_OP_constu, 4, DW_OP_mul, DW_OP_plus, DW_OP_stack_value), $rax, 0, 0
-# CHECK-NEXT: RETQ implicit killed $rax
+# CHECK-NEXT: RET64 implicit killed $rax
 name: foo
 body: |
   bb.0:
@@ -16,5 +16,5 @@ body: |
     DBG_VALUE $rcx, 0, 0, 0, 0
     DBG_VALUE_LIST 0, !DIExpression(DW_OP_LLVM_arg, 0, DW_OP_LLVM_arg, 1, DW_OP_constu, 4, DW_OP_mul, DW_OP_plus, DW_OP_stack_value), $rcx, 0, 0
     $rax = COPY killed renamable $rcx
-    RETQ implicit killed $rax
+    RET64 implicit killed $rax
 ...

diff  --git a/llvm/test/CodeGen/X86/machine-outliner-cfi-tail-some.mir b/llvm/test/CodeGen/X86/machine-outliner-cfi-tail-some.mir
index 328ee19c71921..2056d593205e4 100644
--- a/llvm/test/CodeGen/X86/machine-outliner-cfi-tail-some.mir
+++ b/llvm/test/CodeGen/X86/machine-outliner-cfi-tail-some.mir
@@ -39,7 +39,7 @@ body:             |
     $edx = MOV32ri 2
     $edi = MOV32ri 3
     $eax = MOV32ri 4
-    RETQ
+    RET64
 ...
 ---
 name:            bar
@@ -63,7 +63,7 @@ body:             |
     $edx = MOV32ri 2
     $edi = MOV32ri 3
     $eax = MOV32ri 4
-    RETQ
+    RET64
 ...
 ---
 name:            baz
@@ -87,4 +87,4 @@ body:             |
     $edx = MOV32ri 2
     $edi = MOV32ri 3
     $eax = MOV32ri 4
-    RETQ
+    RET64

diff  --git a/llvm/test/CodeGen/X86/machine-outliner-cfi-tail.mir b/llvm/test/CodeGen/X86/machine-outliner-cfi-tail.mir
index 117205698cea8..f18f62419a0d1 100644
--- a/llvm/test/CodeGen/X86/machine-outliner-cfi-tail.mir
+++ b/llvm/test/CodeGen/X86/machine-outliner-cfi-tail.mir
@@ -30,7 +30,7 @@ body:             |
     $edx = MOV32ri 2
     $edi = MOV32ri 3
     $eax = MOV32ri 4
-    RETQ
+    RET64
 ...
 ---
 name:            bar
@@ -52,7 +52,7 @@ body:             |
     $edx = MOV32ri 2
     $edi = MOV32ri 3
     $eax = MOV32ri 4
-    RETQ
+    RET64
 ...
 ---
 name:            baz
@@ -74,4 +74,4 @@ body:             |
     $edx = MOV32ri 2
     $edi = MOV32ri 3
     $eax = MOV32ri 4
-    RETQ
+    RET64

diff  --git a/llvm/test/CodeGen/X86/optimize-compare.mir b/llvm/test/CodeGen/X86/optimize-compare.mir
index 1537e0c3af899..968ee7804b833 100644
--- a/llvm/test/CodeGen/X86/optimize-compare.mir
+++ b/llvm/test/CodeGen/X86/optimize-compare.mir
@@ -619,7 +619,7 @@ body: |
   ; CHECK-NEXT:   JMP_1 %bb.3
   ; CHECK-NEXT: {{  $}}
   ; CHECK-NEXT: bb.3:
-  ; CHECK-NEXT:   RETQ
+  ; CHECK-NEXT:   RET64
   bb.0:
     %0:gr32 = COPY $eax
     CMP32ri %0, 20, implicit-def $eflags
@@ -636,7 +636,7 @@ body: |
     JMP_1 %bb.3
 
   bb.3:
-    RETQ
+    RET64
 ...
 ---
 name: opt_adjusted_imm_multiple_blocks_noopt
@@ -663,7 +663,7 @@ body: |
   ; CHECK-NEXT:   $al = SETCCr 4, implicit $eflags
   ; CHECK-NEXT: {{  $}}
   ; CHECK-NEXT: bb.3:
-  ; CHECK-NEXT:   RETQ
+  ; CHECK-NEXT:   RET64
   bb.0:
     %0:gr32 = COPY $eax
     CMP32ri %0, 20, implicit-def $eflags
@@ -681,5 +681,5 @@ body: |
     $al = SETCCr 4, implicit $eflags
 
   bb.3:
-    RETQ
+    RET64
 ...

diff  --git a/llvm/test/CodeGen/X86/patchpoint-verifiable.mir b/llvm/test/CodeGen/X86/patchpoint-verifiable.mir
index 54f39e155b065..cd57c64b4b93a 100644
--- a/llvm/test/CodeGen/X86/patchpoint-verifiable.mir
+++ b/llvm/test/CodeGen/X86/patchpoint-verifiable.mir
@@ -38,5 +38,5 @@ body: |
   ; CHECK: PATCHPOINT 5, 5, 0, 2, 0, $rdi, $rsi, csr_64, implicit-def dead early-clobber $r11, implicit-def $rsp, implicit-def dead $rax
     PATCHPOINT 5, 5, 0, 2, 0, $rdi, $rsi, csr_64, implicit-def dead early-clobber $r11, implicit-def $rsp, implicit-def dead $rax
     $rbp = POP64r implicit-def $rsp, implicit $rsp
-    RETQ
+    RET64
 ...

diff  --git a/llvm/test/CodeGen/X86/phielim-undef.mir b/llvm/test/CodeGen/X86/phielim-undef.mir
index 7970a08caaa24..005ee37398157 100644
--- a/llvm/test/CodeGen/X86/phielim-undef.mir
+++ b/llvm/test/CodeGen/X86/phielim-undef.mir
@@ -52,7 +52,7 @@ body: |
   ; CHECK-NEXT:   JMP_1 %bb.2
   ; CHECK-NEXT: {{  $}}
   ; CHECK-NEXT: bb.5:
-  ; CHECK-NEXT:   RETQ
+  ; CHECK-NEXT:   RET64
   ; CHECK-NEXT: {{  $}}
   ; CHECK-NEXT: bb.6:
   bb.0:
@@ -91,7 +91,7 @@ body: |
     JMP_1 %bb.2
 
   bb.6:
-    RETQ
+    RET64
 
   bb.7:
 ...

diff  --git a/llvm/test/CodeGen/X86/post-ra-sched-with-debug.mir b/llvm/test/CodeGen/X86/post-ra-sched-with-debug.mir
index 261d6b9ecb742..960c5c997600c 100644
--- a/llvm/test/CodeGen/X86/post-ra-sched-with-debug.mir
+++ b/llvm/test/CodeGen/X86/post-ra-sched-with-debug.mir
@@ -330,6 +330,6 @@ body:             |
     $rbx = POP64r implicit-def $rsp, implicit $rsp
     $r14 = POP64r implicit-def $rsp, implicit $rsp
     $rbp = POP64r implicit-def $rsp, implicit $rsp
-    RETQ
+    RET64
 
 ...

diff  --git a/llvm/test/CodeGen/X86/prologue-epilogue-remarks.mir b/llvm/test/CodeGen/X86/prologue-epilogue-remarks.mir
index efa674451b28a..f0c6121bd98e7 100644
--- a/llvm/test/CodeGen/X86/prologue-epilogue-remarks.mir
+++ b/llvm/test/CodeGen/X86/prologue-epilogue-remarks.mir
@@ -23,7 +23,7 @@ stack:
 constants:
 body:             |
   bb.0:
-    RETQ
+    RET64
 
 ...
 ---
@@ -41,7 +41,7 @@ stack:
 constants:
 body:             |
   bb.0:
-    RETQ
+    RET64
 
 ...
 ---
@@ -59,6 +59,6 @@ stack:
 constants:
 body:             |
   bb.0:
-    RETQ
+    RET64
 
 ...

diff  --git a/llvm/test/CodeGen/X86/scavenger.mir b/llvm/test/CodeGen/X86/scavenger.mir
index 7a13e872ec531..666fda2ddccfd 100644
--- a/llvm/test/CodeGen/X86/scavenger.mir
+++ b/llvm/test/CodeGen/X86/scavenger.mir
@@ -36,7 +36,7 @@ body: |
     ; CHECK: NOOP implicit killed [[REG1]]
     NOOP implicit %2
     NOOP implicit %1
-    RETQ $eax
+    RET64 $eax
 ...
 ---
 # CHECK-LABEL: name: func3

diff  --git a/llvm/test/CodeGen/X86/tail-merge-after-mbp.mir b/llvm/test/CodeGen/X86/tail-merge-after-mbp.mir
index 97c2a2914f827..ac2e728ab5d07 100644
--- a/llvm/test/CodeGen/X86/tail-merge-after-mbp.mir
+++ b/llvm/test/CodeGen/X86/tail-merge-after-mbp.mir
@@ -24,7 +24,7 @@ body:             |
   ; CHECK: bb.4:
   ; CHECK:   $ebp = XOR32rr undef $ebp, undef $ebp, implicit-def dead $eflags
   ; CHECK:   dead $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags, implicit-def $al
-  ; CHECK:   RETQ $eax
+  ; CHECK:   RET64 $eax
   ; CHECK: bb.6:
   ; CHECK:   successors: %bb.1(0x30000000), %bb.7(0x50000000)
   ; CHECK:   $rax = MOV64rm $r14, 1, $noreg, 0, $noreg :: (load (s64))
@@ -41,7 +41,7 @@ body:             |
   ; CHECK:   JCC_1 %bb.7, 5, implicit $eflags
   ; CHECK: bb.1:
   ; CHECK:   $ebp = XOR32rr undef $ebp, undef $ebp, implicit-def dead $eflags
-  ; CHECK:   RETQ $eax
+  ; CHECK:   RET64 $eax
   bb.0:
     successors: %bb.1(0x40000000), %bb.7(0x40000000)
 
@@ -113,6 +113,6 @@ body:             |
 
   bb.16:
 
-    RETQ $eax
+    RET64 $eax
 
 ...

diff  --git a/llvm/test/CodeGen/X86/tied-depbreak.mir b/llvm/test/CodeGen/X86/tied-depbreak.mir
index 2fef158720aff..4eca28795516f 100644
--- a/llvm/test/CodeGen/X86/tied-depbreak.mir
+++ b/llvm/test/CodeGen/X86/tied-depbreak.mir
@@ -59,6 +59,6 @@ body:             |
     ; Verify that XOR is untouched by the dependency breaker
     ; CHECK: $esi = XOR32rr undef $esi, undef $esi, implicit-def dead $eflags, implicit-def $rsi
     $esi = XOR32rr undef $esi, undef $esi, implicit-def dead $eflags, implicit-def $rsi
-    RETQ killed $eax
+    RET64 killed $eax
 
 ...

diff  --git a/llvm/test/CodeGen/X86/twoaddr-dbg-value.mir b/llvm/test/CodeGen/X86/twoaddr-dbg-value.mir
index f2d6c5df58224..b575852d4ba3c 100644
--- a/llvm/test/CodeGen/X86/twoaddr-dbg-value.mir
+++ b/llvm/test/CodeGen/X86/twoaddr-dbg-value.mir
@@ -13,7 +13,7 @@ body:             |
     %5:gr32 = COPY %4
     PUSH32r killed %1, implicit-def $esp, implicit $esp
     $eax = COPY killed %5
-    RETQ implicit killed $eax
+    RET64 implicit killed $eax
 
 ...
 

diff  --git a/llvm/test/CodeGen/X86/update-terminator.mir b/llvm/test/CodeGen/X86/update-terminator.mir
index bbb327cd2a5f6..d26f797507716 100644
--- a/llvm/test/CodeGen/X86/update-terminator.mir
+++ b/llvm/test/CodeGen/X86/update-terminator.mir
@@ -74,6 +74,6 @@ body:             |
     JMP_1 %bb.2
 
   bb.4:
-    RETQ
+    RET64
 
 ...

diff  --git a/llvm/test/CodeGen/X86/win64-eh-empty-block-2.mir b/llvm/test/CodeGen/X86/win64-eh-empty-block-2.mir
index d7e75db5ebbce..c08dc76aef99a 100644
--- a/llvm/test/CodeGen/X86/win64-eh-empty-block-2.mir
+++ b/llvm/test/CodeGen/X86/win64-eh-empty-block-2.mir
@@ -173,7 +173,7 @@ body:             |
     SEH_Epilogue
     $rsp = frame-destroy ADD64ri8 $rsp, 48, implicit-def dead $eflags
     $rbp = frame-destroy POP64r implicit-def $rsp, implicit $rsp
-    RETQ $eax
+    RET64 $eax
 
   bb.1.if.then:
     successors: %bb.2(0x7ffff800), %bb.7(0x00000800)

diff  --git a/llvm/test/CodeGen/X86/xray-multiplerets-in-blocks.mir b/llvm/test/CodeGen/X86/xray-multiplerets-in-blocks.mir
index d8f08104a9e7f..69e8c6bfda4be 100644
--- a/llvm/test/CodeGen/X86/xray-multiplerets-in-blocks.mir
+++ b/llvm/test/CodeGen/X86/xray-multiplerets-in-blocks.mir
@@ -21,8 +21,8 @@ body:            |
   bb.0:
     liveins: $edi
     ; CHECK: PATCHABLE_FUNCTION_ENTER
-    RETQ
+    RET64
     ; CHECK-NEXT: PATCHABLE_RET
-    RETQ
+    RET64
     ; CHECK-NEXT: PATCHABLE_RET
 ...

diff  --git a/llvm/test/DebugInfo/MIR/InstrRef/dbg-phi-subregister-location.mir b/llvm/test/DebugInfo/MIR/InstrRef/dbg-phi-subregister-location.mir
index 1730bca2ac40d..0e105c132001a 100644
--- a/llvm/test/DebugInfo/MIR/InstrRef/dbg-phi-subregister-location.mir
+++ b/llvm/test/DebugInfo/MIR/InstrRef/dbg-phi-subregister-location.mir
@@ -66,6 +66,6 @@ body:             |
     DBG_INSTR_REF 2, 0, !12, !DIExpression(), debug-location !13
     renamable $rax = MOV64rm $rip, 1, $noreg, target-flags(x86-gotpcrel) @someglobal, $noreg, debug-location !13 :: (load (s64) from got)
     MOV8mr killed renamable $rax, 1, $noreg, 0, $noreg, renamable $dil, debug-location !13 :: (store (s8) into @someglobal)
-    RETQ debug-location !13
+    RET64 debug-location !13
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/InstrRef/dbg-phis-in-ldv.mir b/llvm/test/DebugInfo/MIR/InstrRef/dbg-phis-in-ldv.mir
index 93a82ee8f1d06..0102f648c27a9 100644
--- a/llvm/test/DebugInfo/MIR/InstrRef/dbg-phis-in-ldv.mir
+++ b/llvm/test/DebugInfo/MIR/InstrRef/dbg-phis-in-ldv.mir
@@ -157,6 +157,6 @@ body:             |
     CFI_INSTRUCTION def_cfa_offset 16, debug-location !26
     $r14 = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !26
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !26
-    RETQ implicit $eax, debug-location !26
+    RET64 implicit $eax, debug-location !26
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/InstrRef/dbg-phis-merging-in-ldv.mir b/llvm/test/DebugInfo/MIR/InstrRef/dbg-phis-merging-in-ldv.mir
index b46c4284c31ac..586b4b1824331 100644
--- a/llvm/test/DebugInfo/MIR/InstrRef/dbg-phis-merging-in-ldv.mir
+++ b/llvm/test/DebugInfo/MIR/InstrRef/dbg-phis-merging-in-ldv.mir
@@ -194,6 +194,6 @@ body:             |
     CFI_INSTRUCTION def_cfa_offset 16, debug-location !31
     $r14 = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !31
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !31
-    RETQ implicit $eax, debug-location !31
+    RET64 implicit $eax, debug-location !31
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/InstrRef/dbg-phis-with-loops.mir b/llvm/test/DebugInfo/MIR/InstrRef/dbg-phis-with-loops.mir
index cba605089aa93..1f9843b552517 100644
--- a/llvm/test/DebugInfo/MIR/InstrRef/dbg-phis-with-loops.mir
+++ b/llvm/test/DebugInfo/MIR/InstrRef/dbg-phis-with-loops.mir
@@ -200,6 +200,6 @@ body:             |
     CFI_INSTRUCTION def_cfa_offset 16, debug-location !31
     $r14 = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !31
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !31
-    RETQ implicit $eax, debug-location !31
+    RET64 implicit $eax, debug-location !31
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/InstrRef/follow-spill-of-live-value.mir b/llvm/test/DebugInfo/MIR/InstrRef/follow-spill-of-live-value.mir
index 849395f7e203b..c66c9d05c0637 100644
--- a/llvm/test/DebugInfo/MIR/InstrRef/follow-spill-of-live-value.mir
+++ b/llvm/test/DebugInfo/MIR/InstrRef/follow-spill-of-live-value.mir
@@ -328,6 +328,6 @@ body:             |
     CFI_INSTRUCTION def_cfa_offset 16
     $rbp = frame-destroy POP64r implicit-def $rsp, implicit $rsp
     CFI_INSTRUCTION def_cfa_offset 8
-    RETQ
+    RET64
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/InstrRef/ignore-dbg-value-list.mir b/llvm/test/DebugInfo/MIR/InstrRef/ignore-dbg-value-list.mir
index ee3a0d8e3ac27..f9728d073c6d0 100644
--- a/llvm/test/DebugInfo/MIR/InstrRef/ignore-dbg-value-list.mir
+++ b/llvm/test/DebugInfo/MIR/InstrRef/ignore-dbg-value-list.mir
@@ -69,6 +69,6 @@ body:             |
     ; This clobber of $rax might cause LDV to re-issue a DBG_VALUE stating the
     ; variable location as $rbx. However, the preceeding DBG_VALUE_LIST should
     ; terminate the earlier location.
-    RETQ implicit $rbx, debug-location !13
+    RET64 implicit $rbx, debug-location !13
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/InstrRef/instr-ref-roundtrip.mir b/llvm/test/DebugInfo/MIR/InstrRef/instr-ref-roundtrip.mir
index 0d30b2b8785e7..b045cbc784fcd 100644
--- a/llvm/test/DebugInfo/MIR/InstrRef/instr-ref-roundtrip.mir
+++ b/llvm/test/DebugInfo/MIR/InstrRef/instr-ref-roundtrip.mir
@@ -14,5 +14,5 @@ body:  |
     $rbp = MOV64rr $rdi, debug-instr-number 1
     dead $rcx = MOV64ri 0
     CMP64ri8 renamable $rax, 1, implicit-def $eflags
-    RETQ $rax
+    RET64 $rax
 ...

diff  --git a/llvm/test/DebugInfo/MIR/InstrRef/livedebugvalues_instrref_tolocs.mir b/llvm/test/DebugInfo/MIR/InstrRef/livedebugvalues_instrref_tolocs.mir
index 13d9295ad656a..19353dae26080 100644
--- a/llvm/test/DebugInfo/MIR/InstrRef/livedebugvalues_instrref_tolocs.mir
+++ b/llvm/test/DebugInfo/MIR/InstrRef/livedebugvalues_instrref_tolocs.mir
@@ -154,5 +154,5 @@ body:  |
     ; This is instruction 10 referred to in bb.10. However, as the variable
     ; location/value has been modified in the meantime, no DBG_VALUE should be
     ; generated here.
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/InstrRef/livedebugvalues_recover_clobbers.mir b/llvm/test/DebugInfo/MIR/InstrRef/livedebugvalues_recover_clobbers.mir
index 3d45a548e26e9..c41610fdc2017 100644
--- a/llvm/test/DebugInfo/MIR/InstrRef/livedebugvalues_recover_clobbers.mir
+++ b/llvm/test/DebugInfo/MIR/InstrRef/livedebugvalues_recover_clobbers.mir
@@ -96,5 +96,5 @@ body:  |
     ; CHECK-NEXT: CALL64pcrel32
     ; CHECK-NEXT: DBG_VALUE $ebx
 
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/InstrRef/livedebugvalues_stackslot_subregs.mir b/llvm/test/DebugInfo/MIR/InstrRef/livedebugvalues_stackslot_subregs.mir
index 9cf1e4cc1b45d..327fdeed7cb10 100644
--- a/llvm/test/DebugInfo/MIR/InstrRef/livedebugvalues_stackslot_subregs.mir
+++ b/llvm/test/DebugInfo/MIR/InstrRef/livedebugvalues_stackslot_subregs.mir
@@ -52,5 +52,5 @@ body:  |
     DBG_INSTR_REF 1, 0, !11, !DIExpression(), debug-location !12
     ; CHECK:      DBG_INSTR_REF
     ; CHECK-NEXT: DBG_VALUE $esi
-    RETQ $rsi, debug-location !12
+    RET64 $rsi, debug-location !12
 ...

diff  --git a/llvm/test/DebugInfo/MIR/InstrRef/livedebugvalues_subreg_substitutions.mir b/llvm/test/DebugInfo/MIR/InstrRef/livedebugvalues_subreg_substitutions.mir
index 26cdcf211a64e..6277b1b6dee23 100644
--- a/llvm/test/DebugInfo/MIR/InstrRef/livedebugvalues_subreg_substitutions.mir
+++ b/llvm/test/DebugInfo/MIR/InstrRef/livedebugvalues_subreg_substitutions.mir
@@ -105,5 +105,5 @@ body:  |
     ; CHECK-NEXT: DBG_INSTR_REF 13, 0
     ; CHECK-NEXT: DBG_VALUE $noreg
     $rax = MOV64rm $rsp, 1, $noreg, 8, $noreg :: (load 8 from %stack.0)
-    RETQ $rax, debug-location !12
+    RET64 $rax, debug-location !12
 ...

diff  --git a/llvm/test/DebugInfo/MIR/InstrRef/memory-operand-tracking.mir b/llvm/test/DebugInfo/MIR/InstrRef/memory-operand-tracking.mir
index c7236f5e23c31..2f19ad527ab75 100644
--- a/llvm/test/DebugInfo/MIR/InstrRef/memory-operand-tracking.mir
+++ b/llvm/test/DebugInfo/MIR/InstrRef/memory-operand-tracking.mir
@@ -81,5 +81,5 @@ body:  |
     ; CHECK-NEXT: DBG_VALUE $noreg
 
     $rax = MOV64rm $rsp, 1, $noreg, 8, $noreg :: (load 8 from %stack.0)
-    RETQ $rax, debug-location !12
+    RET64 $rax, debug-location !12
 ...

diff  --git a/llvm/test/DebugInfo/MIR/InstrRef/no-duplicates.mir b/llvm/test/DebugInfo/MIR/InstrRef/no-duplicates.mir
index 79d7960dd3bf8..5ade1830995b2 100644
--- a/llvm/test/DebugInfo/MIR/InstrRef/no-duplicates.mir
+++ b/llvm/test/DebugInfo/MIR/InstrRef/no-duplicates.mir
@@ -36,5 +36,5 @@ body:  |
     $rbp = MOV64rr $rdi, debug-instr-number 1, debug-location !12
     dead $rcx = MOV64ri 0, debug-instr-number 1, debug-location !12
     CMP64ri8 renamable $rax, 1, implicit-def $eflags
-    RETQ $rax
+    RET64 $rax
 ...

diff  --git a/llvm/test/DebugInfo/MIR/InstrRef/no-metainstrs.mir b/llvm/test/DebugInfo/MIR/InstrRef/no-metainstrs.mir
index d943a8eabd06f..b1d5c03d68b8e 100644
--- a/llvm/test/DebugInfo/MIR/InstrRef/no-metainstrs.mir
+++ b/llvm/test/DebugInfo/MIR/InstrRef/no-metainstrs.mir
@@ -37,5 +37,5 @@ body:  |
     $ebp = KILL killed $rbp, debug-instr-number 2, debug-location !12
     dead $rcx = MOV64ri 0
     CMP64ri8 renamable $rax, 1, implicit-def $eflags
-    RETQ $rax
+    RET64 $rax
 ...

diff  --git a/llvm/test/DebugInfo/MIR/InstrRef/phi-coalesce-subreg.mir b/llvm/test/DebugInfo/MIR/InstrRef/phi-coalesce-subreg.mir
index b18f57f4d91ab..b6df94a0b8c2c 100644
--- a/llvm/test/DebugInfo/MIR/InstrRef/phi-coalesce-subreg.mir
+++ b/llvm/test/DebugInfo/MIR/InstrRef/phi-coalesce-subreg.mir
@@ -156,6 +156,6 @@ body:             |
     ADJCALLSTACKUP64 0, 0, implicit-def $rsp, implicit-def $eflags, implicit-def $ssp, implicit $rsp, implicit $ssp, debug-location !13
     %23:gr32 = MOVSX32rr16 %26, debug-location !13
     $eax = COPY %23, debug-location !13
-    RETQ implicit $eax, debug-location !13
+    RET64 implicit $eax, debug-location !13
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/InstrRef/phi-coalescing.mir b/llvm/test/DebugInfo/MIR/InstrRef/phi-coalescing.mir
index c37804f6036c1..91f63937df1c9 100644
--- a/llvm/test/DebugInfo/MIR/InstrRef/phi-coalescing.mir
+++ b/llvm/test/DebugInfo/MIR/InstrRef/phi-coalescing.mir
@@ -155,6 +155,6 @@ body:             |
     ADJCALLSTACKUP64 0, 0, implicit-def $rsp, implicit-def $eflags, implicit-def $ssp, implicit $rsp, implicit $ssp, debug-location !13
     %13:gr32 = COPY %14.sub_32bit, debug-location !13
     $eax = COPY %13, debug-location !13
-    RETQ implicit $eax, debug-location !13
+    RET64 implicit $eax, debug-location !13
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/InstrRef/pick-vphi-in-shifting-loop.mir b/llvm/test/DebugInfo/MIR/InstrRef/pick-vphi-in-shifting-loop.mir
index e1d00597057a1..d652da6088d5d 100644
--- a/llvm/test/DebugInfo/MIR/InstrRef/pick-vphi-in-shifting-loop.mir
+++ b/llvm/test/DebugInfo/MIR/InstrRef/pick-vphi-in-shifting-loop.mir
@@ -123,6 +123,6 @@ body:             |
     JCC_1 %bb.5, 6, implicit $eflags, debug-location !22
   
   bb.6:
-    RETQ debug-location !22
+    RET64 debug-location !22
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/InstrRef/restore-to-rsp-crash.mir b/llvm/test/DebugInfo/MIR/InstrRef/restore-to-rsp-crash.mir
index cfe6c1757a0c5..fa5fccfddcd7e 100644
--- a/llvm/test/DebugInfo/MIR/InstrRef/restore-to-rsp-crash.mir
+++ b/llvm/test/DebugInfo/MIR/InstrRef/restore-to-rsp-crash.mir
@@ -61,6 +61,6 @@ body:             |
     DBG_VALUE $rax, $noreg, !12, !DIExpression(), debug-location !13
     MOV64mr $rsp, 1, $noreg, -8, $noreg, renamable $rax :: (store 8 into %stack.0)
     $rsp = MOV64rm $rsp, 1, $noreg, 0, $noreg, debug-location !13 :: (load 8 from %stack.0)
-    RETQ implicit $rbx, debug-location !13
+    RET64 implicit $rbx, debug-location !13
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/InstrRef/substitusions-roundtrip.mir b/llvm/test/DebugInfo/MIR/InstrRef/substitusions-roundtrip.mir
index 0a8fada169cf8..a5c5018b8434f 100644
--- a/llvm/test/DebugInfo/MIR/InstrRef/substitusions-roundtrip.mir
+++ b/llvm/test/DebugInfo/MIR/InstrRef/substitusions-roundtrip.mir
@@ -22,5 +22,5 @@ body:  |
     DBG_INSTR_REF 1, 0
     dead $rcx = MOV64ri 0
     CMP64ri8 renamable $rax, 1, implicit-def $eflags
-    RETQ $rax
+    RET64 $rax
 ...

diff  --git a/llvm/test/DebugInfo/MIR/InstrRef/survives-livedebugvars.mir b/llvm/test/DebugInfo/MIR/InstrRef/survives-livedebugvars.mir
index 80ae2e78fea07..53658d2fb53c6 100644
--- a/llvm/test/DebugInfo/MIR/InstrRef/survives-livedebugvars.mir
+++ b/llvm/test/DebugInfo/MIR/InstrRef/survives-livedebugvars.mir
@@ -41,7 +41,7 @@
 # FASTREG-NEXT:  JMP_1
 # FASTREG-LABEL: bb.4:
 # FASTREG:       DBG_INSTR_REF 5, 0
-# FASTREG-NEXT:  RETQ
+# FASTREG-NEXT:  RET64
 
 --- |
   ; ModuleID = 'tmp.ll'
@@ -137,6 +137,6 @@ body:             |
   bb.4:
     $eax = COPY %5, debug-location !18
     DBG_INSTR_REF 5, 0, !9, !DIExpression(), debug-location !16
-    RETQ implicit $eax, debug-location !18
+    RET64 implicit $eax, debug-location !18
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/InstrRef/x86-fixup-bw-inst-subreb.mir b/llvm/test/DebugInfo/MIR/InstrRef/x86-fixup-bw-inst-subreb.mir
index 27b155639af5d..b20041d04b991 100644
--- a/llvm/test/DebugInfo/MIR/InstrRef/x86-fixup-bw-inst-subreb.mir
+++ b/llvm/test/DebugInfo/MIR/InstrRef/x86-fixup-bw-inst-subreb.mir
@@ -28,7 +28,7 @@ body:             |
     $ax = MOV16rm killed $rax, 1, $noreg, 0, $noreg, debug-instr-number 1
     ; CHECK: $eax = MOVZX32rm16 killed $rax, {{.*}} debug-instr-number 2
 
-    RETQ $ax
+    RET64 $ax
 
 ...
 ---
@@ -55,11 +55,11 @@ body:             |
     $ax = MOV16rm killed $rdi, 1, $noreg, 0, $noreg, implicit-def $eax, debug-instr-number 1
     ; CHECK: $eax = MOVZX32rm16 killed $rdi, {{.*}} debug-instr-number 2
     $ax = KILL $ax, implicit killed $eax
-    RETQ $ax
+    RET64 $ax
 
   bb.1:
     $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags
     $ax = KILL $ax, implicit killed $eax
-    RETQ $ax
+    RET64 $ax
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/InstrRef/x86-lea-fixup-2.mir b/llvm/test/DebugInfo/MIR/InstrRef/x86-lea-fixup-2.mir
index 2ffd6b5e49b52..867dd278de505 100644
--- a/llvm/test/DebugInfo/MIR/InstrRef/x86-lea-fixup-2.mir
+++ b/llvm/test/DebugInfo/MIR/InstrRef/x86-lea-fixup-2.mir
@@ -18,7 +18,7 @@ body:             |
 
     ; CHECK: $eax = ADD32ri8 {{.*}} debug-instr-number 2
     $eax = LEA32r killed $eax, 1, killed $ebp, -5, $noreg, debug-instr-number 1
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -38,7 +38,7 @@ body:             |
 
     ; CHECK: $ebx = ADD32rr {{.*}} debug-instr-number 2
     $ebx = LEA32r killed $ebp, 1, $ebp, 0, $noreg, debug-instr-number 1
-    RETQ $ebx
+    RET64 $ebx
 
 ...
 ---
@@ -57,6 +57,6 @@ body:             |
 
     ; CHECK: $ebx = ADD32rr {{.*}} debug-instr-number 2
     $ebx = LEA32r $ebp, 1, $ebp, 5, $noreg, debug-instr-number 1
-    RETQ $ebx
+    RET64 $ebx
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/InstrRef/x86-lea-fixup.mir b/llvm/test/DebugInfo/MIR/InstrRef/x86-lea-fixup.mir
index f8b7967e88b6b..2765ce2284f17 100644
--- a/llvm/test/DebugInfo/MIR/InstrRef/x86-lea-fixup.mir
+++ b/llvm/test/DebugInfo/MIR/InstrRef/x86-lea-fixup.mir
@@ -24,7 +24,7 @@ body:             |
 
     $ebp = LEA64_32r killed $rbp, 1, killed $rax, 0, $noreg, debug-instr-number 1
     ; COREI7: ADD32rr {{.*}} debug-instr-number 2
-    RETQ $ebp
+    RET64 $ebp
 
 ...
 ---
@@ -51,7 +51,7 @@ body:             |
     renamable $eax = nsw LEA64_32r killed renamable $rdi, 4, renamable $rdi, 2, $noreg, debug-instr-number 2
     ; HASWELL: ADD32ri8 {{.*}} debug-instr-number 4
     renamable $eax = nsw IMUL32rr killed renamable $eax, killed renamable $ecx, implicit-def dead $eflags
-    RETQ $eax
+    RET64 $eax
 
 ...
 ---
@@ -72,6 +72,6 @@ body:             |
     renamable $ecx = nsw ADD32rr renamable $ecx, renamable $eax, implicit-def dead $eflags, implicit killed $rax, implicit killed $rcx, implicit-def $rcx, debug-instr-number 1
     ; ATOM: LEA64_32r {{.*}} debug-instr-number 2
     renamable $eax = MOV32rm killed renamable $rcx, 1, $noreg, 0, $noreg :: (load (s32) from `i32 *undef`)
-    RETQ $eax
+    RET64 $eax
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/backup-entry-values-usage.mir b/llvm/test/DebugInfo/MIR/X86/backup-entry-values-usage.mir
index 278a3f6a3242c..1bfb8184db306 100644
--- a/llvm/test/DebugInfo/MIR/X86/backup-entry-values-usage.mir
+++ b/llvm/test/DebugInfo/MIR/X86/backup-entry-values-usage.mir
@@ -101,6 +101,6 @@ body:             |
     $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags, debug-location !22
     $rcx = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !22
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !22
-    RETQ killed $eax, debug-location !22
+    RET64 killed $eax, debug-location !22
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/bit-piece-dh.mir b/llvm/test/DebugInfo/MIR/X86/bit-piece-dh.mir
index 9530683506285..3e8a9db2cb047 100644
--- a/llvm/test/DebugInfo/MIR/X86/bit-piece-dh.mir
+++ b/llvm/test/DebugInfo/MIR/X86/bit-piece-dh.mir
@@ -92,6 +92,6 @@ body:             |
     $edi = SHR32ri killed $edi, 8, implicit-def dead $eflags, debug-location !17
     $eax = MOVSX32rr8 $dil, implicit killed $edi, debug-location !20
     $rbp = POP64r implicit-def $rsp, implicit $rsp, debug-location !20
-    RETQ $eax, debug-location !20
+    RET64 $eax, debug-location !20
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/call-site-gnu-vs-dwarf5-attrs.mir b/llvm/test/DebugInfo/MIR/X86/call-site-gnu-vs-dwarf5-attrs.mir
index bde717e3c9da5..789968397199c 100644
--- a/llvm/test/DebugInfo/MIR/X86/call-site-gnu-vs-dwarf5-attrs.mir
+++ b/llvm/test/DebugInfo/MIR/X86/call-site-gnu-vs-dwarf5-attrs.mir
@@ -191,7 +191,7 @@ body:             |
     $rbx = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !33
     DBG_VALUE $rdi, $noreg, !23, !DIExpression(DW_OP_LLVM_entry_value, 1), debug-location !25
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !33
-    RETQ $eax, debug-location !33
+    RET64 $eax, debug-location !33
   
   bb.2.if.then:
     CFI_INSTRUCTION def_cfa_offset 16, debug-location !32

diff  --git a/llvm/test/DebugInfo/MIR/X86/clobbered-fragments.mir b/llvm/test/DebugInfo/MIR/X86/clobbered-fragments.mir
index 259ffa8fce6f4..c8ea384ce7273 100644
--- a/llvm/test/DebugInfo/MIR/X86/clobbered-fragments.mir
+++ b/llvm/test/DebugInfo/MIR/X86/clobbered-fragments.mir
@@ -105,7 +105,7 @@ body:             |
     CALL64pcrel32 @ext2, csr_64, implicit $rsp, implicit $ssp, implicit $edi, implicit killed $esi, implicit-def $rsp, implicit-def $ssp, debug-location !16
     $eax = MOV32ri 123, debug-location !17
     $rcx = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !17
-    RETQ killed $eax, debug-location !17
+    RET64 killed $eax, debug-location !17
 
 ...
 
@@ -135,7 +135,7 @@ body:             |
     CALL64pcrel32 @ext3, csr_64, implicit $rsp, implicit $ssp, implicit killed $edi, implicit $esi, implicit $edx, implicit-def $rsp, implicit-def $ssp, debug-location !20
     $eax = MOV32rr killed $ebx, debug-location !20
     $rbx = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !20
-    RETQ killed $eax, debug-location !21
+    RET64 killed $eax, debug-location !21
 
 ...
 

diff  --git a/llvm/test/DebugInfo/MIR/X86/complex-entryvalue.mir b/llvm/test/DebugInfo/MIR/X86/complex-entryvalue.mir
index cc7e6dbc08e31..a015855f190b2 100644
--- a/llvm/test/DebugInfo/MIR/X86/complex-entryvalue.mir
+++ b/llvm/test/DebugInfo/MIR/X86/complex-entryvalue.mir
@@ -48,6 +48,6 @@ body:             |
     frame-setup PUSH64r killed $rbp, implicit-def $rsp, implicit $rsp
     $rbp = frame-setup MOV64rr $rsp
     $rbp = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !16
-    RETQ debug-location !16
+    RET64 debug-location !16
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/dbg-call-site-spilled-arg-multiple-defs.mir b/llvm/test/DebugInfo/MIR/X86/dbg-call-site-spilled-arg-multiple-defs.mir
index c13c22344d4e5..4d3c466f3eb36 100644
--- a/llvm/test/DebugInfo/MIR/X86/dbg-call-site-spilled-arg-multiple-defs.mir
+++ b/llvm/test/DebugInfo/MIR/X86/dbg-call-site-spilled-arg-multiple-defs.mir
@@ -132,6 +132,6 @@ body:             |
     CFI_INSTRUCTION def_cfa_offset 16, debug-location !18
     $rbp = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !18
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !18
-    RETQ debug-location !18
+    RET64 debug-location !18
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/dbg-call-site-spilled-arg.mir b/llvm/test/DebugInfo/MIR/X86/dbg-call-site-spilled-arg.mir
index 146b7f184c9af..ecfe5de75b458 100644
--- a/llvm/test/DebugInfo/MIR/X86/dbg-call-site-spilled-arg.mir
+++ b/llvm/test/DebugInfo/MIR/X86/dbg-call-site-spilled-arg.mir
@@ -172,6 +172,6 @@ body:             |
     $r14 = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !20
     $r15 = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !20
     $rbp = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !20
-    RETQ debug-location !20
+    RET64 debug-location !20
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/dbg-stack-value-range.mir b/llvm/test/DebugInfo/MIR/X86/dbg-stack-value-range.mir
index 462bf3473a5d2..8254b81c22046 100644
--- a/llvm/test/DebugInfo/MIR/X86/dbg-stack-value-range.mir
+++ b/llvm/test/DebugInfo/MIR/X86/dbg-stack-value-range.mir
@@ -177,6 +177,6 @@ body:             |
     $rsp = frame-destroy ADD64ri8 $rsp, 16, implicit-def dead $eflags, debug-location !15
     $rbp = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !15
     CFI_INSTRUCTION def_cfa $rsp, 8, debug-location !15
-    RETQ $eax, debug-location !15
+    RET64 $eax, debug-location !15
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-copy-super-sub.mir b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-copy-super-sub.mir
index 347a0ec09bb24..821be45acc6ff 100644
--- a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-copy-super-sub.mir
+++ b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-copy-super-sub.mir
@@ -106,7 +106,7 @@ body:             |
     $eax = MOV32rr killed $ebx, debug-location !32
     $rbx = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !32
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !32
-    RETQ killed $eax, debug-location !32
+    RET64 killed $eax, debug-location !32
 
 ...
 

diff  --git a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-interpretation.mir b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-interpretation.mir
index 79601c802e26a..a6f64f6f3b24c 100644
--- a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-interpretation.mir
+++ b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-interpretation.mir
@@ -199,6 +199,6 @@ body:             |
     $r15 = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !21
     DBG_VALUE $esi, $noreg, !15, !DIExpression(DW_OP_LLVM_entry_value, 1), debug-location !21
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !21
-    RETQ $eax, debug-location !21
+    RET64 $eax, debug-location !21
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-lea-interpretation.mir b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-lea-interpretation.mir
index b87c0ac26b0bb..f6f746e470052 100644
--- a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-lea-interpretation.mir
+++ b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-lea-interpretation.mir
@@ -135,6 +135,6 @@ body:             |
     CFI_INSTRUCTION def_cfa_offset 16, debug-location !14
     $rbx = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !14
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !14
-    RETQ $eax, debug-location !14
+    RET64 $eax, debug-location !14
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-partial-describe.mir b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-partial-describe.mir
index f0902bbe41d66..4053bba80a150 100644
--- a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-partial-describe.mir
+++ b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-partial-describe.mir
@@ -54,7 +54,7 @@ body:             |
     CALL64pcrel32 @call, csr_64, implicit $rsp, implicit $ssp, implicit killed $edi, implicit undef $esi, implicit-def $rsp, implicit-def $ssp, debug-location !15
     $rax = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !16
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !16
-    RETQ debug-location !16
+    RET64 debug-location !16
 
 ...
 

diff  --git a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-reference.mir b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-reference.mir
index 2a2943ffaeaad..a915a4826ed74 100644
--- a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-reference.mir
+++ b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-reference.mir
@@ -112,6 +112,6 @@ body:             |
     CALL64pcrel32 @_ZN1CC2E1B, csr_64, implicit $rsp, implicit $ssp, implicit $rdi, implicit $rsi, implicit-def $rsp, implicit-def $ssp, debug-location !36
     $rax = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !36
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !36
-    RETQ debug-location !36
+    RET64 debug-location !36
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-reg-shuffle.mir b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-reg-shuffle.mir
index 27a03193e8161..03c967d17569a 100644
--- a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-reg-shuffle.mir
+++ b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-reg-shuffle.mir
@@ -74,7 +74,7 @@ body:             |
     CALL64pcrel32 @call2, csr_64, implicit $rsp, implicit $ssp, implicit $edi, implicit $esi, implicit-def $rsp, implicit-def $ssp, debug-location !15
     $rax = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !16
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !16
-    RETQ debug-location !16
+    RET64 debug-location !16
 
 ...
 

diff  --git a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-two-fwd-reg-defs.mir b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-two-fwd-reg-defs.mir
index fb150f7b36246..01b61913fd65a 100644
--- a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-two-fwd-reg-defs.mir
+++ b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-two-fwd-reg-defs.mir
@@ -88,7 +88,7 @@ body:             |
     renamable $eax = MOV32rm $rip, 1, $noreg, @a, $noreg, debug-location !16 :: (dereferenceable load (s32) from @a)
     $rbp = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !16
     CFI_INSTRUCTION def_cfa $rsp, 8, debug-location !16
-    RETQ $eax, debug-location !16
+    RET64 $eax, debug-location !16
 
 ...
 ---
@@ -123,7 +123,7 @@ body:             |
     $rbx = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !22
     $rbp = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !22
     CFI_INSTRUCTION def_cfa $rsp, 8, debug-location !22
-    RETQ $eax, debug-location !22
+    RET64 $eax, debug-location !22
 
 ...
 

diff  --git a/llvm/test/DebugInfo/MIR/X86/debug-call-site-param.mir b/llvm/test/DebugInfo/MIR/X86/debug-call-site-param.mir
index ca577f7b6d1f1..ba82357649660 100644
--- a/llvm/test/DebugInfo/MIR/X86/debug-call-site-param.mir
+++ b/llvm/test/DebugInfo/MIR/X86/debug-call-site-param.mir
@@ -190,6 +190,6 @@ body:             |
     CFI_INSTRUCTION def_cfa_offset 16, debug-location !24
     $r15 = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !24
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !24
-    RETQ debug-location !24
+    RET64 debug-location !24
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/debug-entry-value-operation.mir b/llvm/test/DebugInfo/MIR/X86/debug-entry-value-operation.mir
index 3ce6388b21a0c..a051aaa5f7ad1 100644
--- a/llvm/test/DebugInfo/MIR/X86/debug-entry-value-operation.mir
+++ b/llvm/test/DebugInfo/MIR/X86/debug-entry-value-operation.mir
@@ -88,6 +88,6 @@ body:             |
     MOV32mr $rip, 1, $noreg, @global, $noreg, killed renamable $edi, debug-location !18 :: (store (s32) into @global)
     INLINEASM &"", 1, 12, implicit-def dead early-clobber $edi, 12, implicit-def dead early-clobber $esi, 12, implicit-def dead early-clobber $edx, 12, implicit-def dead early-clobber $df, 12, implicit-def dead early-clobber $fpsw, 12, implicit-def dead early-clobber $eflags, !19, debug-location !18
     $eax = MOV32ri 123, debug-location !18
-    RETQ killed $eax, debug-location !18
+    RET64 killed $eax, debug-location !18
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvalues-clobber.mir b/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvalues-clobber.mir
index a42748e5cedb0..124ddd0d78c92 100644
--- a/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvalues-clobber.mir
+++ b/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvalues-clobber.mir
@@ -100,7 +100,7 @@ body:             |
 
   bb.4:
     liveins: $rbx, $rsi
-    RETQ $rbx, debug-location !17
+    RET64 $rbx, debug-location !17
 
 ...
 

diff  --git a/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvalues-join.mir b/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvalues-join.mir
index f8863eedb1764..ea747635bac95 100644
--- a/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvalues-join.mir
+++ b/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvalues-join.mir
@@ -154,7 +154,7 @@ body:             |
   bb.10:
     liveins: $rdi, $rsi
     ; Should _not_ be a live-in loc here.
-    RETQ
+    RET64
 
 ...
 

diff  --git a/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvalues-movements.mir b/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvalues-movements.mir
index 4fd435461718a..3c8e34a466a64 100644
--- a/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvalues-movements.mir
+++ b/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvalues-movements.mir
@@ -84,7 +84,7 @@ body:             |
 
   bb.2:
     liveins: $rbx, $rbp
-    RETQ $rbp, debug-location !17
+    RET64 $rbp, debug-location !17
 
 ...
 

diff  --git a/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvalues-spillrestore.mir b/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvalues-spillrestore.mir
index 32a68639ec5f2..8006945837d6c 100644
--- a/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvalues-spillrestore.mir
+++ b/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvalues-spillrestore.mir
@@ -72,6 +72,6 @@ body:             |
     $rax = COPY killed $rdi
     $rdi = MOV64ri 0
     $rdi = MOV64rm $rsp, 1, $noreg, -16, $noreg, debug-location !15 :: (load (s64) from %stack.0)
-    RETQ
+    RET64
 ...
 

diff  --git a/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvars-movements.mir b/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvars-movements.mir
index 82cc5b00e5309..42f8bc2564285 100644
--- a/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvars-movements.mir
+++ b/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvars-movements.mir
@@ -105,5 +105,5 @@ body:             |
 
     CALL64pcrel32 @foo, csr_64, implicit $rsp, implicit $ssp, implicit %3, implicit %5
 
-    RETQ
+    RET64
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvars-stackptr.mir b/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvars-stackptr.mir
index 491bb27cafeff..aeadd5bd2b4f7 100644
--- a/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvars-stackptr.mir
+++ b/llvm/test/DebugInfo/MIR/X86/dvl-livedebugvars-stackptr.mir
@@ -109,5 +109,5 @@ body:             |
 
     CALL64pcrel32 @foo, csr_64, implicit $rsp, implicit $ssp, implicit %3, implicit %5
 
-    RETQ
+    RET64
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/empty-inline.mir b/llvm/test/DebugInfo/MIR/X86/empty-inline.mir
index 742098ef0c45f..d2b057af17c3e 100644
--- a/llvm/test/DebugInfo/MIR/X86/empty-inline.mir
+++ b/llvm/test/DebugInfo/MIR/X86/empty-inline.mir
@@ -109,13 +109,13 @@ body:             |
     $rax = MOV64rm $rdi, 1, _, 0, _ :: (load (s64) from %ir.6, align 4)
     $al = MOV8rm killed $rax, 1, _, 0, _ :: (load (s8) from %ir.8)
     MOV8mr killed $rdi, 1, _, 8, _, killed $al, debug-location !14 :: (store (s8) into %ir.12)
-    RETQ undef $eax
+    RET64 undef $eax
 
   bb.1:
     liveins: $rdi
 
     $al = IMPLICIT_DEF debug-location !10
     MOV8mr killed $rdi, 1, _, 8, _, killed $al, debug-location !14 :: (store (s8) into %ir.12)
-    RETQ undef $eax
+    RET64 undef $eax
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/entry-value-of-modified-param.mir b/llvm/test/DebugInfo/MIR/X86/entry-value-of-modified-param.mir
index 8de1020e15ea8..3ac9b0be6c407 100644
--- a/llvm/test/DebugInfo/MIR/X86/entry-value-of-modified-param.mir
+++ b/llvm/test/DebugInfo/MIR/X86/entry-value-of-modified-param.mir
@@ -114,6 +114,6 @@ body:             |
     renamable $al = SETCCr 12, implicit killed $eflags, implicit killed $eax, implicit-def $eax, debug-location !23
     $rbx = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !26
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !26
-    RETQ $eax, debug-location !26
+    RET64 $eax, debug-location !26
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/entry-values-diamond-bbs.mir b/llvm/test/DebugInfo/MIR/X86/entry-values-diamond-bbs.mir
index 27f881d0f178b..72810369c0e1f 100644
--- a/llvm/test/DebugInfo/MIR/X86/entry-values-diamond-bbs.mir
+++ b/llvm/test/DebugInfo/MIR/X86/entry-values-diamond-bbs.mir
@@ -178,6 +178,6 @@ body:             |
     CFI_INSTRUCTION def_cfa_offset 16, debug-location !34
     $rbp = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !34
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !34
-    RETQ killed $eax, debug-location !34
+    RET64 killed $eax, debug-location !34
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/kill-after-spill.mir b/llvm/test/DebugInfo/MIR/X86/kill-after-spill.mir
index f2bdab16e574c..29cc2220b8230 100644
--- a/llvm/test/DebugInfo/MIR/X86/kill-after-spill.mir
+++ b/llvm/test/DebugInfo/MIR/X86/kill-after-spill.mir
@@ -382,6 +382,6 @@ body:             |
     $r14 = POP64r implicit-def $rsp, implicit $rsp
     $r15 = POP64r implicit-def $rsp, implicit $rsp
     $rbp = POP64r implicit-def $rsp, implicit $rsp
-    RETQ $eax, debug-location !57
+    RET64 $eax, debug-location !57
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/kill-entry-value-after-diamond-bbs.mir b/llvm/test/DebugInfo/MIR/X86/kill-entry-value-after-diamond-bbs.mir
index ec165f4c798d3..c33f5f6affbb3 100644
--- a/llvm/test/DebugInfo/MIR/X86/kill-entry-value-after-diamond-bbs.mir
+++ b/llvm/test/DebugInfo/MIR/X86/kill-entry-value-after-diamond-bbs.mir
@@ -180,7 +180,7 @@ body:             |
     CFI_INSTRUCTION def_cfa_offset 16, debug-location !34
     $rbp = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !34
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !34
-    RETQ killed $eax, debug-location !34
+    RET64 killed $eax, debug-location !34
 
 ...
 

diff  --git a/llvm/test/DebugInfo/MIR/X86/live-debug-values-3preds.mir b/llvm/test/DebugInfo/MIR/X86/live-debug-values-3preds.mir
index bef0f4e4aa5ab..50cf59025bfb6 100644
--- a/llvm/test/DebugInfo/MIR/X86/live-debug-values-3preds.mir
+++ b/llvm/test/DebugInfo/MIR/X86/live-debug-values-3preds.mir
@@ -267,7 +267,7 @@ body:             |
     $ecx = IMUL32rr killed $ecx, killed $edi, implicit-def dead $eflags, debug-location !36
     DBG_VALUE 0, 0, !13, !17, debug-location !25
     $eax = MOV32rr killed $ecx, debug-location !50
-    RETQ $eax, debug-location !50
+    RET64 $eax, debug-location !50
   
   bb.6.if.then.4:
     liveins: $ecx, $esi
@@ -278,7 +278,7 @@ body:             |
     $ecx = IMUL32rr killed $ecx, killed $esi, implicit-def dead $eflags, debug-location !40
     DBG_VALUE 0, 0, !13, !17, debug-location !25
     $eax = MOV32rr killed $ecx, debug-location !50
-    RETQ $eax, debug-location !50
+    RET64 $eax, debug-location !50
   
   bb.8.if.then.8:
     successors: %bb.9.for.end(0)
@@ -294,6 +294,6 @@ body:             |
   
     DBG_VALUE 0, 0, !13, !17, debug-location !25
     $eax = MOV32rr killed $ecx, debug-location !50
-    RETQ $eax, debug-location !50
+    RET64 $eax, debug-location !50
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/live-debug-values-bad-transfer.mir b/llvm/test/DebugInfo/MIR/X86/live-debug-values-bad-transfer.mir
index 97fad0755b80e..5cc1105e9ab22 100644
--- a/llvm/test/DebugInfo/MIR/X86/live-debug-values-bad-transfer.mir
+++ b/llvm/test/DebugInfo/MIR/X86/live-debug-values-bad-transfer.mir
@@ -106,6 +106,6 @@ body:             |
     $eax = MOV32rr killed $ebx, debug-location !10
     $rbx = frame-destroy POP64r implicit-def $rsp, implicit $rsp
     CFI_INSTRUCTION def_cfa_offset 8
-    RETQ $eax, debug-location !10
+    RET64 $eax, debug-location !10
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/live-debug-values-cutoffs.mir b/llvm/test/DebugInfo/MIR/X86/live-debug-values-cutoffs.mir
index 17b6b9b3149c3..cedfccc574f17 100644
--- a/llvm/test/DebugInfo/MIR/X86/live-debug-values-cutoffs.mir
+++ b/llvm/test/DebugInfo/MIR/X86/live-debug-values-cutoffs.mir
@@ -114,6 +114,6 @@ body:             |
     CALL64pcrel32 @use, csr_64, implicit $rsp, implicit $ssp, implicit killed $edi, implicit-def $eax, debug-location !14
     DBG_VALUE renamable $eax, $noreg, !11, !DIExpression(), debug-location !14
     $rcx = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !15
-    RETQ implicit killed $eax, debug-location !15
+    RET64 implicit killed $eax, debug-location !15
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/live-debug-values-entry-transfer.mir b/llvm/test/DebugInfo/MIR/X86/live-debug-values-entry-transfer.mir
index 53c948ad2678a..03b10929f7be0 100644
--- a/llvm/test/DebugInfo/MIR/X86/live-debug-values-entry-transfer.mir
+++ b/llvm/test/DebugInfo/MIR/X86/live-debug-values-entry-transfer.mir
@@ -118,6 +118,6 @@ body:             |
     $eax = MOV32rr killed $ebx
     $rbx = frame-destroy POP64r implicit-def $rsp, implicit $rsp
     CFI_INSTRUCTION def_cfa_offset 8
-    RETQ $eax
+    RET64 $eax
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/live-debug-values-fragments.mir b/llvm/test/DebugInfo/MIR/X86/live-debug-values-fragments.mir
index 970f59194aa50..d0ae6277a512c 100644
--- a/llvm/test/DebugInfo/MIR/X86/live-debug-values-fragments.mir
+++ b/llvm/test/DebugInfo/MIR/X86/live-debug-values-fragments.mir
@@ -20,7 +20,7 @@
 # CHECK-NEXT: DBG_VALUE $eax, $noreg, !{{[0-9]+}},
 # CHECK-SAME:                 !DIExpression(DW_OP_LLVM_fragment, 0, 32)
 # CHECK-NEXT: XOR32rr
-# CHECK-NEXT: RETQ
+# CHECK-NEXT: RET64
 #
 # CHECK-LABEL: bar
 # CHECK-LABEL: bb.0.entry:
@@ -51,7 +51,7 @@
 # CHECK-NEXT: DBG_VALUE $ax, $noreg, !{{[0-9]+}},
 # CHECK-SAME:                 !DIExpression(DW_OP_LLVM_fragment, 8, 16)
 # CHECK-NEXT: XOR32rr
-# CHECK-NEXT: RETQ
+# CHECK-NEXT: RET64
 
 # CHECK-LABEL: baz
 # CHECK-LABEL: bb.0.entry:
@@ -81,7 +81,7 @@
 # CHECK:      DBG_VALUE $ebx, $noreg, !{{[0-9]+}},
 # CHECK-SAME:                 !DIExpression(DW_OP_LLVM_fragment, 32, 32)
 # CHECK-NEXT: XOR32rr
-# CHECK-NEXT: RETQ
+# CHECK-NEXT: RET64
 
 --- |
   target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
@@ -178,7 +178,7 @@ body:             |
   bb.3.bb3:
     liveins: $eax, $ebx
     $eax = XOR32rr killed $eax, killed $ebx, implicit-def $eflags
-    RETQ $eax, debug-location !8
+    RET64 $eax, debug-location !8
 
 ...
 ---
@@ -216,7 +216,7 @@ body:             |
   bb.3.bb3:
     liveins: $eax, $ebx
     $eax = XOR32rr killed $eax, killed $ebx, implicit-def $eflags
-    RETQ $eax, debug-location !48
+    RET64 $eax, debug-location !48
 
 ...
 ---
@@ -254,6 +254,6 @@ body:             |
   bb.3.bb3:
     liveins: $eax, $ebx
     $eax = XOR32rr killed $eax, killed $ebx, implicit-def $eflags
-    RETQ $eax, debug-location !88
+    RET64 $eax, debug-location !88
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/live-debug-values-restore-collide.mir b/llvm/test/DebugInfo/MIR/X86/live-debug-values-restore-collide.mir
index 49c5aed0b9473..9033c86f62e57 100644
--- a/llvm/test/DebugInfo/MIR/X86/live-debug-values-restore-collide.mir
+++ b/llvm/test/DebugInfo/MIR/X86/live-debug-values-restore-collide.mir
@@ -81,5 +81,5 @@ body:             |
     ; Return faff
     $eax = MOV32ri 0
     $rsp = frame-destroy ADD64ri8 $rsp, 24, implicit-def dead $eflags
-    RETQ debug-location !10
+    RET64 debug-location !10
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/live-debug-values-restore.mir b/llvm/test/DebugInfo/MIR/X86/live-debug-values-restore.mir
index ef0d4d4797b80..6963c8c75363c 100644
--- a/llvm/test/DebugInfo/MIR/X86/live-debug-values-restore.mir
+++ b/llvm/test/DebugInfo/MIR/X86/live-debug-values-restore.mir
@@ -326,7 +326,7 @@ body:             |
     liveins: $rdi, $rbx, $r12, $r13, $r14, $r15, $rbp
   
     renamable $eax = MOV32rm killed renamable $rdi, 1, $noreg, 4, $noreg, debug-location !23 :: (load (s32) from %ir.add.ptr, !tbaa !24)
-    RETQ $eax, debug-location !28
+    RET64 $eax, debug-location !28
 
 ...
 ---
@@ -401,7 +401,7 @@ body:             |
 
     renamable $eax = MOV32rm killed renamable $rsi, 1, $noreg, 4, $noreg, debug-location !123 :: (load (s32) from %ir.add.ptr, !tbaa !24)
     $rdi = MOV64ri 0
-    RETQ $eax, debug-location !128
+    RET64 $eax, debug-location !128
 
 ...
 ---
@@ -507,7 +507,7 @@ body:             |
     liveins: $rdi, $rbx, $r12, $r13, $r14, $r15, $rbp
   
     renamable $eax = MOV32rm killed renamable $rdi, 1, $noreg, 4, $noreg, debug-location !223 :: (load (s32) from %ir.add.ptr, !tbaa !24)
-    RETQ $eax, debug-location !228
+    RET64 $eax, debug-location !228
 
 
 
@@ -628,7 +628,7 @@ body:             |
   
     renamable $rdi = MOV64rm $rsp, 1, $noreg, -8, $noreg :: (load (s64) from %stack.0)
     renamable $eax = MOV32rm killed renamable $rdi, 1, $noreg, 4, $noreg, debug-location !323 :: (load (s32) from %ir.add.ptr, !tbaa !24)
-    RETQ $eax, debug-location !328
+    RET64 $eax, debug-location !328
 
 ...
 ---
@@ -731,6 +731,6 @@ body:             |
     liveins: $rdi, $rbx, $r12, $r13, $r14, $r15, $rbp
   
     renamable $eax = MOV32rm killed renamable $rdi, 1, $noreg, 4, $noreg, debug-location !414 :: (load (s32) from %ir.add.ptr, !tbaa !24)
-    RETQ $eax, debug-location !415
+    RET64 $eax, debug-location !415
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/live-debug-values-spill.mir b/llvm/test/DebugInfo/MIR/X86/live-debug-values-spill.mir
index 61a5e204668c2..88ba9a5ac458b 100644
--- a/llvm/test/DebugInfo/MIR/X86/live-debug-values-spill.mir
+++ b/llvm/test/DebugInfo/MIR/X86/live-debug-values-spill.mir
@@ -467,6 +467,6 @@ body:             |
     $r14 = POP64r implicit-def $rsp, implicit $rsp, debug-location !90
     $r15 = POP64r implicit-def $rsp, implicit $rsp, debug-location !90
     $rbp = POP64r implicit-def $rsp, implicit $rsp, debug-location !90
-    RETQ debug-location !90
+    RET64 debug-location !90
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/live-debug-values-stack-clobber.mir b/llvm/test/DebugInfo/MIR/X86/live-debug-values-stack-clobber.mir
index 647f66c68cd06..2f5f8b829d66a 100644
--- a/llvm/test/DebugInfo/MIR/X86/live-debug-values-stack-clobber.mir
+++ b/llvm/test/DebugInfo/MIR/X86/live-debug-values-stack-clobber.mir
@@ -195,6 +195,6 @@ body:             |
     $r14 = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !28
     $r15 = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !28
     $rbp = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !28
-    RETQ $rax, debug-location !28
+    RET64 $rax, debug-location !28
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/live-debug-values.mir b/llvm/test/DebugInfo/MIR/X86/live-debug-values.mir
index be6fe2f74d3d0..b91d558e7d96b 100644
--- a/llvm/test/DebugInfo/MIR/X86/live-debug-values.mir
+++ b/llvm/test/DebugInfo/MIR/X86/live-debug-values.mir
@@ -252,6 +252,6 @@ body:             |
     CALL64pcrel32 @printf, csr_64, implicit $rsp, implicit $rdi, implicit $esi, implicit $al, implicit-def $rsp, implicit-def dead $eax, debug-location !46
     $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags, debug-location !47
     $rbx = POP64r implicit-def $rsp, implicit $rsp, debug-location !47
-    RETQ $eax, debug-location !47
+    RET64 $eax, debug-location !47
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues-ignores-metaInstructions.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues-ignores-metaInstructions.mir
index 89c7d55d95c6e..b887f9b44fd77 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues-ignores-metaInstructions.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues-ignores-metaInstructions.mir
@@ -60,5 +60,5 @@ body:             |
     successors: %bb.3
     renamable $ebx = KILL $ebx
   bb.3.bb3:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond.mir
index 89b4ac63e08a1..b5b2fe4a463f0 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond.mir
@@ -63,5 +63,5 @@ body:  |
     successors: %bb.3
     $eax = MOV32ri 0, debug-location !17
   bb.3.bb3:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond_match_clobber.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond_match_clobber.mir
index bd6dacc2fed1a..32ab6efa98155 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond_match_clobber.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond_match_clobber.mir
@@ -63,5 +63,5 @@ body:  |
     successors: %bb.3
     $ebx = MOV32ri 0, debug-location !17
   bb.3.bb3:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond_match_move.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond_match_move.mir
index 05a1955532aaa..4c3747be64706 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond_match_move.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond_match_move.mir
@@ -69,5 +69,5 @@ body:  |
     $eax = MOV32ri 0, debug-location !17
     DBG_VALUE $eax, $noreg, !16, !DIExpression(), debug-location !17
   bb.3.bb3:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond_one_clobber.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond_one_clobber.mir
index ee843492c7b95..8f37c88fe9850 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond_one_clobber.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond_one_clobber.mir
@@ -61,5 +61,5 @@ body:  |
     successors: %bb.3
     $eax = MOV32ri 0, debug-location !17
   bb.3.bb3:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond_one_move.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond_one_move.mir
index fe3924bf846ae..33b918c2eaa7d 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond_one_move.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_diamond_one_move.mir
@@ -64,5 +64,5 @@ body:  |
     successors: %bb.3
     $eax = MOV32ri 0, debug-location !17
   bb.3.bb3:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_loop.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_loop.mir
index d7eb4bd48ab3a..7f85b98c20134 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_loop.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_basic_loop.mir
@@ -62,5 +62,5 @@ body:  |
     $eax = MOV32ri 0, debug-location !17
     JCC_1 %bb.1, 4, implicit killed $eflags
   bb.3.bb3:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_bb_to_bb.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_bb_to_bb.mir
index f48940a24861b..808d3a41a05a2 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_bb_to_bb.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_bb_to_bb.mir
@@ -61,5 +61,5 @@ body:             |
     successors: %bb.3
     $eax = MOV32ri 0, debug-location !17
   bb.3.bb3:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_bb_to_bb_clobbered.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_bb_to_bb_clobbered.mir
index f969179b76a7d..935dcc494fd86 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_bb_to_bb_clobbered.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_bb_to_bb_clobbered.mir
@@ -57,5 +57,5 @@ body:             |
     successors: %bb.3
     $eax = MOV32ri 0, debug-location !17
   bb.3.bb3:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_bb_to_bb_move_to_clobber.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_bb_to_bb_move_to_clobber.mir
index 339d21380fa64..33246054dca82 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_bb_to_bb_move_to_clobber.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_bb_to_bb_move_to_clobber.mir
@@ -64,5 +64,5 @@ body:             |
     successors: %bb.3
     $eax = MOV32ri 0, debug-location !17
   bb.3.bb3:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_load_in_loop.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_load_in_loop.mir
index f80bf367f3fed..dd0288ddadf0a 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_load_in_loop.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_load_in_loop.mir
@@ -109,5 +109,5 @@ body:  |
   liveins: $rax, $rbp
   bb.6:
   liveins: $rax, $rbp
-    RETQ $rax, debug-location !17
+    RET64 $rax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_break.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_break.mir
index 0d9cc1905134a..c9f972646f9ba 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_break.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_break.mir
@@ -70,5 +70,5 @@ body:  |
     $eax = MOV32ri 0, debug-location !17
     JCC_1 %bb.1, 4, implicit killed $eflags
   bb.4.bb4:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_break_clobbered.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_break_clobbered.mir
index b4dea6ccbf700..92fe5a041eb47 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_break_clobbered.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_break_clobbered.mir
@@ -62,5 +62,5 @@ body:  |
     $eax = MOV32ri 0, debug-location !17
     JCC_1 %bb.1, 4, implicit killed $eflags
   bb.4.bb4:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_clobbered.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_clobbered.mir
index 47f114f7fe1b8..14d9196ee13a0 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_clobbered.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_clobbered.mir
@@ -59,5 +59,5 @@ body:  |
     JCC_1 %bb.1, 4, implicit killed $eflags
 
   bb.3.bb3:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_diamond.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_diamond.mir
index 1e410054dc1cb..a0b1075ae30a4 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_diamond.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_diamond.mir
@@ -78,5 +78,5 @@ body:  |
     $eax = MOV32ri 0, debug-location !17
     JCC_1 %bb.1, 4, implicit killed $eflags
   bb.5.bb5:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_diamond_clobber.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_diamond_clobber.mir
index 7e18939870bc7..2e1f4292042d6 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_diamond_clobber.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_diamond_clobber.mir
@@ -69,5 +69,5 @@ body:  |
     $eax = MOV32ri 0, debug-location !17
     JCC_1 %bb.1, 4, implicit killed $eflags
   bb.5.bb5:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_diamond_move.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_diamond_move.mir
index 7861e7dfa9c62..70a7b379e19b0 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_diamond_move.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_diamond_move.mir
@@ -79,5 +79,5 @@ body:  |
     $ebx = MOV32ri 0, debug-location !17
     JCC_1 %bb.1, 4, implicit killed $eflags
   bb.5.bb5:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_early_clobber.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_early_clobber.mir
index ff66eba762cb6..01d2735d4d926 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_early_clobber.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_early_clobber.mir
@@ -56,5 +56,5 @@ body:  |
     $eax = MOV32ri 0, debug-location !17
     JCC_1 %bb.1, 4, implicit killed $eflags
   bb.3.bb3:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_terminated.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_terminated.mir
index bbe1d4ceda607..0011593d4f504 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_terminated.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_terminated.mir
@@ -63,5 +63,5 @@ body:  |
     JCC_1 %bb.1, 4, implicit killed $eflags
 
   bb.3.bb3:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_two_backedge.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_two_backedge.mir
index 83f7235558947..a018c66160f1f 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_two_backedge.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_two_backedge.mir
@@ -70,5 +70,5 @@ body:  |
     $eax = MOV32ri 0, debug-location !17
     JCC_1 %bb.1, 4, implicit killed $eflags
   bb.4.bb4:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_two_backedge_clobbered.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_two_backedge_clobbered.mir
index 0148af9155597..d40553322e5dc 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_two_backedge_clobbered.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_two_backedge_clobbered.mir
@@ -62,5 +62,5 @@ body:  |
     $eax = MOV32ri 0, debug-location !17
     JCC_1 %bb.1, 4, implicit killed $eflags
   bb.4.bb4:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_within_loop.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_within_loop.mir
index 7ff781a07fce6..32d85e882dbfb 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_within_loop.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_within_loop.mir
@@ -77,5 +77,5 @@ body:  |
     $eax = MOV32ri 0, debug-location !17
     JCC_1 %bb.1, 4, implicit killed $eflags
   bb.5.bb5:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_within_loop_clobbered.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_within_loop_clobbered.mir
index 78330d52c7cfe..4b143414a41c0 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_within_loop_clobbered.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_within_loop_clobbered.mir
@@ -68,5 +68,5 @@ body:  |
     $eax = MOV32ri 0, debug-location !17
     JCC_1 %bb.1, 4, implicit killed $eflags
   bb.5.bb5:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_within_loop_moved.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_within_loop_moved.mir
index fca7f83a14be4..3b25b8313e40a 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_within_loop_moved.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_within_loop_moved.mir
@@ -71,5 +71,5 @@ body:  |
     $eax = MOV32ri 0, debug-location !17
     JCC_1 %bb.1, 4, implicit killed $eflags
   bb.5.bb5:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_within_loop_outer_moved.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_within_loop_outer_moved.mir
index baade395c6ede..013d9541516f0 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_within_loop_outer_moved.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_loop_within_loop_outer_moved.mir
@@ -73,5 +73,5 @@ body:  |
     DBG_VALUE $eax, $noreg, !16, !DIExpression(), debug-location !17
     JCC_1 %bb.1, 4, implicit killed $eflags
   bb.5.bb5:
-    RETQ $eax, debug-location !17
+    RET64 $eax, debug-location !17
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_many_loop_heads.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_many_loop_heads.mir
index f5332c29c837f..c204b5dcf82c4 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvalues_many_loop_heads.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvalues_many_loop_heads.mir
@@ -191,6 +191,6 @@ body:  |
  
   bb.18:
   liveins: $rsi, $rdi, $eflags
-    RETQ
+    RET64
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/livedebugvars-crossbb-interval.mir b/llvm/test/DebugInfo/MIR/X86/livedebugvars-crossbb-interval.mir
index 14ff154289416..1ace13da0d22b 100644
--- a/llvm/test/DebugInfo/MIR/X86/livedebugvars-crossbb-interval.mir
+++ b/llvm/test/DebugInfo/MIR/X86/livedebugvars-crossbb-interval.mir
@@ -133,6 +133,6 @@ body:             |
   
   bb.4.exit:
     $eax = COPY %5, debug-location !18
-    RETQ implicit $eax, debug-location !18
+    RET64 implicit $eax, debug-location !18
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/multiple-param-dbg-value-entry.mir b/llvm/test/DebugInfo/MIR/X86/multiple-param-dbg-value-entry.mir
index 3b053da5925ee..262eb06697760 100644
--- a/llvm/test/DebugInfo/MIR/X86/multiple-param-dbg-value-entry.mir
+++ b/llvm/test/DebugInfo/MIR/X86/multiple-param-dbg-value-entry.mir
@@ -80,6 +80,6 @@ body:             |
     MOV32mr $rip, 1, $noreg, @global, $noreg, killed renamable $edi, debug-location !18 :: (store (s32) into @global)
     INLINEASM &"", 1, 12, implicit-def dead early-clobber $edi, 12, implicit-def dead early-clobber $esi, 12, implicit-def dead early-clobber $edx, 12, implicit-def dead early-clobber $df, 12, implicit-def dead early-clobber $fpsw, 12, implicit-def dead early-clobber $eflags, !19, debug-location !18
     $eax = MOV32ri 123, debug-location !18
-    RETQ killed $eax, debug-location !18
+    RET64 killed $eax, debug-location !18
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/piece-entryval.mir b/llvm/test/DebugInfo/MIR/X86/piece-entryval.mir
index 0f63faa37e9f9..e711f05d2ae73 100644
--- a/llvm/test/DebugInfo/MIR/X86/piece-entryval.mir
+++ b/llvm/test/DebugInfo/MIR/X86/piece-entryval.mir
@@ -49,6 +49,6 @@ body:             |
     frame-setup PUSH64r killed $rbp, implicit-def $rsp, implicit $rsp
     $rbp = frame-setup MOV64rr $rsp
     $rbp = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !16
-    RETQ debug-location !16
+    RET64 debug-location !16
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/propagate-entry-value-cross-bbs.mir b/llvm/test/DebugInfo/MIR/X86/propagate-entry-value-cross-bbs.mir
index 0bd8d012940cf..d80e214843cd0 100644
--- a/llvm/test/DebugInfo/MIR/X86/propagate-entry-value-cross-bbs.mir
+++ b/llvm/test/DebugInfo/MIR/X86/propagate-entry-value-cross-bbs.mir
@@ -171,6 +171,6 @@ body:             |
     CFI_INSTRUCTION def_cfa_offset 16, debug-location !34
     $rbp = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !34
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !34
-    RETQ killed $eax, debug-location !34
+    RET64 killed $eax, debug-location !34
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/remove-entry-value-from-loop.mir b/llvm/test/DebugInfo/MIR/X86/remove-entry-value-from-loop.mir
index 981fb2da634fc..6f84074231d11 100644
--- a/llvm/test/DebugInfo/MIR/X86/remove-entry-value-from-loop.mir
+++ b/llvm/test/DebugInfo/MIR/X86/remove-entry-value-from-loop.mir
@@ -154,7 +154,7 @@ body:             |
     liveins: $eax
   
     DBG_VALUE $eax, $noreg, !15, !DIExpression(), debug-location !17
-    RETQ $eax, debug-location !32
+    RET64 $eax, debug-location !32
   
   bb.3.if.then:
     liveins: $eax, $edi
@@ -162,6 +162,6 @@ body:             |
     renamable $eax = nsw IMUL32rr killed renamable $eax, killed renamable $edi, implicit-def dead $eflags, debug-location !28
     DBG_VALUE $eax, $noreg, !15, !DIExpression(), debug-location !17
     DBG_VALUE $eax, $noreg, !15, !DIExpression(), debug-location !17
-    RETQ $eax, debug-location !32
+    RET64 $eax, debug-location !32
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/remove-redundant-dbg-vals.mir b/llvm/test/DebugInfo/MIR/X86/remove-redundant-dbg-vals.mir
index fba3d9ee15040..9c51dac7431e5 100644
--- a/llvm/test/DebugInfo/MIR/X86/remove-redundant-dbg-vals.mir
+++ b/llvm/test/DebugInfo/MIR/X86/remove-redundant-dbg-vals.mir
@@ -169,7 +169,7 @@ body:             |
     $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags, debug-location !22
     $rcx = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !22
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !22
-    RETQ killed $eax, debug-location !22
+    RET64 killed $eax, debug-location !22
 
 ...
 ---
@@ -192,7 +192,7 @@ body:             |
     $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags, debug-location !22
     $rcx = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !22
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !22
-    RETQ killed $eax, debug-location !22
+    RET64 killed $eax, debug-location !22
 
 ...
 ---
@@ -214,7 +214,7 @@ body:             |
     DBG_VALUE $edi, $noreg, !13, !DIExpression(DW_OP_LLVM_fragment, 0, 32), debug-location !14
     $rcx = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !22
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !22
-    RETQ killed $eax, debug-location !22
+    RET64 killed $eax, debug-location !22
 
 ...
 ---
@@ -236,7 +236,7 @@ body:             |
     DBG_VALUE $edi, $noreg, !13, !DIExpression(DW_OP_LLVM_fragment, 0, 32), debug-location !14
     $rcx = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !22
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !22
-    RETQ killed $eax, debug-location !22
+    RET64 killed $eax, debug-location !22
 
 ...
 ---
@@ -258,7 +258,7 @@ body:             |
     DBG_VALUE $edi, $noreg, !13, !DIExpression(DW_OP_LLVM_fragment, 0, 32), debug-location !14
     $rcx = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !22
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !22
-    RETQ killed $eax, debug-location !22
+    RET64 killed $eax, debug-location !22
 
 ...
 ---
@@ -279,6 +279,6 @@ body:             |
     $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags, debug-location !22
     $rcx = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !22
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !22
-    RETQ killed $eax, debug-location !22
+    RET64 killed $eax, debug-location !22
 
 ...

diff  --git a/llvm/test/DebugInfo/MIR/X86/unreachable-block-call-site.mir b/llvm/test/DebugInfo/MIR/X86/unreachable-block-call-site.mir
index bfc5c2be127e7..e77192db977d7 100644
--- a/llvm/test/DebugInfo/MIR/X86/unreachable-block-call-site.mir
+++ b/llvm/test/DebugInfo/MIR/X86/unreachable-block-call-site.mir
@@ -63,6 +63,6 @@ body:             |
     $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags, debug-location !18
     $rcx = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !18
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !18
-    RETQ killed $eax, debug-location !18
+    RET64 killed $eax, debug-location !18
 
 ...

diff  --git a/llvm/test/DebugInfo/X86/bbjoin.ll b/llvm/test/DebugInfo/X86/bbjoin.ll
index c175108f38422..b21990469febd 100644
--- a/llvm/test/DebugInfo/X86/bbjoin.ll
+++ b/llvm/test/DebugInfo/X86/bbjoin.ll
@@ -17,7 +17,7 @@
 ; CHECK:   DBG_VALUE 43, $noreg, ![[X]],
 ; CHECK: bb.2.if.end:
 ; CHECK-NOT:  DBG_VALUE 23, $noreg, ![[X]],
-; CHECK:   RETQ $eax
+; CHECK:   RET64 $eax
 
 target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.11.0"

diff  --git a/llvm/test/DebugInfo/X86/dbg_entity_calc_ignores_KILL_instruction_at_return.mir b/llvm/test/DebugInfo/X86/dbg_entity_calc_ignores_KILL_instruction_at_return.mir
index bfc9df5695e88..dcdaed64e88a6 100644
--- a/llvm/test/DebugInfo/X86/dbg_entity_calc_ignores_KILL_instruction_at_return.mir
+++ b/llvm/test/DebugInfo/X86/dbg_entity_calc_ignores_KILL_instruction_at_return.mir
@@ -71,6 +71,6 @@ body:             |
     ; CHECK:  [0x0000000000000003,  0x0000000000000004): DW_OP_reg0 RAX)
     ; CHECK-NEXT: DW_AT_name    ("result")
     renamable $eax = KILL killed $eax, implicit-def $rax
-    RETQ killed $eax, debug-location !24
+    RET64 killed $eax, debug-location !24
 
 ...

diff  --git a/llvm/test/DebugInfo/X86/dbg_entity_calc_ignores_KILL_instruction_still_clobbers.mir b/llvm/test/DebugInfo/X86/dbg_entity_calc_ignores_KILL_instruction_still_clobbers.mir
index 0f01a51a482f5..2828d640c23d1 100644
--- a/llvm/test/DebugInfo/X86/dbg_entity_calc_ignores_KILL_instruction_still_clobbers.mir
+++ b/llvm/test/DebugInfo/X86/dbg_entity_calc_ignores_KILL_instruction_still_clobbers.mir
@@ -74,6 +74,6 @@ body:             |
     $edi = MOV32rr $eax, debug-location !24
     $eax = MOV32rr $eax, debug-location !24
     $edi = MOV32rr $eax, debug-location !24
-    RETQ killed $eax, debug-location !24
+    RET64 killed $eax, debug-location !24
 
 ...

diff  --git a/llvm/test/DebugInfo/X86/dbg_value_list_clobbers.mir b/llvm/test/DebugInfo/X86/dbg_value_list_clobbers.mir
index 601067a80d013..4114efc3f8587 100644
--- a/llvm/test/DebugInfo/X86/dbg_value_list_clobbers.mir
+++ b/llvm/test/DebugInfo/X86/dbg_value_list_clobbers.mir
@@ -80,5 +80,5 @@ body:             |
     DBG_VALUE_LIST !12, !DIExpression(DW_OP_LLVM_arg, 0, DW_OP_LLVM_arg, 1, DW_OP_plus, DW_OP_stack_value, DW_OP_LLVM_fragment, 16, 16), $eax, $ecx, debug-location !15
     ; CHECK-NEXT: [{{.*}}): DW_OP_breg0 RAX+0, DW_OP_constu 0xffffffff, DW_OP_and, DW_OP_stack_value, DW_OP_piece 0x2, DW_OP_breg0 RAX+0, DW_OP_constu 0xffffffff, DW_OP_and, DW_OP_breg2 RCX+0, DW_OP_constu 0xffffffff, DW_OP_and, DW_OP_plus, DW_OP_stack_value, DW_OP_piece 0x2
 
-    RETQ debug-location !15
+    RET64 debug-location !15
 ...

diff  --git a/llvm/test/DebugInfo/X86/dbg_value_list_emission.mir b/llvm/test/DebugInfo/X86/dbg_value_list_emission.mir
index e3380cb42a4ba..e447fa82f95b3 100644
--- a/llvm/test/DebugInfo/X86/dbg_value_list_emission.mir
+++ b/llvm/test/DebugInfo/X86/dbg_value_list_emission.mir
@@ -97,5 +97,5 @@ body:             |
     ; CHECK-NEXT:   DW_AT_name ("localh")
     ; CHECK-NOT:   DW_AT_location
 
-    RETQ debug-location !15
+    RET64 debug-location !15
 ...

diff  --git a/llvm/test/DebugInfo/X86/debug-loc-asan.mir b/llvm/test/DebugInfo/X86/debug-loc-asan.mir
index 79926c3bcfc17..9dd5fc5fa6cd0 100644
--- a/llvm/test/DebugInfo/X86/debug-loc-asan.mir
+++ b/llvm/test/DebugInfo/X86/debug-loc-asan.mir
@@ -341,6 +341,6 @@ body:             |
     $rsp = MOV64rr $rbp, debug-location !12
     $rbp = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !12
     CFI_INSTRUCTION def_cfa $rsp, 8, debug-location !12
-    RETQ implicit killed $eax, debug-location !12
+    RET64 implicit killed $eax, debug-location !12
 
 ...

diff  --git a/llvm/test/DebugInfo/X86/debug-loc-offset.mir b/llvm/test/DebugInfo/X86/debug-loc-offset.mir
index e4a81ce68a7f2..95f524fc162cf 100644
--- a/llvm/test/DebugInfo/X86/debug-loc-offset.mir
+++ b/llvm/test/DebugInfo/X86/debug-loc-offset.mir
@@ -207,7 +207,7 @@ body:             |
     $esp = frame-destroy ADD32ri8 $esp, 4, implicit-def dead $eflags, debug-location !16
     $ebp = frame-destroy POP32r implicit-def $esp, implicit $esp, debug-location !16
     CFI_INSTRUCTION def_cfa $esp, 4, debug-location !16
-    RETL implicit killed $eax, debug-location !16
+    RET32 implicit killed $eax, debug-location !16
 
 ...
 ---
@@ -271,6 +271,6 @@ body:             |
     $esp = frame-destroy ADD32ri8 $esp, 24, implicit-def dead $eflags, debug-location !30
     $ebp = frame-destroy POP32r implicit-def $esp, implicit $esp, debug-location !30
     CFI_INSTRUCTION def_cfa $esp, 4, debug-location !30
-    RETL debug-location !30
+    RET32 debug-location !30
 
 ...

diff  --git a/llvm/test/DebugInfo/X86/dw_op_constu.mir b/llvm/test/DebugInfo/X86/dw_op_constu.mir
index 69e51b141b9e9..be404f0050a4f 100644
--- a/llvm/test/DebugInfo/X86/dw_op_constu.mir
+++ b/llvm/test/DebugInfo/X86/dw_op_constu.mir
@@ -73,7 +73,7 @@ body:             |
     renamable $rcx = MOV64rm renamable $noreg, 1, $noreg, 0, $fs
     DBG_VALUE renamable $rcx, 0, !9, !DIExpression(DW_OP_constu, 18446744073709551614, DW_OP_minus), debug-location !14
 
-    RETQ debug-location !14
+    RET64 debug-location !14
 
 
   bb.1: ;-------------------------- DW_OP_plus -------------------------------
@@ -106,7 +106,7 @@ body:             |
     renamable $rcx = MOV64rm renamable $noreg, 1, $noreg, 0, $fs
     DBG_VALUE renamable $rcx, 0, !9, !DIExpression(DW_OP_constu, 18446744073709551614, DW_OP_plus), debug-location !14
 
-    RETQ debug-location !14
+    RET64 debug-location !14
 
 
   bb.2: ;-------------------------- DW_OP_plus_uconst -------------------------------
@@ -139,7 +139,7 @@ body:             |
     renamable $rcx = MOV64rm renamable $noreg, 1, $noreg, 0, $fs
     DBG_VALUE renamable $rcx, 0, !9, !DIExpression(DW_OP_plus_uconst, 18446744073709551614), debug-location !14
 
-    RETQ debug-location !14
+    RET64 debug-location !14
 
 ...
 

diff  --git a/llvm/test/DebugInfo/X86/dw_op_minus.mir b/llvm/test/DebugInfo/X86/dw_op_minus.mir
index 50491b1b13c1c..2a408c97bf3d2 100644
--- a/llvm/test/DebugInfo/X86/dw_op_minus.mir
+++ b/llvm/test/DebugInfo/X86/dw_op_minus.mir
@@ -114,6 +114,6 @@ body:             |
     MOV64mr killed renamable $rax, 1, $noreg, 0, $fs, killed renamable $rcx, debug-location !18 :: (store (s64) into @__safestack_unsafe_stack_ptr)
     $rsp = frame-destroy ADD64ri8 $rsp, 24, implicit-def dead $eflags, debug-location !18
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !18
-    RETQ debug-location !18
+    RET64 debug-location !18
 
 ...

diff  --git a/llvm/test/DebugInfo/X86/live-debug-values-constprop.mir b/llvm/test/DebugInfo/X86/live-debug-values-constprop.mir
index 57405786ef262..2137b52936e32 100644
--- a/llvm/test/DebugInfo/X86/live-debug-values-constprop.mir
+++ b/llvm/test/DebugInfo/X86/live-debug-values-constprop.mir
@@ -153,7 +153,7 @@ body:             |
 
   bb.3.bb3:
     liveins: $rax
-    RETQ $eax, debug-location !9
+    RET64 $eax, debug-location !9
 
 ...
 ---
@@ -217,7 +217,7 @@ body:             |
 
   bb.3.bb3:
     liveins: $rax
-    RETQ $eax, debug-location !42
+    RET64 $eax, debug-location !42
 
 ...
 ---
@@ -281,7 +281,7 @@ body:             |
 
   bb.3.bb3:
     liveins: $rax
-    RETQ $eax, debug-location !82
+    RET64 $eax, debug-location !82
 
 ...
 ---
@@ -342,6 +342,6 @@ body:             |
 
   bb.3.bb3:
     liveins: $rax
-    RETQ $eax, debug-location !122
+    RET64 $eax, debug-location !122
 
 ...

diff  --git a/llvm/test/DebugInfo/X86/location-range-inlined-xblock.mir b/llvm/test/DebugInfo/X86/location-range-inlined-xblock.mir
index b66e17f99881b..4a8567363c103 100644
--- a/llvm/test/DebugInfo/X86/location-range-inlined-xblock.mir
+++ b/llvm/test/DebugInfo/X86/location-range-inlined-xblock.mir
@@ -167,6 +167,6 @@ body:             |
     $rbx = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !40
     DBG_VALUE $edi, $noreg, !15, !DIExpression(DW_OP_LLVM_entry_value, 1), debug-location !16
     CFI_INSTRUCTION def_cfa_offset 8, debug-location !40
-    RETQ $eax, debug-location !40
+    RET64 $eax, debug-location !40
 
 ...

diff  --git a/llvm/test/DebugInfo/X86/location-range.mir b/llvm/test/DebugInfo/X86/location-range.mir
index 4a306f4c7b433..6b4a44b3f6edc 100644
--- a/llvm/test/DebugInfo/X86/location-range.mir
+++ b/llvm/test/DebugInfo/X86/location-range.mir
@@ -133,12 +133,12 @@ body:             |
 
   bb.1.if.then:
     renamable $rax = MOV64rm $rip, 1, $noreg, @b, $noreg, debug-location !21 :: (dereferenceable load (s64) from @b)
-    RETQ $rax, debug-location !27
+    RET64 $rax, debug-location !27
 
   bb.2.if.end:
     DBG_VALUE 0, $noreg, !19, !DIExpression(), debug-location !27
     renamable $rax = MOV64rm $rip, 1, $noreg, @a, $noreg, debug-location !27 :: (dereferenceable load (s64) from @a)
-    RETQ $rax, debug-location !27
+    RET64 $rax, debug-location !27
 
 ...
 ---
@@ -147,6 +147,6 @@ body:             |
   bb.0.entry:
     $eax = MOVZX32rm16 $noreg, 1, $noreg, 0, $noreg, debug-location !48 :: (load (s16) from `i16* null`, align 1)
     DBG_VALUE $ax, $noreg, !39, !DIExpression(), debug-location !51
-    RETQ $ax, debug-location !51
+    RET64 $ax, debug-location !51
 
 ...

diff  --git a/llvm/test/DebugInfo/X86/pr19307.mir b/llvm/test/DebugInfo/X86/pr19307.mir
index 160f524dba911..594afc043f7f4 100644
--- a/llvm/test/DebugInfo/X86/pr19307.mir
+++ b/llvm/test/DebugInfo/X86/pr19307.mir
@@ -219,6 +219,6 @@ body:             |
     $rsp = frame-destroy ADD64ri8 $rsp, 32, implicit-def dead $eflags, debug-location !53
     $rbp = frame-destroy POP64r implicit-def $rsp, implicit $rsp, debug-location !53
     CFI_INSTRUCTION def_cfa $rsp, 8, debug-location !53
-    RETQ debug-location !53
+    RET64 debug-location !53
 
 ...

diff  --git a/llvm/test/DebugInfo/X86/pr34545.ll b/llvm/test/DebugInfo/X86/pr34545.ll
index fe5d2a285f55c..7b8b548553089 100644
--- a/llvm/test/DebugInfo/X86/pr34545.ll
+++ b/llvm/test/DebugInfo/X86/pr34545.ll
@@ -8,7 +8,7 @@
 ; CHECK: DBG_VALUE $eax
 ; CHECK: $eax = SHL32rCL killed renamable $eax
 ; CHECK: DBG_VALUE $eax
-; CHECK: RETQ $eax
+; CHECK: RET64 $eax
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"

diff  --git a/llvm/test/DebugInfo/X86/single-location-2.mir b/llvm/test/DebugInfo/X86/single-location-2.mir
index e3f0ec979e22e..d412f9f5e2f85 100644
--- a/llvm/test/DebugInfo/X86/single-location-2.mir
+++ b/llvm/test/DebugInfo/X86/single-location-2.mir
@@ -88,5 +88,5 @@ body:             |
     ;; end scope, end location range
     $esi = MOV32ri 2, debug-location !26
 
-    RETQ debug-location !15
+    RET64 debug-location !15
 ...

diff  --git a/llvm/test/DebugInfo/X86/single-location-inlined-param.mir b/llvm/test/DebugInfo/X86/single-location-inlined-param.mir
index f766c4fbef10d..8b36f3ce44f6a 100644
--- a/llvm/test/DebugInfo/X86/single-location-inlined-param.mir
+++ b/llvm/test/DebugInfo/X86/single-location-inlined-param.mir
@@ -105,10 +105,10 @@ body:             |
   bb.2.return:
     liveins: $eax
 
-    RETQ $eax, debug-location !36
+    RET64 $eax, debug-location !36
 
   bb.1.if.end:
     renamable $eax = MOV32ri 1
-    RETQ $eax, debug-location !36
+    RET64 $eax, debug-location !36
 
 ...

diff  --git a/llvm/test/DebugInfo/X86/single-location-interrupted-scope.mir b/llvm/test/DebugInfo/X86/single-location-interrupted-scope.mir
index 19f7caee575dc..c5feecaab40da 100644
--- a/llvm/test/DebugInfo/X86/single-location-interrupted-scope.mir
+++ b/llvm/test/DebugInfo/X86/single-location-interrupted-scope.mir
@@ -155,7 +155,7 @@ body:             |
     TAILJMPd64 @ext, csr_64, implicit $rsp, implicit $ssp, implicit $rsp, implicit $ssp, implicit killed $al, debug-location !35
 
   bb.1.if.end:
-    RETQ debug-location !36
+    RET64 debug-location !36
 
 ...
 ---
@@ -177,6 +177,6 @@ body:             |
     TAILJMPd64 @ext, csr_64, implicit $rsp, implicit $ssp, implicit $rsp, implicit $ssp, implicit killed $al, debug-location !49
 
   bb.1.if.end:
-    RETQ debug-location !50
+    RET64 debug-location !50
 
 ...

diff  --git a/llvm/test/DebugInfo/X86/trim-var-locs.mir b/llvm/test/DebugInfo/X86/trim-var-locs.mir
index 9c1de2593fa5f..e1d3670fee1bd 100644
--- a/llvm/test/DebugInfo/X86/trim-var-locs.mir
+++ b/llvm/test/DebugInfo/X86/trim-var-locs.mir
@@ -116,5 +116,5 @@ body:             |
     $edi = MOV32ri 9, debug-location !26
 
     ; scope fun !7
-    RETQ debug-location !15
+    RET64 debug-location !15
 ...

diff  --git a/llvm/test/Transforms/SampleProfile/pseudo-probe.mir b/llvm/test/Transforms/SampleProfile/pseudo-probe.mir
index 8175a4769c850..d85c1826870b9 100644
--- a/llvm/test/Transforms/SampleProfile/pseudo-probe.mir
+++ b/llvm/test/Transforms/SampleProfile/pseudo-probe.mir
@@ -19,11 +19,11 @@ body:             |
   bb.2:
     PSEUDO_PROBE 6699318081062747564, 3, 0, 0
     PSEUDO_PROBE 6699318081062747564, 4, 0, 0
-    RETQ
+    RET64
   
   bb.1:
     PSEUDO_PROBE 6699318081062747564, 2, 0, 0
     PSEUDO_PROBE 6699318081062747564, 4, 0, 0
-    RETQ
+    RET64
 
 ...

diff  --git a/llvm/unittests/CodeGen/InstrRefLDVTest.cpp b/llvm/unittests/CodeGen/InstrRefLDVTest.cpp
index 2900c59a65d58..866eef8f824ed 100644
--- a/llvm/unittests/CodeGen/InstrRefLDVTest.cpp
+++ b/llvm/unittests/CodeGen/InstrRefLDVTest.cpp
@@ -487,7 +487,7 @@ body:  |
 TEST_F(InstrRefLDVTest, MTransferDefs) {
   MachineFunction *MF = readMIRBlock(
    "    $rax = MOV64ri 0\n"
-   "    RETQ $rax\n");
+   "    RET64 $rax\n");
   setupLDVObj(MF);
 
   // We should start with only SP tracked.
@@ -519,7 +519,7 @@ TEST_F(InstrRefLDVTest, MTransferDefs) {
   MF = readMIRBlock(
    "    $rax = MOV64ri 0\n"
    "    $al = MOV8ri 0\n"
-   "    RETQ $rax\n");
+   "    RET64 $rax\n");
   setupLDVObj(MF);
   TransferMap.clear();
   TransferMap.resize(1);
@@ -556,7 +556,7 @@ TEST_F(InstrRefLDVTest, MTransferDefs) {
    "    $rdi = MOV64ri 0\n" // instr 4
    "    $rsi = MOV64ri 0\n" // instr 5
    "    CALL64r $rax, csr_64, implicit $rsp, implicit $ssp, implicit $rdi, implicit $rsi, implicit-def $rsp, implicit-def $ssp, implicit-def $rax, implicit-def $esp, implicit-def $sp\n\n\n\n" // instr 6
-   "    RETQ $rax\n"); // instr 7
+   "    RET64 $rax\n"); // instr 7
   setupLDVObj(MF);
   TransferMap.clear();
   TransferMap.resize(1);
@@ -590,7 +590,7 @@ TEST_F(InstrRefLDVTest, MTransferDefs) {
   // When we DBG_PHI something, we should track all its subregs.
   MF = readMIRBlock(
    "    DBG_PHI $rdi, 0\n"
-   "    RETQ\n");
+   "    RET64\n");
   setupLDVObj(MF);
   TransferMap.clear();
   TransferMap.resize(1);
@@ -613,7 +613,7 @@ TEST_F(InstrRefLDVTest, MTransferMeta) {
    "    $rax = MOV64ri 0\n"
    "    $rax = IMPLICIT_DEF\n"
    "    $rax = KILL killed $rax\n"
-   "    RETQ $rax\n");
+   "    RET64 $rax\n");
   setupLDVObj(MF);
   TransferMap.clear();
   TransferMap.resize(1);
@@ -632,7 +632,7 @@ TEST_F(InstrRefLDVTest, MTransferCopies) {
   MachineFunction *MF = readMIRBlock(
    "    $rax = MOV64ri 0\n"
    "    MOV64mr $rsp, 1, $noreg, 16, $noreg, $rax :: (store 8 into %stack.0)\n"
-   "    RETQ $rax\n");
+   "    RET64 $rax\n");
   setupLDVObj(MF);
   TransferMap.clear();
   TransferMap.resize(1);
@@ -657,7 +657,7 @@ TEST_F(InstrRefLDVTest, MTransferCopies) {
    "    $rax = MOV64ri 0\n"
    "    MOV64mr $rsp, 1, $noreg, 16, $noreg, $rax :: (store 8 into %stack.0)\n"
    "    $rbx = MOV64rm $rsp, 1, $noreg, 0, $noreg :: (load 8 from %stack.0)\n"
-   "    RETQ\n");
+   "    RET64\n");
   setupLDVObj(MF);
   TransferMap.clear();
   TransferMap.resize(1);
@@ -681,7 +681,7 @@ TEST_F(InstrRefLDVTest, MTransferCopies) {
    "    $rax = MOV64ri 0\n"
    "    $rcx = COPY $rax\n"
    "    $rbx = MOV64rr $rcx\n"
-   "    RETQ\n");
+   "    RET64\n");
   setupLDVObj(MF);
   TransferMap.clear();
   TransferMap.resize(1);
@@ -711,7 +711,7 @@ TEST_F(InstrRefLDVTest, MTransferCopies) {
   MF = readMIRBlock(
    "    $rax = MOV64ri 0\n"
    "    $ecx = COPY $eax\n"
-   "    RETQ\n");
+   "    RET64\n");
   setupLDVObj(MF);
   TransferMap.clear();
   TransferMap.resize(1);
@@ -741,7 +741,7 @@ TEST_F(InstrRefLDVTest, MTransferSubregSpills) {
    "    $rax = MOV64ri 0\n"
    "    MOV64mr $rsp, 1, $noreg, 16, $noreg, $rax :: (store 8 into %stack.0)\n"
    "    $rbx = MOV64rm $rsp, 1, $noreg, 0, $noreg :: (load 8 from %stack.0)\n"
-   "    RETQ\n");
+   "    RET64\n");
   setupLDVObj(MF);
   TransferMap.clear();
   TransferMap.resize(1);
@@ -788,7 +788,7 @@ TEST_F(InstrRefLDVTest, MTransferSubregSpills) {
    "    MOV64mr $rsp, 1, $noreg, 16, $noreg, $rax :: (store 8 into %stack.0)\n"
    "    MOV32mr $rsp, 1, $noreg, 16, $noreg, $eax :: (store 4 into %stack.0)\n"
    "    $rbx = MOV64rm $rsp, 1, $noreg, 0, $noreg :: (load 8 from %stack.0)\n"
-   "    RETQ\n");
+   "    RET64\n");
   setupLDVObj(MF);
   TransferMap.clear();
   TransferMap.resize(1);
@@ -839,7 +839,7 @@ TEST_F(InstrRefLDVTest, MTransferSubregSpills) {
    "    $xmm0 = IMPLICIT_DEF\n"
    "    MOVUPDmr $rsp, 1, $noreg, 16, $noreg, killed $xmm0 :: (store (s128) into %stack.0)\n"
    "    $rbx = MOV64rm $rsp, 1, $noreg, 0, $noreg :: (load 8 from %stack.0)\n"
-   "    RETQ\n");
+   "    RET64\n");
   setupLDVObj(MF);
   TransferMap.clear();
   TransferMap.resize(1);
@@ -874,7 +874,7 @@ TEST_F(InstrRefLDVTest, MTransferSubregSpills) {
    "    $rax = MOV64ri 0\n"
    "    MOV8mr $rsp, 1, $noreg, 16, $noreg, $ah :: (store 1 into %stack.0)\n"
    "    $al = MOV8rm $rsp, 1, $noreg, 0, $noreg :: (load 1 from %stack.0)\n"
-   "    RETQ\n");
+   "    RET64\n");
   setupLDVObj(MF);
   TransferMap.clear();
   TransferMap.resize(1);

diff  --git a/llvm/unittests/tools/llvm-exegesis/X86/SnippetRepetitorTest.cpp b/llvm/unittests/tools/llvm-exegesis/X86/SnippetRepetitorTest.cpp
index b5aca1eb35366..91a271c5c1ad5 100644
--- a/llvm/unittests/tools/llvm-exegesis/X86/SnippetRepetitorTest.cpp
+++ b/llvm/unittests/tools/llvm-exegesis/X86/SnippetRepetitorTest.cpp
@@ -71,7 +71,7 @@ TEST_F(X86SnippetRepetitorTest, Duplicate) {
   ASSERT_EQ(MF->getNumBlockIDs(), 1u);
   EXPECT_THAT(MF->getBlockNumbered(0)->instrs(),
               ElementsAre(HasOpcode(X86::NOOP), HasOpcode(X86::NOOP),
-                          HasOpcode(X86::NOOP), HasOpcode(X86::RETQ)));
+                          HasOpcode(X86::NOOP), HasOpcode(X86::RET64)));
 }
 
 TEST_F(X86SnippetRepetitorTest, Loop) {
@@ -90,7 +90,7 @@ TEST_F(X86SnippetRepetitorTest, Loop) {
                   LiveReg(State.getExegesisTarget().getLoopCounterRegister(
                       State.getTargetMachine().getTargetTriple()))));
   EXPECT_THAT(MF->getBlockNumbered(2)->instrs(),
-              ElementsAre(HasOpcode(X86::RETQ)));
+              ElementsAre(HasOpcode(X86::RET64)));
 }
 
 } // namespace


        


More information about the llvm-commits mailing list