[AMDGPU] Fix incorrect arch assert while setting up FlatScratchInit

madhur13490 · madhur13490 · commit 4a577c3a22c4 · 2020-07-24T18:19:04.000Z
Reviewers: arsenm, foad, rampitec, scott.linder Reviewed By: arsenm Subscribers: kzhuravl, jvesely, wdng, nhaehnle, yaxunl, dstuttard, tpr, t-tye, hiraditya, kerbowa, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D84391
diff --git a/llvm/lib/Target/AMDGPU/SIFrameLowering.cpp b/llvm/lib/Target/AMDGPU/SIFrameLowering.cpp
@@ -274,6 +274,7 @@ void SIFrameLowering::emitEntryFunctionFlatScratchInit(
       return;
     }
 
+    // For GFX9.
     BuildMI(MBB, I, DL, TII->get(AMDGPU::S_ADD_U32), AMDGPU::FLAT_SCR_LO)
       .addReg(FlatScrInitLo)
       .addReg(ScratchWaveOffsetReg);
@@ -284,7 +285,7 @@ void SIFrameLowering::emitEntryFunctionFlatScratchInit(
     return;
   }
 
-  assert(ST.getGeneration() < AMDGPUSubtarget::GFX10);
+  assert(ST.getGeneration() < AMDGPUSubtarget::GFX9);
 
   // Copy the size in bytes.
   BuildMI(MBB, I, DL, TII->get(AMDGPU::COPY), AMDGPU::FLAT_SCR_LO)

Original file line number	Diff line number	Diff line change
`@@ -274,6 +274,7 @@ void SIFrameLowering::emitEntryFunctionFlatScratchInit(`
`274`	`274`	`return;`
`275`	`275`	`}`
`276`	`276`
	`277`	`+ // For GFX9.`
`277`	`278`	`BuildMI(MBB, I, DL, TII->get(AMDGPU::S_ADD_U32), AMDGPU::FLAT_SCR_LO)`
`278`	`279`	`.addReg(FlatScrInitLo)`
`279`	`280`	`.addReg(ScratchWaveOffsetReg);`
`@@ -284,7 +285,7 @@ void SIFrameLowering::emitEntryFunctionFlatScratchInit(`
`284`	`285`	`return;`
`285`	`286`	`}`
`286`	`287`
`287`		`- assert(ST.getGeneration() < AMDGPUSubtarget::GFX10);`
	`288`	`+ assert(ST.getGeneration() < AMDGPUSubtarget::GFX9);`
`288`	`289`
`289`	`290`	`// Copy the size in bytes.`
`290`	`291`	`BuildMI(MBB, I, DL, TII->get(AMDGPU::COPY), AMDGPU::FLAT_SCR_LO)`