commit 35171107616f564a4c18dd75eead6b4393c1f6bd
author Johann <johann.koenig@duck.com> Wed Oct 31 15:56:00 2018 -0700
committer Johann Koenig <johannkoenig@google.com> Thu Nov 01 18:14:45 2018 +0000
tree d86361dfea1453093de674a372e3cccb7b06ca43
parent dca41c0f176bafdc85c6c642cdb7c38f6b3b355a

INTERNAL_STATS: move ssim_opt_x86_64

This file contains sse2 functions, not ssse3.

Fixes -DCONFIG_INTERNAL_STATS=1 -DENABLE_SSE3=0 build.

Change-Id: I2064a5fa160b65746cfaeff75bc9cdd4beedf9e4

aom_dsp/aom_dsp.cmake

diff --git a/aom_dsp/aom_dsp.cmake b/aom_dsp/aom_dsp.cmake
index d4fd97d..7d771bc 100644
--- a/aom_dsp/aom_dsp.cmake
+++ b/aom_dsp/aom_dsp.cmake
@@ -183,6 +183,9 @@
               "${AOM_ROOT}/aom_dsp/x86/subpel_variance_sse2.asm"
               "${AOM_ROOT}/aom_dsp/x86/subtract_sse2.asm")
 
+  list(APPEND AOM_DSP_ENCODER_ASM_SSE2_X86_64
+              "${AOM_ROOT}/aom_dsp/x86/ssim_sse2_x86_64.asm")
+
   list(APPEND AOM_DSP_ENCODER_INTRIN_SSE2
               "${AOM_ROOT}/aom_dsp/x86/fwd_txfm_impl_sse2.h"
               "${AOM_ROOT}/aom_dsp/x86/fwd_txfm_sse2.c"
@@ -197,7 +200,7 @@
 
   list(APPEND AOM_DSP_ENCODER_ASM_SSSE3_X86_64
               "${AOM_ROOT}/aom_dsp/x86/fwd_txfm_ssse3_x86_64.asm"
-              "${AOM_ROOT}/aom_dsp/x86/ssim_opt_x86_64.asm")
+              "${AOM_ROOT}/aom_dsp/x86/quantize_ssse3_x86_64.asm")
 
   list(APPEND AOM_DSP_ENCODER_INTRIN_AVX2
               "${AOM_ROOT}/aom_dsp/x86/masked_sad_intrin_avx2.c"
@@ -215,9 +218,6 @@
               "${AOM_ROOT}/aom_dsp/x86/obmc_variance_avx2.c"
               "${AOM_ROOT}/aom_dsp/x86/sum_squares_avx2.c")
 
-  list(APPEND AOM_DSP_ENCODER_ASM_SSSE3_X86_64
-              "${AOM_ROOT}/aom_dsp/x86/quantize_ssse3_x86_64.asm")
-
   list(APPEND AOM_DSP_ENCODER_AVX_ASM_X86_64
               "${AOM_ROOT}/aom_dsp/x86/quantize_avx_x86_64.asm")
 
@@ -286,6 +286,9 @@
                                   "AOM_DSP_COMMON_INTRIN_SSE2" "aom")
 
     if(CONFIG_AV1_ENCODER)
+      if("${AOM_TARGET_CPU}" STREQUAL "x86_64")
+        list(APPEND AOM_DSP_ENCODER_ASM_SSE2 ${AOM_DSP_ENCODER_ASM_SSE2_X86_64})
+      endif()
       add_asm_library("aom_dsp_encoder_sse2" "AOM_DSP_ENCODER_ASM_SSE2" "aom")
       add_intrinsics_object_library("-msse2" "sse2" "aom_dsp_encoder"
                                     "AOM_DSP_ENCODER_INTRIN_SSE2" "aom")

aom_dsp/x86/ssim_sse2_x86_64.asm

diff --git a/aom_dsp/x86/ssim_opt_x86_64.asm b/aom_dsp/x86/ssim_sse2_x86_64.asm
similarity index 100%
rename from aom_dsp/x86/ssim_opt_x86_64.asm
rename to aom_dsp/x86/ssim_sse2_x86_64.asm