refs llvm#1294 新SchedModelに合わせた修正

Author: hakama2

llvm/include/llvm/CodeGen/SwplTargetMachine.h

@@ -45,7 +45,6 @@ class StmPipeline {
   StmPatternId patternId=0;
   SmallVector<unsigned,4> stages;
   SmallVector<StmResourceId,4> resources;
-  int latency;
 
   /// constructor
   StmPipeline(){}
@@ -287,7 +286,7 @@ class SwplTargetMachine {
   /// Returns all resource usage patterns used by the specified instruction.
   /// \param [in] mi Target instruction
   /// \return StmPipelines
-  virtual const StmPipelinesImpl * getPipelines(const MachineInstr& mi) = 0;
+  virtual const StmPipelinesImpl * getPipelines(const MachineInstr& mi) const = 0;
 
   /// returns the number of resources available
   /// \return number of resources

llvm/lib/Target/AArch64/AArch64SwplSchedA64FX.cpp

@@ -10,13 +10,31 @@
 //
 //===----------------------------------------------------------------------===//
 #include "AArch64SwplSchedA64FX.h"
+#include "AArch64InstrInfo.h"
 using namespace llvm;
 
-AArch64SwplSchedA64FX::ResourceID AArch64SwplSchedA64FX::getRes(const MachineInstr &mi){
+AArch64SwplSchedA64FX::ResourceID AArch64SwplSchedA64FX::getRes(const MachineInstr &mi) const {
     // @todo:実装
     return INT_OP_001;
 }
-const StmPipelinesImpl *AArch64SwplSchedA64FX::getPipelines(ResourceID id){
+
+const StmPipelinesImpl *AArch64SwplSchedA64FX::getPipelines(ResourceID id) const {
     // @todo:実装
     return nullptr;
-}
+}
+
+bool AArch64SwplSchedA64FX::isPseudo(const MachineInstr &mi) const {
+    // アセンブラ出力時までに無くなる可能性が大きいものはPseudoとして扱う
+    switch (mi.getOpcode()) {
+    case AArch64::SUBREG_TO_REG:
+    case AArch64::INSERT_SUBREG:
+    case AArch64::REG_SEQUENCE:
+      return true;
+    }
+    return false;
+}
+
+unsigned AArch64SwplSchedA64FX::getLatency(ResourceID id) const {
+    // @todo:実装
+    return 1;
+}

llvm/lib/Target/AArch64/AArch64SwplSchedA64FX.h

@@ -21,8 +21,10 @@ struct AArch64SwplSchedA64FX{
         INT_OP_002
     };
 
-    ResourceID getRes(const MachineInstr &mi);
-    const StmPipelinesImpl *getPipelines(ResourceID id);
+    ResourceID getRes(const MachineInstr &mi) const;
+    const StmPipelinesImpl *getPipelines(ResourceID id) const;
+    unsigned getLatency(ResourceID id) const;
+    bool isPseudo(const MachineInstr &mi) const;
 };
 }
 

llvm/lib/Target/AArch64/AArch64SwplTargetMachine.cpp

@@ -530,13 +530,40 @@ SwplTargetMachine *AArch64InstrInfo::getSwplTargetMachine() const {
 
 }
 
-namespace llvm {
+static const char *getResourceName(StmResourceId resource) {
+  const char *name="";
+  switch (resource) {
+  case A64FXRes::PortKind::P_FLA:name="FLA";break;
+  case A64FXRes::PortKind::P_FLB:name="FLB";break;
+  case A64FXRes::PortKind::P_EXA:name="EXA";break;
+  case A64FXRes::PortKind::P_EXB:name="EXB";break;
+  case A64FXRes::PortKind::P_EAGA:name="EAGA";break;
+  case A64FXRes::PortKind::P_EAGB:name="EAGB";break;
+  case A64FXRes::PortKind::P_PRX:name="PRX";break;
+  case A64FXRes::PortKind::P_BR:name="BR";break;
+  case A64FXRes::PortKind::P_LSU1:name="LSU1";break;
+  case A64FXRes::PortKind::P_LSU2:name="LSU2";break;
+  case A64FXRes::PortKind::P_FLA_C:name="FLA_C";break;
+  case A64FXRes::PortKind::P_FLB_C:name="FLB_C";break;
+  case A64FXRes::PortKind::P_EXA_C:name="EXA_C";break;
+  case A64FXRes::PortKind::P_EXB_C:name="EXB_C";break;
+  case A64FXRes::PortKind::P_EAGA_C:name="EAGA_C";break;
+  case A64FXRes::PortKind::P_EAGB_C:name="EAGB_C";break;
+  default:
+    llvm_unreachable("unknown resourceid");
+  }
+  return name;
+
+}
+
+static StmPipelines forPseudoMI;
+static StmPipelines forNoImplMI;
+
 
 void AArch64SwplTargetMachine::initialize(const MachineFunction &mf) {
   if (MF==nullptr) {
     const TargetSubtargetInfo &ST = mf.getSubtarget();
     SM.init(&ST);
-    ResInfo=new AArch64A64FXResInfo(ST);
     tmNumSameKindResources[A64FXRes::PortKind::P_FLA]=2;
     tmNumSameKindResources[A64FXRes::PortKind::P_FLB]=2;
     tmNumSameKindResources[A64FXRes::PortKind::P_EXA]=2;
@@ -545,7 +572,22 @@ void AArch64SwplTargetMachine::initialize(const MachineFunction &mf) {
     tmNumSameKindResources[A64FXRes::PortKind::P_EAGB]=2;
     tmNumSameKindResources[A64FXRes::PortKind::P_PRX]=1;
     tmNumSameKindResources[A64FXRes::PortKind::P_BR]=1;
-    numResource=8; // 資源管理がSchedModelとは別になったので、ハードコードする
+    tmNumSameKindResources[A64FXRes::PortKind::P_LSU1]=2;
+    tmNumSameKindResources[A64FXRes::PortKind::P_LSU2]=2;
+    tmNumSameKindResources[A64FXRes::PortKind::P_FLA_C]=2;
+    tmNumSameKindResources[A64FXRes::PortKind::P_FLB_C]=2;
+    tmNumSameKindResources[A64FXRes::PortKind::P_EXA_C]=2;
+    tmNumSameKindResources[A64FXRes::PortKind::P_EXB_C]=2;
+    tmNumSameKindResources[A64FXRes::PortKind::P_EAGA_C]=2;
+    tmNumSameKindResources[A64FXRes::PortKind::P_EAGB_C]=2;
+    numResource=16; // 資源管理がSchedModelとは別になったので、ハードコードする
+
+    forPseudoMI.push_back(new AArch64StmPipeline());
+    auto *p = new AArch64StmPipeline();
+    p->stages.push_back(0);
+    p->resources.push_back(A64FXRes::PortKind::P_BR);
+    forNoImplMI.push_back(p);
+
   }
   MF=&mf;
 }
@@ -578,38 +620,11 @@ void AArch64StmPipeline::print(raw_ostream &ost) const {
 }
 
 const char *AArch64StmPipeline::getResourceName(StmResourceId resource) const {
-  // @todo AArch64SwplTargetMachine::getResourceName()を呼び出すようにすべきor本メソッド削除
-  const char *name="";
-  switch (resource) {
-  case A64FXRes::PortKind::P_FLA:name="FLA";break;
-  case A64FXRes::PortKind::P_FLB:name="FLB";break;
-  case A64FXRes::PortKind::P_EXA:name="EXA";break;
-  case A64FXRes::PortKind::P_EXB:name="EXB";break;
-  case A64FXRes::PortKind::P_EAGA:name="EAGA";break;
-  case A64FXRes::PortKind::P_EAGB:name="EAGB";break;
-  case A64FXRes::PortKind::P_PRX:name="PRX";break;
-  case A64FXRes::PortKind::P_BR:name="BR";break;
-  default:
-    llvm_unreachable("unknown resourceid");
-  }
-  return name;
+  return ::getResourceName(resource);
 }
 
 const char *AArch64SwplTargetMachine::getResourceName(StmResourceId resource) const {
-  const char *name="";
-  switch (resource) {
-  case A64FXRes::PortKind::P_FLA:name="FLA";break;
-  case A64FXRes::PortKind::P_FLB:name="FLB";break;
-  case A64FXRes::PortKind::P_EXA:name="EXA";break;
-  case A64FXRes::PortKind::P_EXB:name="EXB";break;
-  case A64FXRes::PortKind::P_EAGA:name="EAGA";break;
-  case A64FXRes::PortKind::P_EAGB:name="EAGB";break;
-  case A64FXRes::PortKind::P_PRX:name="PRX";break;
-  case A64FXRes::PortKind::P_BR:name="BR";break;
-  default:
-    llvm_unreachable("unknown resourceid");
-  }
-  return name;
+  return ::getResourceName(resource);
 }
 
 int AArch64SwplTargetMachine::computeMemFlowDependence(const MachineInstr *, const MachineInstr *) const {
@@ -618,34 +633,24 @@ int AArch64SwplTargetMachine::computeMemFlowDependence(const MachineInstr *, con
   return 1;
 }
 
+
 const StmPipelinesImpl *
-AArch64SwplTargetMachine::getPipelines(const MachineInstr &mi) {
-  auto *tps= stmPipelines[mi.getOpcode()];
-  if (tps==nullptr) {
-    tps= generateStmPipelines(mi);
-    stmPipelines[mi.getOpcode()]=tps;
-  }
-  return tps;
-}
+AArch64SwplTargetMachine::getPipelines(const MachineInstr &mi) const {
 
-StmPipelinesImpl *
-AArch64SwplTargetMachine::generateStmPipelines(const MachineInstr &mi) {
-  // @todo 作りが必要
-  auto *pipelines=new StmPipelines;
-  if (mi.isPseudo()) {
-    pipelines->push_back(new AArch64StmPipeline());
-  } else {
-    auto *p = new AArch64StmPipeline();
-    p->stages.push_back(0);
-    p->resources.push_back(A64FXRes::PortKind::P_BR);
-    pipelines->push_back(p);
+  if (SwplSched.isPseudo(mi)) {
+    return &forPseudoMI;
+  } else if (!isImplimented(mi)) {
+    return &forNoImplMI;
   }
-  return pipelines;
+  auto id=SwplSched.getRes(mi);
+  return SwplSched.getPipelines(id);
 }
 
-}
 int AArch64SwplTargetMachine::computeRegFlowDependence(const MachineInstr* def, const MachineInstr* use) const {
-  // @todo 作り必要
+  if (isPseudo(*def) || isPseudo(*use)) return 0;
+  if (isImplimented(*def)) {
+    return SwplSched.getLatency(SwplSched.getRes(*def));
+  }
   return 1;
 }
 
@@ -662,16 +667,15 @@ unsigned int AArch64SwplTargetMachine::getNumResource(void) const {
 }
 
 bool AArch64SwplTargetMachine::isImplimented(const MachineInstr&mi) const {
-  if (OptionCopyIsVirtual) {
-    if (mi.isCopy()) return false;
-  }
-  // @todo 作り必要
-  return false;
+  if (SwplSched.getRes(mi)==0)
+    return false;
+  else
+    return true;
 }
 
 bool AArch64SwplTargetMachine::isPseudo(const MachineInstr &mi) const {
-  // @todo 作り必要
-  return mi.isPseudo();
-//  return !isImplimented(mi);
+  if (OptionCopyIsVirtual) {
+    if (mi.isCopy()) return false;
+  }
+  return SwplSched.isPseudo(mi);
 }
-

llvm/lib/Target/AArch64/AArch64SwplTargetMachine.h

@@ -15,12 +15,12 @@
 #include "AArch64TargetTransformInfo.h"
 #include "llvm/CodeGen/TargetSchedule.h"
 #include "llvm/CodeGen/SwplTargetMachine.h"
+#include "AArch64SwplSchedA64FX.h"
 
 
 namespace llvm {
 
 class AArch64StmPipeline: public StmPipeline {
-  //  TargetSchedModel& SM;///< SchedModel
 public:
 
   /// constructor/destructor
@@ -143,19 +143,10 @@ class AArch64StmRegKind: public StmRegKind {
   }
 };
 
-// @todo 書き換える必要あります
-class AArch64A64FXResInfo {
-public:
-  AArch64A64FXResInfo() {}
-  AArch64A64FXResInfo(const TargetSubtargetInfo &ST) {}
-  virtual ~AArch64A64FXResInfo() {}
-
-
-};
-
 class A64FXRes {
 public:
-  enum PortKind {P_FLA=1, P_FLB=2, P_EXA=3, P_EXB=4, P_EAGA=5, P_EAGB=6, P_PRX=7, P_BR=8};
+  enum PortKind {P_FLA=1, P_FLB, P_EXA, P_EXB, P_EAGA, P_EAGB, P_PRX, P_BR,
+                  P_LSU1, P_LSU2, P_FLA_C, P_FLB_C, P_EXA_C, P_EXB_C, P_EAGA_C, P_EAGB_C};
 };
 
 /// SchedModelを利用してターゲット情報を取得し、SWPL機能に提供する
@@ -165,19 +156,15 @@ class AArch64SwplTargetMachine: public SwplTargetMachine {
   DenseMap<StmOpcodeId, StmPipelinesImpl * > stmPipelines; ///< Opcodeが利用する資源
   unsigned numResource=0; ///< 資源数（資源種別数ではない）
 
-  const AArch64A64FXResInfo *ResInfo=nullptr;
-  /// StmPipelineを生成する
-  /// \param [in] mp 対象となる命令
-  /// \return 生成したStmPipeline
-  StmPipelinesImpl *generateStmPipelines(const MachineInstr &mp);
-
   /// 指定命令の資源情報が取得できるかどうかをチェックする
   /// \param [in] mi 調査対象の命令
   /// \retval true 資源情報を取得可能
   /// \retval false 資源情報を取得できない
   bool isImplimented(const MachineInstr &mi) const;
 
 public:
+  AArch64SwplSchedA64FX SwplSched; ///< A64FX SchedModel for SWP
+
   /// constructor
   AArch64SwplTargetMachine() {}
   /// destructor
@@ -190,11 +177,6 @@ class AArch64SwplTargetMachine: public SwplTargetMachine {
         delete tms.getSecond();
       }
     }
-    if (ResInfo!=nullptr) {
-      delete ResInfo;
-      ResInfo=nullptr;
-    }
-
   }
 
   /// Tmの初期化を行う。
@@ -241,7 +223,7 @@ class AArch64SwplTargetMachine: public SwplTargetMachine {
   /// 指定命令が利用するリソースの利用パターンをすべて返す。
   /// \param [in] mi 対象命令
   /// \return StmPipelinesを返す
-  const StmPipelinesImpl * getPipelines(const MachineInstr& mi) override;
+  const StmPipelinesImpl * getPipelines(const MachineInstr& mi) const override;
 
 
   /// 利用可能な資源の数を返す