diff options
| author |  Mike Klein <mtklein@chromium.org> | 2018-01-19 16:23:25 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-22 16:55:17 +0000 |
| commit | de161cb2562c6f96f4e9bb603baa6a21ff8d3a46 (patch) | |
| tree | 3b95c06170595e34ea182d9c3bd070085bdd5c1b | |
| parent | f35fd8d2f26ef7217368d1a09d231ee68ed0cb2f (diff) | |
increase alignment of half-float pixels in F16Stages test
I think the Chorizo is now enforcing that our aligned loads are really
aligned. If this sticks, I'll follow up with the rest of the tests
disabled on the bug.
Bug: skia:7497
Change-Id: Id392e20ead395474f716a2c32d2643c801e03a2e
Reviewed-on: https://skia-review.googlesource.com/97202
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
4 files changed, 9 insertions, 12 deletions
diff --git a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json index 24c1907e29..728f0329ac 100644 --- a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json +++ b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json @@ -496,7 +496,6 @@ "GrShape", "--match", "~readpixels", - "~F16Stages", "~SkRasterPipeline_tail", "~GM_animated-image-blurs", "~verylarge", diff --git a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json index ba4934a118..93d424b0ae 100644 --- a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json +++ b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json @@ -599,7 +599,6 @@ "~imageblur2", "~animated-image-blurs", "~readpixels", - "~F16Stages", "~SkRasterPipeline_tail", "~GM_animated-image-blurs", "~verylarge", diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index 01d20ff025..713bba16bd 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -540,7 +540,6 @@ def dm_flags(api, bot): match.append('~animated-image-blurs') # skia:7497 match.append('~readpixels') # dies with "Caught signal 7 [Bus error]" - match.append('~F16Stages') match.append('~SkRasterPipeline_tail') # Blacklisted to avoid OOM (we see DM just end with "broken pipe") match.append('~GM_animated-image-blurs') diff --git a/tests/F16StagesTest.cpp b/tests/F16StagesTest.cpp index d07f6ba4a7..79a87e0e36 100644 --- a/tests/F16StagesTest.cpp +++ b/tests/F16StagesTest.cpp @@ -17,7 +17,7 @@ DEF_TEST(F16Stages, r) { -1.25f, -0.5f, 1.25f, 2.0f, 0,0,0,0, 0,0,0,0, // pad a bit to make sure we qualify for platform-specific code }; - uint16_t halfs[16] = {0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0}; + uint64_t halfs[4] = {0,0,0,0}; SkJumper_MemoryCtx f32 = { floats, 0 }, f16 = { halfs, 0 }; @@ -28,14 +28,14 @@ DEF_TEST(F16Stages, r) { p.append(SkRasterPipeline::store_f16, &f16); p.run(0,0,16/4,1); } - REPORTER_ASSERT(r, halfs[0] == 0x0000); - REPORTER_ASSERT(r, halfs[1] == 0x3400); - REPORTER_ASSERT(r, halfs[2] == 0x3800); - REPORTER_ASSERT(r, halfs[3] == 0x3c00); - REPORTER_ASSERT(r, halfs[4] == 0xbd00); - REPORTER_ASSERT(r, halfs[5] == 0xb800); - REPORTER_ASSERT(r, halfs[6] == 0x3d00); - REPORTER_ASSERT(r, halfs[7] == 0x4000); + REPORTER_ASSERT(r, ((halfs[0] >> 0) & 0xffff) == 0x0000); + REPORTER_ASSERT(r, ((halfs[0] >> 16) & 0xffff) == 0x3400); + REPORTER_ASSERT(r, ((halfs[0] >> 32) & 0xffff) == 0x3800); + REPORTER_ASSERT(r, ((halfs[0] >> 48) & 0xffff) == 0x3c00); + REPORTER_ASSERT(r, ((halfs[1] >> 0) & 0xffff) == 0xbd00); + REPORTER_ASSERT(r, ((halfs[1] >> 16) & 0xffff) == 0xb800); + REPORTER_ASSERT(r, ((halfs[1] >> 32) & 0xffff) == 0x3d00); + REPORTER_ASSERT(r, ((halfs[1] >> 48) & 0xffff) == 0x4000); { SkRasterPipeline_<256> p; |