Changeset 1323Tweet

Timestamp:

Apr 30, 2012, 11:30:57 PM (11 years ago)

Author:

sam

Message:

core: reduce compilation time by about 30% by playing with namespaces
and avoid cluttering the compiler's symbol table.

File:

• trunk/src/lol/math/vector.h (modified) (11 diffs)

trunk/src/lol/math/vector.h

@@ -1237 +1237 @@
 
 #define DECLARE_ALL_VECTOR_OPS(type) \
-    DECLARE_ALL_VECTOR_OPS_INNER(Vec2, type) \
-    DECLARE_ALL_VECTOR_OPS_INNER(Vec3, type) \
-    DECLARE_ALL_VECTOR_OPS_INNER(Vec4, type) \
-    \
-    DECLARE_VEC_3_COERCE_OPS(Vec3, static, type, type, type)
+    namespace x##type \
+    { \
+        DECLARE_ALL_VECTOR_OPS_INNER(Vec2, type) \
+        DECLARE_ALL_VECTOR_OPS_INNER(Vec3, type) \
+        DECLARE_ALL_VECTOR_OPS_INNER(Vec4, type) \
+        \
+        DECLARE_VEC_3_COERCE_OPS(Vec3, static, type, type, type) \
+    }
 
 #define DECLARE_VEC_ANY_COERCE_OPS(tname, tlow, thigh) \
@@ -1251 +1254 @@
 
 #define DECLARE_ALL_VECTOR_COERCE_OPS(tlow, thigh) \
-    DECLARE_VEC_ANY_COERCE_OPS(Vec2, tlow, thigh) \
-    DECLARE_VEC_ANY_COERCE_OPS(Vec3, tlow, thigh) \
-    DECLARE_VEC_ANY_COERCE_OPS(Vec4, tlow, thigh) \
-    \
-    DECLARE_VEC_3_COERCE_OPS(Vec3, static, tlow, thigh, thigh) \
-    DECLARE_VEC_3_COERCE_OPS(Vec3, static, thigh, tlow, thigh)
+    namespace x##tlow##thigh \
+    { \
+        DECLARE_VEC_ANY_COERCE_OPS(Vec2, tlow, thigh) \
+        DECLARE_VEC_ANY_COERCE_OPS(Vec3, tlow, thigh) \
+        DECLARE_VEC_ANY_COERCE_OPS(Vec4, tlow, thigh) \
+    } \
+    namespace y##tlow##thigh \
+    { \
+        DECLARE_VEC_3_COERCE_OPS(Vec3, static, tlow, thigh, thigh) \
+        DECLARE_VEC_3_COERCE_OPS(Vec3, static, thigh, tlow, thigh) \
+    } \
 
 DECLARE_ALL_NONVECTOR_OPS(Cmplx)
@@ -1298 +1306 @@
 #endif
 
