24 files changed, 47 insertions, 47 deletions
diff --git a/volk/orc/Makefile.am b/volk/orc/Makefile.am
index 066050a7c..43f38543c 100644
--- a/volk/orc/Makefile.am
+++ b/volk/orc/Makefile.am
@@ -25,27 +25,27 @@ lib_LTLIBRARIES = libvolk_orc.la
 libvolk_orc_la_LDFLAGS = $(ORC_LDFLAGS)
 
 libvolk_orc_la_SOURCES = \
-volk_8s_convert_16s_aligned16_orc_impl.orc \
-volk_8s_convert_32f_aligned16_orc_impl.orc \
-volk_16u_byteswap_aligned16_orc_impl.orc \
-volk_32s_and_aligned16_orc_impl.orc \
-volk_32s_or_aligned16_orc_impl.orc \
-volk_32f_add_aligned16_orc_impl.orc \
-volk_32f_subtract_aligned16_orc_impl.orc \
-volk_32f_divide_aligned16_orc_impl.orc \
-volk_32f_multiply_aligned16_orc_impl.orc \
-volk_32fc_multiply_aligned16_orc_impl.orc \
-volk_32fc_32f_multiply_aligned16_orc_impl.orc \
-volk_32f_sqrt_aligned16_orc_impl.orc \
-volk_32f_max_aligned16_orc_impl.orc \
-volk_32f_min_aligned16_orc_impl.orc \
-volk_32f_normalize_aligned16_orc_impl.orc \
-volk_32fc_magnitude_32f_aligned16_orc_impl.orc \
-volk_32fc_magnitude_16s_aligned16_orc_impl.orc \
-volk_16sc_magnitude_16s_aligned16_orc_impl.orc \
-volk_16sc_deinterleave_16s_aligned16_orc_impl.orc \
-volk_16sc_deinterleave_32f_aligned16_orc_impl.orc \
-volk_16sc_deinterleave_real_8s_aligned16_orc_impl.orc
+volk_8s_convert_16s_a16_orc_impl.orc \
+volk_8s_s32f_convert_32f_a16_orc_impl.orc \
+volk_16u_byteswap_a16_orc_impl.orc \
+volk_32s_32s_and_32s_a16_orc_impl.orc \
+volk_32s_32s_or_32s_a16_orc_impl.orc \
+volk_32f_32f_add_32f_a16_orc_impl.orc \
+volk_32f_32f_subtract_32f_a16_orc_impl.orc \
+volk_32f_32f_divide_32f_a16_orc_impl.orc \
+volk_32f_32f_multiply_32f_a16_orc_impl.orc \
+volk_32fc_32fc_multiply_32fc_a16_orc_impl.orc \
+volk_32fc_32f_multiply_32fc_a16_orc_impl.orc \
+volk_32f_sqrt_32f_a16_orc_impl.orc \
+volk_32f_32f_max_32f_a16_orc_impl.orc \
+volk_32f_32f_min_32f_a16_orc_impl.orc \
+volk_32f_s32f_normalize_a16_orc_impl.orc \
+volk_32fc_magnitude_32f_a16_orc_impl.orc \
+volk_32fc_s32f_magnitude_16s_a16_orc_impl.orc \
+volk_16sc_magnitude_16s_a16_orc_impl.orc \
+volk_16sc_deinterleave_16s_16s_a16_orc_impl.orc \
+volk_16sc_s32f_deinterleave_32f_32f_a16_orc_impl.orc \
+volk_16sc_deinterleave_real_8s_a16_orc_impl.orc
 
 
 
diff --git a/volk/orc/volk_16sc_deinterleave_16s_aligned16_orc_impl.orc b/volk/orc/volk_16sc_deinterleave_16s_16s_a16_orc_impl.orc
index d226064a7..d396a0052 100644
--- a/volk/orc/volk_16sc_deinterleave_16s_aligned16_orc_impl.orc
+++ b/volk/orc/volk_16sc_deinterleave_16s_16s_a16_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_16sc_deinterleave_16s_aligned16_orc_impl
+.function volk_16sc_deinterleave_16s_16s_a16_orc_impl
 .dest 2 idst
 .dest 2 qdst
 .source 4 src
