Revert "Add framework for testing intrinsics"
This reverts commit 3e882f29c54e1c669883ca11b8cd421925886111.
This causes build and link issues under visual studio in both x86 and
x64 configs
Change-Id: Id8b1e7e2f313817f034afddc2c627db8aa741d14
diff --git a/build/make/Makefile b/build/make/Makefile
index 0b869db..481398f 100644
--- a/build/make/Makefile
+++ b/build/make/Makefile
@@ -138,20 +138,6 @@
$(BUILD_PFX)%_avx.c.o: CFLAGS += -mavx
$(BUILD_PFX)%_avx2.c.d: CFLAGS += -mavx2
$(BUILD_PFX)%_avx2.c.o: CFLAGS += -mavx2
-$(BUILD_PFX)%_mmx.cc.d: CXXFLAGS += -mmmx
-$(BUILD_PFX)%_mmx.cc.o: CXXFLAGS += -mmmx
-$(BUILD_PFX)%_sse2.cc.d: CXXFLAGS += -msse2
-$(BUILD_PFX)%_sse2.cc.o: CXXFLAGS += -msse2
-$(BUILD_PFX)%_sse3.cc.d: CXXFLAGS += -msse3
-$(BUILD_PFX)%_sse3.cc.o: CXXFLAGS += -msse3
-$(BUILD_PFX)%_ssse3.cc.d: CXXFLAGS += -mssse3
-$(BUILD_PFX)%_ssse3.cc.o: CXXFLAGS += -mssse3
-$(BUILD_PFX)%_sse4.cc.d: CXXFLAGS += -msse4.1
-$(BUILD_PFX)%_sse4.cc.o: CXXFLAGS += -msse4.1
-$(BUILD_PFX)%_avx.cc.d: CXXFLAGS += -mavx
-$(BUILD_PFX)%_avx.cc.o: CXXFLAGS += -mavx
-$(BUILD_PFX)%_avx2.cc.d: CXXFLAGS += -mavx2
-$(BUILD_PFX)%_avx2.cc.o: CXXFLAGS += -mavx2
$(BUILD_PFX)%.c.d: %.c
$(if $(quiet),@echo " [DEP] $@")
diff --git a/test/simd_cmp_impl.h b/test/simd_cmp_impl.h
deleted file mode 100644
index 7d3d106..0000000
--- a/test/simd_cmp_impl.h
+++ /dev/null
@@ -1,616 +0,0 @@
-/*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
- *
- * This source code is subject to the terms of the BSD 2 Clause License and
- * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
- * was not distributed with this source code in the LICENSE file, you can
- * obtain it at www.aomedia.org/license/software. If the Alliance for Open
- * Media Patent License 1.0 was not distributed with this source code in the
- * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
-*/
-
-#include <assert.h>
-#include <string>
-#include "./aom_dsp_rtcd.h"
-#include "test/acm_random.h"
-#include "test/register_state_check.h"
-#include "aom_dsp/aom_simd.h"
-#include "aom_dsp/simd/v64_intrinsics_c.h"
-
-// Machine tuned code goes into this file. This file is included from
-// simd_cmp_sse2.cc, simd_cmp_ssse3.cc etc which define the macros
-// ARCH (=neon, sse2, ssse3, etc), SIMD_NAMESPACE and ARCH_POSTFIX().
-
-using libaom_test::ACMRandom;
-
-namespace SIMD_NAMESPACE {
-
-// Wrap templates around intrinsics using immediate values
-template <int shift>
-v64 imm_v64_shl_n_byte(v64 a) {
- return v64_shl_n_byte(a, shift);
-}
-template <int shift>
-v64 imm_v64_shr_n_byte(v64 a) {
- return v64_shr_n_byte(a, shift);
-}
-template <int shift>
-v64 imm_v64_shl_n_8(v64 a) {
- return v64_shl_n_8(a, shift);
-}
-template <int shift>
-v64 imm_v64_shr_n_u8(v64 a) {
- return v64_shr_n_u8(a, shift);
-}
-template <int shift>
-v64 imm_v64_shr_n_s8(v64 a) {
- return v64_shr_n_s8(a, shift);
-}
-template <int shift>
-v64 imm_v64_shl_n_16(v64 a) {
- return v64_shl_n_16(a, shift);
-}
-template <int shift>
-v64 imm_v64_shr_n_u16(v64 a) {
- return v64_shr_n_u16(a, shift);
-}
-template <int shift>
-v64 imm_v64_shr_n_s16(v64 a) {
- return v64_shr_n_s16(a, shift);
-}
-template <int shift>
-v64 imm_v64_shl_n_32(v64 a) {
- return v64_shl_n_32(a, shift);
-}
-template <int shift>
-v64 imm_v64_shr_n_u32(v64 a) {
- return v64_shr_n_u32(a, shift);
-}
-template <int shift>
-v64 imm_v64_shr_n_s32(v64 a) {
- return v64_shr_n_s32(a, shift);
-}
-template <int shift>
-v64 imm_v64_align(v64 a, v64 b) {
- return v64_align(a, b, shift);
-}
-
-// Wrap templates around corresponding C implementations of the above
-template <int shift>
-c_v64 c_imm_v64_shl_n_byte(c_v64 a) {
- return c_v64_shl_n_byte(a, shift);
-}
-template <int shift>
-c_v64 c_imm_v64_shr_n_byte(c_v64 a) {
- return c_v64_shr_n_byte(a, shift);
-}
-template <int shift>
-c_v64 c_imm_v64_shl_n_8(c_v64 a) {
- return c_v64_shl_n_8(a, shift);
-}
-template <int shift>
-c_v64 c_imm_v64_shr_n_u8(c_v64 a) {
- return c_v64_shr_n_u8(a, shift);
-}
-template <int shift>
-c_v64 c_imm_v64_shr_n_s8(c_v64 a) {
- return c_v64_shr_n_s8(a, shift);
-}
-template <int shift>
-c_v64 c_imm_v64_shl_n_16(c_v64 a) {
- return c_v64_shl_n_16(a, shift);
-}
-template <int shift>
-c_v64 c_imm_v64_shr_n_u16(c_v64 a) {
- return c_v64_shr_n_u16(a, shift);
-}
-template <int shift>
-c_v64 c_imm_v64_shr_n_s16(c_v64 a) {
- return c_v64_shr_n_s16(a, shift);
-}
-template <int shift>
-c_v64 c_imm_v64_shl_n_32(c_v64 a) {
- return c_v64_shl_n_32(a, shift);
-}
-template <int shift>
-c_v64 c_imm_v64_shr_n_u32(c_v64 a) {
- return c_v64_shr_n_u32(a, shift);
-}
-template <int shift>
-c_v64 c_imm_v64_shr_n_s32(c_v64 a) {
- return c_v64_shr_n_s32(a, shift);
-}
-template <int shift>
-c_v64 c_imm_v64_align(c_v64 a, c_v64 b) {
- return c_v64_align(a, b, shift);
-}
-
-// Wrappers around the the SAD and SSD functions
-uint32_t v64_sad_u8(v64 a, v64 b) {
- return v64_sad_u8_sum(::v64_sad_u8(v64_sad_u8_init(), a, b));
-}
-uint32_t v64_ssd_u8(v64 a, v64 b) {
- return v64_ssd_u8_sum(::v64_ssd_u8(v64_ssd_u8_init(), a, b));
-}
-
-uint32_t c_v64_sad_u8(c_v64 a, c_v64 b) {
- return c_v64_sad_u8_sum(::c_v64_sad_u8(c_v64_sad_u8_init(), a, b));
-}
-uint32_t c_v64_ssd_u8(c_v64 a, c_v64 b) {
- return c_v64_ssd_u8_sum(::c_v64_ssd_u8(c_v64_ssd_u8_init(), a, b));
-}
-
-namespace {
-
-#define MAP(name) \
- { \
- reinterpret_cast<const void *const>(#name), \
- reinterpret_cast<const void *const>(c_##name), \
- reinterpret_cast<const void *const>(name) \
- }
-
-const void *const m[][3] = { MAP(v64_sad_u8),
- MAP(v64_ssd_u8),
- MAP(v64_add_8),
- MAP(v64_add_16),
- MAP(v64_sadd_s16),
- MAP(v64_add_32),
- MAP(v64_sub_8),
- MAP(v64_ssub_u8),
- MAP(v64_ssub_s8),
- MAP(v64_sub_16),
- MAP(v64_ssub_s16),
- MAP(v64_sub_32),
- MAP(v64_ziplo_8),
- MAP(v64_ziphi_8),
- MAP(v64_ziplo_16),
- MAP(v64_ziphi_16),
- MAP(v64_ziplo_32),
- MAP(v64_ziphi_32),
- MAP(v64_pack_s32_s16),
- MAP(v64_pack_s16_u8),
- MAP(v64_pack_s16_s8),
- MAP(v64_unziphi_8),
- MAP(v64_unziplo_8),
- MAP(v64_unziphi_16),
- MAP(v64_unziplo_16),
- MAP(v64_or),
- MAP(v64_xor),
- MAP(v64_and),
- MAP(v64_andn),
- MAP(v64_mullo_s16),
- MAP(v64_mulhi_s16),
- MAP(v64_mullo_s32),
- MAP(v64_madd_s16),
- MAP(v64_madd_us8),
- MAP(v64_avg_u8),
- MAP(v64_rdavg_u8),
- MAP(v64_avg_u16),
- MAP(v64_min_u8),
- MAP(v64_max_u8),
- MAP(v64_min_s8),
- MAP(v64_max_s8),
- MAP(v64_min_s16),
- MAP(v64_max_s16),
- MAP(v64_cmpgt_s8),
- MAP(v64_cmplt_s8),
- MAP(v64_cmpeq_8),
- MAP(v64_cmpgt_s16),
- MAP(v64_cmplt_s16),
- MAP(v64_cmpeq_16),
- MAP(v64_shuffle_8),
- MAP(imm_v64_align<1>),
- MAP(imm_v64_align<2>),
- MAP(imm_v64_align<3>),
- MAP(imm_v64_align<4>),
- MAP(imm_v64_align<5>),
- MAP(imm_v64_align<6>),
- MAP(imm_v64_align<7>),
- MAP(v64_abs_s16),
- MAP(v64_unpacklo_u8_s16),
- MAP(v64_unpackhi_u8_s16),
- MAP(v64_unpacklo_u16_s32),
- MAP(v64_unpacklo_s16_s32),
- MAP(v64_unpackhi_u16_s32),
- MAP(v64_unpackhi_s16_s32),
- MAP(imm_v64_shr_n_byte<1>),
- MAP(imm_v64_shr_n_byte<2>),
- MAP(imm_v64_shr_n_byte<3>),
- MAP(imm_v64_shr_n_byte<4>),
- MAP(imm_v64_shr_n_byte<5>),
- MAP(imm_v64_shr_n_byte<6>),
- MAP(imm_v64_shr_n_byte<7>),
- MAP(imm_v64_shl_n_byte<1>),
- MAP(imm_v64_shl_n_byte<2>),
- MAP(imm_v64_shl_n_byte<3>),
- MAP(imm_v64_shl_n_byte<4>),
- MAP(imm_v64_shl_n_byte<5>),
- MAP(imm_v64_shl_n_byte<6>),
- MAP(imm_v64_shl_n_byte<7>),
- MAP(imm_v64_shl_n_8<1>),
- MAP(imm_v64_shl_n_8<2>),
- MAP(imm_v64_shl_n_8<3>),
- MAP(imm_v64_shl_n_8<4>),
- MAP(imm_v64_shl_n_8<5>),
- MAP(imm_v64_shl_n_8<6>),
- MAP(imm_v64_shl_n_8<7>),
- MAP(imm_v64_shr_n_u8<1>),
- MAP(imm_v64_shr_n_u8<2>),
- MAP(imm_v64_shr_n_u8<3>),
- MAP(imm_v64_shr_n_u8<4>),
- MAP(imm_v64_shr_n_u8<5>),
- MAP(imm_v64_shr_n_u8<6>),
- MAP(imm_v64_shr_n_u8<7>),
- MAP(imm_v64_shr_n_s8<1>),
- MAP(imm_v64_shr_n_s8<2>),
- MAP(imm_v64_shr_n_s8<3>),
- MAP(imm_v64_shr_n_s8<4>),
- MAP(imm_v64_shr_n_s8<5>),
- MAP(imm_v64_shr_n_s8<6>),
- MAP(imm_v64_shr_n_s8<7>),
- MAP(imm_v64_shl_n_16<1>),
- MAP(imm_v64_shl_n_16<2>),
- MAP(imm_v64_shl_n_16<4>),
- MAP(imm_v64_shl_n_16<6>),
- MAP(imm_v64_shl_n_16<8>),
- MAP(imm_v64_shl_n_16<10>),
- MAP(imm_v64_shl_n_16<12>),
- MAP(imm_v64_shl_n_16<14>),
- MAP(imm_v64_shr_n_u16<1>),
- MAP(imm_v64_shr_n_u16<2>),
- MAP(imm_v64_shr_n_u16<4>),
- MAP(imm_v64_shr_n_u16<6>),
- MAP(imm_v64_shr_n_u16<8>),
- MAP(imm_v64_shr_n_u16<10>),
- MAP(imm_v64_shr_n_u16<12>),
- MAP(imm_v64_shr_n_u16<14>),
- MAP(imm_v64_shr_n_s16<1>),
- MAP(imm_v64_shr_n_s16<2>),
- MAP(imm_v64_shr_n_s16<4>),
- MAP(imm_v64_shr_n_s16<6>),
- MAP(imm_v64_shr_n_s16<8>),
- MAP(imm_v64_shr_n_s16<10>),
- MAP(imm_v64_shr_n_s16<12>),
- MAP(imm_v64_shr_n_s16<14>),
- MAP(imm_v64_shl_n_32<1>),
- MAP(imm_v64_shl_n_32<4>),
- MAP(imm_v64_shl_n_32<8>),
- MAP(imm_v64_shl_n_32<12>),
- MAP(imm_v64_shl_n_32<16>),
- MAP(imm_v64_shl_n_32<20>),
- MAP(imm_v64_shl_n_32<24>),
- MAP(imm_v64_shl_n_32<28>),
- MAP(imm_v64_shr_n_u32<1>),
- MAP(imm_v64_shr_n_u32<4>),
- MAP(imm_v64_shr_n_u32<8>),
- MAP(imm_v64_shr_n_u32<12>),
- MAP(imm_v64_shr_n_u32<16>),
- MAP(imm_v64_shr_n_u32<20>),
- MAP(imm_v64_shr_n_u32<24>),
- MAP(imm_v64_shr_n_u32<28>),
- MAP(imm_v64_shr_n_s32<1>),
- MAP(imm_v64_shr_n_s32<4>),
- MAP(imm_v64_shr_n_s32<8>),
- MAP(imm_v64_shr_n_s32<12>),
- MAP(imm_v64_shr_n_s32<16>),
- MAP(imm_v64_shr_n_s32<20>),
- MAP(imm_v64_shr_n_s32<24>),
- MAP(imm_v64_shr_n_s32<28>),
- MAP(v64_shl_8),
- MAP(v64_shr_u8),
- MAP(v64_shr_s8),
- MAP(v64_shl_16),
- MAP(v64_shr_u16),
- MAP(v64_shr_s16),
- MAP(v64_shl_32),
- MAP(v64_shr_u32),
- MAP(v64_shr_s32),
- MAP(v64_hadd_u8),
- MAP(v64_hadd_s16),
- MAP(v64_dotp_s16),
- { NULL, NULL, NULL } };
-#undef MAP
-
-// Map reference functions to machine tuned functions. Since the
-// functions depend on machine tuned types, the non-machine tuned
-// instantiations of the test can't refer to these functions directly,
-// so we refer to them by name and do the mapping here.
-void Map(const char *name, const void **ref, const void **simd) {
- unsigned int i;
- for (i = 0; m[i][0] && strcmp(name, reinterpret_cast<const char *>(m[i][0]));
- i++) {
- }
-
- *ref = m[i][1];
- *simd = m[i][2];
-}
-
-// Used for printing errors in TestSimd1Arg and TestSimd2Args
-std::string Print(const uint8_t *a, int size) {
- std::string text = "0x";
- for (int i = 0; i < size; i++) {
- char buf[3];
- snprintf(buf, sizeof(buf), "%02x",
- a[!CONFIG_BIG_ENDIAN ? size - 1 - i : i]);
- text += buf;
- }
-
- return text;
-}
-
-// Used in TestSimd1Arg and TestSimd2Args to restrict argument ranges
-void SetMask(uint8_t *s, int size, uint32_t mask, uint32_t maskwidth) {
- switch (maskwidth) {
- case 0: {
- break;
- }
- case 8: {
- for (int i = 0; i < size; i++) s[i] &= mask;
- break;
- }
- case 16: {
- uint16_t *t = reinterpret_cast<uint16_t *>(s);
- assert(!(reinterpret_cast<uintptr_t>(s) & 1));
- for (int i = 0; i < size / 2; i++) t[i] &= mask;
- break;
- }
- case 32: {
- uint32_t *t = reinterpret_cast<uint32_t *>(s);
- assert(!(reinterpret_cast<uintptr_t>(s) & 3));
- for (int i = 0; i < size / 4; i++) t[i] &= mask;
- break;
- }
- case 64: {
- uint64_t *t = reinterpret_cast<uint64_t *>(s);
- assert(!(reinterpret_cast<uintptr_t>(s) & 7));
- for (int i = 0; i < size / 8; i++) t[i] &= mask;
- break;
- }
- default: {
- FAIL() << "Unsupported mask width";
- break;
- }
- }
-}
-
-// We need a store function for uint64_t
-void u64_store_aligned(void *p, uint64_t a) {
- v64_store_aligned(p, v64_from_64(a));
-}
-
-void c_u64_store_aligned(void *p, uint64_t a) {
- c_v64_store_aligned(p, c_v64_from_64(a));
-}
-
-// CompareSimd1Arg and CompareSimd2Args compare intrinsics taking 1 or
-// 2 arguments respectively with their corresponding C reference.
-// Ideally, the loads and stores should have gone into the template
-// parameter list, but v64 and v128 could be typedef'ed to the same
-// type (which is the case on x86) and then we can't instantiate both
-// v64 and v128, so the function return and argument types, including
-// the always differing types in the C equivalent are used instead.
-// The function arguments must be void pointers and then go through a
-// cast to avoid matching errors in the branches eliminated by the
-// typeid tests in the calling function.
-template <typename Ret, typename Arg, typename CRet, typename CArg>
-int CompareSimd1Arg(const void *store, const void *load, const void *simd,
- void *d, const void *c_store, const void *c_load,
- const void *c_simd, void *ref_d, const void *a) {
- void (*const my_store)(void *, Ret) = (void (*const)(void *, Ret))store;
- Arg (*const my_load)(const void *) = (Arg(*const)(const void *))load;
- Ret (*const my_simd)(Arg) = (Ret(*const)(Arg))simd;
- void (*const my_c_store)(void *, CRet) = (void (*const)(void *, CRet))c_store;
- CArg (*const my_c_load)(const void *) = (CArg(*const)(const void *))c_load;
- CRet (*const my_c_simd)(CArg) = (CRet(*const)(CArg))c_simd;
-
- // Call reference and intrinsic
- ASM_REGISTER_STATE_CHECK(my_c_store(ref_d, my_c_simd(my_c_load(a))));
- ASM_REGISTER_STATE_CHECK(my_store(d, my_simd(my_load(a))));
-
- // Compare results
- return memcmp(ref_d, d, sizeof(CRet));
-}
-
-template <typename Ret, typename Arg1, typename Arg2, typename CRet,
- typename CArg1, typename CArg2>
-int CompareSimd2Args(const void *store, const void *load1, const void *load2,
- const void *simd, void *d, const void *c_store,
- const void *c_load1, const void *c_load2,
- const void *c_simd, void *ref_d, const void *a,
- const void *b) {
- void (*const my_store)(void *, Ret) = (void (*const)(void *, Ret))store;
- Arg1 (*const my_load1)(const void *) = (Arg1(*const)(const void *))load1;
- Arg2 (*const my_load2)(const void *) = (Arg2(*const)(const void *))load2;
- Ret (*const my_simd)(Arg1, Arg2) = (Ret(*const)(Arg1, Arg2))simd;
- void (*const my_c_store)(void *, CRet) = (void (*const)(void *, CRet))c_store;
- CArg1 (*const my_c_load1)(const void *) =
- (CArg1(*const)(const void *))c_load1;
- CArg2 (*const my_c_load2)(const void *) =
- (CArg2(*const)(const void *))c_load2;
- CRet (*const my_c_simd)(CArg1, CArg2) = (CRet(*const)(CArg1, CArg2))c_simd;
-
- // Call reference and intrinsic
- ASM_REGISTER_STATE_CHECK(
- my_c_store(ref_d, my_c_simd(my_c_load1(a), my_c_load2(b))));
- ASM_REGISTER_STATE_CHECK(my_store(d, my_simd(my_load1(a), my_load2(b))));
-
- // Compare results
- return memcmp(ref_d, d, sizeof(CRet));
-}
-
-template <typename CRet, typename CArg>
-void TestSimd1Arg(uint32_t iterations, uint32_t mask, uint32_t maskwidth,
- const char *name) {
- ACMRandom rnd(ACMRandom::DeterministicSeed());
- const void *ref_simd;
- const void *simd;
- int error = 0;
- DECLARE_ALIGNED(sizeof(CArg), uint16_t, s[sizeof(CArg) / sizeof(uint16_t)]);
- DECLARE_ALIGNED(sizeof(CRet), uint8_t, d[sizeof(CRet)]);
- DECLARE_ALIGNED(sizeof(CRet), uint8_t, ref_d[sizeof(CRet)]);
- memset(ref_d, 0, sizeof(ref_d));
- memset(d, 0, sizeof(d));
-
- Map(name, &ref_simd, &simd);
- if (simd == NULL || ref_simd == NULL) {
- FAIL() << "Internal error: Unknown intrinsic function " << name;
- }
-
- for (unsigned int count = 0; count < iterations && !error; count++) {
- for (unsigned int c = 0; c < sizeof(CArg) / sizeof(uint16_t); c++)
- s[c] = rnd.Rand16();
-
- if (maskwidth) {
- SetMask(reinterpret_cast<uint8_t *>(s), sizeof(CArg), mask, maskwidth);
- }
-
- if (typeid(CRet) == typeid(c_v64) && typeid(CArg) == typeid(c_v64)) {
- // V64_V64
- error = CompareSimd1Arg<v64, v64, CRet, CArg>(
- reinterpret_cast<const void *>(v64_store_aligned),
- (const void *)v64_load_aligned, simd, d,
- reinterpret_cast<const void *>(c_v64_store_aligned),
- reinterpret_cast<const void *>(c_v64_load_aligned), ref_simd, ref_d,
- s);
- } else if (typeid(CRet) == typeid(uint64_t) &&
- typeid(CArg) == typeid(c_v64)) {
- // U64_V64
- error = CompareSimd1Arg<uint64_t, v64, CRet, CArg>(
- reinterpret_cast<const void *>(u64_store_aligned),
- reinterpret_cast<const void *>(v64_load_aligned), simd, d,
- reinterpret_cast<const void *>(c_v64_store_aligned),
- reinterpret_cast<const void *>(c_v64_load_aligned), ref_simd, ref_d,
- s);
- } else if (typeid(CRet) == typeid(int64_t) &&
- typeid(CArg) == typeid(c_v64)) {
- // S64_V64
- error = CompareSimd1Arg<int64_t, v64, CRet, CArg>(
- reinterpret_cast<const void *>(u64_store_aligned),
- reinterpret_cast<const void *>(v64_load_aligned), simd, d,
- reinterpret_cast<const void *>(c_v64_store_aligned),
- reinterpret_cast<const void *>(c_v64_load_aligned), ref_simd, ref_d,
- s);
- } else {
- FAIL() << "Internal error: Unknown intrinsic function "
- << typeid(CRet).name() << " " << name << "(" << typeid(CArg).name()
- << ")";
- }
- }
-
- EXPECT_EQ(0, error) << "Error: mismatch for " << name << "("
- << Print((uint8_t *)s, sizeof(s)) << ") -> "
- << Print(d, sizeof(d)) << " (simd), "
- << Print(ref_d, sizeof(ref_d)) << " (ref)";
-}
-
-template <typename CRet, typename CArg1, typename CArg2>
-void TestSimd2Args(uint32_t iterations, uint32_t mask, uint32_t maskwidth,
- const char *name) {
- ACMRandom rnd(ACMRandom::DeterministicSeed());
- const void *ref_simd;
- const void *simd;
- int error = 0;
- DECLARE_ALIGNED(sizeof(CArg1), uint16_t,
- s1[sizeof(CArg1) / sizeof(uint16_t)]);
- DECLARE_ALIGNED(sizeof(CArg2), uint16_t,
- s2[sizeof(CArg2) / sizeof(uint16_t)]);
- DECLARE_ALIGNED(sizeof(CRet), uint8_t, d[sizeof(CRet)]);
- DECLARE_ALIGNED(sizeof(CRet), uint8_t, ref_d[sizeof(CRet)]);
- memset(ref_d, 0, sizeof(ref_d));
- memset(d, 0, sizeof(d));
-
- Map(name, &ref_simd, &simd);
- if (simd == NULL || ref_simd == NULL) {
- FAIL() << "Internal error: Unknown intrinsic function " << name;
- }
-
- for (unsigned int count = 0; count < iterations && !error; count++) {
- for (unsigned int c = 0; c < sizeof(CArg1) / sizeof(uint16_t); c++)
- s1[c] = rnd.Rand16();
-
- for (unsigned int c = 0; c < sizeof(CArg2) / sizeof(uint16_t); c++)
- s2[c] = rnd.Rand16();
-
- if (maskwidth)
- SetMask(reinterpret_cast<uint8_t *>(s2), sizeof(CArg2), mask, maskwidth);
-
- if (typeid(CRet) == typeid(c_v64) && typeid(CArg1) == typeid(c_v64) &&
- typeid(CArg2) == typeid(c_v64)) {
- // V64_V64V64
- error = CompareSimd2Args<v64, v64, v64, CRet, CArg1, CArg2>(
- reinterpret_cast<const void *>(v64_store_aligned),
- reinterpret_cast<const void *>(v64_load_aligned),
- reinterpret_cast<const void *>(v64_load_aligned), simd, d,
- reinterpret_cast<const void *>(c_v64_store_aligned),
- reinterpret_cast<const void *>(c_v64_load_aligned),
- reinterpret_cast<const void *>(c_v64_load_aligned),
- reinterpret_cast<const void *>(ref_simd), ref_d, s1, s2);
- } else if (typeid(CRet) == typeid(uint32_t) &&
- typeid(CArg1) == typeid(c_v64) &&
- typeid(CArg2) == typeid(c_v64)) {
- // U32_V64V64
- error = CompareSimd2Args<uint32_t, v64, v64, CRet, CArg1, CArg2>(
- reinterpret_cast<const void *>(u32_store_aligned),
- reinterpret_cast<const void *>(v64_load_aligned),
- reinterpret_cast<const void *>(v64_load_aligned), simd, d,
- reinterpret_cast<const void *>(c_u32_store_aligned),
- reinterpret_cast<const void *>(c_v64_load_aligned),
- reinterpret_cast<const void *>(c_v64_load_aligned),
- reinterpret_cast<const void *>(ref_simd), ref_d, s1, s2);
- } else if (typeid(CRet) == typeid(int64_t) &&
- typeid(CArg1) == typeid(c_v64) &&
- typeid(CArg2) == typeid(c_v64)) {
- // S64_V64V64
- error = CompareSimd2Args<int64_t, v64, v64, CRet, CArg1, CArg2>(
- reinterpret_cast<const void *>(u64_store_aligned),
- reinterpret_cast<const void *>(v64_load_aligned),
- reinterpret_cast<const void *>(v64_load_aligned), simd, d,
- reinterpret_cast<const void *>(c_u64_store_aligned),
- reinterpret_cast<const void *>(c_v64_load_aligned),
- reinterpret_cast<const void *>(c_v64_load_aligned),
- reinterpret_cast<const void *>(ref_simd), ref_d, s1, s2);
- } else if (typeid(CRet) == typeid(c_v64) &&
- typeid(CArg1) == typeid(c_v64) &&
- typeid(CArg2) == typeid(uint32_t)) {
- // V64_V64U32
- error = CompareSimd2Args<v64, v64, uint32_t, CRet, CArg1, CArg2>(
- reinterpret_cast<const void *>(v64_store_aligned),
- reinterpret_cast<const void *>(v64_load_aligned),
- reinterpret_cast<const void *>(u32_load_aligned), simd, d,
- reinterpret_cast<const void *>(c_v64_store_aligned),
- reinterpret_cast<const void *>(c_v64_load_aligned),
- reinterpret_cast<const void *>(c_u32_load_aligned),
- reinterpret_cast<const void *>(ref_simd), ref_d, s1, s2);
- } else {
- FAIL() << "Internal error: Unknown intrinsic function "
- << typeid(CRet).name() << " " << name << "("
- << typeid(CArg1).name() << ", " << typeid(CArg2).name() << ")";
- }
- }
-
- EXPECT_EQ(0, error) << "Error: mismatch for " << name << "("
- << Print(reinterpret_cast<uint8_t *>(s1), sizeof(s1))
- << ", "
- << Print(reinterpret_cast<uint8_t *>(s2), sizeof(s2))
- << ") -> " << Print(d, sizeof(d)) << " (simd), "
- << Print(ref_d, sizeof(ref_d)) << " (ref)";
-}
-
-// Instantiations to make the functions callable from another files
-template void TestSimd1Arg<c_v64, c_v64>(uint32_t, uint32_t, uint32_t,
- const char *);
-template void TestSimd1Arg<int64_t, c_v64>(uint32_t, uint32_t, uint32_t,
- const char *);
-template void TestSimd1Arg<uint64_t, c_v64>(uint32_t, uint32_t, uint32_t,
- const char *);
-template void TestSimd2Args<c_v64, c_v64, c_v64>(uint32_t, uint32_t, uint32_t,
- const char *);
-template void TestSimd2Args<c_v64, c_v64, uint32_t>(uint32_t, uint32_t,
- uint32_t, const char *);
-template void TestSimd2Args<int64_t, c_v64, c_v64>(uint32_t, uint32_t, uint32_t,
- const char *);
-template void TestSimd2Args<uint32_t, c_v64, c_v64>(uint32_t, uint32_t,
- uint32_t, const char *);
-
-} // namespace
-} // namespace SIMD_NAMESPACE
diff --git a/test/simd_cmp_neon.cc b/test/simd_cmp_neon.cc
deleted file mode 100644
index bab8d09..0000000
--- a/test/simd_cmp_neon.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
- *
- * This source code is subject to the terms of the BSD 2 Clause License and
- * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
- * was not distributed with this source code in the LICENSE file, you can
- * obtain it at www.aomedia.org/license/software. If the Alliance for Open
- * Media Patent License 1.0 was not distributed with this source code in the
- * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
- */
-
-#define ARCH NEON
-#define ARCH_POSTFIX(name) name##_neon
-#define SIMD_NAMESPACE simd_test_neon
-#include "./simd_cmp_impl.h"
diff --git a/test/simd_cmp_sse2.cc b/test/simd_cmp_sse2.cc
deleted file mode 100644
index 230742c..0000000
--- a/test/simd_cmp_sse2.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
- *
- * This source code is subject to the terms of the BSD 2 Clause License and
- * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
- * was not distributed with this source code in the LICENSE file, you can
- * obtain it at www.aomedia.org/license/software. If the Alliance for Open
- * Media Patent License 1.0 was not distributed with this source code in the
- * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
- */
-
-#define ARCH SSE2
-#define ARCH_POSTFIX(name) name##_sse2
-#define SIMD_NAMESPACE simd_test_sse2
-#include "./simd_cmp_impl.h"
diff --git a/test/simd_cmp_sse4.cc b/test/simd_cmp_sse4.cc
deleted file mode 100644
index b08bf92..0000000
--- a/test/simd_cmp_sse4.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
- *
- * This source code is subject to the terms of the BSD 2 Clause License and
- * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
- * was not distributed with this source code in the LICENSE file, you can
- * obtain it at www.aomedia.org/license/software. If the Alliance for Open
- * Media Patent License 1.0 was not distributed with this source code in the
- * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
- */
-
-#define ARCH SSE4_1
-#define ARCH_POSTFIX(name) name##_sse4_1
-#define SIMD_NAMESPACE simd_test_sse4_1
-#include "./simd_cmp_impl.h"
diff --git a/test/simd_cmp_ssse3.cc b/test/simd_cmp_ssse3.cc
deleted file mode 100644
index ac82fe7..0000000
--- a/test/simd_cmp_ssse3.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
- *
- * This source code is subject to the terms of the BSD 2 Clause License and
- * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
- * was not distributed with this source code in the LICENSE file, you can
- * obtain it at www.aomedia.org/license/software. If the Alliance for Open
- * Media Patent License 1.0 was not distributed with this source code in the
- * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
- */
-
-#define ARCH SSSE3
-#define ARCH_POSTFIX(name) name##_ssse3
-#define SIMD_NAMESPACE simd_test_ssse3
-#include "./simd_cmp_impl.h"
diff --git a/test/test.mk b/test/test.mk
index ccd75c8..d6eefaf 100644
--- a/test/test.mk
+++ b/test/test.mk
@@ -117,11 +117,6 @@
LIBAOM_TEST_SRCS-yes += convolve_test.cc
LIBAOM_TEST_SRCS-yes += lpf_8_test.cc
LIBAOM_TEST_SRCS-$(CONFIG_CLPF) += clpf_test.cc
-LIBAOM_TEST_SRCS-yes += simd_cmp_impl.h
-LIBAOM_TEST_SRCS-$(HAVE_SSE2) += simd_cmp_sse2.cc
-LIBAOM_TEST_SRCS-$(HAVE_SSSE3) += simd_cmp_ssse3.cc
-LIBAOM_TEST_SRCS-$(HAVE_SSE4_1) += simd_cmp_sse4.cc
-LIBAOM_TEST_SRCS-$(HAVE_NEON) += simd_cmp_neon.cc
LIBAOM_TEST_SRCS-yes += intrapred_test.cc
#LIBAOM_TEST_SRCS-$(CONFIG_AV1_DECODER) += av1_thread_test.cc
LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += dct16x16_test.cc
