25 files changed, 52 insertions, 46 deletions
diff --git a/volk/orc/Makefile.am b/volk/orc/Makefile.am
index 6b5e4f8b6..814471bd0 100644
--- a/volk/orc/Makefile.am
+++ b/volk/orc/Makefile.am
@@ -21,31 +21,31 @@
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(ORC_CFLAGS)
 
 include $(top_srcdir)/Makefile.common
-lib_LTLIBRARIES = libvolk_orc.la
+noinst_LTLIBRARIES = libvolk_orc.la
 libvolk_orc_la_LDFLAGS = $(ORC_LDFLAGS)
 
 libvolk_orc_la_SOURCES = \
-volk_8i_convert_16i_a16_orc_impl.orc \
-volk_8i_s32f_convert_32f_a16_orc_impl.orc \
-volk_16u_byteswap_a16_orc_impl.orc \
-volk_32i_x2_and_32i_a16_orc_impl.orc \
-volk_32i_x2_or_32i_a16_orc_impl.orc \
-volk_32f_x2_add_32f_a16_orc_impl.orc \
-volk_32f_x2_subtract_32f_a16_orc_impl.orc \
-volk_32f_x2_divide_32f_a16_orc_impl.orc \
-volk_32f_x2_multiply_32f_a16_orc_impl.orc \
-volk_32fc_x2_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_x2_max_32f_a16_orc_impl.orc \
-volk_32f_x2_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_16i_a16_orc_impl.orc \
-volk_16ic_magnitude_16i_a16_orc_impl.orc \
-volk_16ic_deinterleave_16i_x2_a16_orc_impl.orc \
-volk_16i_s32f_deinterleave_32f_x2_a16_orc_impl.orc \
-volk_16ic_deinterleave_real_8i_a16_orc_impl.orc
+volk_8i_convert_16i_a_orc_impl.orc \
+volk_8i_s32f_convert_32f_a_orc_impl.orc \
+volk_16u_byteswap_a_orc_impl.orc \
+volk_32i_x2_and_32i_a_orc_impl.orc \
+volk_32i_x2_or_32i_a_orc_impl.orc \
+volk_32f_x2_add_32f_a_orc_impl.orc \
+volk_32f_x2_subtract_32f_a_orc_impl.orc \
+volk_32f_x2_divide_32f_a_orc_impl.orc \
+volk_32f_x2_multiply_32f_a_orc_impl.orc \
+volk_32fc_x2_multiply_32fc_a_orc_impl.orc \
+volk_32fc_32f_multiply_32fc_a_orc_impl.orc \
+volk_32f_sqrt_32f_a_orc_impl.orc \
+volk_32f_x2_max_32f_a_orc_impl.orc \
+volk_32f_x2_min_32f_a_orc_impl.orc \
+volk_32f_s32f_normalize_a_orc_impl.orc \
+volk_32fc_magnitude_32f_a_orc_impl.orc \
+volk_32fc_s32f_magnitude_16i_a_orc_impl.orc \
+volk_16ic_magnitude_16i_a_orc_impl.orc \
+volk_16ic_deinterleave_16i_x2_a_orc_impl.orc \
+volk_16i_s32f_deinterleave_32f_x2_a_orc_impl.orc \
+volk_16ic_deinterleave_real_8i_a_orc_impl.orc
 
 
 
diff --git a/volk/orc/volk_16i_s32f_deinterleave_32f_x2_a16_orc_impl.orc b/volk/orc/volk_16i_s32f_deinterleave_32f_x2_a_orc_impl.orc
index 0189fbf5d..fd8915da0 100644
--- a/volk/orc/volk_16i_s32f_deinterleave_32f_x2_a16_orc_impl.orc
+++ b/volk/orc/volk_16i_s32f_deinterleave_32f_x2_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_16ic_s32f_deinterleave_32f_x2_a16_orc_impl
+.function volk_16ic_s32f_deinterleave_32f_x2_a_orc_impl
 .dest 4 idst
 .dest 4 qdst
 .source 4 src
