[llvm] [AMDGPU] Address follow-up concerns from 189121 (PR #192322)

[Sean Fertile via llvm-commits]

mandlebug wrote:

@jrbyrnes  This commit breaks some of the upstream buildbots and they have been red for a really long time, unless you have a fix ready to go it should be reverted.

https://github.com/llvm/llvm-project/pull/192322