diff --git a/volk/orc/volk_16sc_deinterleave_real_8s_aligned16_orc_impl.orc b/volk/orc/volk_16sc_deinterleave_real_8s_a16_orc_impl.orc
index 609750096..5954c406f 100644
--- a/volk/orc/volk_16sc_deinterleave_real_8s_aligned16_orc_impl.orc
+++ b/volk/orc/volk_16sc_deinterleave_real_8s_a16_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_16sc_deinterleave_real_8s_aligned16_orc_impl
+.function volk_16sc_deinterleave_real_8s_a16_orc_impl
 .dest 1 dst
 .source 4 src
 .temp 2 iw
diff --git a/volk/orc/volk_16sc_magnitude_16s_aligned16_orc_impl.orc b/volk/orc/volk_16sc_magnitude_16s_a16_orc_impl.orc
index 088f56312..2a49d4ecb 100644
--- a/volk/orc/volk_16sc_magnitude_16s_aligned16_orc_impl.orc
+++ b/volk/orc/volk_16sc_magnitude_16s_a16_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_16sc_magnitude_16s_aligned16_orc_impl
+.function volk_16sc_magnitude_16s_a16_orc_impl
 .source 4 src
 .dest 2 dst
 .floatparam 4 scalar
diff --git a/volk/orc/volk_16sc_deinterleave_32f_aligned16_orc_impl.orc b/volk/orc/volk_16sc_s32f_deinterleave_32f_32f_a16_orc_impl.orc
index dddf682ca..47c3d28a9 100644
--- a/volk/orc/volk_16sc_deinterleave_32f_aligned16_orc_impl.orc
+++ b/volk/orc/volk_16sc_s32f_deinterleave_32f_32f_a16_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_16sc_deinterleave_32f_aligned16_orc_impl
+.function volk_16sc_s32f_deinterleave_32f_32f_a16_orc_impl
 .dest 4 idst
 .dest 4 qdst
 .source 4 src
