harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r490936 - /harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAlloc2.cpp
Date Fri, 29 Dec 2006 07:32:00 GMT
Author: varlax
Date: Thu Dec 28 23:31:59 2006
New Revision: 490936

URL: http://svn.apache.org/viewvc?view=rev&rev=490936
Log:
Applied HARMONY-2816 [drlvm][jit] Jitrino operand priority calculation in bin pack register
allocator
Tested on SLES9

Modified:
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAlloc2.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAlloc2.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAlloc2.cpp?view=diff&rev=490936&r1=490935&r2=490936
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAlloc2.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAlloc2.cpp Thu Dec
28 23:31:59 2006
@@ -86,7 +86,7 @@
         Register* assigned;     // 0 or register assigned
         
         size_t length;          // total length of all intervals
-        size_t weight;          // weight coeff (taken from LIR)
+        double weight;          // weight coeff (taken from LIR)
 
         Opand* parentOpand;     // another opand which is a source in a copy instruction
defining this opand, hint for coalescing
         bool   ignore;
@@ -95,8 +95,8 @@
 
         void update ();
 
-        static bool smaller (const RegAlloc2::Opand*& x, const RegAlloc2::Opand*&
y)
-        {   return x->end - x->beg < y->end - y->beg;   }
+        //static bool smaller (const RegAlloc2::Opand*& x, const RegAlloc2::Opand*&
y)
+        //{   return x->end - x->beg < y->end - y->beg;   }
 
         static bool lighter (const RegAlloc2::Opand* x, const RegAlloc2::Opand* y)
         {   return x->weight < y->weight;   }
@@ -145,7 +145,13 @@
 };
 
 static Dbgout dbgout("regalloc2.txt");
-#endif
+#define DBGOUT(x) dbgout << x;
+
+#else
+
+#define DBGOUT(x) 
+
+#endif //#ifdef _DEBUG_REGALLOC
 
 //========================================================================================
 // class RegAlloc2::Register
@@ -182,13 +188,6 @@
 
 
 #ifdef _DEBUG_REGALLOC
-#   define DBGOUT(x) dbgout << x;
-#else
-#   define DBGOUT(x) 
-#endif
-
-
-#ifdef _DEBUG_REGALLOC
 static ostream& operator << (ostream& os, const RegAlloc2::Opand& x)
 {
     os << "Opand{";
@@ -453,9 +452,7 @@
 //
 void RegAlloc2::buildRegs ()    
 {
-#ifdef _DEBUG_REGALLOC
-        dbgout << endl << "buildRegs" << endl;
-#endif
+    DBGOUT(endl << "buildRegs" << endl;)
 
     OpndKind k = (OpndKind)constrs.getKind(); 
     OpndSize s = constrs.getSize();
@@ -497,9 +494,7 @@
 
 void RegAlloc2::buildOpands ()  
 {
-#ifdef _DEBUG_REGALLOC
-        dbgout << endl << "buildOpands" << endl;
-#endif
+    DBGOUT(endl << "buildOpands" << endl;)
 
     opandcount = irManager->getOpndCount();
     candidateCount = 0;
@@ -576,10 +571,7 @@
                     opnd = opnds.getOpnd(it);
                     if ( (opand=opandmap[opnd->getId()]) != 0 )
                     {
-                        opand->weight += (size_t)(execCount * (registerPressure > (int)registers.size()
? 4 : 1));
-#ifdef _DEBUG_REGALLOC
-                            dbgout << " Pressure: " << registerPressure <<
"/" << registers.size() << " Opand: " << *opand << endl;
-#endif
+                        opand->weight += (execCount * (registerPressure > (int)registers.size()
? 4 : 1));
 
                         if (inst->isLiveRangeEnd(it)){
                             opand->stop(instIndex + 1);
@@ -591,9 +583,6 @@
                                 ++registerPressure;
                                 if ( definedInCopyOpand != 0 && inst->getMnemonic()
== Mnemonic_MOV && definedInCopyOpand->parentOpand == 0){
                                     definedInCopyOpand->parentOpand = opand;
-#ifdef _DEBUG_REGALLOC
-                                        dbgout << *definedInCopyOpand << " =>
" << *opand << endl;
-#endif
                                 }
                             }
                         }
@@ -675,9 +664,7 @@
 
 void RegAlloc2::allocateRegs () 
 {
-#ifdef _DEBUG_REGALLOC
-        dbgout << endl << "allocateRegs" << endl;
-#endif
+    DBGOUT(endl << "allocateRegs" << endl;)
 
     Opands opands(mm);
     opands.reserve(opandmap.size());



Mime
View raw message