libvpx: Pull from upstream

source/libvpx/vp9/common/mips/dspr2/vp9_itrans8_dspr2.c

 /*
  *  Copyright (c) 2013 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include <assert.h>
 #include <stdio.h>
 
 #include "./vpx_config.h"
 #include "./vp9_rtcd.h"
 #include "vp9/common/vp9_common.h"
 #include "vp9/common/vp9_blockd.h"
 #include "vp9/common/vp9_idct.h"
 #include "vp9/common/mips/dspr2/vp9_common_dspr2.h"
 
 #if HAVE_DSPR2
-static void idct8_1d_rows_dspr2(const int16_t *input, int16_t *output,
-                                uint32_t no_rows) {
+static void idct8_rows_dspr2(const int16_t *input, int16_t *output,
+                             uint32_t no_rows) {
   int step1_0, step1_1, step1_2, step1_3, step1_4, step1_5, step1_6, step1_7;
   const int const_2_power_13 = 8192;
   int Temp0, Temp1, Temp2, Temp3, Temp4;
   int i;
 
   for (i = no_rows; i--; ) {
     __asm__ __volatile__ (
         /*
           temp_1 = (input[0] + input[4]) * cospi_16_64;
           step2_0 = dct_const_round_shift(temp_1);
@@ skipping 159 matching lines @@
           [cospi_20_64] "r" (cospi_20_64), [cospi_8_64] "r" (cospi_8_64),
           [cospi_24_64] "r" (cospi_24_64),
           [output] "r" (output), [input] "r" (input)
     );
 
     input += 8;
     output += 1;
   }
 }
 
-static void idct8_1d_columns_add_blk_dspr2(int16_t *input, uint8_t *dest,
-                                           int dest_stride) {
+static void idct8_columns_add_blk_dspr2(int16_t *input, uint8_t *dest,
+                                        int dest_stride) {
   int step1_0, step1_1, step1_2, step1_3, step1_4, step1_5, step1_6, step1_7;
   int Temp0, Temp1, Temp2, Temp3;
   int i;
   const int const_2_power_13 = 8192;
   uint8_t *dest_pix;
   uint8_t *cm = vp9_ff_cropTbl;
 
   /* prefetch vp9_ff_cropTbl */
   vp9_prefetch_load(vp9_ff_cropTbl);
   vp9_prefetch_load(vp9_ff_cropTbl +  32);
@@ skipping 240 matching lines @@
   uint32_t pos = 45;
 
   /* bit positon for extract from acc */
   __asm__ __volatile__ (
     "wrdsp    %[pos],    1    \n\t"
     :
     : [pos] "r" (pos)
   );
 
   // First transform rows
-  idct8_1d_rows_dspr2(input, outptr, 8);
+  idct8_rows_dspr2(input, outptr, 8);
 
   // Then transform columns and add to dest
-  idct8_1d_columns_add_blk_dspr2(&out[0], dest, dest_stride);
+  idct8_columns_add_blk_dspr2(&out[0], dest, dest_stride);
 }
 
