Skip to content

A
abseil-cpp
Commit ee2fc89e by Derek Mauro Committed by Copybara-Service
Options

Remove deprecated use of absl::ToCrc32c() 

PiperOrigin-RevId: 491681300
Change-Id: I4ecdd3bf359cda7592b6c392a2fbb61b8394f71b
parent d03cced7
Showing with 15 additions and 15 deletions
absl/crc/internal/crc_memcpy_x86_64.cc
...@@ -78,7 +78,7 @@ inline crc32c_t ShortCrcCopy(char* dst, const char* src, std::size_t length, ...@@ -78,7 +78,7 @@ inline crc32c_t ShortCrcCopy(char* dst, const char* src, std::size_t length,
++src; ++src;
++dst; ++dst;
} }
return ToCrc32c(crc_uint32); return crc32c_t{crc_uint32};
} }
constexpr int kIntLoadsPerVec = sizeof(__m128i) / sizeof(uint64_t); constexpr int kIntLoadsPerVec = sizeof(__m128i) / sizeof(uint64_t);
...@@ -108,10 +108,10 @@ inline void LargeTailCopy(crc32c_t* crcs, char** dst, const char** src, ...@@ -108,10 +108,10 @@ inline void LargeTailCopy(crc32c_t* crcs, char** dst, const char** src,
_mm_store_si128(vdst, data[i]); _mm_store_si128(vdst, data[i]);
// Compute the running CRC // Compute the running CRC
crcs[region] = ToCrc32c(_mm_crc32_u64(static_cast<uint32_t>(crcs[region]), crcs[region] = crc32c_t{static_cast<uint32_t>(_mm_crc32_u64(
_mm_extract_epi64(data[i], 0))); static_cast<uint32_t>(crcs[region]), _mm_extract_epi64(data[i], 0)))};
crcs[region] = ToCrc32c(_mm_crc32_u64(static_cast<uint32_t>(crcs[region]), crcs[region] = crc32c_t{static_cast<uint32_t>(_mm_crc32_u64(
_mm_extract_epi64(data[i], 1))); static_cast<uint32_t>(crcs[region]), _mm_extract_epi64(data[i], 1)))};
} }
#ifdef __GNUC__ #ifdef __GNUC__
...@@ -131,8 +131,8 @@ inline void LargeTailCopy(crc32c_t* crcs, char** dst, const char** src, ...@@ -131,8 +131,8 @@ inline void LargeTailCopy(crc32c_t* crcs, char** dst, const char** src,
int data_index = i * kIntLoadsPerVec + j; int data_index = i * kIntLoadsPerVec + j;
int_data[data_index] = *(usrc + j); int_data[data_index] = *(usrc + j);
crcs[region] = ToCrc32c(_mm_crc32_u64( crcs[region] = crc32c_t{static_cast<uint32_t>(_mm_crc32_u64(
static_cast<uint32_t>(crcs[region]), int_data[data_index])); static_cast<uint32_t>(crcs[region]), int_data[data_index]))};
*(udst + j) = int_data[data_index]; *(udst + j) = int_data[data_index];
} }
...@@ -279,12 +279,12 @@ crc32c_t AcceleratedCrcMemcpyEngine<vec_regions, int_regions>::Compute( ...@@ -279,12 +279,12 @@ crc32c_t AcceleratedCrcMemcpyEngine<vec_regions, int_regions>::Compute(
// Load and CRC data. // Load and CRC data.
vec_data[j] = _mm_loadu_si128(src + i); vec_data[j] = _mm_loadu_si128(src + i);
crcs[region] = crcs[region] = crc32c_t{static_cast<uint32_t>(
ToCrc32c(_mm_crc32_u64(static_cast<uint32_t>(crcs[region]), _mm_crc32_u64(static_cast<uint32_t>(crcs[region]),
_mm_extract_epi64(vec_data[j], 0))); _mm_extract_epi64(vec_data[j], 0)))};
crcs[region] = crcs[region] = crc32c_t{static_cast<uint32_t>(
ToCrc32c(_mm_crc32_u64(static_cast<uint32_t>(crcs[region]), _mm_crc32_u64(static_cast<uint32_t>(crcs[region]),
_mm_extract_epi64(vec_data[j], 1))); _mm_extract_epi64(vec_data[j], 1)))};
// Store the data. // Store the data.
_mm_store_si128(dst + i, vec_data[j]); _mm_store_si128(dst + i, vec_data[j]);
...@@ -313,8 +313,8 @@ crc32c_t AcceleratedCrcMemcpyEngine<vec_regions, int_regions>::Compute( ...@@ -313,8 +313,8 @@ crc32c_t AcceleratedCrcMemcpyEngine<vec_regions, int_regions>::Compute(
// Load and CRC the data. // Load and CRC the data.
int_data[data_index] = *(usrc + i * kIntLoadsPerVec + k); int_data[data_index] = *(usrc + i * kIntLoadsPerVec + k);
crcs[region] = ToCrc32c(_mm_crc32_u64( crcs[region] = crc32c_t{static_cast<uint32_t>(_mm_crc32_u64(
static_cast<uint32_t>(crcs[region]), int_data[data_index])); static_cast<uint32_t>(crcs[region]), int_data[data_index]))};
// Store the data. // Store the data.
*(udst + i * kIntLoadsPerVec + k) = int_data[data_index]; *(udst + i * kIntLoadsPerVec + k) = int_data[data_index];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment