Rename unpackNN_default to unpackNN_scalar

Author: AntoinePrv

cpp/src/arrow/util/bpacking.cc

@@ -36,7 +36,7 @@
 namespace arrow {
 namespace internal {
 
-int unpack32_default(const uint8_t* in_, uint32_t* out, int batch_size, int num_bits) {
+int unpack32_scalar(const uint8_t* in_, uint32_t* out, int batch_size, int num_bits) {
   const uint32_t* in = reinterpret_cast<const uint32_t*>(in_);
 
   batch_size = batch_size / 32 * 32;
@@ -152,10 +152,10 @@ int unpack32_default(const uint8_t* in_, uint32_t* out, int batch_size, int num_
 namespace {
 
 struct Unpack32DynamicFunction {
-  using FunctionType = decltype(&unpack32_default);
+  using FunctionType = decltype(&unpack32_scalar);
 
   static std::vector<std::pair<DispatchLevel, FunctionType>> implementations() {
-    return {{DispatchLevel::NONE, unpack32_default}
+    return {{DispatchLevel::NONE, unpack32_scalar}
 #if defined(ARROW_HAVE_RUNTIME_AVX2)
             ,
             {DispatchLevel::AVX2, unpack32_avx2}
@@ -179,7 +179,7 @@ int unpack32(const uint8_t* in, uint32_t* out, int batch_size, int num_bits) {
 #endif
 }
 
-int unpack64_default(const uint8_t* in, uint64_t* out, int batch_size, int num_bits) {
+int unpack64_scalar(const uint8_t* in, uint64_t* out, int batch_size, int num_bits) {
   batch_size = batch_size / 32 * 32;
   int num_loops = batch_size / 32;
 
@@ -388,7 +388,7 @@ int unpack64_default(const uint8_t* in, uint64_t* out, int batch_size, int num_b
 
 int unpack64(const uint8_t* in, uint64_t* out, int batch_size, int num_bits) {
   // TODO: unpack64_neon, unpack64_avx2 and unpack64_avx512
-  return unpack64_default(in, out, batch_size, num_bits);
+  return unpack64_scalar(in, out, batch_size, num_bits);
 }
 
 }  // namespace internal

cpp/src/arrow/util/bpacking_benchmark.cc

@@ -124,9 +124,9 @@ void BM_UnpackUint64(benchmark::State& state, bool aligned, UnpackFunc<uint64_t>
   return BM_Unpack<uint64_t>(state, aligned, unpack, skip, std::move(skip_msg));
 }
 
-BENCHMARK_CAPTURE(BM_UnpackUint32, ScalarUnaligned, false, unpack32_default)
+BENCHMARK_CAPTURE(BM_UnpackUint32, ScalarUnaligned, false, unpack32_scalar)
     ->ArgsProduct(kBitWidthsNumValues32);
-BENCHMARK_CAPTURE(BM_UnpackUint64, ScalarUnaligned, false, unpack64_default)
+BENCHMARK_CAPTURE(BM_UnpackUint64, ScalarUnaligned, false, unpack64_scalar)
     ->ArgsProduct(bitWidthsNumValues64);
 
 #if defined(ARROW_HAVE_RUNTIME_AVX2)

cpp/src/arrow/util/bpacking_internal.h

@@ -24,12 +24,12 @@
 namespace arrow::internal {
 
 /// The scalar 32 bit unpacking.
-ARROW_EXPORT int unpack32_default(const uint8_t* in, uint32_t* out, int batch_size,
-                                  int num_bits);
+ARROW_EXPORT int unpack32_scalar(const uint8_t* in, uint32_t* out, int batch_size,
+                                 int num_bits);
 
 /// The scalar 64 bit unpacking.
-ARROW_EXPORT int unpack64_default(const uint8_t* in, uint64_t* out, int batch_size,
-                                  int num_bits);
+ARROW_EXPORT int unpack64_scalar(const uint8_t* in, uint64_t* out, int batch_size,
+                                 int num_bits);
 
 ARROW_EXPORT
 int unpack32(const uint8_t* in, uint32_t* out, int batch_size, int num_bits);

cpp/src/arrow/util/bpacking_test.cc

@@ -221,8 +221,8 @@ INSTANTIATE_TEST_SUITE_P(
                       TestUnpackSize{2048, 16}, TestUnpackSize{2048, 31},
                       TestUnpackSize{2048, 32}));
 
-TEST_P(TestUnpack, unpack32Default) { this->TestAll(&unpack32_default); }
-TEST_P(TestUnpack, unpack64Default) { this->TestAll(&unpack64_default); }
+TEST_P(TestUnpack, unpack32Default) { this->TestAll(&unpack32_scalar); }
+TEST_P(TestUnpack, unpack64Default) { this->TestAll(&unpack64_scalar); }
 
 #if defined(ARROW_HAVE_RUNTIME_AVX2)
 TEST_P(TestUnpack, unpack32Avx2) {