[PATCH 2/5] remove RUN_TEST macro for svolume sse and use new test framework

[dzrongg@xxxxxxxxx (Deng Zhengrong)]

---
 src/pulsecore/cpu-x86.h     |    3 ++
 src/pulsecore/svolume_sse.c |   71 +++++++-----------------------------------
 2 files changed, 15 insertions(+), 59 deletions(-)

diff --git a/src/pulsecore/cpu-x86.h b/src/pulsecore/cpu-x86.h
index 0045ef6..cb76c56 100644
--- a/src/pulsecore/cpu-x86.h
+++ b/src/pulsecore/cpu-x86.h
@@ -25,6 +25,7 @@
 
 #include <stdint.h>
 #include <pulsecore/macro.h>
+#include <pulsecore/test.h>
 
 typedef enum pa_cpu_x86_flag {
     PA_CPU_X86_MMX       = (1 << 0),
@@ -69,4 +70,6 @@ void pa_remap_func_init_sse(pa_cpu_x86_flag_t flags);
 
 void pa_convert_func_init_sse (pa_cpu_x86_flag_t flags);
 
+void svolume_sse_unit_test(pa_test_reporter *reporter);
+
 #endif /* foocpux86hfoo */
diff --git a/src/pulsecore/svolume_sse.c b/src/pulsecore/svolume_sse.c
index fe08de4..5d372aa 100644
--- a/src/pulsecore/svolume_sse.c
+++ b/src/pulsecore/svolume_sse.c
@@ -29,6 +29,7 @@
 #include <pulsecore/random.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/endianmacros.h>
+#include <pulsecore/test.h>
 
 #include "cpu-x86.h"
 
@@ -252,95 +253,47 @@ static void pa_volume_s16re_sse2(int16_t *samples, int32_t *volumes, unsigned ch
     );
 }
 
-#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) {
+static void svolume_sse_unit_test_aux(pa_test_reporter *reporter, int sample_type, void (*sample_func)(int16_t *samples, int32_t *volumes, unsigned channels, unsigned length)) {
     int16_t samples[SAMPLES];
     int16_t samples_ref[SAMPLES];
     int16_t samples_orig[SAMPLES];
     int32_t volumes[CHANNELS + PADDING];
-    int i, j, padding;
+    int i, 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 SSE2 %zd\n", sizeof(samples));
+    func = pa_get_volume_func(sample_type);
 
     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);
+        volumes[i] = PA_CLAMP_VOLUME((pa_volume_t)(rand() >> 15));
     for (padding = 0; padding < PADDING; padding++, i++)
         volumes[i] = volumes[padding];
 
     func(samples_ref, volumes, CHANNELS, sizeof(samples));
-    pa_volume_s16ne_sse2(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]);
-        }
-    }
+    sample_func(samples, volumes, CHANNELS, sizeof(samples));
 
-    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_sse2(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("SSE: %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);
+    for (i = 0; i < SAMPLES; i++)
+        pa_test_assert(reporter, samples[i] == samples_ref[i]);
+}
 
-    pa_assert_se(memcmp(samples_ref, samples, sizeof(samples)) == 0);
+void svolume_sse_unit_test(pa_test_reporter *reporter) {
+    svolume_sse_unit_test_aux(reporter, PA_SAMPLE_S16NE, pa_volume_s16ne_sse2);
+    svolume_sse_unit_test_aux(reporter, PA_SAMPLE_S16RE, pa_volume_s16re_sse2);
 }
-#endif
 #endif /* defined (__i386__) || defined (__amd64__) */
 
 void pa_volume_func_init_sse(pa_cpu_x86_flag_t flags) {
 #if defined (__i386__) || defined (__amd64__)
-
-#ifdef RUN_TEST
-    run_test();
-#endif
-
     if (flags & PA_CPU_X86_SSE2) {
         pa_log_info("Initialising SSE2 optimized volume functions.");
 
-- 
1.7.7.6