Skip to content

Commit

Permalink
Updating some variables to be constexpr. (brainboxdotcc#858)
Browse files Browse the repository at this point in the history
  • Loading branch information
@RealTimeChris @Mishura4
RealTimeChris authored and Mishura4 committed Sep 17, 2023
1 parent 971bcd3 commit 11825e6
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 60 deletions.
98 changes: 45 additions & 53 deletions include/dpp/isa_detection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
using avx_int = __m128i;

/*
* @brief Extracts a 32-bit integer from a 128it AVX2 register.
* @param value The AVX2 register containing packed 16-bit integers.
* @brief Extracts a 32-bit integer from a 128-bit AVX register.
* @param value The AVX register containing packed 32-bit integers.
* @param index The index of the 32-bit integer to extract (0-3).
* @return The extracted 32-bit integer.
*/
Expand Down Expand Up @@ -98,7 +98,7 @@

/*
* @brief Extracts a 32-bit integer from a 512-bit AVX-512 register.
* @param value The AVX-512 register containing packed 16-bit integers.
* @param value The AVX-512 register containing packed 32-bit integers.
* @param index The index of the 32-bit integer to extract (0-15).
* @return The extracted 32-bit integer.
*/
Expand All @@ -122,46 +122,44 @@ namespace dpp {
#ifdef T_AVX512

/**
* @brief A class for audio mixing operations using AVX2 instructions.
* @brief A class for audio mixing operations using AVX512 instructions.
*/
class audio_mixer {
public:
/*
* @brief The number of 32-bit values per CPU register.
*/
* @brief The number of 32-bit values per CPU register.
*/
inline static constexpr int32_t byte_blocks_per_register{ 16 };

/*
* @brief Stores values from a 512-bit AVX vector to a storage location.
* @tparam avx_type The 512-bit AVX vector type.
* @tparam value_type The target value type for storage.
* @param values_to_store The 512-bit AVX vector containing values to store.
* @param storage_location Pointer to the storage location.
*/
* @brief Stores values from a 512-bit AVX512 vector to a storage location.
* @tparam value_type The target value type for storage.
* @param values_to_store The 512-bit AVX512 vector containing values to store.
* @param storage_location Pointer to the storage location.
*/
template<typename value_type> inline static void store_values(const avx_512_int& values_to_store, value_type* storage_location) {
for (int64_t x = 0; x < byte_blocks_per_register; ++x) {
storage_location[x] = static_cast<value_type>(extract_int32_from_avx512(values_to_store, x));
}
}

/**
* @brief Specialization for gathering non-float values into an AVX register.
* @tparam avx_type The AVX type to be used (AVX, AVX2, etc.).
* @brief Specialization for gathering non-float values into an AVX512 register.
* @tparam value_type The type of values being gathered.
* @tparam Indices Parameter pack of indices for gathering values.
* @return An AVX register containing gathered values.
* @return An AVX512 register containing gathered values.
*/
template<typename value_type> inline static avx_512_float gather_values(value_type* values) {
float newArray[byte_blocks_per_register]{};
float new_array[byte_blocks_per_register]{};
for (size_t x = 0; x < byte_blocks_per_register; ++x) {
newArray[x] = static_cast<float>(values[x]);
new_array[x] = static_cast<float>(values[x]);
}
return _mm512_loadu_ps(newArray);
return _mm512_loadu_ps(new_array);
}

/**
* @brief Collect a single register worth of data from data_in, apply gain and increment, and store the result in data_out.
* This version uses AVX2 instructions.
* This version uses AVX512 instructions.
*
* @param data_in Pointer to the input array of int32_t values.
* @param data_out Pointer to the output array of int16_t values.
Expand All @@ -183,11 +181,10 @@ namespace dpp {

/**
* @brief Combine a register worth of elements from decoded_data and store the result in up_sampled_vector.
* This version uses AVX instructions.
* This version uses AVX512 instructions.
*
* @param up_sampled_vector Pointer to the array of int32_t values.
* @param decoded_data Pointer to the array of int16_t values.
* @param x Index to select a specific set of elements to combine.
*/
inline static void combine_samples(int32_t* up_sampled_vector, const int16_t* decoded_data) {
auto newValues{ _mm512_cvtps_epi32(_mm512_add_ps(gather_values(up_sampled_vector), gather_values(decoded_data))) };
Expand All @@ -203,36 +200,34 @@ namespace dpp {
class audio_mixer {
public:
/*
* @brief The number of 32-bit values per CPU register.
*/
* @brief The number of 32-bit values per CPU register.
*/
inline static constexpr int32_t byte_blocks_per_register{ 8 };

/*
* @brief Stores values from a 256-bit AVX vector to a storage location.
* @tparam avx_type The 256-bit AVX vector type.
* @tparam value_type The target value type for storage.
* @param values_to_store The 256-bit AVX vector containing values to store.
* @param storage_location Pointer to the storage location.
*/
* @brief Stores values from a 256-bit AVX2 vector to a storage location.
* @tparam value_type The target value type for storage.
* @param values_to_store The 256-bit AVX2 vector containing values to store.
* @param storage_location Pointer to the storage location.
*/
template<typename value_type> inline static void store_values(const avx_2_int& values_to_store, value_type* storage_location) {
for (int64_t x = 0; x < byte_blocks_per_register; ++x) {
storage_location[x] = static_cast<value_type>(extract_int32_from_avx2(values_to_store, x));
}
}

/**
* @brief Specialization for gathering non-float values into an AVX register.
* @tparam avx_type The AVX type to be used (AVX, AVX2, etc.).
* @brief Specialization for gathering non-float values into an AVX2 register.
* @tparam value_type The type of values being gathered.
* @tparam Indices Parameter pack of indices for gathering values.
* @return An AVX register containing gathered values.
* @return An AVX2 register containing gathered values.
*/
template<typename value_type> inline static avx_2_float gather_values(value_type* values) {
float newArray[byte_blocks_per_register]{};
float new_array[byte_blocks_per_register]{};
for (size_t x = 0; x < byte_blocks_per_register; ++x) {
newArray[x] = static_cast<float>(values[x]);
new_array[x] = static_cast<float>(values[x]);
}
return _mm256_loadu_ps(newArray);
return _mm256_loadu_ps(new_array);
}

/**
Expand All @@ -259,7 +254,7 @@ namespace dpp {

/**
* @brief Combine a register worth of elements from decoded_data and store the result in up_sampled_vector.
* This version uses AVX instructions.
* This version uses AVX2 instructions.
*
* @param up_sampled_vector Pointer to the array of int32_t values.
* @param decoded_data Pointer to the array of int16_t values.
Expand All @@ -274,22 +269,21 @@ namespace dpp {
#elif T_AVX

/**
* @brief A class for audio mixing operations using AVX2 instructions.
* @brief A class for audio mixing operations using AVX instructions.
*/
class audio_mixer {
public:
/*
* @brief The number of 32-bit values per CPU register.
*/
* @brief The number of 32-bit values per CPU register.
*/
inline static constexpr int32_t byte_blocks_per_register{ 4 };

/*
* @brief Stores values from a 128-bit AVX vector to a storage location.
* @tparam avx_type The 128-bit AVX vector type.
* @tparam value_type The target value type for storage.
* @param values_to_store The 128-bit AVX vector containing values to store.
* @param storage_location Pointer to the storage location.
*/
* @brief Stores values from a 128-bit AVX vector to a storage location.
* @tparam value_type The target value type for storage.
* @param values_to_store The 128-bit AVX vector containing values to store.
* @param storage_location Pointer to the storage location.
*/
template<typename value_type> inline static void store_values(const avx_int& values_to_store, value_type* storage_location) {
for (int64_t x = 0; x < byte_blocks_per_register; ++x) {
storage_location[x] = static_cast<value_type>(extract_int32_from_avx(values_to_store, x));
Expand All @@ -298,22 +292,21 @@ namespace dpp {

/**
* @brief Specialization for gathering non-float values into an AVX register.
* @tparam avx_type The AVX type to be used (AVX, AVX2, etc.).
* @tparam value_type The type of values being gathered.
* @tparam Indices Parameter pack of indices for gathering values.
* @return An AVX register containing gathered values.
*/
template<typename value_type> inline static avx_float gather_values(value_type* values) {
float newArray[byte_blocks_per_register]{};
float new_array[byte_blocks_per_register]{};
for (size_t x = 0; x < byte_blocks_per_register; ++x) {
newArray[x] = static_cast<float>(values[x]);
new_array[x] = static_cast<float>(values[x]);
}
return _mm_loadu_ps(newArray);
return _mm_loadu_ps(new_array);
}

/**
* @brief Collect a single register worth of data from data_in, apply gain and increment, and store the result in data_out.
* This version uses AVX2 instructions.
* This version uses AVX instructions.
*
* @param data_in Pointer to the input array of int32_t values.
* @param data_out Pointer to the output array of int16_t values.
Expand All @@ -337,7 +330,6 @@ namespace dpp {
*
* @param up_sampled_vector Pointer to the array of int32_t values.
* @param decoded_data Pointer to the array of int16_t values.
* @param x Index to select a specific set of elements to combine.
*/
inline static void combine_samples(int32_t* up_sampled_vector, const int16_t* decoded_data) {
auto newValues{ _mm_cvtps_epi32(_mm_add_ps(gather_values(up_sampled_vector), gather_values(decoded_data))) };
Expand All @@ -348,7 +340,7 @@ namespace dpp {
#else

/**
* @brief A class for audio mixing operations using AVX instructions.
* @brief A class for audio mixing operations using x64 instructions.
*/
class audio_mixer {
public:
Expand Down Expand Up @@ -383,7 +375,7 @@ namespace dpp {

/**
* @brief Combine a register worth of elements from decoded_data and store the result in up_sampled_vector.
* This version uses instructions.
* This version uses x64 instructions.
*
* @param up_sampled_vector Pointer to the array of int32_t values.
* @param decoded_data Pointer to the array of int16_t values.
Expand Down
14 changes: 7 additions & 7 deletions src/dpp/wsclient.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@

namespace dpp {

const unsigned char WS_MASKBIT = (1u << 7u);
const unsigned char WS_FINBIT = (1u << 7u);
const unsigned char WS_PAYLOAD_LENGTH_MAGIC_LARGE = 126;
const unsigned char WS_PAYLOAD_LENGTH_MAGIC_HUGE = 127;
const size_t WS_MAX_PAYLOAD_LENGTH_SMALL = 125;
const size_t WS_MAX_PAYLOAD_LENGTH_LARGE = 65535;
const size_t MAXHEADERSIZE = sizeof(uint64_t) + 2;
constexpr unsigned char WS_MASKBIT = (1u << 7u);
constexpr unsigned char WS_FINBIT = (1u << 7u);
constexpr unsigned char WS_PAYLOAD_LENGTH_MAGIC_LARGE = 126;
constexpr unsigned char WS_PAYLOAD_LENGTH_MAGIC_HUGE = 127;
constexpr size_t WS_MAX_PAYLOAD_LENGTH_SMALL = 125;
constexpr size_t WS_MAX_PAYLOAD_LENGTH_LARGE = 65535;
constexpr size_t MAXHEADERSIZE = sizeof(uint64_t) + 2;

websocket_client::websocket_client(const std::string &hostname, const std::string &port, const std::string &urlpath, ws_opcode opcode)
: ssl_client(hostname, port),
Expand Down

0 comments on commit 11825e6

Please sign in to comment.