[AMDGPU] Stop special casing flat_scratch for register name

rampitec · rampitec · commit 9c7f4264d352 · 2019-07-17T21:35:11.000Z
Differential Revision: https://reviews.llvm.org/D64885 llvm-svn: 366376
diff --git a/llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp b/llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp
@@ -1347,18 +1347,6 @@ void SIRegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator MI,
 }
 
 StringRef SIRegisterInfo::getRegAsmName(unsigned Reg) const {
-  // FIXME: Rename flat_scr so we don't need to special case this.
-  switch (Reg) {
-  case AMDGPU::FLAT_SCR:
-    return "flat_scratch";
-  case AMDGPU::FLAT_SCR_LO:
-    return "flat_scratch_lo";
-  case AMDGPU::FLAT_SCR_HI:
-    return "flat_scratch_hi";
-  default:
-    break;
-  }
-
   const TargetRegisterClass *RC = getMinimalPhysRegClass(Reg);
   unsigned Size = getRegSizeInBits(*RC);
   unsigned AltName = AMDGPU::NoRegAltName;
diff --git a/llvm/lib/Target/AMDGPU/SIRegisterInfo.td b/llvm/lib/Target/AMDGPU/SIRegisterInfo.td
@@ -171,7 +171,7 @@ foreach Index = 0-15 in {
 multiclass FLAT_SCR_LOHI_m <string n, bits<16> ci_e, bits<16> vi_e> {
   def _ci : SIReg<n, ci_e>;
   def _vi : SIReg<n, vi_e>;
-  def "" : SIReg<"", 0>;
+  def "" : SIReg<n, 0>;
 }
 
 class FlatReg <Register lo, Register hi, bits<16> encoding> :

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ foreach Index = 0-15 in {`
`171`	`171`	`multiclass FLAT_SCR_LOHI_m <string n, bits<16> ci_e, bits<16> vi_e> {`
`172`	`172`	`def _ci : SIReg<n, ci_e>;`
`173`	`173`	`def _vi : SIReg<n, vi_e>;`
`174`		`- def "" : SIReg<"", 0>;`
	`174`	`+ def "" : SIReg<n, 0>;`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`class FlatReg <Register lo, Register hi, bits<16> encoding> :`