Commit 87f079d9 authored by David Reid's avatar David Reid

Update tests to always use the reference implementation.

parent 699fae5d
...@@ -1452,6 +1452,10 @@ int do_channel_routing_tests() ...@@ -1452,6 +1452,10 @@ int do_channel_routing_tests()
routerConfig.mixingMode = mal_channel_mix_mode_planar_blend; routerConfig.mixingMode = mal_channel_mix_mode_planar_blend;
routerConfig.channelsIn = 6; routerConfig.channelsIn = 6;
routerConfig.channelsOut = routerConfig.channelsIn; routerConfig.channelsOut = routerConfig.channelsIn;
routerConfig.noSSE2 = MAL_TRUE;
routerConfig.noAVX = MAL_TRUE;
routerConfig.noAVX512 = MAL_TRUE;
routerConfig.noNEON = MAL_TRUE;
mal_get_standard_channel_map(mal_standard_channel_map_microsoft, routerConfig.channelsIn, routerConfig.channelMapIn); mal_get_standard_channel_map(mal_standard_channel_map_microsoft, routerConfig.channelsIn, routerConfig.channelMapIn);
mal_get_standard_channel_map(mal_standard_channel_map_microsoft, routerConfig.channelsOut, routerConfig.channelMapOut); mal_get_standard_channel_map(mal_standard_channel_map_microsoft, routerConfig.channelsOut, routerConfig.channelMapOut);
...@@ -1551,6 +1555,10 @@ int do_channel_routing_tests() ...@@ -1551,6 +1555,10 @@ int do_channel_routing_tests()
routerConfig.mixingMode = mal_channel_mix_mode_planar_blend; routerConfig.mixingMode = mal_channel_mix_mode_planar_blend;
routerConfig.channelsIn = 6; routerConfig.channelsIn = 6;
routerConfig.channelsOut = routerConfig.channelsIn; routerConfig.channelsOut = routerConfig.channelsIn;
routerConfig.noSSE2 = MAL_TRUE;
routerConfig.noAVX = MAL_TRUE;
routerConfig.noAVX512 = MAL_TRUE;
routerConfig.noNEON = MAL_TRUE;
mal_get_standard_channel_map(mal_standard_channel_map_microsoft, routerConfig.channelsIn, routerConfig.channelMapIn); mal_get_standard_channel_map(mal_standard_channel_map_microsoft, routerConfig.channelsIn, routerConfig.channelMapIn);
for (mal_uint32 iChannel = 0; iChannel < routerConfig.channelsIn; ++iChannel) { for (mal_uint32 iChannel = 0; iChannel < routerConfig.channelsIn; ++iChannel) {
routerConfig.channelMapOut[iChannel] = routerConfig.channelMapIn[routerConfig.channelsIn - iChannel - 1]; routerConfig.channelMapOut[iChannel] = routerConfig.channelMapIn[routerConfig.channelsIn - iChannel - 1];
...@@ -1656,6 +1664,10 @@ int do_channel_routing_tests() ...@@ -1656,6 +1664,10 @@ int do_channel_routing_tests()
routerConfig.mixingMode = mal_channel_mix_mode_simple; routerConfig.mixingMode = mal_channel_mix_mode_simple;
routerConfig.channelsIn = 2; routerConfig.channelsIn = 2;
routerConfig.channelsOut = 6; routerConfig.channelsOut = 6;
routerConfig.noSSE2 = MAL_TRUE;
routerConfig.noAVX = MAL_TRUE;
routerConfig.noAVX512 = MAL_TRUE;
routerConfig.noNEON = MAL_TRUE;
mal_get_standard_channel_map(mal_standard_channel_map_microsoft, routerConfig.channelsIn, routerConfig.channelMapIn); mal_get_standard_channel_map(mal_standard_channel_map_microsoft, routerConfig.channelsIn, routerConfig.channelMapIn);
mal_get_standard_channel_map(mal_standard_channel_map_microsoft, routerConfig.channelsOut, routerConfig.channelMapOut); mal_get_standard_channel_map(mal_standard_channel_map_microsoft, routerConfig.channelsOut, routerConfig.channelMapOut);
...@@ -1704,6 +1716,10 @@ int do_channel_routing_tests() ...@@ -1704,6 +1716,10 @@ int do_channel_routing_tests()
routerConfig.mixingMode = mal_channel_mix_mode_simple; routerConfig.mixingMode = mal_channel_mix_mode_simple;
routerConfig.channelsIn = 6; routerConfig.channelsIn = 6;
routerConfig.channelsOut = 2; routerConfig.channelsOut = 2;
routerConfig.noSSE2 = MAL_TRUE;
routerConfig.noAVX = MAL_TRUE;
routerConfig.noAVX512 = MAL_TRUE;
routerConfig.noNEON = MAL_TRUE;
mal_get_standard_channel_map(mal_standard_channel_map_microsoft, routerConfig.channelsIn, routerConfig.channelMapIn); mal_get_standard_channel_map(mal_standard_channel_map_microsoft, routerConfig.channelsIn, routerConfig.channelMapIn);
mal_get_standard_channel_map(mal_standard_channel_map_microsoft, routerConfig.channelsOut, routerConfig.channelMapOut); mal_get_standard_channel_map(mal_standard_channel_map_microsoft, routerConfig.channelsOut, routerConfig.channelMapOut);
...@@ -1750,6 +1766,10 @@ int do_channel_routing_tests() ...@@ -1750,6 +1766,10 @@ int do_channel_routing_tests()
routerConfig.onReadDeinterleaved = channel_router_callback__passthrough_test; routerConfig.onReadDeinterleaved = channel_router_callback__passthrough_test;
routerConfig.pUserData = NULL; routerConfig.pUserData = NULL;
routerConfig.mixingMode = mal_channel_mix_mode_planar_blend; routerConfig.mixingMode = mal_channel_mix_mode_planar_blend;
routerConfig.noSSE2 = MAL_TRUE;
routerConfig.noAVX = MAL_TRUE;
routerConfig.noAVX512 = MAL_TRUE;
routerConfig.noNEON = MAL_TRUE;
// Use very specific mappings for this test. // Use very specific mappings for this test.
routerConfig.channelsIn = 2; routerConfig.channelsIn = 2;
...@@ -1868,6 +1888,10 @@ int do_channel_routing_tests() ...@@ -1868,6 +1888,10 @@ int do_channel_routing_tests()
routerConfig.onReadDeinterleaved = channel_router_callback__passthrough_test; routerConfig.onReadDeinterleaved = channel_router_callback__passthrough_test;
routerConfig.pUserData = NULL; routerConfig.pUserData = NULL;
routerConfig.mixingMode = mal_channel_mix_mode_planar_blend; routerConfig.mixingMode = mal_channel_mix_mode_planar_blend;
routerConfig.noSSE2 = MAL_TRUE;
routerConfig.noAVX = MAL_TRUE;
routerConfig.noAVX512 = MAL_TRUE;
routerConfig.noNEON = MAL_TRUE;
// Use very specific mappings for this test. // Use very specific mappings for this test.
routerConfig.channelsIn = 8; routerConfig.channelsIn = 8;
...@@ -1940,6 +1964,10 @@ int do_channel_routing_tests() ...@@ -1940,6 +1964,10 @@ int do_channel_routing_tests()
routerConfig.onReadDeinterleaved = channel_router_callback__passthrough_test; routerConfig.onReadDeinterleaved = channel_router_callback__passthrough_test;
routerConfig.pUserData = NULL; routerConfig.pUserData = NULL;
routerConfig.mixingMode = mal_channel_mix_mode_planar_blend; routerConfig.mixingMode = mal_channel_mix_mode_planar_blend;
routerConfig.noSSE2 = MAL_TRUE;
routerConfig.noAVX = MAL_TRUE;
routerConfig.noAVX512 = MAL_TRUE;
routerConfig.noNEON = MAL_TRUE;
// Use very specific mappings for this test. // Use very specific mappings for this test.
routerConfig.channelsIn = 1; routerConfig.channelsIn = 1;
...@@ -1995,6 +2023,10 @@ int do_channel_routing_tests() ...@@ -1995,6 +2023,10 @@ int do_channel_routing_tests()
routerConfig.onReadDeinterleaved = channel_router_callback__passthrough_test; routerConfig.onReadDeinterleaved = channel_router_callback__passthrough_test;
routerConfig.pUserData = NULL; routerConfig.pUserData = NULL;
routerConfig.mixingMode = mal_channel_mix_mode_planar_blend; routerConfig.mixingMode = mal_channel_mix_mode_planar_blend;
routerConfig.noSSE2 = MAL_TRUE;
routerConfig.noAVX = MAL_TRUE;
routerConfig.noAVX512 = MAL_TRUE;
routerConfig.noNEON = MAL_TRUE;
// Use very specific mappings for this test. // Use very specific mappings for this test.
routerConfig.channelsIn = 4; routerConfig.channelsIn = 4;
......
...@@ -259,21 +259,21 @@ ...@@ -259,21 +259,21 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="mal_profiling.c"> <ClCompile Include="mal_profiling.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="mal_test_0.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="mal_test_0.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="mal_test_0.cpp"> <ClCompile Include="mal_test_0.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment