[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/eigen2/src/internal
From:       Michael Olbrich <michael.olbrich () gmx ! net>
Date:       2007-09-30 20:38:09
Message-ID: 1191184689.490897.8823.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 719293 by molbrich:

Generic loop unrolling with template metaprograms. It seems to be as fast as
manually unrolling.
TODO: decide when to stop unrolling (speed vs. code size).
      maybe only unroll one loop for larger matixes.


 M  +32 -13    Object.h  


--- branches/work/eigen2/src/internal/Object.h #719292:719293
@@ -28,26 +28,45 @@
 
 #include "Util.h"
 
+template<int count, int rows> class Loop
+{
+  enum {
+      col  = (count-1)/rows,
+      row  = (count-1)%rows,
+      next =  count-1
+  };
+  public:
+  template <typename Derived1, typename Derived2> static void copy(Derived1 &dst, const Derived2 &src)
+  {
+    Loop<next, rows>::copy(dst, src);
+    dst.write(row, col) = src.read(row, col);
+  }
+};
+template<int rows> class Loop<0, rows>
+{
+  public:
+  template <typename Derived1, typename Derived2> static void copy(Derived1 &dst, const Derived2 &src)
+  {
+    EI_UNUSED(dst);
+    EI_UNUSED(src);
+  }
+};
+
+
 template<typename Scalar, typename Derived> class EiObject
 {
     static const int RowsAtCompileTime = Derived::RowsAtCompileTime,
-                     ColsAtCompileTime = Derived::ColsAtCompileTime;
+                     ColsAtCompileTime = Derived::ColsAtCompileTime,
+                     CountAtCompileTime= RowsAtCompileTime*ColsAtCompileTime > 0 ?
+                                         RowsAtCompileTime*ColsAtCompileTime : 0;
     
     template<typename OtherDerived>
     void _copy_helper(const EiObject<Scalar, OtherDerived>& other)
     {
-      if(RowsAtCompileTime == 3 && ColsAtCompileTime == 3)
-      {
-        write(0,0) = other.read(0,0);
-        write(1,0) = other.read(1,0);
-        write(2,0) = other.read(2,0);
-        write(0,1) = other.read(0,1);
-        write(1,1) = other.read(1,1);
-        write(2,1) = other.read(2,1);
-        write(0,2) = other.read(0,2);
-        write(1,2) = other.read(1,2);
-        write(2,2) = other.read(2,2);
-      }
+      if ((RowsAtCompileTime != EiDynamic) &&
+          (ColsAtCompileTime != EiDynamic) &&
+          (CountAtCompileTime <= 25))
+        Loop<CountAtCompileTime, RowsAtCompileTime>::copy(*this, other);
       else
       for(int i = 0; i < rows(); i++)
         for(int j = 0; j < cols(); j++)
[prev in list] [next in list] [prev in thread] [next in thread]