Fix build for main test program.

This commit is contained in:
David Reid
2018-05-29 19:30:50 +10:00
parent 40abbc8d94
commit da4e05aee2
+11 -11
View File
@@ -1461,7 +1461,7 @@ int do_channel_routing_tests()
routerConfig.channelsIn = 6; routerConfig.channelsIn = 6;
routerConfig.channelsOut = routerConfig.channelsIn; routerConfig.channelsOut = routerConfig.channelsIn;
routerConfig.noSSE2 = MAL_TRUE; routerConfig.noSSE2 = MAL_TRUE;
routerConfig.noAVX = MAL_TRUE; routerConfig.noAVX2 = MAL_TRUE;
routerConfig.noAVX512 = MAL_TRUE; routerConfig.noAVX512 = MAL_TRUE;
routerConfig.noNEON = 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);
@@ -1564,7 +1564,7 @@ int do_channel_routing_tests()
routerConfig.channelsIn = 6; routerConfig.channelsIn = 6;
routerConfig.channelsOut = routerConfig.channelsIn; routerConfig.channelsOut = routerConfig.channelsIn;
routerConfig.noSSE2 = MAL_TRUE; routerConfig.noSSE2 = MAL_TRUE;
routerConfig.noAVX = MAL_TRUE; routerConfig.noAVX2 = MAL_TRUE;
routerConfig.noAVX512 = MAL_TRUE; routerConfig.noAVX512 = MAL_TRUE;
routerConfig.noNEON = 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);
@@ -1673,7 +1673,7 @@ int do_channel_routing_tests()
routerConfig.channelsIn = 2; routerConfig.channelsIn = 2;
routerConfig.channelsOut = 6; routerConfig.channelsOut = 6;
routerConfig.noSSE2 = MAL_TRUE; routerConfig.noSSE2 = MAL_TRUE;
routerConfig.noAVX = MAL_TRUE; routerConfig.noAVX2 = MAL_TRUE;
routerConfig.noAVX512 = MAL_TRUE; routerConfig.noAVX512 = MAL_TRUE;
routerConfig.noNEON = 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);
@@ -1725,7 +1725,7 @@ int do_channel_routing_tests()
routerConfig.channelsIn = 6; routerConfig.channelsIn = 6;
routerConfig.channelsOut = 2; routerConfig.channelsOut = 2;
routerConfig.noSSE2 = MAL_TRUE; routerConfig.noSSE2 = MAL_TRUE;
routerConfig.noAVX = MAL_TRUE; routerConfig.noAVX2 = MAL_TRUE;
routerConfig.noAVX512 = MAL_TRUE; routerConfig.noAVX512 = MAL_TRUE;
routerConfig.noNEON = 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);
@@ -1775,7 +1775,7 @@ int do_channel_routing_tests()
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.noSSE2 = MAL_TRUE;
routerConfig.noAVX = MAL_TRUE; routerConfig.noAVX2 = MAL_TRUE;
routerConfig.noAVX512 = MAL_TRUE; routerConfig.noAVX512 = MAL_TRUE;
routerConfig.noNEON = MAL_TRUE; routerConfig.noNEON = MAL_TRUE;
@@ -1897,7 +1897,7 @@ int do_channel_routing_tests()
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.noSSE2 = MAL_TRUE;
routerConfig.noAVX = MAL_TRUE; routerConfig.noAVX2 = MAL_TRUE;
routerConfig.noAVX512 = MAL_TRUE; routerConfig.noAVX512 = MAL_TRUE;
routerConfig.noNEON = MAL_TRUE; routerConfig.noNEON = MAL_TRUE;
@@ -1973,7 +1973,7 @@ int do_channel_routing_tests()
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.noSSE2 = MAL_TRUE;
routerConfig.noAVX = MAL_TRUE; routerConfig.noAVX2 = MAL_TRUE;
routerConfig.noAVX512 = MAL_TRUE; routerConfig.noAVX512 = MAL_TRUE;
routerConfig.noNEON = MAL_TRUE; routerConfig.noNEON = MAL_TRUE;
@@ -2032,7 +2032,7 @@ int do_channel_routing_tests()
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.noSSE2 = MAL_TRUE;
routerConfig.noAVX = MAL_TRUE; routerConfig.noAVX2 = MAL_TRUE;
routerConfig.noAVX512 = MAL_TRUE; routerConfig.noAVX512 = MAL_TRUE;
routerConfig.noNEON = MAL_TRUE; routerConfig.noNEON = MAL_TRUE;
@@ -2402,10 +2402,10 @@ int main(int argc, char** argv)
} else { } else {
printf("Has SSE: NO\n"); printf("Has SSE: NO\n");
} }
if (mal_has_avx()) { if (mal_has_avx2()) {
printf("Has AVX: YES\n"); printf("Has AVX2: YES\n");
} else { } else {
printf("Has AVX: NO\n"); printf("Has AVX2: NO\n");
} }
if (mal_has_avx512f()) { if (mal_has_avx512f()) {
printf("Has AVX-512F: YES\n"); printf("Has AVX-512F: YES\n");