Skip to content

Commit d949d15

Browse files
r-devulapr-devulap
committed
Fix MSVC compiler warnings
1 parent 6a7a01d commit d949d15

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

‎src/avx2-32bit-half.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ struct avx2_half_vector<int32_t> {
4242
static opmask_t get_partial_loadmask(uint64_t num_to_read)
4343
{
4444
auto mask = ((0x1ull << num_to_read) - 0x1ull);
45-
return convert_int_to_avx2_mask_half(mask);
45+
return convert_int_to_avx2_mask_half(static_cast<int32_t>(mask));
4646
}
4747
static opmask_t convert_int_to_mask(uint64_t intMask)
4848
{
49-
return convert_int_to_avx2_mask_half(intMask);
49+
return convert_int_to_avx2_mask_half(static_cast<int32_t>(intMask));
5050
}
5151
static regi_t seti(int v1, int v2, int v3, int v4)
5252
{
@@ -209,11 +209,11 @@ struct avx2_half_vector<uint32_t> {
209209
static opmask_t get_partial_loadmask(uint64_t num_to_read)
210210
{
211211
auto mask = ((0x1ull << num_to_read) - 0x1ull);
212-
return convert_int_to_avx2_mask_half(mask);
212+
return convert_int_to_avx2_mask_half(static_cast<int32_t>(mask));
213213
}
214214
static opmask_t convert_int_to_mask(uint64_t intMask)
215215
{
216-
return convert_int_to_avx2_mask_half(intMask);
216+
return convert_int_to_avx2_mask_half(static_cast<int32_t>(intMask));
217217
}
218218
static regi_t seti(int v1, int v2, int v3, int v4)
219219
{
@@ -387,11 +387,11 @@ struct avx2_half_vector<float> {
387387
static opmask_t get_partial_loadmask(uint64_t num_to_read)
388388
{
389389
auto mask = ((0x1ull << num_to_read) - 0x1ull);
390-
return convert_int_to_avx2_mask_half(mask);
390+
return convert_int_to_avx2_mask_half(static_cast<int32_t>(mask));
391391
}
392392
static opmask_t convert_int_to_mask(uint64_t intMask)
393393
{
394-
return convert_int_to_avx2_mask_half(intMask);
394+
return convert_int_to_avx2_mask_half(static_cast<int32_t>(intMask));
395395
}
396396
static int32_t convert_mask_to_int(opmask_t mask)
397397
{

‎src/avx2-64bit-qsort.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ struct avx2_vector<int64_t> {
5353
static opmask_t get_partial_loadmask(uint64_t num_to_read)
5454
{
5555
auto mask = ((0x1ull << num_to_read) - 0x1ull);
56-
return convert_int_to_avx2_mask_64bit(mask);
56+
return convert_int_to_avx2_mask_64bit(static_cast<int32_t>(mask));
5757
}
5858
static opmask_t convert_int_to_mask(uint64_t intMask)
5959
{
60-
return convert_int_to_avx2_mask_64bit(intMask);
60+
return convert_int_to_avx2_mask_64bit(static_cast<int32_t>(intMask));
6161
}
6262
static ymmi_t seti(int64_t v1, int64_t v2, int64_t v3, int64_t v4)
6363
{
@@ -241,11 +241,11 @@ struct avx2_vector<uint64_t> {
241241
static opmask_t get_partial_loadmask(uint64_t num_to_read)
242242
{
243243
auto mask = ((0x1ull << num_to_read) - 0x1ull);
244-
return convert_int_to_avx2_mask_64bit(mask);
244+
return convert_int_to_avx2_mask_64bit(static_cast<int32_t>(mask));
245245
}
246246
static opmask_t convert_int_to_mask(uint64_t intMask)
247247
{
248-
return convert_int_to_avx2_mask_64bit(intMask);
248+
return convert_int_to_avx2_mask_64bit(static_cast<int32_t>(intMask));
249249
}
250250
static ymmi_t seti(int64_t v1, int64_t v2, int64_t v3, int64_t v4)
251251
{
@@ -439,11 +439,11 @@ struct avx2_vector<double> {
439439
static opmask_t get_partial_loadmask(uint64_t num_to_read)
440440
{
441441
auto mask = ((0x1ull << num_to_read) - 0x1ull);
442-
return convert_int_to_avx2_mask_64bit(mask);
442+
return convert_int_to_avx2_mask_64bit(static_cast<int32_t>(mask));
443443
}
444444
static opmask_t convert_int_to_mask(uint64_t intMask)
445445
{
446-
return convert_int_to_avx2_mask_64bit(intMask);
446+
return convert_int_to_avx2_mask_64bit(static_cast<int32_t>(intMask));
447447
}
448448
static int32_t convert_mask_to_int(opmask_t mask)
449449
{

‎src/avx2-emu-funcs.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ X86_SIMD_SORT_INLINE
147147
__m256i convert_int_to_avx2_mask(int32_t m)
148148
{
149149
return _mm256_loadu_si256(
150-
(const __m256i *)avx2_mask_helper_lut32[m].data());
150+
(const __m256i *)avx2_mask_helper_lut32[static_cast<size_t>(m)].data());
151151
}
152152

153153
X86_SIMD_SORT_INLINE
@@ -160,7 +160,7 @@ X86_SIMD_SORT_INLINE
160160
__m256i convert_int_to_avx2_mask_64bit(int32_t m)
161161
{
162162
return _mm256_loadu_si256(
163-
(const __m256i *)avx2_mask_helper_lut64[m].data());
163+
(const __m256i *)avx2_mask_helper_lut64[static_cast<size_t>(m)].data());
164164
}
165165

166166
X86_SIMD_SORT_INLINE
@@ -173,7 +173,7 @@ X86_SIMD_SORT_INLINE
173173
__m128i convert_int_to_avx2_mask_half(int32_t m)
174174
{
175175
return _mm_loadu_si128(
176-
(const __m128i *)avx2_mask_helper_lut32_half[m].data());
176+
(const __m128i *)avx2_mask_helper_lut32_half[static_cast<size_t>(m)].data());
177177
}
178178

179179
X86_SIMD_SORT_INLINE

‎src/avx512-16bit-qsort.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ struct zmm_vector<float16> {
4949

5050
static opmask_t ge(reg_t x, reg_t y)
5151
{
52-
reg_t sign_x = _mm512_and_si512(x, _mm512_set1_epi16(0x8000));
53-
reg_t sign_y = _mm512_and_si512(y, _mm512_set1_epi16(0x8000));
54-
reg_t exp_x = _mm512_and_si512(x, _mm512_set1_epi16(0x7c00));
55-
reg_t exp_y = _mm512_and_si512(y, _mm512_set1_epi16(0x7c00));
52+
reg_t sign_x = _mm512_and_si512(x, _mm512_set1_epi16(static_cast<short>(0x8000)));
53+
reg_t sign_y = _mm512_and_si512(y, _mm512_set1_epi16(static_cast<short>(0x8000)));
54+
reg_t exp_x = _mm512_and_si512(x, _mm512_set1_epi16(static_cast<short>(0x7c00)));
55+
reg_t exp_y = _mm512_and_si512(y, _mm512_set1_epi16(static_cast<short>(0x7c00)));
5656
reg_t mant_x = _mm512_and_si512(x, _mm512_set1_epi16(0x3ff));
5757
reg_t mant_y = _mm512_and_si512(y, _mm512_set1_epi16(0x3ff));
5858

@@ -62,7 +62,7 @@ struct zmm_vector<float16> {
6262
__mmask32 neg = _mm512_mask_cmpeq_epu16_mask(
6363
sign_eq,
6464
sign_x,
65-
_mm512_set1_epi16(0x8000)); // both numbers are -ve
65+
_mm512_set1_epi16(static_cast<short>(0x8000))); // both numbers are -ve
6666

6767
// compare exponents only if signs are equal:
6868
mask_ge = mask_ge
@@ -136,7 +136,7 @@ struct zmm_vector<float16> {
136136
static type_t float_to_uint16(float val)
137137
{
138138
__m128 xmm = _mm_load_ss(&val);
139-
__m128i xmm2 = _mm_cvtps_ph(xmm, _MM_FROUND_NO_EXC);
139+
__m128i xmm2 = _mm_cvtps_ph(xmm, 0); // Use 0 (round to nearest) instead of _MM_FROUND_NO_EXC
140140
return _mm_extract_epi16(xmm2, 0);
141141
}
142142
static type_t reducemax(reg_t v)

‎src/xss-common-keyvaluesort.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ X86_SIMD_SORT_INLINE void xss_qsort_kv(
588588
int maxiters = -1;
589589
bool minarrsize = true;
590590
#else
591-
int maxiters = 2 * log2(arrsize);
591+
int maxiters = static_cast<int>(2 * log2(arrsize));
592592
bool minarrsize = arrsize > 1 ? true : false;
593593
#endif // XSS_TEST_KEYVALUE_BASE_CASE
594594

@@ -683,7 +683,7 @@ X86_SIMD_SORT_INLINE void xss_select_kv(T1 *keys,
683683
int maxiters = -1;
684684
bool minarrsize = true;
685685
#else
686-
int maxiters = 2 * log2(arrsize);
686+
int maxiters = static_cast<int>(2 * log2(arrsize));
687687
bool minarrsize = arrsize > 1 ? true : false;
688688
#endif // XSS_TEST_KEYVALUE_BASE_CASE
689689

0 commit comments

Comments
 (0)