Updating altmath library: SIMD for altmath is now optional

lasagnaphil · Aug 21, 2019 · ad650ff · ad650ff
1 parent f38bfa1
commit ad650ff
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 45 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,10 +18,9 @@ set(ALTLIB_DIR ${PROJECT_SOURCE_DIR}/deps/altlib)
 add_subdirectory(${ALTLIB_DIR})
 
 set(ALTMATH_DIR ${PROJECT_SOURCE_DIR}/deps/altmath)
-set(altmath_build_tests OFF)
+set(altmath_build_tests OFF CACHE BOOL "Turn off tests.")
 add_subdirectory(${ALTMATH_DIR})
 
-
 set(LIBRARY_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
 file(GLOB_RECURSE LIBRARY_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h)
 

diff --git a/demo/App.h b/demo/App.h
@@ -7,7 +7,7 @@
 
 #include <SDL.h>
 
-#include "vec2d.h"
+#include "vec2.h"
 #include "Camera2D.h"
 #include "FluidSim2D.h"
 #include "FluidRenderer2D.h"

diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt
@@ -3,6 +3,8 @@ file(GLOB DEMO_HEADERS *.h)
 
 add_executable(fluid_sim_demo ${DEMO_SOURCES} ${DEMO_HEADERS})
 
+# target_compile_definitions(fluid_sim_demo PUBLIC ALTMATH_USE_SIMD)
+
 target_link_libraries(fluid_sim_demo LINK_PUBLIC fluid_sim)
 target_link_libraries(fluid_sim_demo PUBLIC altlib)
 target_link_libraries(fluid_sim_demo PUBLIC altmath)

diff --git a/demo/Camera2D.h b/demo/Camera2D.h
@@ -7,7 +7,7 @@
 
 #include <StackVec.h>
 #include "vec2.h"
-#include "mat4f.h"
+#include "mat4.h"
 
 #include "InputManager.h"
 

diff --git a/demo/FluidRenderer2D.cpp b/demo/FluidRenderer2D.cpp
@@ -4,7 +4,7 @@
 
 #include "FluidRenderer2D.h"
 
-#include <vec4f.h>
+#include <vec4.h>
 #include "App.h"
 #include "FluidSim2D.h"
 

diff --git a/demo/Shader.h b/demo/Shader.h
@@ -8,10 +8,10 @@
 #include "Storage.h"
 #include "StringPool.h"
 
-#include <mat4f.h>
+#include <mat4.h>
 #include <vec2.h>
 #include <vec3.h>
-#include <vec4f.h>
+#include <vec4.h>
 
 struct Shader {
     GLuint id;

diff --git a/demo/Transform.h b/demo/Transform.h
@@ -5,9 +5,9 @@
 #ifndef ALTLIB_TRANSFORM_H
 #define ALTLIB_TRANSFORM_H
 
-#include <vec4f.h>
-#include <quatf.h>
-#include <mat4f.h>
+#include <vec4.h>
+#include <quat.h>
+#include <mat4.h>
 #include <mat_utils.h>
 
 struct Transform {

diff --git a/deps/altmath b/deps/altmath
diff --git a/include/Array2D.h b/include/Array2D.h
@@ -15,8 +15,7 @@
 
 #include <math_utils.h>
 #include <vec_utils.h>
-#include <vec2d.h>
-#include <vec2dx4.h>
+#include <vec2.h>
 #include "immintrin.h"
 
 template <typename T>
@@ -376,6 +375,7 @@ struct Array2D<double> {
         (*this)(x2, y2) += disp.x * disp.y * value;
     }
 
+    /*
     void linearDistribute(vec2dx4 pos, vec4d value) {
         auto floor = aml::toInt(aml::floor(pos));
         auto disp = vec2dx4 {pos.x - aml::toDouble(floor.x), pos.y - aml::toDouble(floor.y)};
@@ -397,6 +397,7 @@ struct Array2D<double> {
             (*this)(x2.v[i], y2.v[i]) += v4.v[i];
         }
     }
+     */
 
     double linearExtract(vec2d pos) {
         int ui = (int) pos.x;

diff --git a/include/FluidSim2D.h b/include/FluidSim2D.h
@@ -7,7 +7,7 @@
 
 #include <cstdint>
 #include <StackVec.h>
-#include <vec2d.h>
+#include <vec2.h>
 #include "Array2D.h"
 #include "MACGrid2D.h"
 #include "PerformanceCounter.h"

diff --git a/src/FluidSim2D.cpp b/src/FluidSim2D.cpp
@@ -4,7 +4,6 @@
 //
 
 #include <ctime>
-#include <vec2dx4.h>
 #include <math_utils.h>
 #include <Defer.h>
 #include <Queue.h>
@@ -595,7 +594,7 @@ void FluidSim2D::applyAdvection() {
         auto nextPos = pos + (2./9.)*dt*k1 + (3./9.)*dt*k2 + (4./9.)*dt*k3;
         nextPos = clampPos(nextPos);
 
-        if (isnan(pos.x) || isnan(pos.y)) {
+        if (std::isnan(pos.x) || std::isnan(pos.y)) {
             log_error("Advected position is NaN! pos=(%d, %d), idx=%d", pos.x, pos.y, i);
             exit(1);
         }
+25 −7		CMakeLists.txt
+21 −8		README.md
+0 −14,075		catch2/catch.hpp
+197 −0		doctest/ThreadLocal.h
+5,271 −0		doctest/doctest.h
+166 −0		src/mat2.h
+281 −5		src/mat4.h
+11 −18		src/math_utils.h
+155 −0		src/simd/mat2f.h
+34 −3		src/simd/mat4d.h
+104 −4		src/simd/mat4f.h
+3 −0		src/simd/quatf.h
+29 −0		src/simd/simd.h
+4 −4		src/simd/vec2d.h
+3 −0		src/simd/vec2dx4.h
+4 −0		src/simd/vec3dx4.h
+4 −5		src/simd/vec4d.h
+10 −5		src/simd/vec4f.h
+3 −0		src/simd/vec4i.h
+44 −0		src/simd/vec_utils.h
+18 −0		src/splines.h
+4 −0		src/vec2.h
+1 −1		src/vec3.h
+6 −1		src/vec4.h
+26 −44		src/vec_utils.h
+53 −27		tests/mat_test.cpp
+14 −10		tests/quat_test.cpp
+2 −11		tests/test_main.cpp
+160 −0		tests/vec_simd_test.cpp
+131 −286		tests/vec_test.cpp