introduce EIGEN_DONT_ALIGN_STACK (disables alignment attributes) and EIGEN_DONT_ALIGN_HEAP (disables aligned malloc)...

you can still use EIGEN_DONT_ALIGN to do both at once.

1 files changed, 47 insertions, 45 deletions

diff --git a/cmake/EigenTesting.cmake b/cmake/EigenTesting.cmake
index b08f8c340..3bb9aed2b 100644
--- a/cmake/EigenTesting.cmake
+++ b/cmake/EigenTesting.cmake
@@ -154,53 +154,55 @@ macro(ei_testing_print_summary)
     message("Default order:     Column-major")
   endif()
 
-  if(EIGEN_TEST_SSE2)
-    message("SSE2:              ON")
+  if(EIGEN_TEST_NO_EXPLICIT_ALIGNMENT)
+    message("Explicit alignment (hence vectorization) disabled")
+  elseif(EIGEN_TEST_NO_EXPLICIT_VECTORIZATION)
+    message("Explicit vectorization disabled (alignment kept enabled)")
   else()
-    message("SSE2:              Using architecture defaults")
-  endif()
-
-  if(EIGEN_TEST_SSE3)
-    message("SSE3:              ON")
-  else()
-    message("SSE3:              Using architecture defaults")
-  endif()
 
-  if(EIGEN_TEST_SSSE3)
-    message("SSSE3:             ON")
-  else()
-    message("SSSE3:             Using architecture defaults")
-  endif()
-
-  if(EIGEN_TEST_SSE4_1)
-    message("SSE4.1:            ON")
-  else()
-    message("SSE4.1:            Using architecture defaults")
-  endif()
-
-  if(EIGEN_TEST_SSE4_2)
-    message("SSE4.2:            ON")
-  else()
-    message("SSE4.2:            Using architecture defaults")
-  endif()
-
-  if(EIGEN_TEST_ALTIVEC)
-    message("Altivec:           ON")
-  else()
-    message("Altivec:           Using architecture defaults")
-  endif()
-
-  if(EIGEN_TEST_NEON)
-    message("ARM NEON:          ON")
-  else()
-    message("ARM NEON:          Using architecture defaults")
-  endif()
-
-  if(EIGEN_TEST_NO_EXPLICIT_VECTORIZATION)
-    message("Explicit vec:      OFF")
-  else()
-    message("Explicit vec:      Using architecture defaults")
-  endif()
+    if(EIGEN_TEST_SSE2)
+      message("SSE2:              ON")
+    else()
+      message("SSE2:              Using architecture defaults")
+    endif()
+
+    if(EIGEN_TEST_SSE3)
+      message("SSE3:              ON")
+    else()
+      message("SSE3:              Using architecture defaults")
+    endif()
+
+    if(EIGEN_TEST_SSSE3)
+      message("SSSE3:             ON")
+    else()
+      message("SSSE3:             Using architecture defaults")
+    endif()
+
+    if(EIGEN_TEST_SSE4_1)
+      message("SSE4.1:            ON")
+    else()
+      message("SSE4.1:            Using architecture defaults")
+    endif()
+
+    if(EIGEN_TEST_SSE4_2)
+      message("SSE4.2:            ON")
+    else()
+      message("SSE4.2:            Using architecture defaults")
+    endif()
+
+    if(EIGEN_TEST_ALTIVEC)
+      message("Altivec:           ON")
+    else()
+      message("Altivec:           Using architecture defaults")
+    endif()
+
+    if(EIGEN_TEST_NEON)
+      message("ARM NEON:          ON")
+    else()
+      message("ARM NEON:          Using architecture defaults")
+    endif()
+
+  endif() # vectorization / alignment options
 
   message("\n${EIGEN_TESTING_SUMMARY}")
   #   message("CXX:               ${CMAKE_CXX_COMPILER}")