AMDGPU: Use Register type for isStackAccess (#154320)

arsenm · web-flow · commit ed0e5310443c · 2025-08-19T23:00:45.000+09:00
diff --git a/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp b/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp
@@ -9229,7 +9229,7 @@ bool SIInstrInfo::isHighLatencyDef(int Opc) const {
          (isMUBUF(Opc) || isMTBUF(Opc) || isMIMG(Opc) || isFLAT(Opc));
 }
 
-unsigned SIInstrInfo::isStackAccess(const MachineInstr &MI,
+Register SIInstrInfo::isStackAccess(const MachineInstr &MI,
                                     int &FrameIndex) const {
   const MachineOperand *Addr = getNamedOperand(MI, AMDGPU::OpName::vaddr);
   if (!Addr || !Addr->isFI())
@@ -9242,7 +9242,7 @@ unsigned SIInstrInfo::isStackAccess(const MachineInstr &MI,
   return getNamedOperand(MI, AMDGPU::OpName::vdata)->getReg();
 }
 
-unsigned SIInstrInfo::isSGPRStackAccess(const MachineInstr &MI,
+Register SIInstrInfo::isSGPRStackAccess(const MachineInstr &MI,
                                         int &FrameIndex) const {
   const MachineOperand *Addr = getNamedOperand(MI, AMDGPU::OpName::addr);
   assert(Addr && Addr->isFI());
diff --git a/llvm/lib/Target/AMDGPU/SIInstrInfo.h b/llvm/lib/Target/AMDGPU/SIInstrInfo.h
@@ -1407,8 +1407,8 @@ class SIInstrInfo final : public AMDGPUGenInstrInfo {
     return get(pseudoToMCOpcode(Opcode));
   }
 
-  unsigned isStackAccess(const MachineInstr &MI, int &FrameIndex) const;
-  unsigned isSGPRStackAccess(const MachineInstr &MI, int &FrameIndex) const;
+  Register isStackAccess(const MachineInstr &MI, int &FrameIndex) const;
+  Register isSGPRStackAccess(const MachineInstr &MI, int &FrameIndex) const;
 
   Register isLoadFromStackSlot(const MachineInstr &MI,
                                int &FrameIndex) const override;

Original file line number	Diff line number	Diff line change
`@@ -1407,8 +1407,8 @@ class SIInstrInfo final : public AMDGPUGenInstrInfo {`
`1407`	`1407`	`return get(pseudoToMCOpcode(Opcode));`
`1408`	`1408`	`}`
`1409`	`1409`
`1410`		`- unsigned isStackAccess(const MachineInstr &MI, int &FrameIndex) const;`
`1411`		`- unsigned isSGPRStackAccess(const MachineInstr &MI, int &FrameIndex) const;`
	`1410`	`+ Register isStackAccess(const MachineInstr &MI, int &FrameIndex) const;`
	`1411`	`+ Register isSGPRStackAccess(const MachineInstr &MI, int &FrameIndex) const;`
`1412`	`1412`
`1413`	`1413`	`Register isLoadFromStackSlot(const MachineInstr &MI,`
`1414`	`1414`	`int &FrameIndex) const override;`