ARCH added to Makefile

headmyshoulder · Nov 10, 2014 · 4816011 · 4816011
1 parent 1b76ef2
commit 4816011
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/performance/SIMD/Makefile b/performance/SIMD/Makefile
@@ -10,10 +10,13 @@
 # you also need NT2s SIMD libary available set the include path here:
 # SIMD_INCLUDE = /path/to/simd/include
 
-INCLUDES += -I../../include/ -I$(BOOST_ROOT) -I${SIMD_INCLUDE}
-#CXXFLAGS = -O3 -ffast-math -march=core-avx-i -std=c++0x -DNDEBUG -I${ODEINT_ROOT} -I${BOOST_ROOT} -I${SIMD_INCLUDE}
-# -mtune=native -march=native
+# change this if you want to cross-compile
+ARCH = Host
+# ARCH = AVX
+# ARCH = SSE4.2
 
-CXXFLAGS = -Ofast -xHost -fno-alias -ip -inline-forceinline -std=c++0x -DNDEBUG ${INCLUDES}
 CXX = icpc
 CC = icpc
+
+INCLUDES += -I../../include/ -I$(BOOST_ROOT) -I${SIMD_INCLUDE}
+CXXFLAGS = -Ofast -x${ARCH} -fno-alias -ip -inline-forceinline -std=c++0x -DNDEBUG ${INCLUDES}
diff --git a/performance/SIMD/perf_roessler.sh b/performance/SIMD/perf_roessler.sh
@@ -1,8 +1,6 @@
 #!/bin/bash
 echo "Running on ${HOSTNAME}"
 
-#make -B roessler roessler_simd
-
 out_dir=perf_${HOSTNAME}
 mkdir -p ${out_dir}
 

diff --git a/performance/SIMD/roessler_simd.cpp b/performance/SIMD/roessler_simd.cpp
@@ -47,15 +47,9 @@ struct roessler_system {
 
     void operator()(const state_type &x, state_type &dxdt, const double t) const
     {
-        // std::clog << "rhs: " << dxdt.size() << std::endl;
         dxdt[0] = -1.0*x[1] - x[2];
-        // std::clog << "rhs: " << dxdt[0] << std::endl;
         dxdt[1] = x[0] + m_a * x[1];
-        // std::clog << "rhs: " << dxdt[1] << std::endl;
-        //simd_pack tmp = boost::simd::splat<simd_pack>(m_b) + x[2] * (x[0] - boost::simd::splat<simd_pack>(m_c));
-        // std::clog << "rhs: " << tmp << std::endl;
         dxdt[2] = m_b + x[2] * (x[0] - m_c);
-        // std::clog << "rhs: " << dxdt[2] << std::endl;
     }
 };