[llvm] r329886 - [SystemZ] Remove FullInstRWOverlapCheck from SchedMachineModels.

Jonas Paulsson via llvm-commits llvm-commits at lists.llvm.org
Thu Apr 12 01:06:04 PDT 2018


Author: jonpa
Date: Thu Apr 12 01:06:04 2018
New Revision: 329886

URL: http://llvm.org/viewvc/llvm-project?rev=329886&view=rev
Log:
[SystemZ]  Remove FullInstRWOverlapCheck from SchedMachineModels.

This is NFC, even though it caught just a few cases of overlapping regular
expressions.

Review: Ulrich Weigand

Modified:
    llvm/trunk/lib/Target/SystemZ/SystemZScheduleZ13.td
    llvm/trunk/lib/Target/SystemZ/SystemZScheduleZ14.td
    llvm/trunk/lib/Target/SystemZ/SystemZScheduleZ196.td
    llvm/trunk/lib/Target/SystemZ/SystemZScheduleZEC12.td

Modified: llvm/trunk/lib/Target/SystemZ/SystemZScheduleZ13.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/SystemZ/SystemZScheduleZ13.td?rev=329886&r1=329885&r2=329886&view=diff
==============================================================================
--- llvm/trunk/lib/Target/SystemZ/SystemZScheduleZ13.td (original)
+++ llvm/trunk/lib/Target/SystemZ/SystemZScheduleZ13.td Thu Apr 12 01:06:04 2018
@@ -24,9 +24,6 @@ def Z13Model : SchedMachineModel {
 
     // Extra cycles for a mispredicted branch.
     let MispredictPenalty = 20;
-
-    // FIXME: Remove when all errors have been fixed.
-    let FullInstRWOverlapCheck = 0;
 }
 
 let SchedModel = Z13Model in  {
@@ -596,7 +593,8 @@ def : InstRW<[LSU, LSU, Lat5, GroupAlone
 def : InstRW<[LSU, Lat30, GroupAlone], (instregex "TR$")>;
 def : InstRW<[FXa, FXa, FXa, LSU, LSU, Lat30, GroupAlone], (instregex "TRT$")>;
 def : InstRW<[FXa, LSU, Lat30], (instregex "TRTR$")>;
-def : InstRW<[FXa, Lat30], (instregex "TR(TR)?(T)?(E|EOpt)?$")>;
+def : InstRW<[FXa, Lat30], (instregex "TRE$")>;
+def : InstRW<[FXa, Lat30], (instregex "TRT(R)?E(Opt)?$")>;
 def : InstRW<[LSU, Lat30], (instregex "TR(T|O)(T|O)(Opt)?$")>;
 def : InstRW<[FXa, Lat30], (instregex "CU(12|14|21|24|41|42)(Opt)?$")>;
 def : InstRW<[FXa, Lat30], (instregex "(CUUTF|CUTFU)(Opt)?$")>;
@@ -880,7 +878,7 @@ def : InstRW<[VecFPd, Lat30], (instregex
 
 // Compare
 def : InstRW<[VecXsPm, LSU, Lat8], (instregex "(K|C)(E|D)B$")>;
-def : InstRW<[VecXsPm, Lat4], (instregex "(K|C)(E|D)BR?$")>;
+def : InstRW<[VecXsPm, Lat4], (instregex "(K|C)(E|D)BR$")>;
 def : InstRW<[VecDF, VecDF, Lat20, GroupAlone], (instregex "(K|C)XBR$")>;
 
 // Test Data Class

Modified: llvm/trunk/lib/Target/SystemZ/SystemZScheduleZ14.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/SystemZ/SystemZScheduleZ14.td?rev=329886&r1=329885&r2=329886&view=diff
==============================================================================
--- llvm/trunk/lib/Target/SystemZ/SystemZScheduleZ14.td (original)
+++ llvm/trunk/lib/Target/SystemZ/SystemZScheduleZ14.td Thu Apr 12 01:06:04 2018
@@ -24,9 +24,6 @@ def Z14Model : SchedMachineModel {
 
     // Extra cycles for a mispredicted branch.
     let MispredictPenalty = 20;
-
-    // FIXME: Remove when all errors have been fixed.
-    let FullInstRWOverlapCheck = 0;
 }
 
 let SchedModel = Z14Model in  {
@@ -604,7 +601,8 @@ def : InstRW<[LSU, LSU, Lat5, GroupAlone
 def : InstRW<[LSU, Lat30, GroupAlone], (instregex "TR$")>;
 def : InstRW<[FXa, FXa, FXa, LSU, LSU, Lat30, GroupAlone], (instregex "TRT$")>;
 def : InstRW<[FXa, LSU, Lat30], (instregex "TRTR$")>;
-def : InstRW<[FXa, Lat30], (instregex "TR(TR)?(T)?(E|EOpt)?$")>;
+def : InstRW<[FXa, Lat30], (instregex "TRE$")>;
+def : InstRW<[FXa, Lat30], (instregex "TRT(R)?E(Opt)?$")>;
 def : InstRW<[LSU, Lat30], (instregex "TR(T|O)(T|O)(Opt)?$")>;
 def : InstRW<[FXa, Lat30], (instregex "CU(12|14|21|24|41|42)(Opt)?$")>;
 def : InstRW<[FXa, Lat30], (instregex "(CUUTF|CUTFU)(Opt)?$")>;
@@ -897,7 +895,7 @@ def : InstRW<[VecFPd, Lat30], (instregex
 
 // Compare
 def : InstRW<[VecXsPm, LSU, Lat8], (instregex "(K|C)(E|D)B$")>;
-def : InstRW<[VecXsPm, Lat4], (instregex "(K|C)(E|D)BR?$")>;
+def : InstRW<[VecXsPm, Lat4], (instregex "(K|C)(E|D)BR$")>;
 def : InstRW<[VecDF, VecDF, Lat20, GroupAlone], (instregex "(K|C)XBR$")>;
 
 // Test Data Class

Modified: llvm/trunk/lib/Target/SystemZ/SystemZScheduleZ196.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/SystemZ/SystemZScheduleZ196.td?rev=329886&r1=329885&r2=329886&view=diff
==============================================================================
--- llvm/trunk/lib/Target/SystemZ/SystemZScheduleZ196.td (original)
+++ llvm/trunk/lib/Target/SystemZ/SystemZScheduleZ196.td Thu Apr 12 01:06:04 2018
@@ -24,9 +24,6 @@ def Z196Model : SchedMachineModel {
 
     // Extra cycles for a mispredicted branch.
     let MispredictPenalty = 16;
-
-    // FIXME: Remove when all errors have been fixed.
-    let FullInstRWOverlapCheck = 0;
 }
 
 let SchedModel = Z196Model in  {
@@ -555,7 +552,8 @@ def : InstRW<[LSU, LSU, Lat5, GroupAlone
 def : InstRW<[LSU, Lat30, GroupAlone], (instregex "TR$")>;
 def : InstRW<[LSU, Lat30, GroupAlone], (instregex "TRT$")>;
 def : InstRW<[FXU, LSU, Lat30], (instregex "TRTR$")>;
-def : InstRW<[FXU, Lat30], (instregex "TR(TR)?(T)?(E|EOpt)?$")>;
+def : InstRW<[FXU, Lat30], (instregex "TRE$")>;
+def : InstRW<[FXU, Lat30], (instregex "TRT(R)?E(Opt)?$")>;
 def : InstRW<[LSU, Lat30], (instregex "TR(T|O)(T|O)(Opt)?$")>;
 def : InstRW<[FXU, Lat30], (instregex "CU(12|14|21|24|41|42)(Opt)?$")>;
 def : InstRW<[FXU, Lat30], (instregex "(CUUTF|CUTFU)(Opt)?$")>;

Modified: llvm/trunk/lib/Target/SystemZ/SystemZScheduleZEC12.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/SystemZ/SystemZScheduleZEC12.td?rev=329886&r1=329885&r2=329886&view=diff
==============================================================================
--- llvm/trunk/lib/Target/SystemZ/SystemZScheduleZEC12.td (original)
+++ llvm/trunk/lib/Target/SystemZ/SystemZScheduleZEC12.td Thu Apr 12 01:06:04 2018
@@ -24,9 +24,6 @@ def ZEC12Model : SchedMachineModel {
 
     // Extra cycles for a mispredicted branch.
     let MispredictPenalty = 16;
-
-    // FIXME: Remove when all errors have been fixed.
-    let FullInstRWOverlapCheck = 0;
 }
 
 let SchedModel = ZEC12Model in  {
@@ -567,7 +564,8 @@ def : InstRW<[LSU, LSU, Lat5, GroupAlone
 def : InstRW<[LSU, Lat30, GroupAlone], (instregex "TR$")>;
 def : InstRW<[FXU, FXU, FXU, LSU, LSU, Lat30, GroupAlone], (instregex "TRT$")>;
 def : InstRW<[FXU, LSU, Lat30], (instregex "TRTR$")>;
-def : InstRW<[FXU, Lat30], (instregex "TR(TR)?(T)?(E|EOpt)?$")>;
+def : InstRW<[FXU, Lat30], (instregex "TRE$")>;
+def : InstRW<[FXU, Lat30], (instregex "TRT(R)?E(Opt)?$")>;
 def : InstRW<[LSU, Lat30], (instregex "TR(T|O)(T|O)(Opt)?$")>;
 def : InstRW<[FXU, Lat30], (instregex "CU(12|14|21|24|41|42)(Opt)?$")>;
 def : InstRW<[FXU, Lat30], (instregex "(CUUTF|CUTFU)(Opt)?$")>;




More information about the llvm-commits mailing list