diff --git a/vp9/encoder/vp9_sad.c b/vp9/encoder/vp9_sad.c
index 0d4e7d868..184a26a13 100644
--- a/vp9/encoder/vp9_sad.c
+++ b/vp9/encoder/vp9_sad.c
@@ -173,295 +173,107 @@ static INLINE unsigned int high_sadb(const uint8_t *a8, int a_stride,
   return sad;
 }
 
-#define high_sad_mxn_func(m, n) \
-unsigned int vp9_high_sad##m##x##n##_c(const uint8_t *src_ptr, int src_stride, \
-                                       const uint8_t *ref_ptr, int ref_stride, \
+#define high_sadMxN(m, n) \
+unsigned int vp9_high_sad##m##x##n##_c(const uint8_t *src, int src_stride, \
+                                       const uint8_t *ref, int ref_stride, \
                                        unsigned int max_sad) { \
-  return high_sad(src_ptr, src_stride, ref_ptr, ref_stride, m, n); \
+  return high_sad(src, src_stride, ref, ref_stride, m, n); \
 } \
-unsigned int vp9_high_sad##m##x##n##_avg_c(const uint8_t *src_ptr, \
-                                           int src_stride, \
-                                           const uint8_t *ref_ptr, \
-                                           int ref_stride, \
-                                           const uint8_t *second_pred, \
-                                           unsigned int max_sad) { \
+unsigned int vp9_high_sad##m##x##n##_avg_c(const uint8_t *src, int src_stride, \
+                                      const uint8_t *ref, int ref_stride, \
+                                      const uint8_t *second_pred, \
+                                      unsigned int max_sad) { \
   uint16_t comp_pred[m * n]; \
-  high_comp_avg_pred(comp_pred, second_pred, m, n, ref_ptr, ref_stride); \
-  return high_sadb(src_ptr, src_stride, comp_pred, m, m, n); \
+  high_comp_avg_pred(comp_pred, second_pred, m, n, ref, ref_stride); \
+  return high_sadb(src, src_stride, comp_pred, m, m, n); \
 }
 
-high_sad_mxn_func(64, 64)
-high_sad_mxn_func(64, 32)
-high_sad_mxn_func(32, 64)
-high_sad_mxn_func(32, 32)
-high_sad_mxn_func(32, 16)
-high_sad_mxn_func(16, 32)
-high_sad_mxn_func(16, 16)
-high_sad_mxn_func(16, 8)
-high_sad_mxn_func(8, 16)
-high_sad_mxn_func(8, 8)
-high_sad_mxn_func(8, 4)
-high_sad_mxn_func(4, 8)
-high_sad_mxn_func(4, 4)
-
-void vp9_high_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride,
-                            const uint8_t* const ref_ptr[], int ref_stride,
-                            unsigned int *sad_array) {
-  int i;
-  for (i = 0; i < 4; ++i)
-    sad_array[i] = vp9_high_sad64x32(src_ptr, src_stride, ref_ptr[i],
-                                     ref_stride, 0x7fffffff);
+#define high_sadMxNxK(m, n, k) \
+void vp9_high_sad##m##x##n##x##k##_c(const uint8_t *src, int src_stride, \
+                                     const uint8_t *ref, int ref_stride, \
+                                     unsigned int *sads) { \
+  int i; \
+  for (i = 0; i < k; ++i) \
+    sads[i] = vp9_high_sad##m##x##n##_c(src, src_stride, &ref[i], ref_stride, \
+                                        0x7fffffff); \
 }
 
-void vp9_high_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride, unsigned int *sad_array) {
-  int i;
-  for (i = 0; i < 4; ++i)
-    sad_array[i] = vp9_high_sad32x64(src_ptr, src_stride, ref_ptr[i],
-                                     ref_stride, 0x7fffffff);
+#define high_sadMxNx4D(m, n) \
+void vp9_high_sad##m##x##n##x4d_c(const uint8_t *src, int src_stride, \
+                                  const uint8_t *const refs[], \
+                                  int ref_stride, unsigned int *sads) { \
+  int i; \
+  for (i = 0; i < 4; ++i) \
+    sads[i] = vp9_high_sad##m##x##n##_c(src, src_stride, refs[i], ref_stride, \
+                                        0x7fffffff); \
 }
 
-void vp9_high_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride,
-                            const uint8_t* const ref_ptr[], int ref_stride,
-                            unsigned int *sad_array) {
-  int i;
-  for (i = 0; i < 4; ++i)
-    sad_array[i] = vp9_high_sad32x16(src_ptr, src_stride, ref_ptr[i],
-                                     ref_stride, 0x7fffffff);
-}
+// 64x64
+high_sadMxN(64, 64)
+high_sadMxNxK(64, 64, 3)
+high_sadMxNxK(64, 64, 8)
+high_sadMxNx4D(64, 64)
 
-void vp9_high_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride,
-                            const uint8_t* const ref_ptr[],
-                            int ref_stride, unsigned int *sad_array) {
-  int i;
-  for (i = 0; i < 4; ++i)
-    sad_array[i] = vp9_high_sad16x32(src_ptr, src_stride, ref_ptr[i],
-                                     ref_stride, 0x7fffffff);
-}
+// 64x32
+high_sadMxN(64, 32)
+high_sadMxNx4D(64, 32)
 
-void vp9_high_sad64x64x3_c(const uint8_t *src_ptr, int src_stride,
-                      const uint8_t *ref_ptr, int ref_stride,
-                      unsigned int *sad_array) {
-  int i;
-  for (i = 0; i < 3; ++i)
-    sad_array[i] = vp9_high_sad64x64(src_ptr, src_stride, ref_ptr + i,
-                                     ref_stride, 0x7fffffff);
-}
+// 32x64
+high_sadMxN(32, 64)
+high_sadMxNx4D(32, 64)
 
-void vp9_high_sad32x32x3_c(const uint8_t *src_ptr, int src_stride,
-                      const uint8_t *ref_ptr, int ref_stride,
-                      unsigned int *sad_array) {
-  int i;
-  for (i = 0; i < 3; ++i)
-    sad_array[i] = vp9_high_sad32x32(src_ptr, src_stride, ref_ptr + i,
-                                     ref_stride, 0x7fffffff);
-}
+// 32x32
+high_sadMxN(32, 32)
+high_sadMxNxK(32, 32, 3)
+high_sadMxNxK(32, 32, 8)
+high_sadMxNx4D(32, 32)
 
-void vp9_high_sad64x64x8_c(const uint8_t *src_ptr, int src_stride,
-                           const uint8_t *ref_ptr, int ref_stride,
-                           unsigned int *sad_array) {
-  int i;
-  for (i = 0; i < 8; ++i)
-    sad_array[i] = vp9_high_sad64x64(src_ptr, src_stride, ref_ptr + i,
-                                     ref_stride, 0x7fffffff);
-}
+// 32x16
+high_sadMxN(32, 16)
+high_sadMxNx4D(32, 16)
 
-void vp9_high_sad32x32x8_c(const uint8_t *src_ptr, int src_stride,
-                           const uint8_t *ref_ptr, int ref_stride,
-                           unsigned int *sad_array) {
-  int i;
-  for (i = 0; i < 8; ++i)
-    sad_array[i] = vp9_high_sad32x32(src_ptr, src_stride, ref_ptr + i,
-                                     ref_stride, 0x7fffffff);
-}
+// 16x32
+high_sadMxN(16, 32)
+high_sadMxNx4D(16, 32)
 
-void vp9_high_sad16x16x3_c(const uint8_t *src_ptr, int src_stride,
-                           const uint8_t *ref_ptr, int ref_stride,
-                           unsigned int *sad_array) {
-  int i;
-  for (i = 0; i < 3; ++i)
-    sad_array[i] = vp9_high_sad16x16(src_ptr, src_stride, ref_ptr + i,
-                                     ref_stride, 0x7fffffff);
-}
+// 16x16
+high_sadMxN(16, 16)
+high_sadMxNxK(16, 16, 3)
+high_sadMxNxK(16, 16, 8)
+high_sadMxNx4D(16, 16)
 
-void vp9_high_sad16x16x8_c(const uint8_t *src_ptr, int src_stride,
-                           const uint8_t *ref_ptr, int ref_stride,
-                           uint32_t *sad_array) {
-  int i;
-  for (i = 0; i < 8; ++i)
-    sad_array[i] = vp9_high_sad16x16(src_ptr, src_stride, ref_ptr + i,
-                                     ref_stride, 0x7fffffff);
-}
+// 16x8
+high_sadMxN(16, 8)
+high_sadMxNxK(16, 8, 3)
+high_sadMxNxK(16, 8, 8)
+high_sadMxNx4D(16, 8)
 
