Merge pull request #47 from MichealReed/static_helpers

MSVC build fixes

Author: austinvhuang

numeric_types/half.h

@@ -7,14 +7,59 @@
 #include <cstdint>
 #include <cstdio>
 
+#ifdef _MSC_VER
+#include <intrin.h>
+
+static inline uint32_t __builtin_clz(uint32_t value)
+{
+  unsigned long leading_zero = 0;
+  if (value == 0)
+  {
+    return 32;
+  }
+  _BitScanReverse(&leading_zero, value);
+  return 31 - leading_zero;
+}
+
+static inline uint16_t __builtin_clz(uint16_t value)
+{
+  return __builtin_clz(static_cast<uint32_t>(value)) - 16;
+}
+
+static inline uint64_t __builtin_clz(uint64_t value)
+{
+  unsigned long leading_zero = 0;
+  if (value == 0)
+  {
+    return 64;
+  }
+#if defined(_WIN64)
+  _BitScanReverse64(&leading_zero, value);
+  return 63 - leading_zero;
+#else
+  uint32_t high = static_cast<uint32_t>(value >> 32);
+  uint32_t low = static_cast<uint32_t>(value);
+  if (high != 0)
+  {
+    return __builtin_clz(high);
+  }
+  else
+  {
+    return 32 + __builtin_clz(low);
+  }
+#endif
+}
+#endif
+
 struct half;
-half halfFromFloat(float f);
-float halfToFloat(half h);
+static inline half halfFromFloat(float f);
+static inline float halfToFloat(half h);
 
 /**
  * Experimental implementation of half-precision 16-bit floating point numbers.
  */
-struct half {
+struct half
+{
   uint16_t data;
 
   // Default constructor
@@ -32,19 +77,22 @@ struct half {
   operator uint16_t() const { return data; }
 
   // Overload assignment operator from uint16_t
-  half &operator=(uint16_t value) {
+  half &operator=(uint16_t value)
+  {
     data = value;
     return *this;
   }
 
   // Overload assignment operator from another half
-  half &operator=(const half &other) {
+  half &operator=(const half &other)
+  {
     data = other.data;
     return *this;
   }
 
   // Overload assignment operator from float
-  half &operator=(float value) {
+  half &operator=(float value)
+  {
     data = halfFromFloat(value);
     return *this;
   }
@@ -55,8 +103,10 @@ struct half {
  *
  * Based on Mike Acton's half.c implementation.
  */
-half halfFromFloat(float f) {
-  union {
+half halfFromFloat(float f)
+{
+  union
+  {
     float f;
     uint32_t u;
   } floatUnion = {f};
@@ -95,7 +145,8 @@ half halfFromFloat(float f) {
   const uint32_t floatMantissa = float32 & FLOAT_MANTISSA_MASK;
 
   // Check for NaN
-  if ((floatExpMasked == FLOAT_EXP_MASK) && (floatMantissa != 0)) {
+  if ((floatExpMasked == FLOAT_EXP_MASK) && (floatMantissa != 0))
+  {
     half result;
     result.data =
         HALF_EXP_MASK | (floatMantissa >> FLOAT_HALF_MANTISSA_POS_OFFSET);
@@ -175,7 +226,8 @@ half halfFromFloat(float f) {
  *
  * Based on Mike Acton's half.c implementation.
  */
-float halfToFloat(half h) {
+float halfToFloat(half h)
+{
   // Constants for bit masks, shifts, and biases
   const uint16_t ONE = 0x0001;
   const uint16_t TWO = 0x0002;
@@ -256,7 +308,8 @@ float halfToFloat(half h) {
   const uint32_t result = checkNanResult;
 
   // Reinterpret the uint32_t result as a float using a union
-  union {
+  union
+  {
     uint32_t u;
     float f;
   } floatUnion;

utils/logging.h

@@ -97,14 +97,13 @@ namespace gpu
    */
   static Logger kDefLog = {std::cout, kInfo};
 
-  /**
-   * @brief Set the log level of the default logger.
-   * @param level The log level to set.
-   */
-  static inline void setLogLevel(int level)
-  {
-    kDefLog.level = level;
-  }
+/**
+ * @brief Set the log level of the default logger.
+ * @param level The log level to set.
+ */
+static inline void setLogLevel(int level) {
+  kDefLog.level = level;
+}
 
 } // namespace gpu