diff --git a/volk/orc/volk_16ic_deinterleave_16i_x2_a16_orc_impl.orc b/volk/orc/volk_16ic_deinterleave_16i_x2_a_orc_impl.orc
index 56018edda..76faa936a 100644
--- a/volk/orc/volk_16ic_deinterleave_16i_x2_a16_orc_impl.orc
+++ b/volk/orc/volk_16ic_deinterleave_16i_x2_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_16ic_deinterleave_16i_x2_a16_orc_impl
+.function volk_16ic_deinterleave_16i_x2_a_orc_impl
 .dest 2 idst
 .dest 2 qdst
 .source 4 src
diff --git a/volk/orc/volk_16ic_deinterleave_real_8i_a16_orc_impl.orc b/volk/orc/volk_16ic_deinterleave_real_8i_a_orc_impl.orc
index dba9a4c8e..8db49fd7c 100644
--- a/volk/orc/volk_16ic_deinterleave_real_8i_a16_orc_impl.orc
+++ b/volk/orc/volk_16ic_deinterleave_real_8i_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_16ic_deinterleave_real_8i_a16_orc_impl
+.function volk_16ic_deinterleave_real_8i_a_orc_impl
 .dest 1 dst
 .source 4 src
 .temp 2 iw
diff --git a/volk/orc/volk_16ic_magnitude_16i_a16_orc_impl.orc b/volk/orc/volk_16ic_magnitude_16i_a_orc_impl.orc
index 37225e9b8..fbaebc46d 100644
--- a/volk/orc/volk_16ic_magnitude_16i_a16_orc_impl.orc
+++ b/volk/orc/volk_16ic_magnitude_16i_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_16ic_magnitude_16i_a16_orc_impl
+.function volk_16ic_magnitude_16i_a_orc_impl
 .source 4 src
 .dest 2 dst
 .floatparam 4 scalar
diff --git a/volk/orc/volk_16sc_magnitude_32f_aligned16_orc_impl.orc b/volk/orc/volk_16sc_magnitude_32f_aligned16_orc_impl.orc
index 1e2380837..66fef7d2e 100644
--- a/volk/orc/volk_16sc_magnitude_32f_aligned16_orc_impl.orc
+++ b/volk/orc/volk_16sc_magnitude_32f_aligned16_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_16ic_magnitude_32f_a16_orc_impl
+.function volk_16ic_magnitude_32f_a_orc_impl
 .source 4 src
 .dest 4 dst
 .floatparam 4 scalar
diff --git a/volk/orc/volk_16u_byteswap_a16_orc_impl.orc b/volk/orc/volk_16u_byteswap_a16_orc_impl.orc
deleted file mode 100644
index c1c8ee59e..000000000
--- a/volk/orc/volk_16u_byteswap_a16_orc_impl.orc
+++ /dev/null
@@ -1,3 +0,0 @@
-.function volk_16u_byteswap_a16_orc_impl
-.dest 2 dst
-swapw dst, dst
diff --git a/volk/orc/volk_16u_byteswap_a_orc_impl.orc b/volk/orc/volk_16u_byteswap_a_orc_impl.orc
new file mode 100644
index 000000000..b96ba84af
--- /dev/null
+++ b/volk/orc/volk_16u_byteswap_a_orc_impl.orc
@@ -0,0 +1,3 @@
+.function volk_16u_byteswap_a_orc_impl
+.dest 2 dst
+swapw dst, dst
diff --git a/volk/orc/volk_32f_s32f_normalize_a16_orc_impl.orc b/volk/orc/volk_32f_s32f_normalize_a_orc_impl.orc
index acd319b16..986fdf665 100644
--- a/volk/orc/volk_32f_s32f_normalize_a16_orc_impl.orc
+++ b/volk/orc/volk_32f_s32f_normalize_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32f_s32f_normalize_a16_orc_impl
+.function volk_32f_s32f_normalize_a_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_a_orc_impl.orc
index ae5680f15..f339b1122 100644
--- a/volk/orc/volk_32f_sqrt_32f_a16_orc_impl.orc
+++ b/volk/orc/volk_32f_sqrt_32f_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32f_sqrt_32f_a16_orc_impl
+.function volk_32f_sqrt_32f_a_orc_impl
 .source 4 src
 .dest 4 dst
 sqrtf dst, src
