[llvm] a95ce5f - [ARM][SchedModels] Rename and generalize predicate. NFC

[Evgeny Leviant via llvm-commits]

Author: Evgeny Leviant
Date: 2020-10-26T12:14:55+03:00
New Revision: a95ce5f65f13608f652d554ee37e61d9df7fa0d3

URL: https://github.com/llvm/llvm-project/commit/a95ce5f65f13608f652d554ee37e61d9df7fa0d3
DIFF: https://github.com/llvm/llvm-project/commit/a95ce5f65f13608f652d554ee37e61d9df7fa0d3.diff

LOG: [ARM][SchedModels] Rename and generalize predicate. NFC

Added: 
    

Modified: 
    llvm/lib/Target/ARM/ARMSchedule.td
    llvm/lib/Target/ARM/ARMScheduleA57.td

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/ARM/ARMSchedule.td b/llvm/lib/Target/ARM/ARMSchedule.td
index 03c84e2ddbf6..8119455f0e57 100644
--- a/llvm/lib/Target/ARM/ARMSchedule.td
+++ b/llvm/lib/Target/ARM/ARMSchedule.td
@@ -165,7 +165,7 @@ def IsCPSRDefined : CheckFunctionPredicateWithTII<
 def IsCPSRDefinedPred : MCSchedPredicate<IsCPSRDefined>;
 
 let FunctionMapper = "ARM_AM::getAM2ShiftOpc" in {
-  def CheckExtNoShift : CheckImmOperand_s<4, "ARM_AM::no_shift">;
+  class CheckAM2NoShift<int n> : CheckImmOperand_s<n, "ARM_AM::no_shift">;
 }
 
 let FunctionMapper = "ARM_AM::getAM2Op" in {

diff  --git a/llvm/lib/Target/ARM/ARMScheduleA57.td b/llvm/lib/Target/ARM/ARMScheduleA57.td
index f0bb5c7a650c..784bee19e9ec 100644
--- a/llvm/lib/Target/ARM/ARMScheduleA57.td
+++ b/llvm/lib/Target/ARM/ARMScheduleA57.td
@@ -49,7 +49,7 @@ def IsLdstsoScaledNotOptimalPred :
 def IsLdstsoScaledNotOptimalPredX2 :
   SchedPredicate<[{TII->isLdstScaledRegNotPlusLsl2(*MI, 2)}]>;
 
-def IsLdstsoScaledPredX2 : MCSchedPredicate<CheckNot<CheckExtNoShift>>;
+def IsLdstsoScaledPredX2 : MCSchedPredicate<CheckNot<CheckAM2NoShift<4>>>;
 
 def IsLdstsoMinusRegPredX0 : MCSchedPredicate<CheckAM2OpSub<2>>;
 def IsLdstsoMinusRegPred : MCSchedPredicate<CheckAM2OpSub<3>>;