[PowerPC][NFC] Update p10 scheduler

diff --git a/llvm/lib/Target/PowerPC/P10InstrResources.td b/llvm/lib/Target/PowerPC/P10InstrResources.td
index 7ba7cfd..27dfc82 100644 (file)
--- a/llvm/lib/Target/PowerPC/P10InstrResources.td
+++ b/llvm/lib/Target/PowerPC/P10InstrResources.td
@@ -1002,7 +1002,6 @@ def : InstRW<[P10W_FX_3C, P10W_DISP_ANY, P10FX_Read, P10FX_Read],
     CRANDC,
     CRNAND,
     CRNOR,
-    CRNOT,
     CROR,
     CRORC,
     CR6UNSET, CRUNSET, CRXOR,
@@ -1713,9 +1712,7 @@ def : InstRW<[P10W_PM_4C, P10W_DISP_ANY, P10PM_Read, P10PM_Read],
     XXGENPCVWM,
     XXMRGHW,
     XXMRGLW,
-    XXPERM,
     XXPERMDI, XXPERMDIs,
-    XXPERMR,
     XXSLDWI, XXSLDWIs,
     XXSPLTW, XXSPLTWs
 )>;
@@ -1755,7 +1752,9 @@ def : InstRW<[P10W_PM_4C, P10W_DISP_ANY, P10PM_Read, P10PM_Read, P10PM_Read],
     VSLDBI,
     VSLDOI,
     VSRDBI,
-    XXINSERTW
+    XXINSERTW,
+    XXPERM,
+    XXPERMR
 )>;
 
 // 2-way crack instructions
@@ -1975,6 +1974,7 @@ def : InstRW<[P10W_SX, P10W_DISP_ANY],
       (instrs
     ATTN,
     CP_ABORT,
+    CRNOT,
     DCBA,
     DCBI,
     DCBZL,

diff --git a/llvm/lib/Target/PowerPC/PPCBack2BackFusion.def b/llvm/lib/Target/PowerPC/PPCBack2BackFusion.def
index b8e9825..1fbe94e 100644 (file)
--- a/llvm/lib/Target/PowerPC/PPCBack2BackFusion.def
+++ b/llvm/lib/Target/PowerPC/PPCBack2BackFusion.def
@@ -567,7 +567,6 @@ FUSION_FEATURE(GeneralBack2Back, hasBack2BackFusion, -1,
     CREQV,
     CRNAND,
     CRNOR,
-    CRNOT,
     CROR,
     CRORC,
     CRSET,

diff --git a/llvm/lib/Target/PowerPC/PPCSchedPredicates.td b/llvm/lib/Target/PowerPC/PPCSchedPredicates.td
index 18f325e..f23557c 100644 (file)
--- a/llvm/lib/Target/PowerPC/PPCSchedPredicates.td
+++ b/llvm/lib/Target/PowerPC/PPCSchedPredicates.td
@@ -292,3 +292,4 @@ def P10W_MM_10C_Pred : MCSchedPredicate<
                    XXMTACC,
                    XXSETACCZ]>
 >;
+