diff --git a/volk/orc/volk_32f_x2_add_32f_a16_orc_impl.orc b/volk/orc/volk_32f_x2_add_32f_a_orc_impl.orc
index 8d095a052..450cc6a9e 100644
--- a/volk/orc/volk_32f_x2_add_32f_a16_orc_impl.orc
+++ b/volk/orc/volk_32f_x2_add_32f_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32f_x2_add_32f_a16_orc_impl
+.function volk_32f_x2_add_32f_a_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_32f_x2_divide_32f_a16_orc_impl.orc b/volk/orc/volk_32f_x2_divide_32f_a_orc_impl.orc
index 0097646cb..ee3b61b82 100644
--- a/volk/orc/volk_32f_x2_divide_32f_a16_orc_impl.orc
+++ b/volk/orc/volk_32f_x2_divide_32f_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32f_x2_divide_32f_a16_orc_impl
+.function volk_32f_x2_divide_32f_a_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_32f_x2_dot_prod_32f_a_orc_impl.orc b/volk/orc/volk_32f_x2_dot_prod_32f_a_orc_impl.orc
new file mode 100644
index 000000000..b367f3091
--- /dev/null
+++ b/volk/orc/volk_32f_x2_dot_prod_32f_a_orc_impl.orc
@@ -0,0 +1,6 @@
+.function volk_32f_x2_dot_prod_32f_a_orc_impl
+.source 4 src1
+.source 4 src2
+.dest 4 dst
+.accumulator 4 accum
+addf dst, src1, src2
diff --git a/volk/orc/volk_32f_x2_max_32f_a16_orc_impl.orc b/volk/orc/volk_32f_x2_max_32f_a_orc_impl.orc
index b7f008737..725201633 100644
--- a/volk/orc/volk_32f_x2_max_32f_a16_orc_impl.orc
+++ b/volk/orc/volk_32f_x2_max_32f_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32f_x2_max_32f_a16_orc_impl
+.function volk_32f_x2_max_32f_a_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_32f_x2_min_32f_a16_orc_impl.orc b/volk/orc/volk_32f_x2_min_32f_a_orc_impl.orc
index 78328b576..a71ed8250 100644
--- a/volk/orc/volk_32f_x2_min_32f_a16_orc_impl.orc
+++ b/volk/orc/volk_32f_x2_min_32f_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32f_x2_min_32f_a16_orc_impl
+.function volk_32f_x2_min_32f_a_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_32f_x2_multiply_32f_a16_orc_impl.orc b/volk/orc/volk_32f_x2_multiply_32f_a_orc_impl.orc
index e8fadff19..c17d539fd 100644
--- a/volk/orc/volk_32f_x2_multiply_32f_a16_orc_impl.orc
+++ b/volk/orc/volk_32f_x2_multiply_32f_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32f_x2_multiply_32f_a16_orc_impl
+.function volk_32f_x2_multiply_32f_a_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_32f_x2_subtract_32f_a16_orc_impl.orc b/volk/orc/volk_32f_x2_subtract_32f_a_orc_impl.orc
index 13fbe8c83..b3b0f256e 100644
--- a/volk/orc/volk_32f_x2_subtract_32f_a16_orc_impl.orc
+++ b/volk/orc/volk_32f_x2_subtract_32f_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32f_x2_subtract_32f_a16_orc_impl
+.function volk_32f_x2_subtract_32f_a_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_32fc_32f_multiply_32fc_a16_orc_impl.orc b/volk/orc/volk_32fc_32f_multiply_32fc_a_orc_impl.orc
index 455293cff..aa82699f5 100644
--- a/volk/orc/volk_32fc_32f_multiply_32fc_a16_orc_impl.orc
+++ b/volk/orc/volk_32fc_32f_multiply_32fc_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32fc_32f_multiply_32fc_a16_orc_impl
+.function volk_32fc_32f_multiply_32fc_a_orc_impl
 .source 8 src1
 .source 4 src2
 .dest 8 dst
