ref: 35ab85bbbc6f8270b5ba973cf8452cb5aa2b32eb
parent: 03511f8cc77eba680e3db6f5497691a685aa64ce
author: Lynne <[email protected]>
date: Mon Jan 13 06:05:36 EST 2020
msac: make symbol_adapt16 a function pointer on x86_64
--- a/src/meson.build
+++ b/src/meson.build
@@ -146,6 +146,12 @@
'x86/cpu.c',
)
+ if host_machine.cpu_family() == 'x86_64'
+ libdav1d_sources += files(
+ 'x86/msac_init.c',
+ )
+ endif
+
libdav1d_tmpl_sources += files(
'x86/cdef_init_tmpl.c',
'x86/film_grain_init_tmpl.c',
--- a/src/msac.c
+++ b/src/msac.c
@@ -196,5 +196,12 @@
s->rng = 0x8000;
s->cnt = -15;
s->allow_update_cdf = !disable_cdf_update_flag;
+
+#if ARCH_X86_64 && HAVE_ASM
+ s->symbol_adapt16 = dav1d_msac_decode_symbol_adapt_c;
+
+ dav1d_msac_init_x86(s);
+#endif
+
ctx_refill(s);
}
--- a/src/msac.h
+++ b/src/msac.h
@@ -31,7 +31,7 @@
#include <stdint.h>
#include <stdlib.h>
-#include "common/attributes.h"
+#include "common/intops.h"
typedef size_t ec_win;
@@ -42,6 +42,10 @@
unsigned rng;
int cnt;
int allow_update_cdf;
+
+#if ARCH_X86_64 && HAVE_ASM
+ unsigned (*symbol_adapt16)(struct MsacContext *s, uint16_t *cdf, size_t n_symbols);
+#endif
} MsacContext;
#if HAVE_ASM
--- a/src/x86/msac.h
+++ b/src/x86/msac.h
@@ -42,7 +42,6 @@
#if ARCH_X86_64 || defined(__SSE2__) || (defined(_M_IX86_FP) && _M_IX86_FP >= 2)
#define dav1d_msac_decode_symbol_adapt4 dav1d_msac_decode_symbol_adapt4_sse2
#define dav1d_msac_decode_symbol_adapt8 dav1d_msac_decode_symbol_adapt8_sse2
-#define dav1d_msac_decode_symbol_adapt16 dav1d_msac_decode_symbol_adapt16_sse2
#define dav1d_msac_decode_hi_tok dav1d_msac_decode_hi_tok_sse2
#endif
@@ -49,5 +48,11 @@
#define dav1d_msac_decode_bool_adapt dav1d_msac_decode_bool_adapt_sse2
#define dav1d_msac_decode_bool_equi dav1d_msac_decode_bool_equi_sse2
#define dav1d_msac_decode_bool dav1d_msac_decode_bool_sse2
+
+#if defined(__SSE2__) || (defined(_M_IX86_FP) && _M_IX86_FP >= 2)
+#define dav1d_msac_decode_symbol_adapt16 dav1d_msac_decode_symbol_adapt16_sse2
+#endif
+
+void dav1d_msac_init_x86(MsacContext *const s);
#endif /* DAV1D_SRC_X86_MSAC_H */
--- /dev/null
+++ b/src/x86/msac_init.c
@@ -1,0 +1,41 @@
+/*
+ * Copyright © 2020, VideoLAN and dav1d authors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "src/cpu.h"
+#include "src/msac.h"
+#include "src/x86/msac.h"
+
+unsigned dav1d_msac_decode_symbol_adapt16_avx2(MsacContext *s, uint16_t *cdf,
+ size_t n_symbols);
+
+void dav1d_msac_init_x86(MsacContext *const s) {+ const unsigned flags = dav1d_get_cpu_flags();
+
+ if (flags & DAV1D_X86_CPU_FLAG_SSE2) {+ s->symbol_adapt16 = dav1d_msac_decode_symbol_adapt16_sse2;
+ }
+}
+