Added more pref tests

glm/core/intrinsic_common.hpp

@@ -12,7 +12,7 @@
 
 #include "../setup.hpp"
 
-#if(GLM_ARCH >= GLM_ARCH_SSE2)
+//#if(GLM_ARCH >= GLM_ARCH_SSE2)
 
 namespace glm{
 namespace detail{
@@ -63,5 +63,5 @@ namespace detail{
 
 #include "intrinsic_common.inl"
 
-#endif//(GLM_ARCH >= GLM_ARCH_SSE2)
+//#endif//(GLM_ARCH >= GLM_ARCH_SSE2)
 #endif//glm_detail_intrinsic_common

test/gtx/gtx-simd-mat4.cpp

@@ -7,14 +7,13 @@
 // File    : test/gtx/simd-mat4.cpp
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#define GLM_INSTRUCTION_SET GLM_PLATFORM_SSE3
+#define GLM_INSTRUCTION_SET GLM_PLATFORM_SSE3 | GLM_PLATFORM_SSE2
 #include <glm/glm.hpp>
 #include <glm/gtx/simd_mat4.hpp>
 #include <glm/gtx/random.hpp>
 #include <iostream>
 #include <ctime>
 #include <vector>
-#include <array>
 
 std::vector<float> test_detA(std::vector<glm::mat4> const & Data)
 {
@@ -22,7 +21,7 @@ std::vector<float> test_detA(std::vector<glm::mat4> const & Data)
 
 	std::clock_t TimeStart = clock();
 
-	for(std::size_t i = 0; i < Test.size(); ++i)
+	for(std::size_t i = 0; i < Test.size() - 1; ++i)
 		Test[i] = glm::determinant(Data[i]);
 
 	std::clock_t TimeEnd = clock();
@@ -37,8 +36,9 @@ std::vector<float> test_detB(std::vector<glm::mat4> const & Data)
 
 	std::clock_t TimeStart = clock();
 
-	for(std::size_t i = 0; i < Test.size(); ++i)
+	for(std::size_t i = 0; i < Test.size() - 1; ++i)
 	{
+		_mm_prefetch((char*)&Data[i + 1], _MM_HINT_T0);
 		glm::simd_mat4 m(Data[i]);
 		Test[i] = glm::simd_vec4(glm::detail::sse_slow_det_ps((__m128 const * const)&m)).x; 
 	}
@@ -55,8 +55,9 @@ std::vector<float> test_detC(std::vector<glm::mat4> const & Data)
 
 	std::clock_t TimeStart = clock();
 
-	for(std::size_t i = 0; i < Test.size(); ++i)
+	for(std::size_t i = 0; i < Test.size() - 1; ++i)
 	{
+		_mm_prefetch((char*)&Data[i + 1], _MM_HINT_T0);
 		glm::simd_mat4 m(Data[i]);
 		Test[i] = glm::simd_vec4(glm::detail::sse_det_ps((__m128 const * const)&m)).x; 
 	}
@@ -73,21 +74,112 @@ std::vector<float> test_detD(std::vector<glm::mat4> const & Data)
 
 	std::clock_t TimeStart = clock();
 
-	for(std::size_t i = 0; i < Test.size(); ++i)
+	for(std::size_t i = 0; i < Test.size() - 1; ++i)
 	{
+		_mm_prefetch((char*)&Data[i + 1], _MM_HINT_T0);
 		glm::simd_mat4 m(Data[i]);
 		Test[i] = glm::simd_vec4(glm::detail::sse_detd_ps((__m128 const * const)&m)).x; 
 	}
 
 	std::clock_t TimeEnd = clock();
-	printf("Det C: %d\n", TimeEnd - TimeStart);
+	printf("Det D: %d\n", TimeEnd - TimeStart);
 
 	return Test;
 }
 
+void test_invA(std::vector<glm::mat4> const & Data, std::vector<glm::mat4> & Out)
+{
+	//std::vector<float> Test(Data.size());
+	Out.resize(Data.size());
+
+	std::clock_t TimeStart = clock();
+
+	for(std::size_t i = 0; i < Out.size() - 1; ++i)
+	{
+		Out[i] = glm::inverse(Data[i]);
+	}
+
+	std::clock_t TimeEnd = clock();
+	printf("Inv A: %d\n", TimeEnd - TimeStart);
+}
+
+void test_invC(std::vector<glm::mat4> const & Data, std::vector<glm::mat4> & Out)
+{
+	//std::vector<float> Test(Data.size());
+	Out.resize(Data.size());
+
+	std::clock_t TimeStart = clock();
+
+	for(std::size_t i = 0; i < Out.size() - 1; ++i)
+	{
+		_mm_prefetch((char*)&Data[i + 1], _MM_HINT_T0);
+		glm::simd_mat4 m(Data[i]);
+		glm::simd_mat4 o;
+		glm::detail::sse_inverse_fast_ps((__m128 const * const)&m, (__m128 *)&o);
+		Out[i] = *(glm::mat4*)&o;
+	}
+
+	std::clock_t TimeEnd = clock();
+	printf("Inv C: %d\n", TimeEnd - TimeStart);
+}
+
+void test_invD(std::vector<glm::mat4> const & Data, std::vector<glm::mat4> & Out)
+{
+	//std::vector<float> Test(Data.size());
+	Out.resize(Data.size());
+
+	std::clock_t TimeStart = clock();
+
+	for(std::size_t i = 0; i < Out.size() - 1; ++i)
+	{
+		_mm_prefetch((char*)&Data[i + 1], _MM_HINT_T0);
+		glm::simd_mat4 m(Data[i]);
+		glm::simd_mat4 o;
+		glm::detail::sse_inverse_ps((__m128 const * const)&m, (__m128 *)&o);
+		Out[i] = *(glm::mat4*)&o;
+	}
+
+	std::clock_t TimeEnd = clock();
+	printf("Inv D: %d\n", TimeEnd - TimeStart);
+}
+
+void test_mulA(std::vector<glm::mat4> const & Data, std::vector<glm::mat4> & Out)
+{
+	//std::vector<float> Test(Data.size());
+	Out.resize(Data.size());
+
+	std::clock_t TimeStart = clock();
+
+	for(std::size_t i = 0; i < Out.size() - 1; ++i)
+	{
+		Out[i] = Data[i] * Data[i];
+	}
+
+	std::clock_t TimeEnd = clock();
+	printf("Mul A: %d\n", TimeEnd - TimeStart);
+}
+
+void test_mulD(std::vector<glm::mat4> const & Data, std::vector<glm::mat4> & Out)
+{
+	//std::vector<float> Test(Data.size());
+	Out.resize(Data.size());
+
+	std::clock_t TimeStart = clock();
+
+	for(std::size_t i = 0; i < Out.size() - 1; ++i)
+	{
+		_mm_prefetch((char*)&Data[i + 1], _MM_HINT_T0);
+		glm::simd_mat4 m(Data[i]);
+		glm::detail::sse_mul_ps((__m128 const * const)&m, (__m128 const * const)&m, (__m128*)&Out[i]);
+	}
+
+	std::clock_t TimeEnd = clock();
+	printf("Mul D: %d\n", TimeEnd - TimeStart);
+}
+
 int main(int argc, void* argv[])
 {
-	std::vector<glm::mat4> Data(1024 * 1024 * 16);
+	std::vector<glm::mat4> Data(1024 * 1024 * 8);
 	for(std::size_t i = 0; i < Data.size(); ++i)
 		Data[i] = glm::mat4(
 			glm::vec4(glm::compRand4(-2.0f, 2.0f)),
@@ -95,19 +187,45 @@ int main(int argc, void* argv[])
 			glm::vec4(glm::compRand4(-2.0f, 2.0f)),
 			glm::vec4(glm::compRand4(-2.0f, 2.0f)));
 
-	std::vector<float> TestDetA = test_detA(Data);
-	std::vector<float> TestDetB = test_detB(Data);
-	std::vector<float> TestDetC = test_detC(Data);
-	std::vector<float> TestDetD = test_detD(Data);
+	{
+		std::vector<glm::mat4> TestInvA;
+		test_invA(Data, TestInvA);
+	}
+	{
+		std::vector<glm::mat4> TestInvC;
+		test_invC(Data, TestInvC);
+	}
+	{
+		std::vector<glm::mat4> TestInvD;
+		test_invD(Data, TestInvD);
+	}
 
-	for(std::size_t i = 0; i < TestDetA.size(); ++i)
-		if(TestDetA[i] != TestDetB[i] && TestDetC[i] != TestDetB[i] && TestDetC[i] != TestDetD[i])
-			return 1;
+	{
+		std::vector<glm::mat4> TestA;
+		test_mulA(Data, TestA);
+	}
+	{
+		std::vector<glm::mat4> TestD;
+		test_mulD(Data, TestD);
+	}
+
+	{
+		std::vector<float> TestDetA = test_detA(Data);
+		std::vector<float> TestDetB = test_detB(Data);
+		std::vector<float> TestDetC = test_detC(Data);
+		std::vector<float> TestDetD = test_detD(Data);
+
+		for(std::size_t i = 0; i < TestDetA.size(); ++i)
+			if(TestDetA[i] != TestDetB[i] && TestDetC[i] != TestDetB[i] && TestDetC[i] != TestDetD[i])
+				return 1;
+	}
 
 	// shuffle test
 	glm::simd_vec4 A(1.0f, 2.0f, 3.0f, 4.0f);
 	glm::simd_vec4 B(5.0f, 6.0f, 7.0f, 8.0f);
 	__m128 C = _mm_shuffle_ps(A.Data, B.Data, _MM_SHUFFLE(1, 0, 1, 0));
 
+	system("pause");
+
 	return 0;
 }