diff --git a/volk/orc/volk_32fc_magnitude_32f_a16_orc_impl.orc b/volk/orc/volk_32fc_magnitude_32f_a_orc_impl.orc
index c5e2e57f1..032ab2b1b 100644
--- a/volk/orc/volk_32fc_magnitude_32f_a16_orc_impl.orc
+++ b/volk/orc/volk_32fc_magnitude_32f_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32fc_magnitude_32f_a16_orc_impl
+.function volk_32fc_magnitude_32f_a_orc_impl
 .source 8 src
 .dest 4 dst
 .temp 8 iqf
diff --git a/volk/orc/volk_32fc_s32f_magnitude_16i_a16_orc_impl.orc b/volk/orc/volk_32fc_s32f_magnitude_16i_a_orc_impl.orc
index 6116f5e1f..505e73f5d 100644
--- a/volk/orc/volk_32fc_s32f_magnitude_16i_a16_orc_impl.orc
+++ b/volk/orc/volk_32fc_s32f_magnitude_16i_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32fc_s32f_magnitude_16i_a16_orc_impl
+.function volk_32fc_s32f_magnitude_16i_a_orc_impl
 .source 8 src
 .dest 2 dst
 .floatparam 4 scalar
diff --git a/volk/orc/volk_32fc_x2_multiply_32fc_a16_orc_impl.orc b/volk/orc/volk_32fc_x2_multiply_32fc_a_orc_impl.orc
index a27d722cd..cb8a12d81 100644
--- a/volk/orc/volk_32fc_x2_multiply_32fc_a16_orc_impl.orc
+++ b/volk/orc/volk_32fc_x2_multiply_32fc_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32fc_x2_multiply_32fc_a16_orc_impl
+.function volk_32fc_x2_multiply_32fc_a_orc_impl
 .source 8 src1
 .source 8 src2
 .dest 8 dst
diff --git a/volk/orc/volk_32i_x2_and_32i_a16_orc_impl.orc b/volk/orc/volk_32i_x2_and_32i_a_orc_impl.orc
index 7b331f8ed..1845e4654 100644
--- a/volk/orc/volk_32i_x2_and_32i_a16_orc_impl.orc
+++ b/volk/orc/volk_32i_x2_and_32i_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32i_x2_and_32i_a16_orc_impl
+.function volk_32i_x2_and_32i_a_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_32i_x2_or_32i_a16_orc_impl.orc b/volk/orc/volk_32i_x2_or_32i_a_orc_impl.orc
index 4984a9ced..004663f42 100644
--- a/volk/orc/volk_32i_x2_or_32i_a16_orc_impl.orc
+++ b/volk/orc/volk_32i_x2_or_32i_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32i_x2_or_32i_a16_orc_impl
+.function volk_32i_x2_or_32i_a_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_8i_convert_16i_a16_orc_impl.orc b/volk/orc/volk_8i_convert_16i_a_orc_impl.orc
index f44845c88..d813c6cfa 100644
--- a/volk/orc/volk_8i_convert_16i_a16_orc_impl.orc
+++ b/volk/orc/volk_8i_convert_16i_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_8i_convert_16i_a16_orc_impl
+.function volk_8i_convert_16i_a_orc_impl
 .source 1 src
 .dest 2 dst
 convsbw dst, src
diff --git a/volk/orc/volk_8i_s32f_convert_32f_a16_orc_impl.orc b/volk/orc/volk_8i_s32f_convert_32f_a_orc_impl.orc
index 8f6e157e9..ad54fb1e1 100644
--- a/volk/orc/volk_8i_s32f_convert_32f_a16_orc_impl.orc
+++ b/volk/orc/volk_8i_s32f_convert_32f_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_8i_s32f_convert_32f_a16_orc_impl
+.function volk_8i_s32f_convert_32f_a_orc_impl
 .source 1 src
 .dest 4 dst
 .floatparam 4 scalar