Commute the operands of the add and regenerate mingw-refptr.ll with update_llc_test_checks.py

Author: PanTao2

llvm/lib/Target/AArch64/AArch64ISelLowering.cpp

@@ -29108,9 +29108,10 @@ SDValue AArch64TargetLowering::emitStackGuardMixCookie(SelectionDAG &DAG,
                                                        bool FailureBB) const {
   if (FailureBB) {
     return DAG.getNode(
-        ISD::ADD, DL, Val.getValueType(), Val,
+        ISD::ADD, DL, Val.getValueType(),
         DAG.getCopyFromReg(DAG.getEntryNode(), DL,
-                           getStackPointerRegisterToSaveRestore(), MVT::i64));
+                           getStackPointerRegisterToSaveRestore(), MVT::i64),
+        Val);
   }
   return Val;
 }

llvm/test/CodeGen/AArch64/mingw-refptr.ll

@@ -15,6 +15,13 @@ define dso_local i32 @getVar() {
 ; CHECK-NEXT:    ldr x8, [x8, :lo12:.refptr.var]
 ; CHECK-NEXT:    ldr w0, [x8]
 ; CHECK-NEXT:    ret
+;
+; CHECK-GI-LABEL: getVar:
+; CHECK-GI:       // %bb.0: // %entry
+; CHECK-GI-NEXT:    adrp x8, .refptr.var
+; CHECK-GI-NEXT:    ldr x8, [x8, :lo12:.refptr.var]
+; CHECK-GI-NEXT:    ldr w0, [x8]
+; CHECK-GI-NEXT:    ret
 entry:
   %0 = load i32, ptr @var, align 4
   ret i32 %0
@@ -26,6 +33,12 @@ define dso_local i32 @getDsoLocalVar() {
 ; CHECK-NEXT:    adrp x8, dsolocalvar
 ; CHECK-NEXT:    ldr w0, [x8, :lo12:dsolocalvar]
 ; CHECK-NEXT:    ret
+;
+; CHECK-GI-LABEL: getDsoLocalVar:
+; CHECK-GI:       // %bb.0: // %entry
+; CHECK-GI-NEXT:    adrp x8, dsolocalvar
+; CHECK-GI-NEXT:    ldr w0, [x8, :lo12:dsolocalvar]
+; CHECK-GI-NEXT:    ret
 entry:
   %0 = load i32, ptr @dsolocalvar, align 4
   ret i32 %0
@@ -37,6 +50,12 @@ define dso_local i32 @getLocalVar() {
 ; CHECK-NEXT:    adrp x8, localvar
 ; CHECK-NEXT:    ldr w0, [x8, :lo12:localvar]
 ; CHECK-NEXT:    ret
+;
+; CHECK-GI-LABEL: getLocalVar:
+; CHECK-GI:       // %bb.0: // %entry
+; CHECK-GI-NEXT:    adrp x8, localvar
+; CHECK-GI-NEXT:    ldr w0, [x8, :lo12:localvar]
+; CHECK-GI-NEXT:    ret
 entry:
   %0 = load i32, ptr @localvar, align 4
   ret i32 %0
@@ -48,6 +67,12 @@ define dso_local i32 @getLocalCommon() {
 ; CHECK-NEXT:    adrp x8, localcommon
 ; CHECK-NEXT:    ldr w0, [x8, :lo12:localcommon]
 ; CHECK-NEXT:    ret
+;
+; CHECK-GI-LABEL: getLocalCommon:
+; CHECK-GI:       // %bb.0: // %entry
+; CHECK-GI-NEXT:    adrp x8, localcommon
+; CHECK-GI-NEXT:    ldr w0, [x8, :lo12:localcommon]
+; CHECK-GI-NEXT:    ret
 entry:
   %0 = load i32, ptr @localcommon, align 4
   ret i32 %0
@@ -60,6 +85,13 @@ define dso_local i32 @getExtVar() {
 ; CHECK-NEXT:    ldr x8, [x8, :lo12:__imp_extvar]
 ; CHECK-NEXT:    ldr w0, [x8]
 ; CHECK-NEXT:    ret
+;
+; CHECK-GI-LABEL: getExtVar:
+; CHECK-GI:       // %bb.0: // %entry
+; CHECK-GI-NEXT:    adrp x8, __imp_extvar
+; CHECK-GI-NEXT:    ldr x8, [x8, :lo12:__imp_extvar]
+; CHECK-GI-NEXT:    ldr w0, [x8]
+; CHECK-GI-NEXT:    ret
 entry:
   %0 = load i32, ptr @extvar, align 4
   ret i32 %0
@@ -69,6 +101,10 @@ define dso_local void @callFunc() {
 ; CHECK-LABEL: callFunc:
 ; CHECK:       // %bb.0: // %entry
 ; CHECK-NEXT:    b otherFunc
+;
+; CHECK-GI-LABEL: callFunc:
+; CHECK-GI:       // %bb.0: // %entry
+; CHECK-GI-NEXT:    b otherFunc
 entry:
   tail call void @otherFunc()
   ret void
@@ -112,6 +148,40 @@ define dso_local void @sspFunc() #0 {
 ; CHECK-NEXT:    brk #0x1
 ; CHECK-NEXT:    .seh_endfunclet
 ; CHECK-NEXT:    .seh_endproc
+;
+; CHECK-GI-LABEL: sspFunc:
+; CHECK-GI:       .seh_proc sspFunc
+; CHECK-GI-NEXT:  // %bb.0: // %entry
+; CHECK-GI-NEXT:    sub sp, sp, #32
+; CHECK-GI-NEXT:    .seh_stackalloc 32
+; CHECK-GI-NEXT:    str x30, [sp, #16] // 8-byte Folded Spill
+; CHECK-GI-NEXT:    .seh_save_reg x30, 16
+; CHECK-GI-NEXT:    .seh_endprologue
+; CHECK-GI-NEXT:    adrp x8, .refptr.__stack_chk_guard
+; CHECK-GI-NEXT:    add x0, sp, #7
+; CHECK-GI-NEXT:    ldr x8, [x8, :lo12:.refptr.__stack_chk_guard]
+; CHECK-GI-NEXT:    ldr x8, [x8]
+; CHECK-GI-NEXT:    str x8, [sp, #8]
+; CHECK-GI-NEXT:    bl ptrUser
+; CHECK-GI-NEXT:    adrp x8, .refptr.__stack_chk_guard
+; CHECK-GI-NEXT:    ldr x8, [x8, :lo12:.refptr.__stack_chk_guard]
+; CHECK-GI-NEXT:    ldr x9, [sp, #8]
+; CHECK-GI-NEXT:    ldr x8, [x8]
+; CHECK-GI-NEXT:    cmp x8, x9
+; CHECK-GI-NEXT:    b.ne .LBB6_2
+; CHECK-GI-NEXT:  // %bb.1: // %entry
+; CHECK-GI-NEXT:    .seh_startepilogue
+; CHECK-GI-NEXT:    ldr x30, [sp, #16] // 8-byte Folded Reload
+; CHECK-GI-NEXT:    .seh_save_reg x30, 16
+; CHECK-GI-NEXT:    add sp, sp, #32
+; CHECK-GI-NEXT:    .seh_stackalloc 32
+; CHECK-GI-NEXT:    .seh_endepilogue
+; CHECK-GI-NEXT:    ret
+; CHECK-GI-NEXT:  .LBB6_2: // %entry
+; CHECK-GI-NEXT:    bl __stack_chk_fail
+; CHECK-GI-NEXT:    brk #0x1
+; CHECK-GI-NEXT:    .seh_endfunclet
+; CHECK-GI-NEXT:    .seh_endproc
 entry:
   %c = alloca i8, align 1
   call void @llvm.lifetime.start.p0(i64 1, ptr nonnull %c)
@@ -136,5 +206,4 @@ attributes #0 = { sspstrong }
 ; CHECK:        .xword  var
 
 ;; NOTE: These prefixes are unused and the list is autogenerated. Do not add tests below this line:
-; CHECK-GI: {{.*}}
 ; CHECK-SD: {{.*}}

llvm/test/CodeGen/AArch64/stack-protector-target.ll

@@ -36,7 +36,7 @@ declare void @_Z7CapturePi(ptr)
 ; WINDOWS-AARCH64: bl  _Z7CapturePi
 ; WINDOWS-AARCH64: ldr x8, [sp, #8]
 ; WINDOWS-AARCH64: mov x9, sp
-; WINDOWS-AARCH64: add x0, x8, x9
+; WINDOWS-AARCH64: add x0, x9, x8
 ; WINDOWS-AARCH64: bl  __security_check_cookie
 
 ; WINDOWS-ARM64EC: adrp x8, __security_cookie
@@ -46,5 +46,5 @@ declare void @_Z7CapturePi(ptr)
 ; WINDOWS-ARM64EC: bl "#_Z7CapturePi"
 ; WINDOWS-ARM64EC: ldr x8, [sp, #8]
 ; WINDOWS-ARM64EC: mov x9, sp
-; WINDOWS-ARM64EC: add x0, x8, x9
+; WINDOWS-ARM64EC: add x0, x9, x8
 ; WINDOWS-ARM64EC: bl "#__security_check_cookie_arm64ec"