Removed MSVC requirement for AVX2 compilation (see issue #71)

Author: Forceflow

include/libmorton/morton.h

@@ -9,7 +9,7 @@
 #include "morton2D.h"
 #include "morton3D.h"
 
-#if defined(__BMI2__) || (defined(__AVX2__) && defined(_MSC_VER))
+#if defined(__BMI2__) || defined(__AVX2__)
 #include "morton_BMI.h"
 #elif defined(__AVX512BITALG__)
 #include "morton_AVX512BITALG.h"
@@ -20,7 +20,7 @@ namespace libmorton {
 	//-----------------------------------------------------------------------------------------------
 
 	// ENCODING
-#if defined(__BMI2__) || (defined(__AVX2__) && defined(_MSC_VER))
+#if defined(__BMI2__) || defined(__AVX2__)
 	inline uint_fast32_t morton2D_32_encode(const uint_fast16_t x, const uint_fast16_t y) {
 		return m2D_e_BMI<uint_fast32_t, uint_fast16_t>(x, y);
 	}
@@ -63,7 +63,7 @@ namespace libmorton {
 
 	// DECODING
 
-#if defined(__BMI2__) || (defined(__AVX2__) && defined(_MSC_VER))
+#if defined(__BMI2__) || defined(__AVX2__)
 	inline void morton2D_32_decode(const uint_fast32_t morton, uint_fast16_t& x, uint_fast16_t& y) {
 		m2D_d_BMI<uint_fast32_t, uint_fast16_t>(morton, x, y);
 	}

include/libmorton/morton_BMI.h

@@ -1,5 +1,5 @@
 #pragma once
-#if defined(__BMI2__) || (defined(__AVX2__) && defined(_MSC_VER))
+#if defined(__BMI2__) || defined(__AVX2__)
 #include <immintrin.h>
 #include <stdint.h>
 

test/libmorton_test.cpp

@@ -108,7 +108,7 @@ void registerFunctions() {
 	f3D_32_decode.push_back(decode_3D_32_wrapper("For", &m3D_d_for<uint_fast32_t, uint_fast16_t>));
 
 	// Register 3D BMI intrinsics if available
-#if defined(__BMI2__) || (defined(__AVX2__) && defined(_MSC_VER))
+#if defined(__BMI2__) || defined(__AVX2__)
 	f3D_64_encode.push_back(encode_3D_64_wrapper("BMI2 instruction set", &m3D_e_BMI<uint_fast64_t, uint_fast32_t>));
 	f3D_32_encode.push_back(encode_3D_32_wrapper("BMI2 instruction set", &m3D_e_BMI<uint_fast32_t, uint_fast16_t>));
 	f3D_64_decode.push_back(decode_3D_64_wrapper("BMI2 Instruction set", &m3D_d_BMI<uint_fast64_t, uint_fast32_t>));

test/libmorton_test.h

@@ -22,7 +22,7 @@
 // Load libraries we're going to test
 #include <libmorton/morton2D.h>
 #include <libmorton/morton3D.h>
-#if defined(__BMI2__) || (defined(__AVX2__) && defined(_MSC_VER))
+#if defined(__BMI2__) || defined(__AVX2__)
 #include <libmorton/morton_BMI.h>
 #endif
 #if defined(__AVX512BITALG__)

test/test2D_performance.h

@@ -10,9 +10,6 @@ extern size_t CURRENT_TEST_MAX;
 extern unsigned int times;
 extern std::vector<uint_fast64_t> running_sums;
 
-
-
-
 // Check 2D encode function performance (linear)
 template <typename morton, typename coord>
 static double testEncode_2D_Linear_Perf(morton(*function)(coord, coord), size_t times) {

test/test3D_correctness.h

@@ -112,7 +112,7 @@ inline bool check3D_Match(const encode_f_3D_wrapper<morton, coord>& encode, deco
 		coord x_result, y_result, z_result;
 		morton mortonresult = encode.encode(x, y, z);
 		decode.decode(mortonresult, x_result, y_result, z_result);
-		if ((x != x_result) | (y != y_result) | (z != z_result)) {
+		if ((x != x_result) || (y != y_result) || (z != z_result)) {
 			std::cout << "\n" << "x: " << getBitString<coord>(x) << " (" << x << ")\n";
 			std::cout << "y: " << getBitString<coord>(y) << " (" << y << ")\n";
 			std::cout << "z: " << getBitString<coord>(z) << " (" << z << ")\n";