From 95e91b44d2ef3535129c0a402c51bc56cfd74d06 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 15 Apr 2012 17:32:38 -0700
Subject: volk: created other templates for runtime + machines

---
 volk/tmpl/volk.tmpl.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 volk/tmpl/volk.tmpl.c

(limited to 'volk/tmpl/volk.tmpl.c')

diff --git a/volk/tmpl/volk.tmpl.c b/volk/tmpl/volk.tmpl.c
new file mode 100644
index 000000000..161f49a43
--- /dev/null
+++ b/volk/tmpl/volk.tmpl.c
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2011-2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <volk/volk_common.h>
+#include "volk_machines.h"
+#include <volk/volk_typedefs.h>
+#include <volk/volk_cpu.h>
+#include "volk_rank_archs.h"
+#include <volk/volk.h>
+#include <stdio.h>
+#include <string.h>
+
+struct volk_machine *get_machine(void) {
+    extern struct volk_machine *volk_machines[];
+    extern unsigned int n_volk_machines;
+    static struct volk_machine *machine = NULL;
+    
+    if(machine != NULL) return machine;
+    else {
+        unsigned int max_score = 0;
+        unsigned int i;
+        for(i=0; i<n_volk_machines; i++) {
+            if(!(volk_machines[i]->caps & (~volk_get_lvarch()))) {
+                if(volk_machines[i]->caps > max_score) {
+                    max_score = volk_machines[i]->caps;
+                    machine = volk_machines[i];
+                }
+            }
+        }
+        printf("Using Volk machine: %s\n", machine->name);
+        return machine;
+    }
+}
+
+unsigned int volk_get_alignment(void) {
+    return get_machine()->alignment;
+}
+
+#for $kern in $kernels
+
+void get_$(kern.name)($kern.arglist_defs) {
+    $kern.name = get_machine()->$(kern.name)_archs[volk_rank_archs(
+        get_machine()->$(kern.name)_indices,
+        get_machine()->$(kern.name)_arch_defs,
+        get_machine()->$(kern.name)_n_archs,
+        get_machine()->$(kern.name)_name,
+        volk_get_lvarch()
+    )];
+    $(kern.name)($kern.arglist_names);
+}
+
+$kern.pname $kern.name = &get_$(kern.name);
+
+void $(kern.name)_manual($kern.arglist_defs, const char* arch) {
+    const size_t index = get_index(
+        get_machine()->$(kern.name)_indices,
+        get_machine()->$(kern.name)_n_archs,
+        arch
+    );
+    get_machine()->$(kern.name)_archs[index](
+        $kern.arglist_names
+    );
+}
+
+struct volk_func_desc volk_32f_x2_add_32f_a_get_func_desc(void) {
+    struct volk_func_desc desc = {
+        get_machine()->$(kern.name)_indices,
+        get_machine()->$(kern.name)_arch_defs,
+        get_machine()->$(kern.name)_n_archs
+    };
+    return desc;
+}
+
+#end for
-- 
cgit 


From 37f9a62fd45ece1e6a92769fbb1798403c86ba9b Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 15 Apr 2012 19:11:52 -0700
Subject: volk: working build w/ cmakelists

---
 volk/tmpl/volk.tmpl.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'volk/tmpl/volk.tmpl.c')

