4429a4f82c
It's been driving me nuts that I can't just write `SkMatrix44 m;`, and I often don't care whether it's initialized or not. The default identity constructor would be nice to use, but it's deprecated. By tagging this constructor deprecated, we're only hurting ourselves; our big clients disable warnings about deprecated routines and use it freely. A quick tally in Skia shows we mostly use the uninitialized constructor, but sometimes the identity constructor, and there is a spread of all three in Chromium. So I've left the two explicit calls available. I switched a bunch of calls in Skia to use the less verbose constructor where it was clear that it didn't matter if the matrix was initialized. Literally zero of the kUninitialized constructor calls looked important for performance, so the only place I've kept is its lone unit test. A few places read clearer with an explicit "identity" to read. Change-Id: I0573cb6201f5a36f3b43070fb111f7d9af92736f Reviewed-on: https://skia-review.googlesource.com/c/159480 Reviewed-by: Brian Osman <brianosman@google.com>
297 lines
7.4 KiB
C++
297 lines
7.4 KiB
C++
/*
|
|
* Copyright 2012 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "Benchmark.h"
|
|
#include "SkMatrix44.h"
|
|
#include "SkRandom.h"
|
|
#include "SkString.h"
|
|
|
|
class Matrix44Bench : public Benchmark {
|
|
SkString fName;
|
|
public:
|
|
Matrix44Bench(const char name[]) {
|
|
fName.printf("matrix44_%s", name);
|
|
}
|
|
|
|
bool isSuitableFor(Backend backend) override {
|
|
return backend == kNonRendering_Backend;
|
|
}
|
|
|
|
virtual void performTest() = 0;
|
|
|
|
protected:
|
|
virtual int mulLoopCount() const { return 1; }
|
|
|
|
const char* onGetName() override {
|
|
return fName.c_str();
|
|
}
|
|
|
|
void onDraw(int loops, SkCanvas*) override {
|
|
for (int i = 0; i < loops; i++) {
|
|
this->performTest();
|
|
}
|
|
}
|
|
|
|
private:
|
|
typedef Benchmark INHERITED;
|
|
};
|
|
|
|
class EqualsMatrix44Bench : public Matrix44Bench {
|
|
public:
|
|
EqualsMatrix44Bench()
|
|
: INHERITED("equals")
|
|
{
|
|
fM1.set(0, 0, 0);
|
|
fM2.set(3, 3, 0);
|
|
}
|
|
protected:
|
|
void performTest() override {
|
|
for (int i = 0; i < 10; ++i) {
|
|
(void) (fM0 == fM1);
|
|
(void) (fM1 == fM2);
|
|
(void) (fM2 == fM0);
|
|
}
|
|
}
|
|
private:
|
|
SkMatrix44 fM0, fM1, fM2;
|
|
typedef Matrix44Bench INHERITED;
|
|
};
|
|
|
|
class SetIdentityMatrix44Bench : public Matrix44Bench {
|
|
public:
|
|
SetIdentityMatrix44Bench()
|
|
: INHERITED("setidentity")
|
|
{
|
|
double rowMajor[16] =
|
|
{ 1, 2, 3, 4,
|
|
5, 6, 7, 8,
|
|
9, 10, 11, 12,
|
|
13, 14, 15, 16};
|
|
mat.setRowMajord(rowMajor);
|
|
}
|
|
protected:
|
|
void performTest() override {
|
|
for (int i = 0; i < 10; ++i) {
|
|
mat.setIdentity();
|
|
}
|
|
}
|
|
private:
|
|
SkMatrix44 mat;
|
|
typedef Matrix44Bench INHERITED;
|
|
};
|
|
|
|
class PreScaleMatrix44Bench : public Matrix44Bench {
|
|
public:
|
|
PreScaleMatrix44Bench()
|
|
: INHERITED("prescale")
|
|
{
|
|
fX = fY = fZ = SkDoubleToMScalar(1.5);
|
|
}
|
|
protected:
|
|
void performTest() override {
|
|
fM0.reset();
|
|
for (int i = 0; i < 10; ++i) {
|
|
fM0.preScale(fX, fY, fZ);
|
|
}
|
|
}
|
|
private:
|
|
SkMatrix44 fM0;
|
|
SkMScalar fX, fY, fZ;
|
|
typedef Matrix44Bench INHERITED;
|
|
};
|
|
|
|
class InvertMatrix44Bench : public Matrix44Bench {
|
|
public:
|
|
InvertMatrix44Bench()
|
|
: INHERITED("invert")
|
|
{
|
|
fM0.setDouble(0, 0, -1.1);
|
|
fM0.setDouble(0, 1, 2.1);
|
|
fM0.setDouble(0, 2, -3.1);
|
|
fM0.setDouble(0, 3, 4.1);
|
|
fM0.setDouble(1, 0, 5.1);
|
|
fM0.setDouble(1, 1, -6.1);
|
|
fM0.setDouble(1, 2, 7.1);
|
|
fM0.setDouble(1, 3, 8.1);
|
|
fM0.setDouble(2, 0, -9.1);
|
|
fM0.setDouble(2, 1, 10.1);
|
|
fM0.setDouble(2, 2, 11.1);
|
|
fM0.setDouble(2, 3, -12.1);
|
|
fM0.setDouble(3, 0, -13.1);
|
|
fM0.setDouble(3, 1, 14.1);
|
|
fM0.setDouble(3, 2, -15.1);
|
|
fM0.setDouble(3, 3, 16.1);
|
|
}
|
|
protected:
|
|
void performTest() override {
|
|
for (int i = 0; i < 10; ++i) {
|
|
fM0.invert(&fM1);
|
|
}
|
|
}
|
|
private:
|
|
SkMatrix44 fM0, fM1;
|
|
typedef Matrix44Bench INHERITED;
|
|
};
|
|
|
|
class InvertAffineMatrix44Bench : public Matrix44Bench {
|
|
public:
|
|
InvertAffineMatrix44Bench()
|
|
: INHERITED("invertaffine")
|
|
{
|
|
fM0.setDouble(0, 0, -1.1);
|
|
fM0.setDouble(0, 1, 2.1);
|
|
fM0.setDouble(0, 2, -3.1);
|
|
fM0.setDouble(0, 3, 4.1);
|
|
fM0.setDouble(1, 0, 5.1);
|
|
fM0.setDouble(1, 1, -6.1);
|
|
fM0.setDouble(1, 2, 7.1);
|
|
fM0.setDouble(1, 3, 8.1);
|
|
fM0.setDouble(2, 0, -9.1);
|
|
fM0.setDouble(2, 1, 10.1);
|
|
fM0.setDouble(2, 2, 11.1);
|
|
fM0.setDouble(2, 3, -12.1);
|
|
// bottom row (perspective component) remains (0, 0, 0, 1).
|
|
}
|
|
protected:
|
|
void performTest() override {
|
|
for (int i = 0; i < 10; ++i) {
|
|
fM0.invert(&fM1);
|
|
}
|
|
}
|
|
private:
|
|
SkMatrix44 fM0, fM1;
|
|
typedef Matrix44Bench INHERITED;
|
|
};
|
|
|
|
class InvertScaleTranslateMatrix44Bench : public Matrix44Bench {
|
|
public:
|
|
InvertScaleTranslateMatrix44Bench()
|
|
: INHERITED("invertscaletranslate")
|
|
{
|
|
fM0.setDouble(0, 0, -1.1);
|
|
fM0.setDouble(0, 3, 4.1);
|
|
|
|
fM0.setDouble(1, 1, -6.1);
|
|
fM0.setDouble(1, 3, 8.1);
|
|
|
|
fM0.setDouble(2, 2, 11.1);
|
|
fM0.setDouble(2, 3, -12.1);
|
|
}
|
|
protected:
|
|
void performTest() override {
|
|
for (int i = 0; i < 10; ++i) {
|
|
fM0.invert(&fM1);
|
|
}
|
|
}
|
|
private:
|
|
SkMatrix44 fM0, fM1;
|
|
typedef Matrix44Bench INHERITED;
|
|
};
|
|
|
|
class InvertTranslateMatrix44Bench : public Matrix44Bench {
|
|
public:
|
|
InvertTranslateMatrix44Bench()
|
|
: INHERITED("inverttranslate")
|
|
{
|
|
fM0.setDouble(0, 3, 4.1);
|
|
fM0.setDouble(1, 3, 8.1);
|
|
fM0.setDouble(2, 3, -12.1);
|
|
}
|
|
protected:
|
|
void performTest() override {
|
|
for (int i = 0; i < 10; ++i) {
|
|
fM0.invert(&fM1);
|
|
}
|
|
}
|
|
private:
|
|
SkMatrix44 fM0, fM1;
|
|
typedef Matrix44Bench INHERITED;
|
|
};
|
|
|
|
class PostScaleMatrix44Bench : public Matrix44Bench {
|
|
public:
|
|
PostScaleMatrix44Bench()
|
|
: INHERITED("postscale")
|
|
{
|
|
fX = fY = fZ = SkDoubleToMScalar(1.5);
|
|
}
|
|
protected:
|
|
void performTest() override {
|
|
fM0.reset();
|
|
for (int i = 0; i < 10; ++i) {
|
|
fM0.postScale(fX, fY, fZ);
|
|
}
|
|
}
|
|
private:
|
|
SkMatrix44 fM0;
|
|
SkMScalar fX, fY, fZ;
|
|
typedef Matrix44Bench INHERITED;
|
|
};
|
|
|
|
class SetConcatMatrix44Bench : public Matrix44Bench {
|
|
public:
|
|
// SkMatrix44::setConcat() has a fast path for matrices that are at most scale+translate.
|
|
SetConcatMatrix44Bench(bool fastPath)
|
|
: INHERITED(fastPath ? "setconcat_fast" : "setconcat_general")
|
|
{
|
|
if (fastPath) {
|
|
const SkMScalar v = SkDoubleToMScalar(1.5);
|
|
fM1.setScale(v,v,v);
|
|
fM2.setTranslate(v,v,v);
|
|
} else {
|
|
SkRandom rand;
|
|
for (int x = 0; x < 4; x++) {
|
|
for (int y = 0; y < 4; y++) {
|
|
fM1.setFloat(x,y, rand.nextF());
|
|
fM2.setFloat(x,y, rand.nextF());
|
|
}}
|
|
}
|
|
}
|
|
protected:
|
|
void performTest() override {
|
|
fM0.reset(); // just to normalize this test with prescale/postscale
|
|
for (int i = 0; i < 10000; ++i) {
|
|
fM0.setConcat(fM1, fM2);
|
|
}
|
|
}
|
|
private:
|
|
SkMatrix44 fM0, fM1, fM2;
|
|
typedef Matrix44Bench INHERITED;
|
|
};
|
|
|
|
class GetTypeMatrix44Bench : public Matrix44Bench {
|
|
public:
|
|
GetTypeMatrix44Bench()
|
|
: INHERITED("gettype")
|
|
{}
|
|
protected:
|
|
// Putting random generation of the matrix inside performTest()
|
|
// would help us avoid anomalous runs, but takes up 25% or
|
|
// more of the function time.
|
|
void performTest() override {
|
|
for (int i = 0; i < 20; ++i) {
|
|
fMatrix.set(1, 2, 1); // to invalidate the type-cache
|
|
fMatrix.getType();
|
|
}
|
|
}
|
|
private:
|
|
SkMatrix44 fMatrix;
|
|
typedef Matrix44Bench INHERITED;
|
|
};
|
|
|
|
DEF_BENCH( return new SetIdentityMatrix44Bench(); )
|
|
DEF_BENCH( return new EqualsMatrix44Bench(); )
|
|
DEF_BENCH( return new PreScaleMatrix44Bench(); )
|
|
DEF_BENCH( return new PostScaleMatrix44Bench(); )
|
|
DEF_BENCH( return new InvertMatrix44Bench(); )
|
|
DEF_BENCH( return new InvertAffineMatrix44Bench(); )
|
|
DEF_BENCH( return new InvertScaleTranslateMatrix44Bench(); )
|
|
DEF_BENCH( return new InvertTranslateMatrix44Bench(); )
|
|
DEF_BENCH( return new SetConcatMatrix44Bench(true); )
|
|
DEF_BENCH( return new SetConcatMatrix44Bench(false); )
|
|
DEF_BENCH( return new GetTypeMatrix44Bench(); )
|