Revise SVD code to remove arctangents.

bench/MatrixBench.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkBenchmark.h"
 #include "SkMatrix.h"
+#include "SkMatrixUtils.h"
 #include "SkRandom.h"
 #include "SkString.h"
 
 class MatrixBench : public SkBenchmark {
     SkString    fName;
     enum { N = 100000 };
 public:
     MatrixBench(void* param, const char name[]) : INHERITED(param) {
         fName.printf("matrix_%s", name);
         fIsRendering = false;
@@ skipping 318 matching lines @@
     enum {
         kCount = SkBENCHLOOP(16)
     };
     double fMatrix [9];
     SkPoint fSrc [16];
     SkPoint fDst [16];
     SkRandom fRandom;
     typedef MatrixBench INHERITED;
 };
 
+class DecomposeMatrixBench : public MatrixBench {
+public:
+    DecomposeMatrixBench(void* param) : INHERITED(param, "decompose") {}
+
+protected:
+    virtual void onPreDraw() {
+        for (int i = 0; i < 10; ++i) {
+            SkScalar rot0 = (fRandom.nextBool()) ? fRandom.nextRangeF(-180, 180) : 0.0f;
+            SkScalar sx = fRandom.nextRangeF(-3000.f, 3000.f);
+            SkScalar sy = (fRandom.nextBool()) ? fRandom.nextRangeF(-3000.f, 3000.f) : sx;
+            SkScalar rot1 = fRandom.nextRangeF(-180, 180);
+            fMatrix[i].setRotate(rot0);
+            fMatrix[i].postScale(sx, sy);
+            fMatrix[i].postRotate(rot1);
+        }
+    }
+    virtual void performTest() {
+        SkPoint rotation1, scale, rotation2;
+        for (int i = 0; i < 10; ++i) {
+            (void) SkDecomposeUpper2x2(fMatrix[i], &rotation1, &scale, &rotation2);
+        }
+    }
+private:
+    SkMatrix fMatrix[10];
+    SkMWCRandom fRandom;
+    typedef MatrixBench INHERITED;
+};
+
 class InvertMapRectMatrixBench : public MatrixBench {
 public:
     InvertMapRectMatrixBench(void* param, const char* name, int flags)
         : INHERITED(param, name)
         , fFlags(flags) {
         fMatrix.reset();
         fIteration = 0;
         if (flags & kScale_Flag) {
             fMatrix.postScale(SkFloatToScalar(1.5f), SkFloatToScalar(2.5f));
         }
@@ skipping 43 matching lines @@
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return new EqualsMatrixBench(p); )
 DEF_BENCH( return new ScaleMatrixBench(p); )
 DEF_BENCH( return new FloatConcatMatrixBench(p); )
 DEF_BENCH( return new FloatDoubleConcatMatrixBench(p); )
 DEF_BENCH( return new DoubleConcatMatrixBench(p); )
 DEF_BENCH( return new GetTypeMatrixBench(p); )
+DEF_BENCH( return new DecomposeMatrixBench(p); )
+
 DEF_BENCH( return new InvertMapRectMatrixBench(p, "invert_maprect_identity", 0); )
 
 DEF_BENCH(return new InvertMapRectMatrixBench(p,
                                   "invert_maprect_rectstaysrect",
                                   InvertMapRectMatrixBench::kScale_Flag |
                                   InvertMapRectMatrixBench::kTranslate_Flag); )
 
 DEF_BENCH(return new InvertMapRectMatrixBench(p,
                                   "invert_maprect_translate",
                                   InvertMapRectMatrixBench::kTranslate_Flag); )
@@ skipping 16 matching lines @@
 
 DEF_BENCH( return new InvertMapRectMatrixBench(p,
                            "invert_maprect_typemask_nonpersp",
                            InvertMapRectMatrixBench::kUncachedTypeMask_Flag |
                            InvertMapRectMatrixBench::kScale_Flag |
                            InvertMapRectMatrixBench::kRotate_Flag |
                            InvertMapRectMatrixBench::kTranslate_Flag); )
 
 DEF_BENCH( return new ScaleTransMixedMatrixBench(p); )
 DEF_BENCH( return new ScaleTransDoubleMatrixBench(p); )