-static void iadst8_1d_dspr2(const int16_t *input, int16_t *output) {
+static void iadst8_dspr2(const int16_t *input, int16_t *output) {
   int s0, s1, s2, s3, s4, s5, s6, s7;
   int x0, x1, x2, x3, x4, x5, x6, x7;
 
   x0 = input[7];
   x1 = input[0];
   x2 = input[5];
   x3 = input[2];
   x4 = input[3];
   x5 = input[4];
   x6 = input[1];
@@ skipping 74 matching lines @@
 
   /* bit positon for extract from acc */
   __asm__ __volatile__ (
     "wrdsp    %[pos],    1    \n\t"
     :
     : [pos] "r" (pos)
   );
 
   switch (tx_type) {
     case DCT_DCT:     // DCT in both horizontal and vertical
-      idct8_1d_rows_dspr2(input, outptr, 8);
-      idct8_1d_columns_add_blk_dspr2(&out[0], dest, dest_stride);
+      idct8_rows_dspr2(input, outptr, 8);
+      idct8_columns_add_blk_dspr2(&out[0], dest, dest_stride);
       break;
     case ADST_DCT:    // ADST in vertical, DCT in horizontal
-      idct8_1d_rows_dspr2(input, outptr, 8);
+      idct8_rows_dspr2(input, outptr, 8);
 
       for (i = 0; i < 8; ++i) {
-        iadst8_1d_dspr2(&out[i * 8], temp_out);
+        iadst8_dspr2(&out[i * 8], temp_out);
 
         for (j = 0; j < 8; ++j)
           dest[j * dest_stride + i] =
                     clip_pixel(ROUND_POWER_OF_TWO(temp_out[j], 5)
                                       + dest[j * dest_stride + i]);
       }
       break;
     case DCT_ADST:    // DCT in vertical, ADST in horizontal
       for (i = 0; i < 8; ++i) {
-        iadst8_1d_dspr2(input, outptr);
+        iadst8_dspr2(input, outptr);
         input += 8;
         outptr += 8;
       }
 
       for (i = 0; i < 8; ++i) {
         for (j = 0; j < 8; ++j) {
           temp_in[i * 8 + j] = out[j * 8 + i];
         }
       }
-      idct8_1d_columns_add_blk_dspr2(&temp_in[0], dest, dest_stride);
+      idct8_columns_add_blk_dspr2(&temp_in[0], dest, dest_stride);
       break;
     case ADST_ADST:   // ADST in both directions
       for (i = 0; i < 8; ++i) {
-        iadst8_1d_dspr2(input, outptr);
+        iadst8_dspr2(input, outptr);
         input += 8;
         outptr += 8;
       }
 
       for (i = 0; i < 8; ++i) {
         for (j = 0; j < 8; ++j)
           temp_in[j] = out[j * 8 + i];
 
-        iadst8_1d_dspr2(temp_in, temp_out);
+        iadst8_dspr2(temp_in, temp_out);
 
         for (j = 0; j < 8; ++j)
           dest[j * dest_stride + i] =
                 clip_pixel(ROUND_POWER_OF_TWO(temp_out[j], 5)
                                       + dest[j * dest_stride + i]);
       }
       break;
     default:
       printf("vp9_short_iht8x8_add_dspr2 : Invalid tx_type\n");
       break;
   }
 }
 
 void vp9_idct8x8_10_add_dspr2(const int16_t *input, uint8_t *dest,
                               int dest_stride) {
   DECLARE_ALIGNED(32, int16_t, out[8 * 8]);
   int16_t *outptr = out;
   uint32_t pos = 45;
 
   /* bit positon for extract from acc */
   __asm__ __volatile__ (
     "wrdsp    %[pos],    1    \n\t"
     :
     : [pos] "r" (pos)
   );
 
   // First transform rows
-  idct8_1d_rows_dspr2(input, outptr, 4);
+  idct8_rows_dspr2(input, outptr, 4);
 
   outptr += 4;
 
   __asm__ __volatile__ (
       "sw  $zero,   0(%[outptr])  \n\t"
       "sw  $zero,   4(%[outptr])  \n\t"
       "sw  $zero,  16(%[outptr])  \n\t"
       "sw  $zero,  20(%[outptr])  \n\t"
       "sw  $zero,  32(%[outptr])  \n\t"
       "sw  $zero,  36(%[outptr])  \n\t"
       "sw  $zero,  48(%[outptr])  \n\t"
       "sw  $zero,  52(%[outptr])  \n\t"
       "sw  $zero,  64(%[outptr])  \n\t"
       "sw  $zero,  68(%[outptr])  \n\t"
       "sw  $zero,  80(%[outptr])  \n\t"
       "sw  $zero,  84(%[outptr])  \n\t"
       "sw  $zero,  96(%[outptr])  \n\t"
       "sw  $zero, 100(%[outptr])  \n\t"
       "sw  $zero, 112(%[outptr])  \n\t"
       "sw  $zero, 116(%[outptr])  \n\t"
 
       :
       : [outptr] "r" (outptr)
   );
 
 
   // Then transform columns and add to dest
-  idct8_1d_columns_add_blk_dspr2(&out[0], dest, dest_stride);
+  idct8_columns_add_blk_dspr2(&out[0], dest, dest_stride);
 }
 
 void vp9_idct8x8_1_add_dspr2(const int16_t *input, uint8_t *dest,
                              int dest_stride) {
   uint32_t pos = 45;
   int32_t out;
   int32_t r;
   int32_t a1, absa1;
   int32_t t1, t2, vector_a1, vector_1, vector_2;
 
@@ skipping 63 matching lines @@
 
           : [t1] "=&r" (t1), [t2] "=&r" (t2),
             [vector_1] "=&r" (vector_1), [vector_2] "=&r" (vector_2),
             [dest] "+r" (dest)
           : [dest_stride] "r" (dest_stride), [vector_a1] "r" (vector_a1)
       );
     }
   }
 }
 #endif  // #if HAVE_DSPR2