-void vp9_high_sad16x8x3_c(const uint8_t *src_ptr, int src_stride,
-                          const uint8_t *ref_ptr, int ref_stride,
-                          unsigned int *sad_array) {
-  int i;
-  for (i = 0; i < 3; ++i)
-    sad_array[i] = vp9_high_sad16x8(src_ptr, src_stride, ref_ptr + i,
-                                    ref_stride, 0x7fffffff);
-}
+// 8x16
+high_sadMxN(8, 16)
+high_sadMxNxK(8, 16, 3)
+high_sadMxNxK(8, 16, 8)
+high_sadMxNx4D(8, 16)
 
-void vp9_high_sad16x8x8_c(const uint8_t *src_ptr, int src_stride,
-                          const uint8_t *ref_ptr, int ref_stride,
-                          uint32_t *sad_array) {
-  int i;
-  for (i = 0; i < 8; ++i)
-    sad_array[i] = vp9_high_sad16x8(src_ptr, src_stride, ref_ptr + i,
-                                    ref_stride, 0x7fffffff);
-}
+// 8x8
+high_sadMxN(8, 8)
+high_sadMxNxK(8, 8, 3)
+high_sadMxNxK(8, 8, 8)
+high_sadMxNx4D(8, 8)
 
-void vp9_high_sad8x8x3_c(const uint8_t *src_ptr, int src_stride,
-                         const uint8_t *ref_ptr, int ref_stride,
-                         unsigned int *sad_array) {
-  int i;
-  for (i = 0; i < 3; ++i)
-    sad_array[i] = vp9_high_sad8x8(src_ptr, src_stride, ref_ptr + i,
-                                   ref_stride, 0x7fffffff);
-}
+// 8x4
+high_sadMxN(8, 4)
+high_sadMxNxK(8, 4, 8)
+high_sadMxNx4D(8, 4)
 
-void vp9_high_sad8x8x8_c(const uint8_t *src_ptr, int src_stride,
-                         const uint8_t *ref_ptr, int ref_stride,
-                         uint32_t *sad_array) {
-  int i;
-  for (i = 0; i < 8; ++i)
-    sad_array[i] = vp9_high_sad8x8(src_ptr, src_stride, ref_ptr + i,
-                                   ref_stride, 0x7fffffff);
-}
+// 4x8
+high_sadMxN(4, 8)
+high_sadMxNxK(4, 8, 8)
+high_sadMxNx4D(4, 8)
 
-void vp9_high_sad8x16x3_c(const uint8_t *src_ptr, int src_stride,
-                          const uint8_t *ref_ptr, int ref_stride,
-                          unsigned int *sad_array) {
-  int i;
-  for (i = 0; i < 3; ++i)
-    sad_array[i] = vp9_high_sad8x16(src_ptr, src_stride, ref_ptr + i,
-                                    ref_stride, 0x7fffffff);
-}
+// 4x4
+high_sadMxN(4, 4)
+high_sadMxNxK(4, 4, 3)
+high_sadMxNxK(4, 4, 8)
+high_sadMxNx4D(4, 4)
 
-void vp9_high_sad8x16x8_c(const uint8_t *src_ptr, int src_stride,
-                          const uint8_t *ref_ptr, int ref_stride,
-                          uint32_t *sad_array) {
-  int i;
-  for (i = 0; i < 8; ++i)
-    sad_array[i] = vp9_high_sad8x16(src_ptr, src_stride, ref_ptr + i,
-                                    ref_stride, 0x7fffffff);
-}
-
-void vp9_high_sad4x4x3_c(const uint8_t *src_ptr, int src_stride,
-                         const uint8_t *ref_ptr, int ref_stride,
-                         unsigned int *sad_array) {
-  int i;
-  for (i = 0; i < 3; ++i)
-    sad_array[i] = vp9_high_sad4x4(src_ptr, src_stride, ref_ptr + i,
-                                   ref_stride, 0x7fffffff);
-}
-
-void vp9_high_sad4x4x8_c(const uint8_t *src_ptr, int src_stride,
-                    const uint8_t *ref_ptr, int ref_stride,
-                    uint32_t *sad_array) {
-  int i;
-  for (i = 0; i < 8; ++i)
-    sad_array[i] = vp9_high_sad4x4(src_ptr, src_stride, ref_ptr + i,
-                                   ref_stride, 0x7fffffff);
-}
-
-void vp9_high_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride,
-                            const uint8_t* const ref_ptr[], int ref_stride,
-                            unsigned int *sad_array) {
-  int i;
-  for (i = 0; i < 4; ++i)
-    sad_array[i] = vp9_high_sad64x64(src_ptr, src_stride, ref_ptr[i],
-                                     ref_stride, 0x7fffffff);
-}
-
-void vp9_high_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride,
-                            const uint8_t* const ref_ptr[], int ref_stride,
-                            unsigned int *sad_array) {
-  int i;
-  for (i = 0; i < 4; ++i)
-    sad_array[i] = vp9_high_sad32x32(src_ptr, src_stride, ref_ptr[i],
-                                     ref_stride, 0x7fffffff);
-}
-
-void vp9_high_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride,
-                            const uint8_t* const ref_ptr[], int ref_stride,
-                            unsigned int *sad_array) {
-  int i;
-  for (i = 0; i < 4; ++i)
-    sad_array[i] = vp9_high_sad16x16(src_ptr, src_stride, ref_ptr[i],
-                                     ref_stride, 0x7fffffff);
-}
-
-void vp9_high_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride,
-                           const uint8_t* const ref_ptr[], int ref_stride,
-                           unsigned int *sad_array) {
-  int i;
-  for (i = 0; i < 4; ++i)
-    sad_array[i] = vp9_high_sad16x8(src_ptr, src_stride, ref_ptr[i],
-                                    ref_stride, 0x7fffffff);
-}
-
-void vp9_high_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride,
-                          const uint8_t* const ref_ptr[], int ref_stride,
-                          unsigned int *sad_array) {
-  int i;
-  for (i = 0; i < 4; ++i)
-    sad_array[i] = vp9_high_sad8x8(src_ptr, src_stride, ref_ptr[i],
-                                   ref_stride, 0x7fffffff);
-}
-
-void vp9_high_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride,
-                           const uint8_t* const ref_ptr[], int ref_stride,
-                           unsigned int *sad_array) {
-  int i;
-  for (i = 0; i < 4; ++i)
-    sad_array[i] = vp9_high_sad8x16(src_ptr, src_stride, ref_ptr[i],
-                                    ref_stride, 0x7fffffff);
-}
-
-void vp9_high_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride,
-                          const uint8_t* const ref_ptr[], int ref_stride,
-                          unsigned int *sad_array) {
-  int i;
-  for (i = 0; i < 4; ++i)
-    sad_array[i] = vp9_high_sad8x4(src_ptr, src_stride, ref_ptr[i],
-                                   ref_stride, 0x7fffffff);
-}
-
-void vp9_high_sad8x4x8_c(const uint8_t *src_ptr, int src_stride,
-                         const uint8_t *ref_ptr, int ref_stride,
-                         uint32_t *sad_array) {
-  int i;
-  for (i = 0; i < 8; ++i)
-    sad_array[i] = vp9_high_sad8x4(src_ptr, src_stride, ref_ptr + i,
-                                   ref_stride, 0x7fffffff);
-}
-
-void vp9_high_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride,
-                          const uint8_t* const ref_ptr[], int ref_stride,
-                          unsigned int *sad_array) {
-  int i;
-  for (i = 0; i < 4; ++i)
-    sad_array[i] = vp9_high_sad4x8(src_ptr, src_stride, ref_ptr[i],
-                                   ref_stride, 0x7fffffff);
-}
-
-void vp9_high_sad4x8x8_c(const uint8_t *src_ptr, int src_stride,
-                         const uint8_t *ref_ptr, int ref_stride,
-                         uint32_t *sad_array) {
-  int i;
-  for (i = 0; i < 8; ++i)
-    sad_array[i] = vp9_high_sad4x8(src_ptr, src_stride, ref_ptr + i,
-                                   ref_stride, 0x7fffffff);
-}
-
-void vp9_high_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride,
-                          const uint8_t* const ref_ptr[], int ref_stride,
-                          unsigned int *sad_array) {
-  int i;
-  for (i = 0; i < 4; ++i)
-    sad_array[i] = vp9_high_sad4x4(src_ptr, src_stride, ref_ptr[i],
-                                   ref_stride, 0x7fffffff);
-}
 #endif