Rename predicates

Author: jwanggit86

llvm/lib/Target/AMDGPU/AMDGPU.td

@@ -2344,12 +2344,14 @@ def isGFX8GFX9NotGFX90A :
             " Subtarget->getGeneration() == AMDGPUSubtarget::GFX9)">,
   AssemblerPredicate<(all_of FeatureGFX8Insts, FeatureGCN3Encoding, (not FeatureGFX90AInsts))>;
 
-def isGFX9NotGFX90A :
+// Pre-90A GFX9s allow the NV bit in FLAT instructions.
+def isNVAllowedInFlat :
   Predicate<"!Subtarget->hasGFX90AInsts() &&"
             " Subtarget->getGeneration() == AMDGPUSubtarget::GFX9)">,
   AssemblerPredicate<(all_of FeatureGFX9Insts, (not FeatureGFX90AInsts), (not FeatureGFX10Insts))>;
 
-def isGFX8orGFX9After908 :
+// GFX8 or GFX90A+ do not allow the NV bit in FLAT instructions.
+def isNVNotAllowedInFlat :
   Predicate<"(Subtarget->getGeneration() == AMDGPUSubtarget::VOLCANIC_ISLANDS) ||"
             " ((Subtarget->getGeneration() == AMDGPUSubtarget::GFX9) && Subtarget->hasGFX90AInsts())">,
   AssemblerPredicate <(any_of FeatureVolcanicIslands, FeatureGFX90AInsts)>;

llvm/lib/Target/AMDGPU/FLATInstructions.td

@@ -2695,12 +2695,12 @@ class FLAT_Real_vi <bits<7> op, FLAT_Pseudo ps, bit has_sccb = ps.has_sccb> :
 
 class FLAT_Real_vi_ex_gfx9 <bits<7> op, FLAT_Pseudo ps, bit has_sccb = ps.has_sccb> :
   FLAT_Real_vi <op, ps, has_sccb> {
-  let AssemblerPredicate = isGFX8orGFX9After908;
+  let AssemblerPredicate = isNVNotAllowedInFlat;
 }
 
 class FLAT_Real_gfx9 <bits<7> op, FLAT_Pseudo ps, bit has_sccb = ps.has_sccb> :
   FLAT_Real_vi <op, ps, has_sccb> {
-  let AssemblerPredicate = isGFX9NotGFX90A;
+  let AssemblerPredicate = isNVAllowedInFlat;
   let Subtarget = SIEncodingFamily.GFX9;
   let DecoderNamespace = "GFX9";
   let Inst{55} = cpol{CPolBit.NV}; // nv - GFX9 (pre-90A) uses bit 55 as the non-volatile bit.