Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
5704578f
Commit
5704578f
authored
Jun 09, 2014
by
James Zern
Browse files
convolve: disable avx2 variants
tests failing under Win32/Win64 Change-Id: I5d49d11911bcda3a832b14efe5500d22597bedcf
parent
0d6267ca
Changes
2
Hide whitespace changes
Inline
Side-by-side
test/convolve_test.cc
View file @
5704578f
...
...
@@ -645,6 +645,26 @@ INSTANTIATE_TEST_CASE_P(SSSE3, ConvolveTest, ::testing::Values(
#endif
#if HAVE_AVX2
// TODO(jzern): these prototypes can be removed after the avx2 versions are
// reenabled in vp9_rtcd_defs.pl.
extern
"C"
{
void
vp9_convolve8_vert_avx2
(
const
uint8_t
*
src
,
ptrdiff_t
src_stride
,
uint8_t
*
dst
,
ptrdiff_t
dst_stride
,
const
int16_t
*
filter_x
,
int
x_step_q4
,
const
int16_t
*
filter_y
,
int
y_step_q4
,
int
w
,
int
h
);
void
vp9_convolve8_horiz_avx2
(
const
uint8_t
*
src
,
ptrdiff_t
src_stride
,
uint8_t
*
dst
,
ptrdiff_t
dst_stride
,
const
int16_t
*
filter_x
,
int
x_step_q4
,
const
int16_t
*
filter_y
,
int
y_step_q4
,
int
w
,
int
h
);
void
vp9_convolve8_avx2
(
const
uint8_t
*
src
,
ptrdiff_t
src_stride
,
uint8_t
*
dst
,
ptrdiff_t
dst_stride
,
const
int16_t
*
filter_x
,
int
x_step_q4
,
const
int16_t
*
filter_y
,
int
y_step_q4
,
int
w
,
int
h
);
}
const
ConvolveFunctions
convolve8_avx2
(
vp9_convolve8_horiz_avx2
,
vp9_convolve8_avg_horiz_ssse3
,
vp9_convolve8_vert_avx2
,
vp9_convolve8_avg_vert_ssse3
,
...
...
@@ -655,8 +675,10 @@ INSTANTIATE_TEST_CASE_P(AVX2, ConvolveTest, ::testing::Values(
make_tuple
(
8
,
4
,
&
convolve8_avx2
),
make_tuple
(
4
,
8
,
&
convolve8_avx2
),
make_tuple
(
8
,
8
,
&
convolve8_avx2
),
make_tuple
(
8
,
16
,
&
convolve8_avx2
)));
INSTANTIATE_TEST_CASE_P
(
DISABLED_AVX2
,
ConvolveTest
,
::
testing
::
Values
(
make_tuple
(
16
,
8
,
&
convolve8_avx2
),
make_tuple
(
8
,
16
,
&
convolve8_avx2
),
make_tuple
(
16
,
16
,
&
convolve8_avx2
),
make_tuple
(
32
,
16
,
&
convolve8_avx2
),
make_tuple
(
16
,
32
,
&
convolve8_avx2
),
...
...
vp9/common/vp9_rtcd_defs.pl
View file @
5704578f
...
...
@@ -305,15 +305,15 @@ specialize qw/vp9_convolve_avg neon_asm dspr2/, "$sse2_x86inc";
$vp9_convolve_avg_neon_asm
=
vp9_convolve_avg_neon
;
add_proto
qw/void vp9_convolve8/
,
"
const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h
";
specialize
qw/vp9_convolve8 sse2 ssse3
avx2
neon_asm dspr2/
;
specialize
qw/vp9_convolve8 sse2 ssse3 neon_asm dspr2/
;
$vp9_convolve8_neon_asm
=
vp9_convolve8_neon
;
add_proto
qw/void vp9_convolve8_horiz/
,
"
const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h
";
specialize
qw/vp9_convolve8_horiz sse2 ssse3
avx2
neon_asm dspr2/
;
specialize
qw/vp9_convolve8_horiz sse2 ssse3 neon_asm dspr2/
;
$vp9_convolve8_horiz_neon_asm
=
vp9_convolve8_horiz_neon
;
add_proto
qw/void vp9_convolve8_vert/
,
"
const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h
";
specialize
qw/vp9_convolve8_vert sse2 ssse3
avx2
neon_asm dspr2/
;
specialize
qw/vp9_convolve8_vert sse2 ssse3 neon_asm dspr2/
;
$vp9_convolve8_vert_neon_asm
=
vp9_convolve8_vert_neon
;
add_proto
qw/void vp9_convolve8_avg/
,
"
const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h
";
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment