commit 7fd93e349ad20fb83433cdaafb1502f5eb255fd7
author mtklein <mtklein@chromium.org> Tue Jul 26 13:05:30 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue Jul 26 13:05:31 2016 -0700
tree ebfc0701fd8df38ce45ff4793a825e10a96ab9e9
parent 6c471f75b28ba8c7127875277ae27799f57a3ddc

Start measuring f16 and srgb speed.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2181073003

Review-Url: https://codereview.chromium.org/2181073003

src/core/SkBitmap.cpp

diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index a803c78..e73217e 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -535,6 +535,9 @@
     if (base) {
         base += y * this->rowBytes();
         switch (this->colorType()) {
+            case kRGBA_F16_SkColorType:
+                base += x << 3;
+                break;
             case kRGBA_8888_SkColorType:
             case kBGRA_8888_SkColorType:
                 base += x << 2;

tools/nanobench_flags.json

diff --git a/tools/nanobench_flags.json b/tools/nanobench_flags.json
index 16f44da..640f3cc 100644
--- a/tools/nanobench_flags.json
+++ b/tools/nanobench_flags.json
@@ -16,6 +16,8 @@
     "nonrendering", 
     "angle", 
     "hwui", 
+    "f16", 
+    "srgb", 
     "msaa4", 
     "nvpr4", 
     "nvprdit4", 
@@ -60,6 +62,8 @@
     "nonrendering", 
     "angle", 
     "hwui", 
+    "f16", 
+    "srgb", 
     "gl", 
     "glmsaa4", 
     "glnvpr4", 
@@ -141,6 +145,8 @@
     "nonrendering", 
     "angle", 
     "hwui", 
+    "f16", 
+    "srgb", 
     "msaa4", 
     "nvpr4", 
     "nvprdit4", 
@@ -186,6 +192,8 @@
     "nonrendering", 
     "angle", 
     "hwui", 
+    "f16", 
+    "srgb", 
     "msaa4", 
     "nvpr4", 
     "nvprdit4", 
@@ -230,6 +238,8 @@
     "nonrendering", 
     "angle", 
     "hwui", 
+    "f16", 
+    "srgb", 
     "--match", 
     "~blurroundrect", 
     "~patch_grid", 
@@ -270,6 +280,8 @@
     "nonrendering", 
     "angle", 
     "hwui", 
+    "f16", 
+    "srgb", 
     "msaa4", 
     "nvpr4", 
     "nvprdit4", 
@@ -314,6 +326,8 @@
     "nonrendering", 
     "angle", 
     "hwui", 
+    "f16", 
+    "srgb", 
     "--match", 
     "~blurroundrect", 
     "~patch_grid", 
@@ -354,6 +368,8 @@
     "nonrendering", 
     "angle", 
     "hwui", 
+    "f16", 
+    "srgb", 
     "msaa16", 
     "nvpr16", 
     "nvprdit16", 
@@ -402,6 +418,8 @@
     "nonrendering", 
     "angle", 
     "hwui", 
+    "f16", 
+    "srgb", 
     "msaa16", 
     "nvpr16", 
     "nvprdit16", 
@@ -452,6 +470,8 @@
     "nonrendering", 
     "angle", 
     "hwui", 
+    "f16", 
+    "srgb", 
     "msaa16", 
     "nvpr16", 
     "nvprdit16", 

tools/nanobench_flags.py

diff --git a/tools/nanobench_flags.py b/tools/nanobench_flags.py
index 12acc0d..41779ef 100755
--- a/tools/nanobench_flags.py
+++ b/tools/nanobench_flags.py
@@ -41,7 +41,8 @@
   if 'iOS' in bot:
     args.extend(['--skps', 'ignore_skps'])
 
-  config = ['565', '8888', 'gpu', 'nonrendering', 'angle', 'hwui']
+  config = ['565', '8888', 'gpu', 'nonrendering', 'angle', 'hwui' ]
+  config += [ 'f16', 'srgb' ]
   # The S4 crashes and the NP produces a long error stream when we run with
   # MSAA.
   if ('GalaxyS4'    not in bot and