commit ae18d07a7de8db4a10e7b38b23300dfca7527f6a
author Chris Dalton <csmartdalton@google.com> Fri Mar 23 21:17:35 2018 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Mar 23 21:18:01 2018 +0000
tree 88419dce7fccf93ce787ca9a4ce486797b5388d1
parent 032aaae5be51e92ec9677d6c511241b19a7cb70d

Revert "Implement Sk2f::Store2"

This reverts commit 8a8a8e9dd5c47f3fc930064bd030790f98af27af.

Reason for revert: Needs non-SIMD impl

Original change's description:
> Implement Sk2f::Store2
> 
> Bug: skia:
> Change-Id: Ieedd05ced376a7604936e9d2729fc20a8669496e
> Reviewed-on: https://skia-review.googlesource.com/115531
> Commit-Queue: Chris Dalton <csmartdalton@google.com>
> Reviewed-by: Mike Klein <mtklein@google.com>

TBR=mtklein@google.com,csmartdalton@google.com

Change-Id: I8dfbd87c5871b041a4fc6ef3816f121c72083a20
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/116240
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/opts/SkNx_neon.h

diff --git a/src/opts/SkNx_neon.h b/src/opts/SkNx_neon.h
index 554fc82..f8170ef 100644
--- a/src/opts/SkNx_neon.h
+++ b/src/opts/SkNx_neon.h
@@ -34,14 +34,6 @@
     AI static SkNx Load(const void* ptr) { return vld1_f32((const float*)ptr); }
     AI void store(void* ptr) const { vst1_f32((float*)ptr, fVec); }
 
-    AI static void Store2(void* dst, const SkNx& a, const SkNx& b) {
-        float32x2x2_t ab = {{
-            a.fVec,
-            b.fVec,
-        }};
-        vst2_f32((float*) dst, ab);
-    }
-
     AI static void Store3(void* dst, const SkNx& a, const SkNx& b, const SkNx& c) {
         float32x2x3_t abc = {{
             a.fVec,

src/opts/SkNx_sse.h

diff --git a/src/opts/SkNx_sse.h b/src/opts/SkNx_sse.h
index bd5c58e..b4ae0cb 100644
--- a/src/opts/SkNx_sse.h
+++ b/src/opts/SkNx_sse.h
@@ -29,11 +29,6 @@
 
     AI void store(void* ptr) const { _mm_storel_pi((__m64*)ptr, fVec); }
 
-    AI static void Store2(void* dst, const SkNx& a, const SkNx& b) {
-        auto vals = _mm_unpacklo_ps(a.fVec, b.fVec);
-        _mm_storeu_ps((float*)dst, vals);
-    }
-
     AI static void Store3(void* dst, const SkNx& a, const SkNx& b, const SkNx& c) {
         auto lo = _mm_setr_ps(a[0], b[0], c[0], a[1]),
              hi = _mm_setr_ps(b[1], c[1],    0,    0);

tests/SkNxTest.cpp

diff --git a/tests/SkNxTest.cpp b/tests/SkNxTest.cpp
index de21f26..9e2c27e 100644
--- a/tests/SkNxTest.cpp
+++ b/tests/SkNxTest.cpp
@@ -424,17 +424,6 @@
     REPORTER_ASSERT(r, y[3] == 7);
 }
 
-DEF_TEST(Sk2f_Store2, r) {
-    Sk2f p0{0, 2};
-    Sk2f p1{1, 3};
-    float dst[4];
-    Sk2f::Store2(dst, p0, p1);
-    REPORTER_ASSERT(r, dst[0] == 0);
-    REPORTER_ASSERT(r, dst[1] == 1);
-    REPORTER_ASSERT(r, dst[2] == 2);
-    REPORTER_ASSERT(r, dst[3] == 3);
-}
-
 DEF_TEST(Sk2f_Store3, r) {
     Sk2f p0{0, 3};
     Sk2f p1{1, 4};