so far everything compiles

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6423 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp b/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp
index 839382a9c6a0994c5dd20409f3dd87d9c7b49976..10a888f55e175fcc145dc594be6e1f7710cb4dc1 100644 (file)
--- a/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp
+++ b/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp
@@ -35,19 +35,19 @@
 // see ModuloSchedulingPass::runOnFunction()
 //************************************************************
 
-namespace {
-  cl::opt<ModuloScheduling::DebugLevel_t,true>
-    SDL_opt("modsched", cl::Hidden, cl::location(ModuloScheduling::DebugLevel),
-            cl::desc("enable modulo scheduling debugging information"),
-            cl::values(clEnumValN(ModuloScheduling::DebugLevel_NoDebugInfo,
-                                  "none", "disable debug output"),
-                       clEnumValN(ModuloScheduling::DebugLevel_PrintSchedule,
-                                  "psched", "print original and new schedule"),
-                       clEnumValN(ModuloScheduling::DebugLevel_PrintScheduleProcess,
-                                  "pschedproc",
-                                  "print how the new schdule is produced"),
-                       0));
-}
+ModuloSchedDebugLevel_t ModuloSchedDebugLevel;
+
+cl::opt<ModuloSchedDebugLevel_t,true>
+SDL_opt("modsched", cl::Hidden, cl::location(ModuloSchedDebugLevel),
+       cl::desc("enable modulo scheduling debugging information"),
+       cl::values(clEnumValN(ModuloSchedDebugLevel_NoDebugInfo,
+                             "none", "disable debug output"),
+                  clEnumValN(ModuloSchedDebugLevel_PrintSchedule,
+                             "psched", "print original and new schedule"),
+                  clEnumValN(ModuloSchedDebugLevel_PrintScheduleProcess,
+                             "pschedproc",
+                             "print how the new schdule is produced"),
+                  0));
 
 // Computes the schedule and inserts epilogue and prologue
 //

diff --git a/lib/CodeGen/ModuloScheduling/ModuloScheduling.h b/lib/CodeGen/ModuloScheduling/ModuloScheduling.h
index 87403cfe3138b6b2150a69212607269b1d1e0feb..782476eda9cd81315137d5f3b48daa2d63b4950d 100644 (file)
--- a/lib/CodeGen/ModuloScheduling/ModuloScheduling.h
+++ b/lib/CodeGen/ModuloScheduling/ModuloScheduling.h
@@ -13,6 +13,13 @@
 #include <iostream>
 #include <vector>
 
