diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-12-13 19:18:45 -0800 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-12-13 19:20:51 -0800 |
| commit | bef3db60e73953f2d2ecdc6a86a81e11df3b103d (patch) | |
| tree | 106ecec19d9b3fcf77c535c14ed9bcd9c3c090f9 /volk/lib | |
| parent | 09c84f41c3265d27a7812e95a2906b17a7f01ca8 (diff) | |
volk: committed some stuff i neglected
Diffstat (limited to 'volk/lib')
| -rw-r--r-- | volk/lib/Makefile.am | 17 | ||||
| -rw-r--r-- | volk/lib/qa_32f_sqrt_aligned16.cc | 15 |
2 files changed, 26 insertions, 6 deletions
diff --git a/volk/lib/Makefile.am b/volk/lib/Makefile.am index 814d438fd4..1291b01cd7 100644 --- a/volk/lib/Makefile.am +++ b/volk/lib/Makefile.am @@ -45,7 +45,9 @@ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_CPPFLAGS) \ # list of programs run by "make check" and "make distcheck" #TESTS = test_all - +#orc stuff gets built in the ORC directory conditional to ORC being enabled. +#it gets linked in during the build of libvolk as an added library. +#there might be a better way to do this. lib_LTLIBRARIES = \ libvolk.la \ @@ -72,6 +74,9 @@ universal_CODE = \ generic_CODE = \ volk_cpu_generic.c + +orc_CODE = \ + volk_cpu_orc.c x86_CODE = \ volk_cpu_x86.c @@ -133,10 +138,9 @@ endif -libvolk_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 -libvolk_runtime_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 - -libvolk_la_LIBADD = +libvolk_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 -lorc-0.4 +libvolk_runtime_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 -lorc-0.4 +libvolk_la_LIBADD = ../orc/libvolk_orc.a @@ -233,11 +237,12 @@ libvolk_qa_la_SOURCES = \ qa_32f_stddev_aligned16.cc \ qa_32f_stddev_and_mean_aligned16.cc -libvolk_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 +libvolk_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 -lorc-0.4 libvolk_qa_la_LIBADD = \ libvolk.la \ libvolk_runtime.la \ + ../orc/libvolk_orc.a \ $(CPPUNIT_LIBS) # ---------------------------------------------------------------- diff --git a/volk/lib/qa_32f_sqrt_aligned16.cc b/volk/lib/qa_32f_sqrt_aligned16.cc index 9a5f71de03..81d66dad72 100644 --- a/volk/lib/qa_32f_sqrt_aligned16.cc +++ b/volk/lib/qa_32f_sqrt_aligned16.cc @@ -52,6 +52,14 @@ void qa_32f_sqrt_aligned16::t1() { total = (double)(end-start)/(double)CLOCKS_PER_SEC; printf("generic_time: %f\n", total); + start = clock(); + for(int count = 0; count < ITERS; ++count) { + volk_32f_sqrt_aligned16_manual(output0, input0, vlen, "orc"); + } + end = clock(); + total = (double)(end-start)/(double)CLOCKS_PER_SEC; + printf("orc_time: %f\n", total); + /* for(int i = 0; i < 10; ++i) { printf("inputs: %f\n", input0[i]); @@ -93,6 +101,13 @@ void qa_32f_sqrt_aligned16::t1() { printf("generic_time: %f\n", total); start = clock(); for(int count = 0; count < ITERS; ++count) { + volk_32f_sqrt_aligned16_manual(output0, input0, vlen, "orc"); + } + end = clock(); + total = (double)(end-start)/(double)CLOCKS_PER_SEC; + printf("orc_time: %f\n", total); + start = clock(); + for(int count = 0; count < ITERS; ++count) { volk_32f_sqrt_aligned16_manual(output01, input0, vlen, "sse"); } end = clock(); |