diff --git a/volk/tmpl/volk.tmpl.c b/volk/tmpl/volk.tmpl.c
index 161f49a43..c3a1544ff 100644
--- a/volk/tmpl/volk.tmpl.c
+++ b/volk/tmpl/volk.tmpl.c
@@ -56,7 +56,7 @@ unsigned int volk_get_alignment(void) {
 
 #for $kern in $kernels
 
-void get_$(kern.name)($kern.arglist_defs) {
+void get_$(kern.name)($kern.arglist_namedefs) {
     $kern.name = get_machine()->$(kern.name)_archs[volk_rank_archs(
         get_machine()->$(kern.name)_indices,
         get_machine()->$(kern.name)_arch_defs,
@@ -69,7 +69,7 @@ void get_$(kern.name)($kern.arglist_defs) {
 
 $kern.pname $kern.name = &get_$(kern.name);
 
-void $(kern.name)_manual($kern.arglist_defs, const char* arch) {
+void $(kern.name)_manual($kern.arglist_namedefs, const char* arch) {
     const size_t index = get_index(
         get_machine()->$(kern.name)_indices,
         get_machine()->$(kern.name)_n_archs,
@@ -80,7 +80,7 @@ void $(kern.name)_manual($kern.arglist_defs, const char* arch) {
     );
 }
 
-struct volk_func_desc volk_32f_x2_add_32f_a_get_func_desc(void) {
+struct volk_func_desc $(kern.name)_get_func_desc(void) {
     struct volk_func_desc desc = {
         get_machine()->$(kern.name)_indices,
         get_machine()->$(kern.name)_arch_defs,
-- 
cgit 


From e826097e09fdfb04d14bf87861646b88229db881 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 13 Jan 2013 13:51:46 -0800
Subject: gras: support changeset for 3.6.4

used volk from next branch cf5c930d89ac89ba5a0da4a616c88d3c37e018ae for grextras support (it uses the dispatcher)

empty stubs for the gr_basic_block msg passing. This is going to be difficult to figure out. The alias stuff may or may not be related

most qa pass, there seems to be some additional issues, will be working through them on futher commits

Conflicts:

	gnuradio-core/CMakeLists.txt
	gnuradio-core/src/lib/runtime/CMakeLists.txt
	gnuradio-core/src/lib/runtime/gr_block.cc
	gnuradio-core/src/lib/runtime/gr_block.h
	gnuradio-core/src/lib/runtime/gr_hier_block2.h
	gnuradio-core/src/lib/runtime/gr_top_block.h
	gnuradio-core/src/python/gnuradio/gr/__init__.py
	gr-audio/examples/c++/CMakeLists.txt
	gr-fcd/examples/c++/CMakeLists.txt
	grc/python/Port.py
---
 volk/tmpl/volk.tmpl.c | 121 +++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 99 insertions(+), 22 deletions(-)

(limited to 'volk/tmpl/volk.tmpl.c')

diff --git a/volk/tmpl/volk.tmpl.c b/volk/tmpl/volk.tmpl.c
index c3a1544ff..f915f157f 100644
--- a/volk/tmpl/volk.tmpl.c
+++ b/volk/tmpl/volk.tmpl.c
@@ -27,6 +27,10 @@
 #include <volk/volk.h>
 #include <stdio.h>
 #include <string.h>
+#include <assert.h>
+
+static size_t __alignment = 0;
+static intptr_t __alignment_mask = 0;
 
 struct volk_machine *get_machine(void) {
     extern struct volk_machine *volk_machines[];
@@ -46,45 +50,118 @@ struct volk_machine *get_machine(void) {
             }
         }
         printf("Using Volk machine: %s\n", machine->name);
+        __alignment = machine->alignment;
+        __alignment_mask = (intptr_t)(__alignment-1);
         return machine;
     }
 }
 
-unsigned int volk_get_alignment(void) {
-    return get_machine()->alignment;
+size_t volk_get_alignment(void)
+{
+    get_machine(); //ensures alignment is set
+    return __alignment;
+}
+
+bool volk_is_aligned(const void *ptr)
+{
+    return ((intptr_t)(ptr) & __alignment_mask) == 0;
 }
 
+#define LV_HAVE_GENERIC
+#define LV_HAVE_DISPATCHER
+
 #for $kern in $kernels
 
-void get_$(kern.name)($kern.arglist_namedefs) {
-    $kern.name = get_machine()->$(kern.name)_archs[volk_rank_archs(
-        get_machine()->$(kern.name)_indices,
-        get_machine()->$(kern.name)_arch_defs,
-        get_machine()->$(kern.name)_n_archs,
-        get_machine()->$(kern.name)_name,
-        volk_get_lvarch()
-    )];
+#if $kern.has_dispatcher
+#include <volk/$(kern.name).h> //pulls in the dispatcher
+#end if
+
+static inline void __$(kern.name)_d($kern.arglist_full)
+{
+    #if $kern.has_dispatcher
+    $(kern.name)_dispatcher($kern.arglist_names);
+    return;
+    #end if
+
+    if (volk_is_aligned(
+    #set $num_open_parens = 0
+    #for $arg_type, $arg_name in $kern.args
+        #if '*' in $arg_type
+        VOLK_OR_PTR($arg_name,
+        #set $num_open_parens += 1
+        #end if
+    #end for
+        0$(')'*$num_open_parens)
+    )){
+        $(kern.name)_a($kern.arglist_names);
+    }
+    else{
+        $(kern.name)_u($kern.arglist_names);
+    }
+}
+
+static inline void __init_$(kern.name)(void)
+{
+    const char *name = get_machine()->$(kern.name)_name;
+    const char **impl_names = get_machine()->$(kern.name)_impl_names;
+    const int *impl_deps = get_machine()->$(kern.name)_impl_deps;
+    const bool *alignment = get_machine()->$(kern.name)_impl_alignment;
+    const size_t n_impls = get_machine()->$(kern.name)_n_impls;
+    const size_t index_a = volk_rank_archs(name, impl_names, impl_deps, alignment, n_impls, true/*aligned*/);
+    const size_t index_u = volk_rank_archs(name, impl_names, impl_deps, alignment, n_impls, false/*unaligned*/);
+    $(kern.name)_a = get_machine()->$(kern.name)_impls[index_a];
+    $(kern.name)_u = get_machine()->$(kern.name)_impls[index_u];
+
+    assert($(kern.name)_a);
+    assert($(kern.name)_u);
+
+    $(kern.name) = &__$(kern.name)_d;
+}
+
+static inline void __$(kern.name)_a($kern.arglist_full)
+{
+    __init_$(kern.name)();
+    $(kern.name)_a($kern.arglist_names);
+}
+
+static inline void __$(kern.name)_u($kern.arglist_full)
+{
+    __init_$(kern.name)();
+    $(kern.name)_u($kern.arglist_names);
+}
+
+static inline void __$(kern.name)($kern.arglist_full)
+{
+    __init_$(kern.name)();
     $(kern.name)($kern.arglist_names);
 }
 
-$kern.pname $kern.name = &get_$(kern.name);
+$kern.pname $(kern.name)_a = &__$(kern.name)_a;
+$kern.pname $(kern.name)_u = &__$(kern.name)_u;
+$kern.pname $(kern.name)   = &__$(kern.name);
 
-void $(kern.name)_manual($kern.arglist_namedefs, const char* arch) {
-    const size_t index = get_index(
-        get_machine()->$(kern.name)_indices,
-        get_machine()->$(kern.name)_n_archs,
-        arch
+void $(kern.name)_manual($kern.arglist_full, const char* impl_name)
+{
+    const int index = volk_get_index(
+        get_machine()->$(kern.name)_impl_names,
+        get_machine()->$(kern.name)_n_impls,
+        impl_name
     );
-    get_machine()->$(kern.name)_archs[index](
+    get_machine()->$(kern.name)_impls[index](
         $kern.arglist_names
     );
 }
 
-struct volk_func_desc $(kern.name)_get_func_desc(void) {
-    struct volk_func_desc desc = {
-        get_machine()->$(kern.name)_indices,
-        get_machine()->$(kern.name)_arch_defs,
-        get_machine()->$(kern.name)_n_archs
+volk_func_desc_t $(kern.name)_get_func_desc(void) {
+    const char **impl_names = get_machine()->$(kern.name)_impl_names;
+    const int *impl_deps = get_machine()->$(kern.name)_impl_deps;
+    const bool *alignment = get_machine()->$(kern.name)_impl_alignment;
+    const size_t n_impls = get_machine()->$(kern.name)_n_impls;
+    volk_func_desc_t desc = {
+        impl_names,
+        impl_deps,
+        alignment,
+        n_impls
     };
     return desc;
 }
-- 
cgit