summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Giles <giles@thaumas.net>2017-06-13 15:50:07 -0700
committerRalph Giles <giles@thaumas.net>2017-09-11 09:11:13 -0700
commit6db968e9ad1a604fdaa35578df959a8098721a86 (patch)
treee8930bbad583f1a64f068f49eb6994064b9a5903
parent1b9be1a616f38f21f61f2c6b0d51e8763f0c785e (diff)
downloadopus-6db968e9ad1a604fdaa35578df959a8098721a86.tar.gz
Rename SSE 4.1 files to match their targets.
Distinguish source files for the SSE 4.1 instruction set extension consistently by their filename. This makes it easier to check the correct flags are being set at build time. Signed-off-by: Jonathan Lennox <jonathan@vidyo.com>
-rw-r--r--celt/x86/celt_lpc_sse4_1.c (renamed from celt/x86/celt_lpc_sse.c)0
-rw-r--r--celt_sources.mk2
-rw-r--r--silk/fixed/x86/burg_modified_FIX_sse4_1.c (renamed from silk/fixed/x86/burg_modified_FIX_sse.c)0
-rw-r--r--silk/fixed/x86/vector_ops_FIX_sse4_1.c (renamed from silk/fixed/x86/vector_ops_FIX_sse.c)0
-rw-r--r--silk/x86/NSQ_del_dec_sse4_1.c (renamed from silk/x86/NSQ_del_dec_sse.c)0
-rw-r--r--silk/x86/NSQ_sse4_1.c (renamed from silk/x86/NSQ_sse.c)0
-rw-r--r--silk/x86/VAD_sse4_1.c (renamed from silk/x86/VAD_sse.c)0
-rw-r--r--silk/x86/VQ_WMat_EC_sse4_1.c (renamed from silk/x86/VQ_WMat_EC_sse.c)0
-rw-r--r--silk_sources.mk12
-rw-r--r--win32/VS2015/opus.vcxproj12
-rw-r--r--win32/VS2015/opus.vcxproj.filters12
11 files changed, 19 insertions, 19 deletions
diff --git a/celt/x86/celt_lpc_sse.c b/celt/x86/celt_lpc_sse4_1.c
index 54785688..54785688 100644
--- a/celt/x86/celt_lpc_sse.c
+++ b/celt/x86/celt_lpc_sse4_1.c
diff --git a/celt_sources.mk b/celt_sources.mk
index f7d81cc4..3e22c78d 100644
--- a/celt_sources.mk
+++ b/celt_sources.mk
@@ -27,7 +27,7 @@ celt/x86/pitch_sse2.c \
celt/x86/vq_sse2.c
CELT_SOURCES_SSE4_1 = \
-celt/x86/celt_lpc_sse.c \
+celt/x86/celt_lpc_sse4_1.c \
celt/x86/pitch_sse4_1.c
CELT_SOURCES_ARM = \
diff --git a/silk/fixed/x86/burg_modified_FIX_sse.c b/silk/fixed/x86/burg_modified_FIX_sse4_1.c
index 3c3583c5..3c3583c5 100644
--- a/silk/fixed/x86/burg_modified_FIX_sse.c
+++ b/silk/fixed/x86/burg_modified_FIX_sse4_1.c
diff --git a/silk/fixed/x86/vector_ops_FIX_sse.c b/silk/fixed/x86/vector_ops_FIX_sse4_1.c
index c1e90564..c1e90564 100644
--- a/silk/fixed/x86/vector_ops_FIX_sse.c
+++ b/silk/fixed/x86/vector_ops_FIX_sse4_1.c
diff --git a/silk/x86/NSQ_del_dec_sse.c b/silk/x86/NSQ_del_dec_sse4_1.c
index c5212bee..c5212bee 100644
--- a/silk/x86/NSQ_del_dec_sse.c
+++ b/silk/x86/NSQ_del_dec_sse4_1.c
diff --git a/silk/x86/NSQ_sse.c b/silk/x86/NSQ_sse4_1.c
index 6a9e6e96..6a9e6e96 100644
--- a/silk/x86/NSQ_sse.c
+++ b/silk/x86/NSQ_sse4_1.c
diff --git a/silk/x86/VAD_sse.c b/silk/x86/VAD_sse4_1.c
index 4e90f441..4e90f441 100644
--- a/silk/x86/VAD_sse.c
+++ b/silk/x86/VAD_sse4_1.c
diff --git a/silk/x86/VQ_WMat_EC_sse.c b/silk/x86/VQ_WMat_EC_sse4_1.c
index 74d6c6d0..74d6c6d0 100644
--- a/silk/x86/VQ_WMat_EC_sse.c
+++ b/silk/x86/VQ_WMat_EC_sse4_1.c
diff --git a/silk_sources.mk b/silk_sources.mk
index 6d143920..67c8a4fd 100644
--- a/silk_sources.mk
+++ b/silk_sources.mk
@@ -77,11 +77,11 @@ silk/stereo_find_predictor.c \
silk/stereo_quant_pred.c \
silk/LPC_fit.c
-SILK_SOURCES_SSE4_1 = silk/x86/NSQ_sse.c \
-silk/x86/NSQ_del_dec_sse.c \
+SILK_SOURCES_SSE4_1 = silk/x86/NSQ_sse4_1.c \
+silk/x86/NSQ_del_dec_sse4_1.c \
silk/x86/x86_silk_map.c \
-silk/x86/VAD_sse.c \
-silk/x86/VQ_WMat_EC_sse.c
+silk/x86/VAD_sse4_1.c \
+silk/x86/VQ_WMat_EC_sse4_1.c
SILK_SOURCES_ARM_NEON_INTR = \
silk/arm/arm_silk_map.c \
@@ -115,8 +115,8 @@ silk/fixed/vector_ops_FIX.c \
silk/fixed/schur64_FIX.c \
silk/fixed/schur_FIX.c
-SILK_SOURCES_FIXED_SSE4_1 = silk/fixed/x86/vector_ops_FIX_sse.c \
-silk/fixed/x86/burg_modified_FIX_sse.c
+SILK_SOURCES_FIXED_SSE4_1 = silk/fixed/x86/vector_ops_FIX_sse4_1.c \
+silk/fixed/x86/burg_modified_FIX_sse4_1.c
SILK_SOURCES_FIXED_ARM_NEON_INTR = \
silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c
diff --git a/win32/VS2015/opus.vcxproj b/win32/VS2015/opus.vcxproj
index 33bf706d..28da440a 100644
--- a/win32/VS2015/opus.vcxproj
+++ b/win32/VS2015/opus.vcxproj
@@ -257,7 +257,7 @@
<ClCompile Include="..\..\celt\quant_bands.c" />
<ClCompile Include="..\..\celt\rate.c" />
<ClCompile Include="..\..\celt\vq.c" />
- <ClCompile Include="..\..\celt\x86\celt_lpc_sse.c" />
+ <ClCompile Include="..\..\celt\x86\celt_lpc_sse4_1.c" />
<ClCompile Include="..\..\celt\x86\pitch_sse.c" />
<ClCompile Include="..\..\celt\x86\pitch_sse2.c" />
<ClCompile Include="..\..\celt\x86\pitch_sse4_1.c" />
@@ -341,10 +341,10 @@
<ClCompile Include="..\..\silk\table_LSF_cos.c" />
<ClCompile Include="..\..\silk\VAD.c" />
<ClCompile Include="..\..\silk\VQ_WMat_EC.c" />
- <ClCompile Include="..\..\silk\x86\NSQ_del_dec_sse.c" />
- <ClCompile Include="..\..\silk\x86\NSQ_sse.c" />
- <ClCompile Include="..\..\silk\x86\VAD_sse.c" />
- <ClCompile Include="..\..\silk\x86\VQ_WMat_EC_sse.c" />
+ <ClCompile Include="..\..\silk\x86\NSQ_del_dec_sse4_1.c" />
+ <ClCompile Include="..\..\silk\x86\NSQ_sse4_1.c" />
+ <ClCompile Include="..\..\silk\x86\VAD_sse4_1.c" />
+ <ClCompile Include="..\..\silk\x86\VQ_WMat_EC_sse4_1.c" />
<ClCompile Include="..\..\silk\x86\x86_silk_map.c" />
<ClCompile Include="..\..\src\analysis.c" />
<ClCompile Include="..\..\src\mlp.c" />
@@ -391,4 +391,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project> \ No newline at end of file
+</Project>
diff --git a/win32/VS2015/opus.vcxproj.filters b/win32/VS2015/opus.vcxproj.filters
index bb82b640..27d3533f 100644
--- a/win32/VS2015/opus.vcxproj.filters
+++ b/win32/VS2015/opus.vcxproj.filters
@@ -230,7 +230,7 @@
<ClCompile Include="..\..\celt\celt_lpc.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\celt\x86\celt_lpc_sse.c">
+ <ClCompile Include="..\..\celt\x86\celt_lpc_sse4_1.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\celt\cwrs.c">
@@ -449,10 +449,10 @@
<ClCompile Include="..\..\silk\NSQ_del_dec.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\silk\x86\NSQ_del_dec_sse.c">
+ <ClCompile Include="..\..\silk\x86\NSQ_del_dec_sse4_1.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\silk\x86\NSQ_sse.c">
+ <ClCompile Include="..\..\silk\x86\NSQ_sse4_1.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\silk\pitch_est_tables.c">
@@ -548,13 +548,13 @@
<ClCompile Include="..\..\silk\VAD.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\silk\x86\VAD_sse.c">
+ <ClCompile Include="..\..\silk\x86\VAD_sse4_1.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\silk\VQ_WMat_EC.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\silk\x86\VQ_WMat_EC_sse.c">
+ <ClCompile Include="..\..\silk\x86\VQ_WMat_EC_sse4_1.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\silk\x86\x86_silk_map.c">
@@ -567,4 +567,4 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
-</Project> \ No newline at end of file
+</Project>