+// for debug information selecton
+enum ModuloSchedDebugLevel_t { 
+  ModuloSchedDebugLevel_NoDebugInfo,
+  ModuloSchedDebugLevel_PrintSchedule,
+  ModuloSchedDebugLevel_PrintScheduleProcess,
+};
+
 class ModuloScheduling: NonCopyable {
 private:
 
@@ -48,6 +55,10 @@ private:
   typedef BasicBlock::InstListType InstListType;
   typedef std::vector<std::vector<ModuloSchedGraphNode*> > vvNodeType;
 
+
+
+
+
 public:
 
   ModuloScheduling(ModuloSchedGraph & _graph):
@@ -60,18 +71,23 @@ public:
 
   ~ModuloScheduling() {};
 
-  // for debug information selecton
-  enum DebugLevel_t {
-    DebugLevel_NoDebugInfo,
-    DebugLevel_PrintSchedule,
-    DebugLevel_PrintScheduleProcess,
-  };
 
-  static DebugLevel_t DebugLevel;
 
-  static bool printSchedule() { return DebugLevel >= DebugLevel_PrintSchedule; }
-  static bool printScheduleProcess() {
-    return DebugLevel >= DebugLevel_PrintScheduleProcess;
+  static bool 
+  printSchedule() { 
+
+    //return ModuloScheduling::DebugLevel >= DebugLevel_PrintSchedule; 
+    return false;
+
+
+  }
+  static bool 
+  printScheduleProcess() {
+  
+    //return DebugLevel >= DebugLevel_PrintScheduleProcess;
+    return false;
+
+
   }
 
   // The method to compute schedule and instert epilogue and prologue

diff --git a/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp b/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp
index 839382a9c6a0994c5dd20409f3dd87d9c7b49976..10a888f55e175fcc145dc594be6e1f7710cb4dc1 100644 (file)
--- a/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp
+++ b/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp
@@ -35,19 +35,19 @@
 // see ModuloSchedulingPass::runOnFunction()
 //************************************************************
 
-namespace {
-  cl::opt<ModuloScheduling::DebugLevel_t,true>
-    SDL_opt("modsched", cl::Hidden, cl::location(ModuloScheduling::DebugLevel),
-            cl::desc("enable modulo scheduling debugging information"),
-            cl::values(clEnumValN(ModuloScheduling::DebugLevel_NoDebugInfo,
-                                  "none", "disable debug output"),
-                       clEnumValN(ModuloScheduling::DebugLevel_PrintSchedule,
-                                  "psched", "print original and new schedule"),
-                       clEnumValN(ModuloScheduling::DebugLevel_PrintScheduleProcess,
-                                  "pschedproc",
-                                  "print how the new schdule is produced"),
-                       0));
-}
+ModuloSchedDebugLevel_t ModuloSchedDebugLevel;
+
+cl::opt<ModuloSchedDebugLevel_t,true>
+SDL_opt("modsched", cl::Hidden, cl::location(ModuloSchedDebugLevel),
+       cl::desc("enable modulo scheduling debugging information"),
+       cl::values(clEnumValN(ModuloSchedDebugLevel_NoDebugInfo,
+                             "none", "disable debug output"),
+                  clEnumValN(ModuloSchedDebugLevel_PrintSchedule,
+                             "psched", "print original and new schedule"),
+                  clEnumValN(ModuloSchedDebugLevel_PrintScheduleProcess,
+                             "pschedproc",
+                             "print how the new schdule is produced"),
+                  0));
 
 // Computes the schedule and inserts epilogue and prologue
 //

diff --git a/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.h b/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.h
index 87403cfe3138b6b2150a69212607269b1d1e0feb..782476eda9cd81315137d5f3b48daa2d63b4950d 100644 (file)
--- a/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.h
+++ b/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.h
@@ -13,6 +13,13 @@
 #include <iostream>
 #include <vector>
 
+// for debug information selecton
+enum ModuloSchedDebugLevel_t { 
+  ModuloSchedDebugLevel_NoDebugInfo,
+  ModuloSchedDebugLevel_PrintSchedule,
+  ModuloSchedDebugLevel_PrintScheduleProcess,
+};
+
 class ModuloScheduling: NonCopyable {
 private:
 
@@ -48,6 +55,10 @@ private:
   typedef BasicBlock::InstListType InstListType;
   typedef std::vector<std::vector<ModuloSchedGraphNode*> > vvNodeType;
 
+
+
+
+
 public:
 
   ModuloScheduling(ModuloSchedGraph & _graph):
@@ -60,18 +71,23 @@ public:
 
   ~ModuloScheduling() {};
 
-  // for debug information selecton
-  enum DebugLevel_t {
-    DebugLevel_NoDebugInfo,
-    DebugLevel_PrintSchedule,
-    DebugLevel_PrintScheduleProcess,
-  };
 
-  static DebugLevel_t DebugLevel;
 
-  static bool printSchedule() { return DebugLevel >= DebugLevel_PrintSchedule; }
-  static bool printScheduleProcess() {
-    return DebugLevel >= DebugLevel_PrintScheduleProcess;
+  static bool 
+  printSchedule() { 
+
+    //return ModuloScheduling::DebugLevel >= DebugLevel_PrintSchedule; 
+    return false;
+
+
+  }
+  static bool 
+  printScheduleProcess() {
+  
+    //return DebugLevel >= DebugLevel_PrintScheduleProcess;
+    return false;
+
+
   }
 
   // The method to compute schedule and instert epilogue and prologue