Merge pull request #6 from CSUS-LLVM/master

Fetch upstream
jrbyrnes · May 20, 2022 · 40d222a · 40d222a
2 parents aa02802 + 5df3319
commit 40d222a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/include/opt-sched/Scheduler/machine_model.h b/include/opt-sched/Scheduler/machine_model.h
@@ -189,6 +189,8 @@ class MachineModel {
   std::vector<RegTypeInfo> registerTypes_;
   // A vector of issue types with their names and slot counts.
   std::vector<IssueTypeInfo> issueTypes_;
+
+  void parseBuffer(SpecsBuffer &buf);
 };
 
 } // namespace opt_sched

diff --git a/lib/Scheduler/machine_model.cpp b/lib/Scheduler/machine_model.cpp
@@ -14,12 +14,7 @@ using namespace llvm::opt_sched;
 using std::string;
 using std::vector;
 
-MachineModel::MachineModel(const std::string &modelFile) {
-  SpecsBuffer buf;
-  buf.Load(modelFile.c_str());
-}
-
-MachineModel::MachineModel(SpecsBuffer &buf) {
+void MachineModel::parseBuffer(SpecsBuffer &buf) {
   char buffer[MAX_NAMESIZE];
 
   buf.ReadSpec("MODEL_NAME:", buffer);
@@ -91,6 +86,14 @@ MachineModel::MachineModel(SpecsBuffer &buf) {
   }
 }
 
+MachineModel::MachineModel(const std::string &modelFile) {
+  SpecsBuffer buf;
+  buf.Load(modelFile.c_str());
+  parseBuffer(buf);
+}
+
+MachineModel::MachineModel(SpecsBuffer &buf) { parseBuffer(buf); }
+
 InstType MachineModel::GetInstTypeByName(const string &typeName,
                                          const string &prevName) const {
   string composite = prevName.size() ? typeName + "_after_" + prevName : "";