diff --git a/include/cglm/common.h b/include/cglm/common.h index 403273f..d3c3484 100644 --- a/include/cglm/common.h +++ b/include/cglm/common.h @@ -37,6 +37,14 @@ # define CGLM_INLINE static inline __attribute((always_inline)) #endif +#if defined(__GNUC__) || defined(__clang__) +# define CGLM_UNLIKELY(expr) __builtin_expect(!!(expr), 0) +# define CGLM_LIKELY(expr) __builtin_expect(!!(expr), 1) +#else +# define CGLM_UNLIKELY(expr) (expr) +# define CGLM_LIKELY(expr) (expr) +#endif + #define GLM_SHUFFLE4(z, y, x, w) (((z) << 6) | ((y) << 4) | ((x) << 2) | (w)) #define GLM_SHUFFLE3(z, y, x) (((z) << 4) | ((y) << 2) | (x)) diff --git a/include/cglm/plane.h b/include/cglm/plane.h index 0504373..9efabb7 100644 --- a/include/cglm/plane.h +++ b/include/cglm/plane.h @@ -33,7 +33,7 @@ void glm_plane_normalize(vec4 plane) { float norm; - if ((norm = glm_vec3_norm(plane)) == 0.0f) { + if (CGLM_UNLIKELY((norm = glm_vec3_norm(plane)) < FLT_EPSILON)) { glm_vec4_zero(plane); return; } diff --git a/include/cglm/vec2.h b/include/cglm/vec2.h index 2465529..aeb9e91 100644 --- a/include/cglm/vec2.h +++ b/include/cglm/vec2.h @@ -278,7 +278,7 @@ glm_vec2_scale_as(vec2 v, float s, vec2 dest) { float norm; norm = glm_vec2_norm(v); - if (norm == 0.0f) { + if (CGLM_UNLIKELY(norm < FLT_EPSILON)) { glm_vec2_zero(dest); return; } @@ -542,7 +542,7 @@ glm_vec2_normalize(vec2 v) { norm = glm_vec2_norm(v); - if (norm == 0.0f) { + if (CGLM_UNLIKELY(norm < FLT_EPSILON)) { v[0] = v[1] = 0.0f; return; } @@ -563,7 +563,7 @@ glm_vec2_normalize_to(vec2 v, vec2 dest) { norm = glm_vec2_norm(v); - if (norm == 0.0f) { + if (CGLM_UNLIKELY(norm < FLT_EPSILON)) { glm_vec2_zero(dest); return; } diff --git a/include/cglm/vec3.h b/include/cglm/vec3.h index 8fc0680..72bd371 100644 --- a/include/cglm/vec3.h +++ b/include/cglm/vec3.h @@ -372,7 +372,7 @@ glm_vec3_scale_as(vec3 v, float s, vec3 dest) { float norm; norm = glm_vec3_norm(v); - if (norm == 0.0f) { + if (CGLM_UNLIKELY(norm < FLT_EPSILON)) { glm_vec3_zero(dest); return; } @@ -651,7 +651,7 @@ glm_vec3_normalize(vec3 v) { norm = glm_vec3_norm(v); - if (norm == 0.0f) { + if (CGLM_UNLIKELY(norm < FLT_EPSILON)) { v[0] = v[1] = v[2] = 0.0f; return; } @@ -672,7 +672,7 @@ glm_vec3_normalize_to(vec3 v, vec3 dest) { norm = glm_vec3_norm(v); - if (norm == 0.0f) { + if (CGLM_UNLIKELY(norm < FLT_EPSILON)) { glm_vec3_zero(dest); return; } diff --git a/include/cglm/vec4.h b/include/cglm/vec4.h index 8c61c19..4053b9f 100644 --- a/include/cglm/vec4.h +++ b/include/cglm/vec4.h @@ -487,7 +487,7 @@ glm_vec4_scale_as(vec4 v, float s, vec4 dest) { float norm; norm = glm_vec4_norm(v); - if (norm == 0.0f) { + if (CGLM_UNLIKELY(norm < FLT_EPSILON)) { glm_vec4_zero(dest); return; } @@ -918,7 +918,7 @@ glm_vec4_normalize_to(vec4 v, vec4 dest) { /* dot = _mm_cvtss_f32(xdot); */ dot = wasm_f32x4_extract_lane(xdot, 0); - if (dot == 0.0f) { + if (CGLM_UNLIKELY(dot < FLT_EPSILON)) { glmm_store(dest, wasm_f32x4_const_splat(0.f)); return; } @@ -932,7 +932,7 @@ glm_vec4_normalize_to(vec4 v, vec4 dest) { xdot = glmm_vdot(x0, x0); dot = _mm_cvtss_f32(xdot); - if (dot == 0.0f) { + if (CGLM_UNLIKELY(dot < FLT_EPSILON)) { glmm_store(dest, _mm_setzero_ps()); return; } @@ -943,7 +943,7 @@ glm_vec4_normalize_to(vec4 v, vec4 dest) { norm = glm_vec4_norm(v); - if (norm == 0.0f) { + if (CGLM_UNLIKELY(norm < FLT_EPSILON)) { glm_vec4_zero(dest); return; } diff --git a/test/src/test_vec2.h b/test/src/test_vec2.h index 59a398b..d45962d 100644 --- a/test/src/test_vec2.h +++ b/test/src/test_vec2.h @@ -241,7 +241,7 @@ TEST_IMPL(GLM_PREFIX, vec2_scale_as) { GLM(vec2_scale_as)(v1, s, v2); norm = sqrtf(v1[0] * v1[0] + v1[1] * v1[1]); - if (norm == 0.0f) { + if (norm < FLT_EPSILON) { ASSERT(test_eq(v1[0], 0.0f)) ASSERT(test_eq(v1[1], 0.0f)) @@ -492,7 +492,7 @@ TEST_IMPL(GLM_PREFIX, vec2_normalize) { GLM(vec2_normalize)(v2); norm = sqrtf(v1[0] * v1[0] + v1[1] * v1[1]); - if (norm == 0.0f) { + if (norm < FLT_EPSILON) { ASSERT(test_eq(v1[0], 0.0f)) ASSERT(test_eq(v1[1], 0.0f)) @@ -519,7 +519,7 @@ TEST_IMPL(GLM_PREFIX, vec2_normalize_to) { GLM(vec2_normalize_to)(v1, v2); norm = sqrtf(v1[0] * v1[0] + v1[1] * v1[1]); - if (norm == 0.0f) { + if (norm < FLT_EPSILON) { ASSERT(test_eq(v1[0], 0.0f)) ASSERT(test_eq(v1[1], 0.0f)) diff --git a/test/src/test_vec3.h b/test/src/test_vec3.h index 3111b09..33f746b 100644 --- a/test/src/test_vec3.h +++ b/test/src/test_vec3.h @@ -433,7 +433,7 @@ TEST_IMPL(GLM_PREFIX, vec3_scale_as) { GLM(vec3_scale_as)(v1, s, v2); norm = sqrtf(v1[0] * v1[0] + v1[1] * v1[1] + v1[2] * v1[2]); - if (norm == 0.0f) { + if (norm < FLT_EPSILON) { ASSERT(test_eq(v1[0], 0.0f)) ASSERT(test_eq(v1[1], 0.0f)) ASSERT(test_eq(v1[2], 0.0f)) @@ -704,7 +704,7 @@ TEST_IMPL(GLM_PREFIX, vec3_normalize) { GLM(vec3_normalize)(v2); norm = sqrtf(v1[0] * v1[0] + v1[1] * v1[1] + v1[2] * v1[2]); - if (norm == 0.0f) { + if (norm < FLT_EPSILON) { ASSERT(test_eq(v1[0], 0.0f)) ASSERT(test_eq(v1[1], 0.0f)) ASSERT(test_eq(v1[2], 0.0f)) @@ -733,7 +733,7 @@ TEST_IMPL(GLM_PREFIX, vec3_normalize_to) { GLM(vec3_normalize_to)(v1, v2); norm = sqrtf(v1[0] * v1[0] + v1[1] * v1[1] + v1[2] * v1[2]); - if (norm == 0.0f) { + if (norm < FLT_EPSILON) { ASSERT(test_eq(v1[0], 0.0f)) ASSERT(test_eq(v1[1], 0.0f)) ASSERT(test_eq(v1[2], 0.0f)) @@ -764,7 +764,7 @@ TEST_IMPL(GLM_PREFIX, normalize) { GLM(vec3_normalize)(v2); norm = sqrtf(v1[0] * v1[0] + v1[1] * v1[1] + v1[2] * v1[2]); - if (norm == 0.0f) { + if (norm < FLT_EPSILON) { ASSERT(test_eq(v1[0], 0.0f)) ASSERT(test_eq(v1[1], 0.0f)) ASSERT(test_eq(v1[2], 0.0f)) @@ -795,7 +795,7 @@ TEST_IMPL(GLM_PREFIX, normalize_to) { GLM(vec3_normalize_to)(v1, v2); norm = sqrtf(v1[0] * v1[0] + v1[1] * v1[1] + v1[2] * v1[2]); - if (norm == 0.0f) { + if (norm < FLT_EPSILON) { ASSERT(test_eq(v1[0], 0.0f)) ASSERT(test_eq(v1[1], 0.0f)) ASSERT(test_eq(v1[2], 0.0f)) diff --git a/test/src/test_vec4.h b/test/src/test_vec4.h index e234e92..3523420 100644 --- a/test/src/test_vec4.h +++ b/test/src/test_vec4.h @@ -410,7 +410,7 @@ TEST_IMPL(GLM_PREFIX, vec4_scale_as) { GLM(vec4_scale_as)(v1, s, v2); norm = sqrtf(v1[0] * v1[0] + v1[1] * v1[1] + v1[2] * v1[2] + v1[3] * v1[3]); - if (norm == 0.0f) { + if (norm < FLT_EPSILON) { ASSERT(test_eq(v1[0], 0.0f)) ASSERT(test_eq(v1[1], 0.0f)) ASSERT(test_eq(v1[2], 0.0f)) @@ -701,7 +701,7 @@ TEST_IMPL(GLM_PREFIX, vec4_normalize) { GLM(vec4_normalize)(v2); norm = sqrtf(v1[0] * v1[0] + v1[1] * v1[1] + v1[2] * v1[2] + v1[3] * v1[3]); - if (norm == 0.0f) { + if (norm < FLT_EPSILON) { ASSERT(test_eq(v1[0], 0.0f)) ASSERT(test_eq(v1[1], 0.0f)) ASSERT(test_eq(v1[2], 0.0f)) @@ -732,7 +732,7 @@ TEST_IMPL(GLM_PREFIX, vec4_normalize_to) { GLM(vec4_normalize_to)(v1, v2); norm = sqrtf(v1[0] * v1[0] + v1[1] * v1[1] + v1[2] * v1[2] + v1[3] * v1[3]); - if (norm == 0.0f) { + if (norm < FLT_EPSILON) { ASSERT(test_eq(v1[0], 0.0f)) ASSERT(test_eq(v1[1], 0.0f)) ASSERT(test_eq(v1[2], 0.0f))