Removed GLM_TEST_ENABLE_PERF

This commit is contained in:
Christophe Riccio 2014-11-29 20:46:58 +01:00
parent 0b9b157e24
commit a42f84ed47
12 changed files with 20 additions and 25 deletions

View File

@ -13,11 +13,6 @@ if(NOT GLM_TEST_ENABLE)
message(STATUS "GLM is a header only library, no need to build it. Set the option GLM_TEST_ENABLE with ON to build and run the test bench")
endif()
option(GLM_PERF_ENABLE "GLM perf" OFF)
if(GLM_PERF_ENABLE)
add_definitions(-DGLM_TEST_ENABLE_PERF)
endif()
if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") OR (("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") AND UNIX))
option(GLM_TEST_ENABLE_CXX_98 "Enable C++ 98" OFF)
option(GLM_TEST_ENABLE_CXX_0X "Enable C++ 0x" OFF)

View File

@ -1156,7 +1156,7 @@ int main()
Error += isnan_::test();
Error += isinf_::test();
# ifdef GLM_TEST_ENABLE_PERF
# ifdef NDEBUG
Error += sign::perf();
# endif

View File

@ -1578,7 +1578,7 @@ int main()
Error += ::bitfieldInsert::test();
Error += ::bitfieldExtract::test();
# ifdef GLM_TEST_ENABLE_PERF
# ifdef NDEBUG
Error += ::bitCount::perf();
Error += ::bitfieldReverse::perf();
Error += ::findMSB::perf();

View File

@ -207,7 +207,7 @@ void error(int x, int y)
int main()
{
# ifdef GLM_TEST_ENABLE_PERF
# ifdef NDEBUG
int i, n;
static int test[] = {0,0, 1,1, 2,1, 3,2, 4,1, 5,2, 6,2, 7,3,
@ -318,5 +318,5 @@ int main()
if (errors == 0)
printf("Passed all %d cases.\n", sizeof(test)/8);
# endif//GLM_TEST_ENABLE_PERF
# endif//NDEBUG
}

View File

@ -292,7 +292,7 @@ void error(int x, int y) {
int main()
{
# ifdef GLM_TEST_ENABLE_PERF
# ifdef NDEBUG
int i, m, n;
static unsigned test[] = {0,32, 1,0, 2,1, 3,0, 4,2, 5,0, 6,1, 7,0,
@ -427,5 +427,5 @@ int main()
if (errors == 0)
printf("Passed all %d cases.\n", sizeof(test)/8);
# endif//GLM_TEST_ENABLE_PERF
# endif//NDEBUG
}

View File

@ -331,7 +331,7 @@ void error(int x, int y) {
int main()
{
# ifdef GLM_TEST_ENABLE_PERF
# ifdef NDEBUG
int i, n;
static unsigned test[] = {0,32, 1,31, 2,30, 3,30, 4,29, 5,29, 6,29,
@ -464,5 +464,5 @@ int main()
if (errors == 0)
printf("Passed all %d cases.\n", sizeof(test)/8);
# endif//GLM_TEST_ENABLE_PERF
# endif//NDEBUG
}

View File

@ -263,13 +263,13 @@ int main()
Error += test_determinant();
Error += test_inverse();
# ifdef GLM_TEST_ENABLE_PERF
# ifdef NDEBUG
for(std::size_t i = 0; i < 1; ++i)
{
Error += test_inverse_perf<glm::vec3, glm::mat4>(i, "mat4");
Error += test_inverse_perf<glm::dvec3, glm::dmat4>(i, "dmat4");
}
# endif
# endif//NDEBUG
return Error;
}

View File

@ -448,10 +448,10 @@ int main()
std::size_t const Size(1000000);
# ifdef GLM_TEST_ENABLE_PERF
# ifdef NDEBUG
Error += test_vec4_perf_AoS(Size);
Error += test_vec4_perf_SoA(Size);
# endif
# endif//NDEBUG
Error += test_vec4_ctor();
Error += test_vec4_size();

View File

@ -664,10 +664,10 @@ int main()
Error += ::bitfieldInterleave::test();
//Error += ::bitRevert::test();
# ifdef GLM_TEST_ENABLE_PERF
# ifdef NDEBUG
Error += ::mask::perf();
Error += ::bitfieldInterleave::perf();
# endif
# endif//NDEBUG
return Error;
}

View File

@ -263,9 +263,9 @@ int main()
Error += ::log2_::test();
Error += ::mod_::test();
# ifdef GLM_TEST_ENABLE_PERF
# ifdef NDEBUG
Error += ::log2_::perf();
# endif
# endif//NDEBUG
return Error;
}

View File

@ -300,9 +300,9 @@ int main()
Error += isPowerOfTwo::test();
Error += ceilPowerOfTwo::test();
# ifdef GLM_TEST_ENABLE_PERF
# ifdef NDEBUG
Error += ceilPowerOfTwo::perf();
# endif
# endif//NDEBUG
return Error;
}

View File

@ -178,14 +178,14 @@ int main()
{
int Error(0);
# ifdef GLM_TEST_ENABLE_PERF
# ifdef NDEBUG
Error += ::fastCos::perf();
Error += ::fastSin::perf();
Error += ::fastTan::perf();
Error += ::fastAcos::perf();
Error += ::fastAsin::perf();
Error += ::fastAtan::perf();
# endif
# endif//NDEBUG
return Error;
}