+/* Hack for compilation speedups: we can hide some of our global methods in
+ * namespaces. We therefore want "long_double" to be a one-symbol type */
+typedef long double long_double;
+
 /* Apply the same coercion rules as in the C++ standard. However, instead
  * of always promoting smaller types to int, we allow int8_t op int16_t to
@@ -1310 +1322 @@
 DECLARE_ALL_VECTOR_COERCE_OPS(int8_t, float)
 DECLARE_ALL_VECTOR_COERCE_OPS(int8_t, double)
-DECLARE_ALL_VECTOR_COERCE_OPS(int8_t, long double)
+DECLARE_ALL_VECTOR_COERCE_OPS(int8_t, long_double)
 
 DECLARE_ALL_VECTOR_COERCE_OPS(uint8_t, int16_t)
@@ -1320 +1332 @@
 DECLARE_ALL_VECTOR_COERCE_OPS(uint8_t, float)
 DECLARE_ALL_VECTOR_COERCE_OPS(uint8_t, double)
-DECLARE_ALL_VECTOR_COERCE_OPS(uint8_t, long double)
+DECLARE_ALL_VECTOR_COERCE_OPS(uint8_t, long_double)
 
 DECLARE_ALL_VECTOR_COERCE_OPS(int16_t, uint16_t)
@@ -1329 +1341 @@
 DECLARE_ALL_VECTOR_COERCE_OPS(int16_t, float)
 DECLARE_ALL_VECTOR_COERCE_OPS(int16_t, double)
-DECLARE_ALL_VECTOR_COERCE_OPS(int16_t, long double)
+DECLARE_ALL_VECTOR_COERCE_OPS(int16_t, long_double)
 
 DECLARE_ALL_VECTOR_COERCE_OPS(uint16_t, int32_t)
@@ -1337 +1349 @@
 DECLARE_ALL_VECTOR_COERCE_OPS(uint16_t, float)
 DECLARE_ALL_VECTOR_COERCE_OPS(uint16_t, double)
-DECLARE_ALL_VECTOR_COERCE_OPS(uint16_t, long double)
+DECLARE_ALL_VECTOR_COERCE_OPS(uint16_t, long_double)
 
 DECLARE_ALL_VECTOR_COERCE_OPS(int32_t, uint32_t)
@@ -1344 +1356 @@
 DECLARE_ALL_VECTOR_COERCE_OPS(int32_t, float)
 DECLARE_ALL_VECTOR_COERCE_OPS(int32_t, double)
-DECLARE_ALL_VECTOR_COERCE_OPS(int32_t, long double)
+DECLARE_ALL_VECTOR_COERCE_OPS(int32_t, long_double)
 
 DECLARE_ALL_VECTOR_COERCE_OPS(uint32_t, int64_t)
@@ -1350 +1362 @@
 DECLARE_ALL_VECTOR_COERCE_OPS(uint32_t, float)
 DECLARE_ALL_VECTOR_COERCE_OPS(uint32_t, double)
-DECLARE_ALL_VECTOR_COERCE_OPS(uint32_t, long double)
+DECLARE_ALL_VECTOR_COERCE_OPS(uint32_t, long_double)
 
 DECLARE_ALL_VECTOR_COERCE_OPS(int64_t, uint64_t)
 DECLARE_ALL_VECTOR_COERCE_OPS(int64_t, float)
 DECLARE_ALL_VECTOR_COERCE_OPS(int64_t, double)
-DECLARE_ALL_VECTOR_COERCE_OPS(int64_t, long double)
+DECLARE_ALL_VECTOR_COERCE_OPS(int64_t, long_double)
 
 DECLARE_ALL_VECTOR_COERCE_OPS(uint64_t, float)
 DECLARE_ALL_VECTOR_COERCE_OPS(uint64_t, double)
-DECLARE_ALL_VECTOR_COERCE_OPS(uint64_t, long double)
+DECLARE_ALL_VECTOR_COERCE_OPS(uint64_t, long_double)
 
 DECLARE_ALL_VECTOR_COERCE_OPS(float, double)
-DECLARE_ALL_VECTOR_COERCE_OPS(float, long double)
-
-DECLARE_ALL_VECTOR_COERCE_OPS(double, long double)
+DECLARE_ALL_VECTOR_COERCE_OPS(float, long_double)
+
+DECLARE_ALL_VECTOR_COERCE_OPS(double, long_double)
 
 /* FIXME: vectors of "half" are deactivated for now, because they
@@ -1383 +1395 @@
 DECLARE_ALL_VECTOR_COERCE_OPS(half, float)
 DECLARE_ALL_VECTOR_COERCE_OPS(half, double)
-DECLARE_ALL_VECTOR_COERCE_OPS(half, long double)
+DECLARE_ALL_VECTOR_COERCE_OPS(half, long_double)
 #endif
 
@@ -1402 +1414 @@
 DECLARE_ALL_VECTOR_COERCE_OPS(float, real)
 DECLARE_ALL_VECTOR_COERCE_OPS(double, real)
-DECLARE_ALL_VECTOR_COERCE_OPS(long double, real)
-#endif
+DECLARE_ALL_VECTOR_COERCE_OPS(long_double, real)
+#endif
+
+/* Activate all the namespaces that we created. Delaying this activation
+ * reduces compilation times significantly. */
+#define ACTIVATE_COERCE_NAMESPACES_INNER(tlow, thigh) \
+    namespace x##tlow##thigh {} \
+    namespace y##tlow##thigh {} \
+    using namespace x##tlow##thigh; \
+    using namespace y##tlow##thigh;
+
+#define ACTIVATE_COERCE_NAMESPACES(tlow) \
+    namespace x##tlow {} \
+    using namespace x##tlow; \
+    ACTIVATE_COERCE_NAMESPACES_INNER(tlow, int8_t) \
+    ACTIVATE_COERCE_NAMESPACES_INNER(tlow, uint8_t) \
+    ACTIVATE_COERCE_NAMESPACES_INNER(tlow, int16_t) \
+    ACTIVATE_COERCE_NAMESPACES_INNER(tlow, uint16_t) \
+    ACTIVATE_COERCE_NAMESPACES_INNER(tlow, int32_t) \
+    ACTIVATE_COERCE_NAMESPACES_INNER(tlow, uint32_t) \
+    ACTIVATE_COERCE_NAMESPACES_INNER(tlow, int64_t) \
+    ACTIVATE_COERCE_NAMESPACES_INNER(tlow, uint64_t) \
+    ACTIVATE_COERCE_NAMESPACES_INNER(tlow, half) \
+    ACTIVATE_COERCE_NAMESPACES_INNER(tlow, float) \
+    ACTIVATE_COERCE_NAMESPACES_INNER(tlow, double) \
+    ACTIVATE_COERCE_NAMESPACES_INNER(tlow, long_double) \
+    ACTIVATE_COERCE_NAMESPACES_INNER(tlow, real)
+
+ACTIVATE_COERCE_NAMESPACES(int8_t)
+ACTIVATE_COERCE_NAMESPACES(uint8_t)
+ACTIVATE_COERCE_NAMESPACES(int16_t)
+ACTIVATE_COERCE_NAMESPACES(uint16_t)
+ACTIVATE_COERCE_NAMESPACES(int32_t)
+ACTIVATE_COERCE_NAMESPACES(uint32_t)
+ACTIVATE_COERCE_NAMESPACES(int64_t)
+ACTIVATE_COERCE_NAMESPACES(uint64_t)
+ACTIVATE_COERCE_NAMESPACES(half)
+ACTIVATE_COERCE_NAMESPACES(float)
+ACTIVATE_COERCE_NAMESPACES(double)
+ACTIVATE_COERCE_NAMESPACES(long_double)
+ACTIVATE_COERCE_NAMESPACES(real)
 
 #if defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))