From 0bf89269eb2954c9abd613a2a6de93fcf3163d97 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Mon, 26 Feb 2018 13:34:21 -0500 Subject: [PATCH] align f16 buffers in SkRasterPipeline_tail test The load_f16 and store_f16 stages are assuming they can load each pixel at a time with 8 byte alignment, but as declared the buffers are only guaranteed 2 byte alignment. Bug: skia:7497 Change-Id: I47b29f13b48f90d2b15540979c3d87ba25dcc506 Reviewed-on: https://skia-review.googlesource.com/110321 Reviewed-by: Kevin Lubick Commit-Queue: Mike Klein --- ...-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json | 1 - ...-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json | 1 - infra/bots/recipes/test.py | 1 - tests/SkRasterPipelineTest.cpp | 4 ++-- 4 files changed, 2 insertions(+), 5 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 4409d99e6c..d4a6c3a108 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", - "~SkRasterPipeline_tail", "~GM_animated-image-blurs", "~verylarge", "~ImageFilterBlurLargeImage", 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 a6c20bca81..9ef15249d6 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", - "~SkRasterPipeline_tail", "~GM_animated-image-blurs", "~verylarge", "~ImageFilterBlurLargeImage", diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index a6ab7472c1..07e28034a1 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -528,7 +528,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('~SkRasterPipeline_tail') # Blacklisted to avoid OOM (we see DM just end with "broken pipe") match.append('~GM_animated-image-blurs') match.append('~verylarge') diff --git a/tests/SkRasterPipelineTest.cpp b/tests/SkRasterPipelineTest.cpp index 1923f1cb64..ac0278386a 100644 --- a/tests/SkRasterPipelineTest.cpp +++ b/tests/SkRasterPipelineTest.cpp @@ -137,13 +137,13 @@ DEF_TEST(SkRasterPipeline_tail, r) { } { - uint16_t data[][4] = { + alignas(8) uint16_t data[][4] = { {h(00), h(01), h(02), h(03)}, {h(10), h(11), h(12), h(13)}, {h(20), h(21), h(22), h(23)}, {h(30), h(31), h(32), h(33)}, }; - uint16_t buffer[4][4]; + alignas(8) uint16_t buffer[4][4]; SkJumper_MemoryCtx src = { &data[0][0], 0 }, dst = { &buffer[0][0], 0 };