volk: removed volk_registry.h, it was superseded by the machines

6 files changed, 0 insertions, 97 deletions

diff --git a/volk/gen/make_c.py b/volk/gen/make_c.py
index 65c42d89a..3fe604f39 100644
--- a/volk/gen/make_c.py
+++ b/volk/gen/make_c.py
@@ -30,7 +30,6 @@ def make_c(machines, archs, functions, arched_arglist, my_arglist):
     tempstring += """
 #include <volk/volk_common.h>
 #include <volk/volk_machines.h>
-#include <volk/volk_registry.h>
 #include <volk/volk_typedefs.h>
 #include <volk/volk_cpu.h>
 #include "volk_rank_archs.h"
diff --git a/volk/gen/make_registry.py b/volk/gen/make_registry.py
deleted file mode 100644
index de1f46aa6..000000000
--- a/volk/gen/make_registry.py
+++ /dev/null
@@ -1,85 +0,0 @@
-from xml.dom import minidom
-from emit_omnilog import *
-from volk_regexp import *
-import string
-
-def make_registry(dom, funclist, fcountlist, taglist) :
-    tempstring = "";
-    tempstring = tempstring + "/*this file is auto_generated by volk_register.py*/\n\n";
-    tempstring = tempstring +'\n#ifndef INCLUDED_VOLK_REGISTRY_H';
-    tempstring = tempstring +'\n#define INCLUDED_VOLK_REGISTRY_H\n\n';
-    tempstring = tempstring +'#include<volk/volk_config_fixed.h>\n';
-    tempstring = tempstring + emit_prolog();
-    tempstring = tempstring + '\n'
-
-    
-
-    
-    for domarch in dom:
-        arch = str(domarch.attributes["name"].value);
-        tempstring = tempstring +"#ifdef LV_HAVE_" + arch.swapcase() + "\n";
-        tempstring = tempstring +"#define LV_" + arch.swapcase() + "_CNT 1\n";
-        tempstring = tempstring +"#else\n";
-        tempstring = tempstring +"#define LV_" + arch.swapcase() + "_CNT 0\n";
-        tempstring = tempstring +"#endif /*LV_HAVE_" + arch.swapcase() + "*/\n\n";
-
-    counter = 0;
-    
-    for i in range(len(funclist)):
-        tempstring = tempstring + "static const char* " + funclist[i] + "_indices[] = {\n";
-        
-        tags_counter = 0;    
-        for arch_list in fcountlist[i]:
-            tempstring = tempstring + "#if defined(LV_HAVE_"
-            for ind in range(len(arch_list)):
-                
-                tempstring = tempstring + arch_list[ind] + ")";
-                if ind < len(arch_list) - 1:
-                    tempstring = tempstring + " && defined(LV_HAVE_";
-                
-            tempstring = tempstring + "\n \"" + str(taglist[i][tags_counter]) + "\",\n#endif\n";
-            tags_counter = tags_counter + 1;
-                
-        tempstring = strip_trailing(tempstring, ",")
-        tempstring = tempstring + "};\n\n";
-
-    
-    for fcount in fcountlist:
-        tempstring = tempstring + "static const int " + funclist[counter] + "_arch_defs[] = {\n";
-        counter += 1;
-        for arch_list in fcount:
-            tempstring = tempstring + "#if defined(LV_HAVE_"
-            for ind in range(len(arch_list)): 
-                tempstring = tempstring + arch_list[ind] + ")";
-                if ind < len(arch_list) - 1:
-                    tempstring = tempstring + " && defined(LV_HAVE_";
-            tempstring = tempstring + "\n"
-            tempstring = tempstring + " (1 << LV_"
-            for ind in range(len(arch_list)):
-                tempstring = tempstring + arch_list[ind];
-                if ind < len(arch_list) - 1:
-                    tempstring = tempstring + ") + (1 << LV_"
-            tempstring = tempstring + "),\n#endif\n"
-        tempstring = strip_trailing(tempstring, ",")
-        tempstring = tempstring + "};\n\n"
-        
-    counter = 0;
-    for fcount in fcountlist:
-        tempstring += "static const int " + funclist[counter] + "_n_archs = "
-        counter += 1;
-        for arch_list in fcount:
-            tempstring = tempstring + " (LV_"
-            for ind in range(len(arch_list)): 
-                tempstring = tempstring + arch_list[ind] + "_CNT";
-                if ind < len(arch_list) - 1:
-                    tempstring = tempstring + " * LV_";
-            tempstring = tempstring + ") + ";
-        tempstring = strip_trailing(tempstring, " + ");
-        tempstring = tempstring + ";\n"
-
-    
-    tempstring = tempstring + emit_epilog();
-    tempstring = tempstring +"#endif /*INCLUDED_VOLK_REGISTRY_H*/\n";
-
-    return tempstring;
-    
diff --git a/volk/gen/volk_register.py b/volk/gen/volk_register.py
index f67a8d17e..a239811db 100644
--- a/volk/gen/volk_register.py
+++ b/volk/gen/volk_register.py
@@ -9,7 +9,6 @@ from volk_regexp import *
 from make_cpuid_c import make_cpuid_c
 from make_cpuid_h import make_cpuid_h
 from make_set_simd import make_set_simd
-from make_registry import make_registry
 from make_config_fixed import make_config_fixed
 from make_typedefs import make_typedefs
 from make_environment_init_c import make_environment_init_c
@@ -36,7 +35,6 @@ for dir in (
     if not os.path.exists(dir): os.makedirs(dir)
 
 outfile_set_simd = open(os.path.join(gendir, "config/lv_set_simd_flags.m4"), "w")
-outfile_reg = open(os.path.join(gendir, "include/volk/volk_registry.h"), "w")
 outfile_h = open(os.path.join(gendir, "include/volk/volk.h"), "w")
 outfile_c = open(os.path.join(gendir, "lib/volk.cc"), "w")
 outfile_typedefs = open(os.path.join(gendir, "include/volk/volk_typedefs.h"), "w")
@@ -45,7 +43,6 @@ outfile_cpu_h = open(os.path.join(gendir, "include/volk/volk_cpu.h"), "w")
 outfile_cpu_c = open(os.path.join(gendir, "lib/volk_cpu.c"), "w")
 #outfile_config_in = open(os.path.join(gendir, "include/volk/volk_config.h.in"), "w")
 outfile_config_fixed = open(os.path.join(gendir, "include/volk/volk_config_fixed.h"), "w")
-#outfile_mktables = open(os.path.join(gendir, "lib/volk_mktables.c"), "w")
 outfile_environment_c = open(os.path.join(gendir, "lib/volk_environment_init.c"), "w")
 outfile_environment_h = open(os.path.join(gendir, "include/volk/volk_environment_init.h"), "w")
 outfile_makefile_am = open(os.path.join(gendir, "lib/Makefile.am"), "w")
@@ -273,9 +270,6 @@ outfile_cpu_c.close();
 
 outfile_set_simd.write(make_set_simd(filearchs, machines));
 outfile_set_simd.close();
-    
-outfile_reg.write(make_registry(filearchs, functions, fcountlist, taglist));
-outfile_reg.close();
 
 outfile_config_fixed.write(make_config_fixed(filearchs));
 outfile_config_fixed.close();
diff --git a/volk/include/volk/Makefile.am b/volk/include/volk/Makefile.am
index ea60d201a..bb4645526 100644
--- a/volk/include/volk/Makefile.am
+++ b/volk/include/volk/Makefile.am
@@ -31,7 +31,6 @@ volkinclude_HEADERS = \
 	volk_common.h \
 	$(top_gendir)/include/volk/volk_config_fixed.h \
 	$(top_gendir)/include/volk/volk_typedefs.h \
-	$(top_gendir)/include/volk/volk_registry.h \
 	$(top_gendir)/include/volk/volk.h \
 	$(top_gendir)/include/volk/volk_cpu.h \
 	$(top_gendir)/include/volk/volk_machines.h \
diff --git a/volk/lib/qa_utils.cc b/volk/lib/qa_utils.cc
index 2dee61823..b195ab365 100644
--- a/volk/lib/qa_utils.cc
+++ b/volk/lib/qa_utils.cc
@@ -3,15 +3,12 @@
 #include <boost/foreach.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/tokenizer.hpp>
-//#include <boost/test/unit_test.hpp>
 #include <iostream>
 #include <vector>
 #include <list>
 #include <ctime>
 #include <cmath>
 #include <boost/lexical_cast.hpp>
-//#include <volk/volk_runtime.h>
-#include <volk/volk_registry.h>
 #include <volk/volk.h>
 #include <volk/volk_cpu.h>
 #include <volk/volk_common.h>
diff --git a/volk/lib/testqa.cc b/volk/lib/testqa.cc
index c746cc336..47d3c1328 100644
--- a/volk/lib/testqa.cc
+++ b/volk/lib/testqa.cc
@@ -1,6 +1,5 @@
 #include "qa_utils.h"
 #include <volk/volk.h>
-#include <volk/volk_registry.h>
 #include <boost/test/unit_test.hpp>
 
 BOOST_AUTO_TEST_CASE(volk_test_all) {