Merge "Earmark extra space for VSX."

This commit is contained in:
Johann Koenig 2017-07-19 21:35:57 +00:00 committed by Gerrit Code Review
commit e1809501d0
2 changed files with 19 additions and 1 deletions

View File

@ -71,8 +71,16 @@ void vp8_build_intra_predictors_mbuv_s(
unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char *uleft, unsigned char *vleft, int left_stride,
unsigned char *upred_ptr, unsigned char *vpred_ptr, int pred_stride) { unsigned char *upred_ptr, unsigned char *vpred_ptr, int pred_stride) {
MB_PREDICTION_MODE uvmode = x->mode_info_context->mbmi.uv_mode; MB_PREDICTION_MODE uvmode = x->mode_info_context->mbmi.uv_mode;
#if HAVE_VSX
/* Power PC implementation uses "vec_vsx_ld" to read 16 bytes from
uleft_col and vleft_col. Play it safe by reserving enough stack
space here. */
unsigned char uleft_col[16];
unsigned char vleft_col[16];
#else
unsigned char uleft_col[8]; unsigned char uleft_col[8];
unsigned char vleft_col[8]; unsigned char vleft_col[8];
#endif
int i; int i;
intra_pred_fn fn; intra_pred_fn fn;

View File

@ -40,7 +40,15 @@ void vp8_intra4x4_predict(unsigned char *above, unsigned char *yleft,
int left_stride, B_PREDICTION_MODE b_mode, int left_stride, B_PREDICTION_MODE b_mode,
unsigned char *dst, int dst_stride, unsigned char *dst, int dst_stride,
unsigned char top_left) { unsigned char top_left) {
unsigned char Aboveb[12], *Above = Aboveb + 4; /* Power PC implementation uses "vec_vsx_ld" to read 16 bytes from
Above (aka, Aboveb + 4). Play it safe by reserving enough stack
space here. Similary for "Left". */
#if HAVE_VSX
unsigned char Aboveb[20];
#else
unsigned char Aboveb[12];
#endif
unsigned char *Above = Aboveb + 4;
#if HAVE_NEON #if HAVE_NEON
// Neon intrinsics are unable to load 32 bits, or 4 8 bit values. Instead, it // Neon intrinsics are unable to load 32 bits, or 4 8 bit values. Instead, it
// over reads but does not use the extra 4 values. // over reads but does not use the extra 4 values.
@ -50,6 +58,8 @@ void vp8_intra4x4_predict(unsigned char *above, unsigned char *yleft,
// indeed read, they are not used. // indeed read, they are not used.
vp8_zero_array(Left, 8); vp8_zero_array(Left, 8);
#endif // VPX_WITH_ASAN #endif // VPX_WITH_ASAN
#elif HAVE_VSX
unsigned char Left[16];
#else #else
unsigned char Left[4]; unsigned char Left[4];
#endif // HAVE_NEON #endif // HAVE_NEON