diff --git a/volk/orc/volk_16u_byteswap_a16_orc_impl.orc b/volk/orc/volk_16u_byteswap_a16_orc_impl.orc
new file mode 100644
index 000000000..c1c8ee59e
--- /dev/null
+++ b/volk/orc/volk_16u_byteswap_a16_orc_impl.orc
@@ -0,0 +1,3 @@
+.function volk_16u_byteswap_a16_orc_impl
+.dest 2 dst
+swapw dst, dst
diff --git a/volk/orc/volk_16u_byteswap_aligned16_orc_impl.orc b/volk/orc/volk_16u_byteswap_aligned16_orc_impl.orc
deleted file mode 100644
index 3ffd12ec0..000000000
--- a/volk/orc/volk_16u_byteswap_aligned16_orc_impl.orc
+++ /dev/null
@@ -1,3 +0,0 @@
-.function volk_16u_byteswap_aligned16_orc_impl
-.dest 2 dst
-swapw dst, dst
diff --git a/volk/orc/volk_32f_add_aligned16_orc_impl.orc b/volk/orc/volk_32f_32f_add_32f_a16_orc_impl.orc
index 20e000f68..e6a30cf01 100644
--- a/volk/orc/volk_32f_add_aligned16_orc_impl.orc
+++ b/volk/orc/volk_32f_32f_add_32f_a16_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32f_add_aligned16_orc_impl
+.function volk_32f_32f_add_32f_a16_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_32f_divide_aligned16_orc_impl.orc b/volk/orc/volk_32f_32f_divide_32f_a16_orc_impl.orc
index 870843f2a..0bdcd0010 100644
--- a/volk/orc/volk_32f_divide_aligned16_orc_impl.orc
+++ b/volk/orc/volk_32f_32f_divide_32f_a16_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32f_divide_aligned16_orc_impl
+.function volk_32f_32f_divide_32f_a16_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_32f_max_aligned16_orc_impl.orc b/volk/orc/volk_32f_32f_max_32f_a16_orc_impl.orc
index 97f48ba4a..9584e6634 100644
--- a/volk/orc/volk_32f_max_aligned16_orc_impl.orc
+++ b/volk/orc/volk_32f_32f_max_32f_a16_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32f_max_aligned16_orc_impl
+.function volk_32f_32f_max_32f_a16_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_32f_min_aligned16_orc_impl.orc b/volk/orc/volk_32f_32f_min_32f_a16_orc_impl.orc
index a597933de..47b9c05db 100644
--- a/volk/orc/volk_32f_min_aligned16_orc_impl.orc
+++ b/volk/orc/volk_32f_32f_min_32f_a16_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32f_min_aligned16_orc_impl
+.function volk_32f_32f_min_32f_a16_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_32f_multiply_aligned16_orc_impl.orc b/volk/orc/volk_32f_32f_multiply_32f_a16_orc_impl.orc
index 23619af4e..e5a049c16 100644
--- a/volk/orc/volk_32f_multiply_aligned16_orc_impl.orc
+++ b/volk/orc/volk_32f_32f_multiply_32f_a16_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32f_multiply_aligned16_orc_impl
+.function volk_32f_32f_multiply_32f_a16_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_32f_subtract_aligned16_orc_impl.orc b/volk/orc/volk_32f_32f_subtract_32f_a16_orc_impl.orc
index 17dbcad46..2ab42d5f6 100644
--- a/volk/orc/volk_32f_subtract_aligned16_orc_impl.orc
+++ b/volk/orc/volk_32f_32f_subtract_32f_a16_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32f_subtract_aligned16_orc_impl
+.function volk_32f_32f_subtract_32f_a16_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_32f_normalize_aligned16_orc_impl.orc b/volk/orc/volk_32f_s32f_normalize_a16_orc_impl.orc
index 84d965e7f..acd319b16 100644
--- a/volk/orc/volk_32f_normalize_aligned16_orc_impl.orc
+++ b/volk/orc/volk_32f_s32f_normalize_a16_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32f_normalize_aligned16_orc_impl
+.function volk_32f_s32f_normalize_a16_orc_impl
 .source 4 src1
 .floatparam 4 invscalar
 .dest 4 dst
diff --git a/volk/orc/volk_32f_sqrt_32f_a16_orc_impl.orc b/volk/orc/volk_32f_sqrt_32f_a16_orc_impl.orc
new file mode 100644
index 000000000..ae5680f15
--- /dev/null
+++ b/volk/orc/volk_32f_sqrt_32f_a16_orc_impl.orc
@@ -0,0 +1,4 @@
+.function volk_32f_sqrt_32f_a16_orc_impl
+.source 4 src
+.dest 4 dst
+sqrtf dst, src
diff --git a/volk/orc/volk_32f_sqrt_aligned16_orc_impl.orc b/volk/orc/volk_32f_sqrt_aligned16_orc_impl.orc
deleted file mode 100644
index 0983271db..000000000
--- a/volk/orc/volk_32f_sqrt_aligned16_orc_impl.orc
+++ /dev/null
@@ -1,4 +0,0 @@
-.function volk_32f_sqrt_aligned16_orc_impl
-.source 4 src
-.dest 4 dst
-sqrtf dst, src
diff --git a/volk/orc/volk_32fc_32f_multiply_aligned16_orc_impl.orc b/volk/orc/volk_32fc_32f_multiply_32fc_a16_orc_impl.orc
index 27c059852..455293cff 100644
--- a/volk/orc/volk_32fc_32f_multiply_aligned16_orc_impl.orc
+++ b/volk/orc/volk_32fc_32f_multiply_32fc_a16_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32fc_32f_multiply_aligned16_orc_impl
+.function volk_32fc_32f_multiply_32fc_a16_orc_impl
 .source 8 src1
 .source 4 src2
 .dest 8 dst
