Include CSA++ into SDSL version 3

include/sdsl/bit_vectors.hpp

@@ -13,5 +13,6 @@
 #include "rrr_vector.hpp"
 #include "sd_vector.hpp"
 #include "hyb_vector.hpp"
+#include "hyb_sd_vector.hpp"
 
 #endif

include/sdsl/bits.hpp

@@ -11,12 +11,15 @@
 #include <stdint.h> // for uint64_t uint32_t declaration
 #include <iostream> // for cerr
 #include <cassert>
-#ifdef __SSE4_2__
+
+// clang-format off
+#if 1
 #include <xmmintrin.h>
 #endif
-#ifdef __BMI2__
+#if 0
 #include <x86intrin.h>
 #endif
+// clang-format on
 
 #ifdef WIN32
 #include "iso646.h"
@@ -490,9 +493,11 @@ struct bits_impl {
 template <typename T>
 inline uint64_t bits_impl<T>::cnt(uint64_t x)
 {
-#ifdef __SSE4_2__
+// clang-format off
+#if 1
 	return __builtin_popcountll(x);
 #else
+// clang-format on
 #ifdef POPCOUNT_TL
 	return lt_cnt[x & 0xFFULL] + lt_cnt[(x >> 8) & 0xFFULL] + lt_cnt[(x >> 16) & 0xFFULL] +
 		   lt_cnt[(x >> 24) & 0xFFULL] + lt_cnt[(x >> 32) & 0xFFULL] + lt_cnt[(x >> 40) & 0xFFULL] +
@@ -579,11 +584,13 @@ inline uint64_t bits_impl<T>::map01(uint64_t x, uint64_t c)
 template <typename T>
 inline uint32_t bits_impl<T>::sel(uint64_t x, uint32_t i)
 {
-#ifdef __BMI2__
+// clang-format off
+#if 0
 	// taken from folly
 	return _tzcnt_u64(_pdep_u64(1ULL << (i - 1), x));
 #endif
-#ifdef __SSE4_2__
+#if 1
+	// clang-format on
 	uint64_t s = x, b;
 	s		   = s - ((s >> 1) & 0x5555555555555555ULL);
 	s		   = (s & 0x3333333333333333ULL) + ((s >> 2) & 0x3333333333333333ULL);
@@ -653,10 +660,12 @@ inline uint32_t bits_impl<T>::_sel(uint64_t x, uint32_t i)
 template <typename T>
 inline uint32_t bits_impl<T>::hi(uint64_t x)
 {
-#ifdef __SSE4_2__
+// clang-format off
+#if 1
 	if (x == 0) return 0;
 	return 63 - __builtin_clzll(x);
 #else
+	// clang-format on
 	uint64_t t, tt;			  // temporaries
 	if ((tt = x >> 32)) {	 // hi >= 32
 		if ((t = tt >> 16)) { // hi >= 48
@@ -679,10 +688,12 @@ inline uint32_t bits_impl<T>::hi(uint64_t x)
 template <typename T>
 inline uint32_t bits_impl<T>::lo(uint64_t x)
 {
-#ifdef __SSE4_2__
+// clang-format off
+#if 1
 	if (x == 0) return 0;
 	return __builtin_ctzll(x);
 #else
+	// clang-format on
 	if (x & 1) return 0;
 	if (x & 3) return 1;
 	if (x & 7) return 2;

include/sdsl/coder_elias_delta.hpp

@@ -140,6 +140,18 @@ class elias_delta {
 	{
 		return v.m_data;
 	}
+
+    static uint64_t decode(const uint64_t*& z, uint8_t& offset)
+    {
+        size_type len_1_len;
+        len_1_len = bits::read_unary_and_move(z, offset); // read length of length of x
+        if (!len_1_len) {
+            return 1ULL;
+        }
+        size_type len   =  bits::read_int_and_move(z, offset, len_1_len) + (1ULL << len_1_len);
+        return bits::read_int_and_move(z, offset, len-1) + (len-1<64) * (1ULL << (len-1));
+    }
+
 };
 
 // \sa coder::elias_delta::encoding_length

include/sdsl/config.hpp

@@ -124,6 +124,31 @@ using key_text_trait = key_text_trait_impl<width,void>;
 template<uint8_t width>
 using key_bwt_trait = key_bwt_trait_impl<width,void>;
 
+template<uint8_t int_width>
+constexpr const char* key_text()
+{
+    return conf::KEY_TEXT_INT;
+}
+
+template<uint8_t int_width>
+constexpr const char* key_bwt()
+{
+    return conf::KEY_BWT_INT;
+}
+
+
+template<>
+inline constexpr const char* key_text<8>()
+{
+    return conf::KEY_TEXT;
+}
+
+template<>
+inline constexpr const char* key_bwt<8>()
+{
+    return conf::KEY_BWT;
+}
+
 }
 
 #endif

include/sdsl/construct_sa.hpp

@@ -11,6 +11,7 @@
 
 #include "config.hpp"
 #include "int_vector.hpp"
+#include "bits.hpp"
 
 #include "divsufsort.h"
 #include "divsufsort64.h"