MIPS: added optimization for functions from SkBlitRow.

gyp/opts.gyp

 # Gyp file for opts projects
 {
   'targets': [
     # Due to an unfortunate intersection of lameness between gcc and gyp,
     # we have to build the *_SSE2.cpp files in a separate target.  The
     # gcc lameness is that, in order to compile SSE2 intrinsics code, it
     # must be passed the -msse2 flag.  However, with this flag, it may
     # emit SSE2 instructions even for scalar code, such as the CPUID
     # test used to test for the presence of SSE2.  So that, and all other
     # code must be compiled *without* -msse2.  The gyp lameness is that it
@@ skipping 82 matching lines @@
             [ 'skia_os == "ios"', {
               'sources!': [
                 # these fail to compile under xcode for ios
                 '../src/opts/memset.arm.S',
                 '../src/opts/SkBitmapProcState_opts_arm.cpp',
                 '../src/opts/SkBlitRow_opts_arm.cpp',
               ],
             }],
           ],
         }],
-        [ '(skia_arch_type == "mips") or (skia_arch_type == "arm" and arm_version < 7) \
+        [ 'skia_arch_type == "mips"', {
+          'cflags!': [
+          ],
+          'sources': [
+            '../src/opts/SkBitmapProcState_opts_none.cpp',
+            '../src/opts/SkBlitMask_opts_none.cpp',
+            '../src/opts/SkBlurImage_opts_none.cpp',
+            '../src/opts/SkMorphology_opts_none.cpp',
+            '../src/opts/SkUtils_opts_none.cpp',
+            '../src/opts/SkXfermode_opts_none.cpp',
+          ],
+          'conditions': [

[djsollen, 2014/06/10 15:46:07]

I looks like you want this to work for all mips32r2 devices. If so, I think this
conditions can be simplified to be...

'conditions': [
  [ 'mips_arch_variant == "mips32r2"' {
    'dependencies': [
      'opts_dsp',
    ]
  }, { #else
    'sources': [
      '../src/opts/SkBlitRow_opts_none.cpp',
    ]
  }],
]

[djordje, 2014/06/10 16:39:17]

no, it can not be done in this way since there is mips32r2 platforms without dsp
and optimizations should not be included for them. for now, there is two
versions of dsp and mips32r2 is essential for them. for these optimizations arch
must be mips32r2 and dsp must be 1 or 2. 

[djsollen, 2014/06/10 17:49:56]

Gotcha.  You should still update this to look like my suggestion (e.g. using an
else clause), but can keep the more complex condition.

+            [ '(mips_dsp == 1 or mips_dsp == 2) \
+                and (mips_arch_variant == "mips32r2")', {
+              'dependencies': [
+                'opts_dsp',
+              ]
+            }],
+            [ '(mips_dsp != 1 and mips_dsp != 2) \
+                or (mips_arch_variant != "mips32r2")', {
+              'sources': [
+                '../src/opts/SkBlitRow_opts_none.cpp',
+              ]
+            }],
+          ],
+        }],
+        [ '(skia_arch_type == "arm" and arm_version < 7) \
             or (skia_os == "ios") \
             or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips", "arm64"])', {
           'sources': [
             '../src/opts/SkBitmapProcState_opts_none.cpp',
             '../src/opts/SkBlitMask_opts_none.cpp',
             '../src/opts/SkBlitRow_opts_none.cpp',
             '../src/opts/SkBlurImage_opts_none.cpp',
             '../src/opts/SkMorphology_opts_none.cpp',
             '../src/opts/SkUtils_opts_none.cpp',
             '../src/opts/SkXfermode_opts_none.cpp',
@@ skipping 99 matching lines @@
         '../src/opts/SkBitmapProcState_arm_neon.cpp',
         '../src/opts/SkBitmapProcState_matrixProcs_neon.cpp',
         '../src/opts/SkBitmapProcState_matrix_neon.h',
         '../src/opts/SkBlitMask_opts_arm_neon.cpp',
         '../src/opts/SkBlitRow_opts_arm_neon.cpp',
         '../src/opts/SkBlurImage_opts_neon.cpp',
         '../src/opts/SkMorphology_opts_neon.cpp',
         '../src/opts/SkXfermode_opts_arm_neon.cpp',
       ],
     },
+    {
+      'target_name': 'opts_dsp',

[djsollen, 2014/06/10 17:49:56]

do you intend to make using the dsp optimized code runtime optional?  If not,
there is no need for a separate target as this file can just be included where
you reference this dependency above.

[djordje, 2014/06/10 18:30:18]

there will be no runtime detection. this part will be included above.

+      'product_name': 'skia_opts_dsp',
+      'type': 'static_library',
+      'standalone_static_library': 1,
+      'dependencies': [
+        'core.gyp:*',
+      ],
+      'include_dirs': [
+        '../src/core',
+        '../src/opts',
+      ],
+      'cflags!': [

[djsollen, 2014/06/10 15:46:07]

remove the empty blocks

+      ],
+      'ldflags': [
+      ],
+      'sources': [
+        '../src/opts/SkBlitRow_opts_mips_dsp.cpp',
+      ],
+    },
   ],
 }