From f8017bb19d6eb815b2dafed521f7a0447b6d5501 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Tue, 16 Oct 2012 12:23:19 +0530 Subject: [PATCH] tests: Factor out ARM svolume test into cpu-test This allows us to run the testing code separately from the PulseAudio daemon, which makes developing / regression testing this code a lot easier. --- src/pulsecore/svolume_arm.c | 86 --------------------------------------------- src/tests/cpu-test.c | 39 ++++++++++++++++++++ 2 files changed, 39 insertions(+), 86 deletions(-) diff --git a/src/pulsecore/svolume_arm.c b/src/pulsecore/svolume_arm.c index 79ed830..92b05a4 100644 --- a/src/pulsecore/svolume_arm.c +++ b/src/pulsecore/svolume_arm.c @@ -121,98 +121,12 @@ static void pa_volume_s16ne_arm(int16_t *samples, const int32_t *volumes, unsign ); } -#undef RUN_TEST - -#ifdef RUN_TEST -#define CHANNELS 2 -#define SAMPLES 1022 -#define TIMES 1000 -#define TIMES2 100 -#define PADDING 16 - -static void run_test(void) { - int16_t samples[SAMPLES]; - int16_t samples_ref[SAMPLES]; - int16_t samples_orig[SAMPLES]; - int32_t volumes[CHANNELS + PADDING]; - int i, j, padding; - pa_do_volume_func_t func; - pa_usec_t start, stop; - int k; - pa_usec_t min = INT_MAX, max = 0; - double s1 = 0, s2 = 0; - - func = pa_get_volume_func(PA_SAMPLE_S16NE); - - printf("checking ARM %zd\n", sizeof(samples)); - - pa_random(samples, sizeof(samples)); - memcpy(samples_ref, samples, sizeof(samples)); - memcpy(samples_orig, samples, sizeof(samples)); - - for (i = 0; i < CHANNELS; i++) - volumes[i] = PA_CLAMP_VOLUME(rand() >> 15); - for (padding = 0; padding < PADDING; padding++, i++) - volumes[i] = volumes[padding]; - - func(samples_ref, volumes, CHANNELS, sizeof(samples)); - pa_volume_s16ne_arm(samples, volumes, CHANNELS, sizeof(samples)); - for (i = 0; i < SAMPLES; i++) { - if (samples[i] != samples_ref[i]) { - printf ("%d: %04x != %04x (%04x * %04x)\n", i, samples[i], samples_ref[i], - samples_orig[i], volumes[i % CHANNELS]); - } - } - - for (k = 0; k < TIMES2; k++) { - start = pa_rtclock_now(); - for (j = 0; j < TIMES; j++) { - memcpy(samples, samples_orig, sizeof(samples)); - pa_volume_s16ne_arm(samples, volumes, CHANNELS, sizeof(samples)); - } - stop = pa_rtclock_now(); - - if (min > (stop - start)) min = stop - start; - if (max < (stop - start)) max = stop - start; - s1 += stop - start; - s2 += (stop - start) * (stop - start); - } - pa_log_info("ARM: %llu usec (min = %llu, max = %llu, stddev = %g).", (long long unsigned int)s1, - (long long unsigned int)min, (long long unsigned int)max, sqrt(TIMES2 * s2 - s1 * s1) / TIMES2); - - min = INT_MAX; max = 0; - s1 = s2 = 0; - for (k = 0; k < TIMES2; k++) { - start = pa_rtclock_now(); - for (j = 0; j < TIMES; j++) { - memcpy(samples_ref, samples_orig, sizeof(samples)); - func(samples_ref, volumes, CHANNELS, sizeof(samples)); - } - stop = pa_rtclock_now(); - - if (min > (stop - start)) min = stop - start; - if (max < (stop - start)) max = stop - start; - s1 += stop - start; - s2 += (stop - start) * (stop - start); - } - pa_log_info("ref: %llu usec (min = %llu, max = %llu, stddev = %g).", (long long unsigned int)s1, - (long long unsigned int)min, (long long unsigned int)max, sqrt(TIMES2 * s2 - s1 * s1) / TIMES2); - - pa_assert_se(memcmp(samples_ref, samples, sizeof(samples)) == 0); -} -#endif - #endif /* defined (__arm__) && defined (HAVE_ARMV6) */ - void pa_volume_func_init_arm(pa_cpu_arm_flag_t flags) { #if defined (__arm__) && defined (HAVE_ARMV6) pa_log_info("Initialising ARM optimized volume functions."); -#ifdef RUN_TEST - run_test(); -#endif - pa_set_volume_func(PA_SAMPLE_S16NE, (pa_do_volume_func_t) pa_volume_s16ne_arm); #endif /* defined (__arm__) && defined (HAVE_ARMV6) */ } diff --git a/src/tests/cpu-test.c b/src/tests/cpu-test.c index ac4312e..e23bfe5 100644 --- a/src/tests/cpu-test.c +++ b/src/tests/cpu-test.c @@ -90,6 +90,7 @@ static void run_volume_test(pa_do_volume_func_t func, pa_do_volume_func_t orig_f fail_unless(memcmp(samples_ref, samples, sizeof(samples)) == 0); } +#if defined (__i386__) || defined (__amd64__) START_TEST (svolume_mmx_test) { pa_do_volume_func_t orig_func, mmx_func; pa_cpu_x86_flag_t flags = 0; @@ -129,6 +130,29 @@ START_TEST (svolume_sse_test) { run_volume_test(sse_func, orig_func); } END_TEST +#endif /* defined (__i386__) || defined (__amd64__) */ + +#if defined (__arm__) && defined (__linux__) +START_TEST (svolume_arm_test) { + pa_do_volume_func_t orig_func, arm_func; + pa_cpu_arm_flag_t flags = 0; + + pa_cpu_get_arm_flags(&flags); + + if (!(flags & PA_CPU_ARM_V6)) { + pa_log_info("ARMv6 instructions not supported. Skipping"); + return; + } + + orig_func = pa_get_volume_func(PA_SAMPLE_S16NE); + pa_volume_func_init_arm(flags); + arm_func = pa_get_volume_func(PA_SAMPLE_S16NE); + + pa_log_debug("Checking ARM svolume"); + run_volume_test(arm_func, orig_func); +} +END_TEST +#endif /* defined (__arm__) && defined (__linux__) */ START_TEST (svolume_orc_test) { pa_do_volume_func_t orig_func, orc_func; @@ -161,6 +185,8 @@ END_TEST #undef PADDING /* End svolume tests */ +/* Start conversion tests */ +#if defined (__i386__) || defined (__amd64__) START_TEST (sconv_sse_test) { #define SAMPLES 1019 #define TIMES 1000 @@ -222,6 +248,8 @@ START_TEST (sconv_sse_test) { #undef TIMES } END_TEST +#endif /* defined (__i386__) || defined (__amd64__) */ +/* End conversion tests */ int main(int argc, char *argv[]) { int failed = 0; @@ -234,10 +262,21 @@ int main(int argc, char *argv[]) { s = suite_create("CPU"); tc = tcase_create("x86"); + + /* Volume tests */ +#if defined (__i386__) || defined (__amd64__) tcase_add_test(tc, svolume_mmx_test); tcase_add_test(tc, svolume_sse_test); +#endif +#if defined (__arm__) && defined (__linux__) + tcase_add_test(tc, svolume_arm_test); +#endif tcase_add_test(tc, svolume_orc_test); + + /* Converstion tests */ +#if defined (__i386__) || defined (__amd64__) tcase_add_test(tc, sconv_sse_test); +#endif suite_add_tcase(s, tc); sr = srunner_create(s); -- 2.7.4