ltpf: Move analysis to fixed point

test/arm/ltpf_arm.c

@@ -0,0 +1,114 @@
+/******************************************************************************
+ *
+ *  Copyright 2022 Google LLC
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "simd32.h"
+
+/* -------------------------------------------------------------------------- */
+
+#define TEST_ARM
+#include <ltpf.c>
+
+void lc3_put_bits_generic(lc3_bits_t *a, unsigned b, int c)
+{ (void)a, (void)b, (void)c; }
+
+unsigned lc3_get_bits_generic(struct lc3_bits *a, int b)
+{ return (void)a, (void)b, 0; }
+
+/* -------------------------------------------------------------------------- */
+
+static int check_resampler()
+{
+    int16_t __x[60+480], *x = __x + 60;
+    for (int i = -60; i < 480; i++)
+        x[i] = rand() & 0xffff;
+
+    struct lc3_ltpf_hp50_state hp50 = { 0 }, hp50_arm = { 0 };
+    int16_t y[128], y_arm[128];
+
+    resample_8k_12k8(&hp50, x, y, 128);
+    arm_resample_8k_12k8(&hp50_arm, x, y_arm, 128);
+    if (memcmp(y, y_arm, 128 * sizeof(*y)) != 0)
+        return -1;
+
+    resample_16k_12k8(&hp50, x, y, 128);
+    arm_resample_16k_12k8(&hp50_arm, x, y_arm, 128);
+    if (memcmp(y, y_arm, 128 * sizeof(*y)) != 0)
+        return -1;
+
+    resample_24k_12k8(&hp50, x, y, 128);
+    arm_resample_24k_12k8(&hp50_arm, x, y_arm, 128);
+    if (memcmp(y, y_arm, 128 * sizeof(*y)) != 0)
+        return -1;
+
+    resample_32k_12k8(&hp50, x, y, 128);
+    arm_resample_32k_12k8(&hp50_arm, x, y_arm, 128);
+    if (memcmp(y, y_arm, 128 * sizeof(*y)) != 0)
+        return -1;
+
+    resample_48k_12k8(&hp50, x, y, 128);
+    arm_resample_48k_12k8(&hp50_arm, x, y_arm, 128);
+    if (memcmp(y, y_arm, 128 * sizeof(*y)) != 0)
+        return -1;
+
+    return 0;
+}
+
+static int check_correlate()
+{
+    int16_t alignas(4) a[500], b[500];
+    float y[100], y_arm[100];
+
+    for (int i = 0; i < 500; i++) {
+        a[i] = rand() & 0xffff;
+        b[i] = rand() & 0xffff;
+    }
+
+    correlate(a, b+200, 128, y, 100);
+    arm_correlate(a, b+200, 128, y_arm, 100);
+    if (memcmp(y, y_arm, 100 * sizeof(*y)) != 0)
+        return -1;
+
+    correlate(a, b+199, 128, y, 99);
+    arm_correlate(a, b+199, 128, y_arm, 99);
+    if (memcmp(y, y_arm, 99 * sizeof(*y)) != 0)
+        return -1;
+
+    correlate(a, b+199, 128, y, 100);
+    arm_correlate(a, b+199, 128, y_arm, 100);
+    if (memcmp(y, y_arm, 100 * sizeof(*y)) != 0)
+        return -1;
+
+    return 0;
+}
+
+int check_ltpf(void)
+{
+    int ret;
+
+    if ((ret = check_resampler()) < 0)
+        return ret;
+
+    if ((ret = check_correlate()) < 0)
+        return ret;
+
+    return 0;
+}

test/arm/makefile.mk

@@ -0,0 +1,31 @@
+#
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+test_arm_src += \
+    $(TEST_DIR)/arm/test_arm.c \
+    $(TEST_DIR)/arm/ltpf_arm.c \
+    $(SRC_DIR)/tables.c
+
+test_arm_include += $(SRC_DIR)
+test_arm_ldlibs += m
+
+$(eval $(call add-bin,test_arm))
+
+test_arm: $(test_arm_bin)
+	@echo "  RUN     $(notdir $<)"
+	$(V)$<
+
+test: test_arm

test/arm/simd32.h

@@ -0,0 +1,64 @@
+/******************************************************************************
+ *
+ *  Copyright 2022 Google LLC
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+#if __ARM_FEATURE_SIMD32
+
+#include <arm_acle.h>
+
+#else
+#define __ARM_FEATURE_SIMD32 1
+
+#include <stdint.h>
+
+typedef int32_t int16x2_t;
+
+__attribute__((unused))
+static int16x2_t __pkhbt(int16x2_t a, int16x2_t b)
+{
+    uint32_t a_bot = (uint32_t)a & 0x0000ffffu;
+    uint32_t b_top = (uint32_t)b & 0xffff0000u;
+
+    return (int16x2_t)(a_bot | b_top);
+}
+
+__attribute__((unused))
+static int32_t __smlad(int16x2_t a, int16x2_t b, int32_t u)
+{
+    int16_t a_hi = a >> 16, a_lo = a & 0xffff;
+    int16_t b_hi = b >> 16, b_lo = b & 0xffff;
+
+    return u + (a_hi * b_hi) + (a_lo * b_lo);
+}
+
+__attribute__((unused))
+static int64_t __smlald(int16x2_t a, int16x2_t b, int64_t u)
+{
+    int16_t a_hi = a >> 16, a_lo = a & 0xffff;
+    int16_t b_hi = b >> 16, b_lo = b & 0xffff;
+    return u + (a_hi * b_hi) + (a_lo * b_lo);
+}
+
+__attribute__((unused))
+static int64_t __smlaldx(int16x2_t a, int16x2_t b, int64_t u)
+{
+    int16_t a_hi = a >> 16, a_lo = a & 0xffff;
+    int16_t b_hi = b >> 16, b_lo = b & 0xffff;
+    return u + (a_hi * b_lo) + (a_lo * b_hi);
+}
+
+#endif /* __ARM_FEATURE_SIMD32 */

test/arm/test_arm.c

@@ -0,0 +1,32 @@
+/******************************************************************************
+ *
+ *  Copyright 2022 Google LLC
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at:
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+
+#include <stdio.h>
+
+int check_ltpf(void);
+
+int main()
+{
+    int r, ret = 0;
+
+    printf("Checking LTPF ARM... "); fflush(stdout);
+    printf("%s\n", (r = check_ltpf()) == 0 ? "OK" : "Failed");
+    ret = ret || r;
+
+    return ret;
+}