From 553ad65f787c7dafa7a131921ea107724dc95357 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 29 Apr 2013 13:48:34 +0000 Subject: use DEF_BENCH macro git-svn-id: http://skia.googlecode.com/svn/trunk@8893 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench/MathBench.cpp | 50 +++++++++++++++++--------------------------------- 1 file changed, 17 insertions(+), 33 deletions(-) (limited to 'bench/MathBench.cpp') diff --git a/bench/MathBench.cpp b/bench/MathBench.cpp index 5c80dc0ca6..86dd684b86 100644 --- a/bench/MathBench.cpp +++ b/bench/MathBench.cpp @@ -373,36 +373,20 @@ private: /////////////////////////////////////////////////////////////////////////////// -static SkBenchmark* M0(void* p) { return new NoOpMathBench(p); } -static SkBenchmark* M1(void* p) { return new SlowISqrtMathBench(p); } -static SkBenchmark* M2(void* p) { return new FastISqrtMathBench(p); } -static SkBenchmark* M3(void* p) { return new QMul64Bench(p); } -static SkBenchmark* M4(void* p) { return new QMul32Bench(p); } - -static SkBenchmark* M5neg1(void* p) { return new IsFiniteBench(p, -1); } -static SkBenchmark* M50(void* p) { return new IsFiniteBench(p, 0); } -static SkBenchmark* M51(void* p) { return new IsFiniteBench(p, 1); } -static SkBenchmark* M52(void* p) { return new IsFiniteBench(p, 2); } -static SkBenchmark* M53(void* p) { return new IsFiniteBench(p, 3); } -static SkBenchmark* M54(void* p) { return new IsFiniteBench(p, 4); } -static SkBenchmark* M55(void* p) { return new IsFiniteBench(p, 5); } - -static SkBenchmark* F0(void* p) { return new FloorBench(p, false); } -static SkBenchmark* F1(void* p) { return new FloorBench(p, true); } - -static BenchRegistry gReg0(M0); -static BenchRegistry gReg1(M1); -static BenchRegistry gReg2(M2); -static BenchRegistry gReg3(M3); -static BenchRegistry gReg4(M4); - -static BenchRegistry gReg5neg1(M5neg1); -static BenchRegistry gReg50(M50); -static BenchRegistry gReg51(M51); -static BenchRegistry gReg52(M52); -static BenchRegistry gReg53(M53); -static BenchRegistry gReg54(M54); -static BenchRegistry gReg55(M55); - -static BenchRegistry gRF0(F0); -static BenchRegistry gRF1(F1); +DEF_BENCH( return new NoOpMathBench(p); ) +DEF_BENCH( return new SlowISqrtMathBench(p); ) +DEF_BENCH( return new FastISqrtMathBench(p); ) +DEF_BENCH( return new QMul64Bench(p); ) +DEF_BENCH( return new QMul32Bench(p); ) + +DEF_BENCH( return new IsFiniteBench(p, -1); ) +DEF_BENCH( return new IsFiniteBench(p, 0); ) +DEF_BENCH( return new IsFiniteBench(p, 1); ) +DEF_BENCH( return new IsFiniteBench(p, 2); ) +DEF_BENCH( return new IsFiniteBench(p, 3); ) +DEF_BENCH( return new IsFiniteBench(p, 4); ) +DEF_BENCH( return new IsFiniteBench(p, 5); ) + +DEF_BENCH( return new FloorBench(p, false); ) +DEF_BENCH( return new FloorBench(p, true); ) + -- cgit v1.2.3