summaryrefslogtreecommitdiff
path: root/volk
diff options
context:
space:
mode:
authorNick Foster2011-02-15 22:28:38 -0800
committerNick Foster2011-02-15 22:28:38 -0800
commit1bf5a3ea4bbb9fd6baf72eb876778d2652c97f2c (patch)
tree3c133a726756b6b615e7e5cc9dbc239dec0e712f /volk
parent88c389e1166cf5427cfabc012502337999c2b68f (diff)
downloadgnuradio-1bf5a3ea4bbb9fd6baf72eb876778d2652c97f2c.tar.gz
gnuradio-1bf5a3ea4bbb9fd6baf72eb876778d2652c97f2c.tar.bz2
gnuradio-1bf5a3ea4bbb9fd6baf72eb876778d2652c97f2c.zip
reverted mktables deletion until i get my act together and make it go straight from python -> .h
Diffstat (limited to 'volk')
-rwxr-xr-xvolk/include/volk/volk_register.py8
-rw-r--r--volk/lib/qa_utils.cc2
2 files changed, 5 insertions, 5 deletions
diff --git a/volk/include/volk/volk_register.py b/volk/include/volk/volk_register.py
index 77290f12a..460a11fab 100755
--- a/volk/include/volk/volk_register.py
+++ b/volk/include/volk/volk_register.py
@@ -18,9 +18,9 @@ from make_runtime_c import make_runtime_c
from make_init_c import make_init_c
from make_runtime import make_runtime
from make_typedefs import make_typedefs
-from make_mktables import make_mktables
from make_environment_init_c import make_environment_init_c
from make_environment_init_h import make_environment_init_h
+from make_mktables import make_mktables
outfile_set_simd = open("../../config/lv_set_simd_flags.m4", "w");
outfile_reg = open("volk_registry.h", "w");
@@ -213,9 +213,6 @@ for func in functions:
fcountlist.append(fcount);
taglist.append(tags);
-outfile_mktables.write(make_mktables(functions));
-outfile_mktables.close();
-
outfile_cpu_h.write(make_cpuid_h(filearchs));
outfile_cpu_h.close();
@@ -261,3 +258,6 @@ outfile_environment_c.close();
outfile_environment_h.write(make_environment_init_h());
outfile_environment_h.close();
+
+outfile_mktables.write(make_mktables(functions));
+outfile_mktables.close();
diff --git a/volk/lib/qa_utils.cc b/volk/lib/qa_utils.cc
index 150cef729..f8fcc7b28 100644
--- a/volk/lib/qa_utils.cc
+++ b/volk/lib/qa_utils.cc
@@ -83,10 +83,10 @@ static std::vector<std::string> get_arch_list(const char **indices, const int ar
int num_archs = archs[0];
for(int i = 0; i < num_archs; i++) {
- //std::cout << "the archs this fn is avail on is " << archs[0] << std::endl;
if(!(archs[i+1] & volk_get_lvarch())) continue; //this arch isn't available on this pc
archlist.push_back(std::string(indices[i]));
}
+
return archlist;
}