Upgrade libsimdpp to 2.1 (hail-is#4210)

* Upgrade libsimdpp to 2.1

* Update vector_popcnt to account for deprecations

* Update gitignore

* Retarget url

* Update prebuilt

.gitignore

@@ -10,8 +10,7 @@ python/**/*.pyc
 .pytest_cache/
 .*.crc
 python/hail/docs/_build/*
-src/main/c/libsimdpp-2.0-rc2.tar.gz
-src/main/c/libsimdpp-2.0-rc2
+src/main/c/libsimdpp-2*
 src/main/c/headers
 src/main/c/lib
 target

src/main/c/Makefile

@@ -43,7 +43,7 @@ ifndef CXX
 endif
 
 # append existing flags so they override our flags
-CXXFLAGS += -O3 -march=native $(CXXSTD) -Ilibsimdpp-2.0-rc2 -Wall -Werror
+CXXFLAGS += -O3 -march=native $(CXXSTD) -Ilibsimdpp-2.1 -Wall -Werror
 CXXFLAGS += -fPIC -ggdb -fno-strict-aliasing
 CXXFLAGS += -I../resources/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(JAVA_MD)
 LIBFLAGS += -fvisibility=default
@@ -98,13 +98,13 @@ Region.o: headers
 # succeed without attempting to access the Internet.
 # WGET ?= wget
 WGET ?= curl -L -O
-libsimdpp-2.0-rc2.tar.gz:
-	${WGET} https://storage.googleapis.com/hail-common/libsimdpp-2.0-rc2.tar.gz
+libsimdpp-2.1.tar.gz:
+	${WGET} https://storage.googleapis.com/hail-common/$@
 
-libsimdpp-2.0-rc2: libsimdpp-2.0-rc2.tar.gz
-	tar -xzf libsimdpp-2.0-rc2.tar.gz
+libsimdpp-2.1: libsimdpp-2.1.tar.gz
+	tar -xzf $<
 
-$(shared_library): libsimdpp-2.0-rc2 ${OBJECTS}
+$(shared_library): libsimdpp-2.1 ${OBJECTS}
 	mkdir -p $(dir $(shared_library))
 	${CXX} ${LIBFLAGS} ${LIBDIRS} ${CXXFLAGS} ${OBJECTS} -o $@ 
 

src/main/c/ibs.cpp

@@ -15,10 +15,10 @@ uint64_t vector_popcnt(uint64vector x) {
   count += __builtin_popcountll(extract<1>(x));
   #endif
   #elif UINT64_VECTOR_SIZE == 4
-  uint64_t count = __builtin_popcountll(_mm256_extract_epi64(x.operator __m256i(), 0));
-  count += __builtin_popcountll(_mm256_extract_epi64(x.operator __m256i(), 1));
-  count += __builtin_popcountll(_mm256_extract_epi64(x.operator __m256i(), 2));
-  count += __builtin_popcountll(_mm256_extract_epi64(x.operator __m256i(), 3));
+  uint64_t count = __builtin_popcountll(_mm256_extract_epi64(x.native(), 0));
+  count += __builtin_popcountll(_mm256_extract_epi64(x.native(), 1));
+  count += __builtin_popcountll(_mm256_extract_epi64(x.native(), 2));
+  count += __builtin_popcountll(_mm256_extract_epi64(x.native(), 3));
   #else
   #error "we do not support vectors longer than 4, please file an issue"
   #endif