diff --git a/volk/orc/volk_32fc_multiply_aligned16_orc_impl.orc b/volk/orc/volk_32fc_32fc_multiply_32fc_a16_orc_impl.orc
index ffe9cc3ef..ed928b90f 100644
--- a/volk/orc/volk_32fc_multiply_aligned16_orc_impl.orc
+++ b/volk/orc/volk_32fc_32fc_multiply_32fc_a16_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32fc_multiply_aligned16_orc_impl
+.function volk_32fc_32fc_multiply_32fc_a16_orc_impl
 .source 8 src1
 .source 8 src2
 .dest 8 dst
diff --git a/volk/orc/volk_32fc_magnitude_32f_aligned16_orc_impl.orc b/volk/orc/volk_32fc_magnitude_32f_a16_orc_impl.orc
index 47a10531d..c5e2e57f1 100644
--- a/volk/orc/volk_32fc_magnitude_32f_aligned16_orc_impl.orc
+++ b/volk/orc/volk_32fc_magnitude_32f_a16_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32fc_magnitude_32f_aligned16_orc_impl
+.function volk_32fc_magnitude_32f_a16_orc_impl
 .source 8 src
 .dest 4 dst
 .temp 8 iqf
diff --git a/volk/orc/volk_32fc_magnitude_16s_aligned16_orc_impl.orc b/volk/orc/volk_32fc_s32f_magnitude_16s_a16_orc_impl.orc
index 15f8fdff0..cccda8a0f 100644
--- a/volk/orc/volk_32fc_magnitude_16s_aligned16_orc_impl.orc
+++ b/volk/orc/volk_32fc_s32f_magnitude_16s_a16_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32fc_magnitude_16s_aligned16_orc_impl
+.function volk_32fc_s32f_magnitude_16s_a16_orc_impl
 .source 8 src
 .dest 2 dst
 .floatparam 4 scalar
diff --git a/volk/orc/volk_32s_and_aligned16_orc_impl.orc b/volk/orc/volk_32s_32s_and_32s_a16_orc_impl.orc
index 9d3c7b733..bff3af875 100644
--- a/volk/orc/volk_32s_and_aligned16_orc_impl.orc
+++ b/volk/orc/volk_32s_32s_and_32s_a16_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32s_and_aligned16_orc_impl
+.function volk_32s_32s_and_32s_a16_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_32s_or_aligned16_orc_impl.orc b/volk/orc/volk_32s_32s_or_32s_a16_orc_impl.orc
index 6d2a3859a..b6961f79e 100644
--- a/volk/orc/volk_32s_or_aligned16_orc_impl.orc
+++ b/volk/orc/volk_32s_32s_or_32s_a16_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32s_or_aligned16_orc_impl
+.function volk_32s_32s_or_32s_a16_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_8s_convert_16s_aligned16_orc_impl.orc b/volk/orc/volk_8s_convert_16s_a16_orc_impl.orc
index a089877d1..a55c7f723 100644
--- a/volk/orc/volk_8s_convert_16s_aligned16_orc_impl.orc
+++ b/volk/orc/volk_8s_convert_16s_a16_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_8s_convert_16s_aligned16_orc_impl
+.function volk_8s_convert_16s_a16_orc_impl
 .source 1 src
 .dest 2 dst
 convsbw dst, src
diff --git a/volk/orc/volk_8s_convert_32f_aligned16_orc_impl.orc b/volk/orc/volk_8s_s32f_convert_32f_a16_orc_impl.orc
index 91a0084d7..3274ab9d6 100644
--- a/volk/orc/volk_8s_convert_32f_aligned16_orc_impl.orc
+++ b/volk/orc/volk_8s_s32f_convert_32f_a16_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_8s_convert_32f_aligned16_orc_impl
+.function volk_8s_s32f_convert_32f_a16_orc_impl
 .source 2 src
 .dest 4 dst
 .floatparam 4 scalar