fixup! [AMDGPU] Ensure non-reserved CSR spilled regs are live-in

Author: macurtis-amd

llvm/lib/Target/AMDGPU/SIFrameLowering.cpp

@@ -996,10 +996,10 @@ void SIFrameLowering::emitCSRSpillStores(
         }
       };
 
-  for (const auto &Reg : WWMScratchRegs) {
-    if (!MRI.isReserved(Reg.first)) {
-      MRI.addLiveIn(Reg.first);
-      MBB.addLiveIn(Reg.first);
+  for (const auto &Reg : make_first_range(WWMScratchRegs)) {
+    if (!MRI.isReserved(Reg)) {
+      MRI.addLiveIn(Reg);
+      MBB.addLiveIn(Reg);
     }
   }
   StoreWWMRegisters(WWMScratchRegs);

llvm/test/CodeGen/AMDGPU/bug-undef-spilled-agpr.ll

@@ -36,12 +36,12 @@ bb30:                                             ; preds = %bb29
   br i1 %arg5, label %bb31, label %bb32
 
 bb31:                                             ; preds = %bb30
-  store i1 false, ptr addrspace(5) null, align 2147483648
+  store i1 false, ptr addrspace(5) %arg17, align 8
   br label %bb55
 
 bb32:                                             ; preds = %bb30
-  store float %arg3, ptr addrspace(5) null, align 2147483648
-  store float %arg7, ptr addrspace(5) %arg10, align 2147483648
+  store float %arg3, ptr addrspace(5) %arg25, align 8
+  store float %arg7, ptr addrspace(5) %arg10, align 8
   br i1 %arg2, label %bb34, label %bb33
 
 bb33:                                             ; preds = %bb32
@@ -52,11 +52,11 @@ bb34:                                             ; preds = %bb33, %bb32
   br i1 %arg11, label %bb37, label %bb36
 
 bb35:                                             ; preds = %bb33
-  store float 0.000000e+00, ptr addrspace(5) null, align 2147483648
+  store float 0.000000e+00, ptr addrspace(5) %arg25, align 8
   ret i1 false
 
 bb36:                                             ; preds = %bb34
-  store i32 1, ptr addrspace(5) null, align 2147483648
+  store i32 1, ptr addrspace(5) %arg17, align 8
   br label %bb29
 
 bb37:                                             ; preds = %bb34
@@ -68,22 +68,22 @@ bb38:                                             ; preds = %bb37
   br i1 %arg4, label %bb39, label %bb53
 
 bb39:                                             ; preds = %bb38
-  store float %arg1, ptr addrspace(5) null, align 2147483648
+  store float %arg1, ptr addrspace(5) %arg25, align 8
   %load40 = load float, ptr %arg15, align 8
   call void @llvm.memcpy.p5.p0.i64(ptr addrspace(5) %arg25, ptr %arg24, i64 12, i1 false)
   %load41 = load float, ptr %arg16, align 4
   call void @llvm.memcpy.p5.p0.i64(ptr addrspace(5) %arg17, ptr null, i64 36, i1 false)
   %load42 = load float, ptr %arg18, align 4
   %load43 = load float, ptr %arg19, align 4
-  store float 0x7FF8000000000000, ptr addrspace(5) null, align 2147483648
+  store float 0x7FF8000000000000, ptr addrspace(5) %arg25, align 8
   %load44 = load float, ptr %arg14, align 16
-  store float %load44, ptr addrspace(5) null, align 2147483648
+  store float %load44, ptr addrspace(5) %arg25, align 8
   %fcmp45 = fcmp ole float %arg9, 0.000000e+00
   br i1 %fcmp45, label %bb29, label %bb46
 
 bb46:                                             ; preds = %bb39
   %fsub = fsub float %arg8, %load40
-  store float %fsub, ptr addrspace(5) null, align 2147483648
+  store float %fsub, ptr addrspace(5) %arg25, align 8
   %fadd = fadd float %load42, %load43
   br i1 %arg, label %bb29, label %bb47
 
@@ -96,12 +96,12 @@ bb48:                                             ; preds = %bb47
 bb49:                                             ; preds = %bb48
   store float 0.000000e+00, ptr %arg23, align 4
   store float 0.000000e+00, ptr %arg22, align 8
-  store float %fadd, ptr addrspace(5) null, align 2147483648
+  store float %fadd, ptr addrspace(5) %arg25, align 8
   %load50 = load float, ptr %arg20, align 4
   %fdiv = fdiv float %load41, %load50
-  store float %fdiv, ptr addrspace(5) null, align 2147483648
+  store float %fdiv, ptr addrspace(5) %arg25, align 8
   %load51 = load float, ptr %arg13, align 16
-  store float %load51, ptr addrspace(5) null, align 2147483648
+  store float %load51, ptr addrspace(5) %arg25, align 8
   store float 1.000000e+00, ptr %arg21, align 4
   br label %bb29
 
@@ -115,11 +115,10 @@ bb54:                                             ; preds = %bb37
   ret i1 true
 
 bb55:                                             ; preds = %bb31, %bb29
-  %load56 = load i1, ptr addrspace(5) null, align 2147483648
+  %load56 = load i1, ptr addrspace(5) null, align 8
   ret i1 %load56
 }
 
-; Function Attrs: nocallback nofree nounwind willreturn memory(argmem: readwrite)
 declare void @llvm.memcpy.p5.p0.i64(ptr addrspace(5) noalias writeonly captures(none), ptr noalias readonly captures(none), i64, i1 immarg) #1
 
 attributes #0 = { "denormal-fp-math-f32"="preserve-sign,preserve-sign" }