You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ze...@apache.org on 2023/11/28 22:49:35 UTC
(arrow) branch main updated: GH-38932: [GO] Fix spelling (#38933)
This is an automated email from the ASF dual-hosted git repository.
zeroshade pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new 461d6950de GH-38932: [GO] Fix spelling (#38933)
461d6950de is described below
commit 461d6950deb389fe75f002a2548a160c3609a7d6
Author: Josh Soref <21...@users.noreply.github.com>
AuthorDate: Tue Nov 28 17:49:27 2023 -0500
GH-38932: [GO] Fix spelling (#38933)
### Rationale for this change
### What changes are included in this PR?
Spelling fixes to go/
### Are these changes tested?
### Are there any user-facing changes?
* Closes: #38932
Authored-by: Josh Soref <21...@users.noreply.github.com>
Signed-off-by: Matt Topol <zo...@gmail.com>
---
go/arrow/array/binary_test.go | 2 +-
go/arrow/array/concat_test.go | 4 +-
go/arrow/array/dictionary.go | 4 +-
go/arrow/array/list.go | 2 +-
go/arrow/array/list_test.go | 2 +-
go/arrow/array/string_test.go | 6 +-
go/arrow/array/union.go | 4 +-
go/arrow/bitutil/bitmaps.go | 2 +-
go/arrow/cdata/interface.go | 2 +-
go/arrow/compute/arithmetic_test.go | 2 +-
go/arrow/compute/datum.go | 2 +-
go/arrow/compute/doc.go | 2 +-
go/arrow/compute/exec/utils.go | 2 +-
go/arrow/compute/executor.go | 2 +-
go/arrow/compute/exprs/types.go | 4 +-
go/arrow/compute/functions.go | 4 +-
.../compute/internal/kernels/base_arithmetic.go | 2 +-
go/arrow/compute/internal/kernels/rounding.go | 4 +-
.../internal/kernels/vector_run_end_encode.go | 2 +-
go/arrow/compute/registry_test.go | 2 +-
go/arrow/csv/common.go | 2 +-
go/arrow/csv/writer_test.go | 4 +-
go/arrow/datatype.go | 2 +-
go/arrow/datatype_extension.go | 4 +-
go/arrow/datatype_nested.go | 2 +-
go/arrow/decimal128/decimal128.go | 2 +-
go/arrow/decimal128/decimal128_test.go | 2 +-
go/arrow/decimal256/decimal256.go | 2 +-
go/arrow/encoded/ree_utils_test.go | 8 +-
go/arrow/flight/client.go | 2 +-
go/arrow/flight/flightsql/driver/README.md | 4 +-
go/arrow/flight/flightsql/example/sqlite_server.go | 2 +-
go/arrow/flight/flightsql/server.go | 4 +-
go/arrow/flight/flightsql/types.go | 4 +-
go/arrow/flight/gen/flight/FlightSql.pb.go | 20 +-
go/arrow/flight/server.go | 4 +-
go/arrow/internal/arrjson/writer.go | 2 +-
go/arrow/internal/flatbuf/Timestamp.go | 2 +-
go/arrow/internal/flight_integration/scenario.go | 2 +-
go/arrow/internal/testing/gen/random_array_gen.go | 2 +-
go/arrow/memory/mallocator/mallocator.go | 2 +-
go/internal/bitutils/bit_block_counter.go | 2 +-
go/internal/hashing/xxh3_memo_table.go | 4 +-
go/parquet/encryption_properties.go | 6 +-
go/parquet/file/column_writer_test.go | 4 +-
go/parquet/file/file_reader.go | 2 +-
go/parquet/file/level_conversion.go | 2 +-
go/parquet/file/level_conversion_test.go | 2 +-
go/parquet/file/record_reader.go | 2 +-
go/parquet/file/row_group_writer.go | 2 +-
go/parquet/internal/encoding/delta_byte_array.go | 2 +-
go/parquet/internal/encoding/memo_table.go | 2 +-
go/parquet/internal/encoding/typed_encoder.gen.go | 14 +-
.../internal/encoding/typed_encoder.gen.go.tmpl | 2 +-
go/parquet/internal/testutils/primitive_typed.go | 2 +-
go/parquet/internal/testutils/random.go | 2 +-
go/parquet/internal/utils/_lib/README.md | 4 +-
go/parquet/internal/utils/_lib/bit_packing_neon.c | 1054 ++++++++++----------
go/parquet/internal/utils/bit_reader.go | 4 +-
go/parquet/internal/utils/rle.go | 4 +-
go/parquet/metadata/file.go | 6 +-
go/parquet/metadata/statistics.go | 2 +-
go/parquet/metadata/statistics_types.gen.go | 18 +-
go/parquet/metadata/statistics_types.gen.go.tmpl | 2 +-
go/parquet/pqarrow/column_readers.go | 2 +-
go/parquet/pqarrow/encode_arrow.go | 4 +-
go/parquet/pqarrow/file_reader.go | 2 +-
go/parquet/pqarrow/path_builder.go | 2 +-
go/parquet/pqarrow/schema.go | 2 +-
go/parquet/pqarrow/schema_test.go | 2 +-
go/parquet/schema/logical_types_test.go | 24 +-
go/parquet/schema/node.go | 6 +-
go/parquet/schema/reflection.go | 4 +-
go/parquet/schema/schema_test.go | 2 +-
go/parquet/types.go | 2 +-
75 files changed, 665 insertions(+), 665 deletions(-)
diff --git a/go/arrow/array/binary_test.go b/go/arrow/array/binary_test.go
index c9e1655152..8a11ec7dab 100644
--- a/go/arrow/array/binary_test.go
+++ b/go/arrow/array/binary_test.go
@@ -705,7 +705,7 @@ func TestBinaryViewStringRoundTrip(t *testing.T) {
mem := memory.NewCheckedAllocator(memory.DefaultAllocator)
defer mem.AssertSize(t, 0)
- values := []string{"a", "bc", "", "", "supercalifragilistic", "", "expeallodocious"}
+ values := []string{"a", "bc", "", "", "supercalifragilistic", "", "expialidocious"}
valid := []bool{true, true, false, false, true, true, true}
b := NewBinaryViewBuilder(mem)
diff --git a/go/arrow/array/concat_test.go b/go/arrow/array/concat_test.go
index 7b22d97a41..a3686b4570 100644
--- a/go/arrow/array/concat_test.go
+++ b/go/arrow/array/concat_test.go
@@ -694,7 +694,7 @@ func TestConcatAlmostOverflowRunEndEncoding(t *testing.T) {
defer bldr.Release()
valBldr := bldr.ValueBuilder().(*array.StringBuilder)
- // max is not evently divisible by 4, so we add one to each
+ // max is not evenly divisible by 4, so we add one to each
// to account for that so our final concatenate will overflow
bldr.Append((tt.max / 4) + 1)
valBldr.Append("foo")
@@ -741,7 +741,7 @@ func TestConcatOverflowRunEndEncoding(t *testing.T) {
defer bldr.Release()
valBldr := bldr.ValueBuilder().(*array.StringBuilder)
- // max is not evently divisible by 4, so we add one to each
+ // max is not evenly divisible by 4, so we add one to each
// to account for that so our final concatenate will overflow
bldr.Append((tt.max / 4) + 1)
valBldr.Append("foo")
diff --git a/go/arrow/array/dictionary.go b/go/arrow/array/dictionary.go
index 856f91605f..125c02391f 100644
--- a/go/arrow/array/dictionary.go
+++ b/go/arrow/array/dictionary.go
@@ -739,7 +739,7 @@ func (b *dictionaryBuilder) UnmarshalJSON(data []byte) error {
}
if delim, ok := t.(json.Delim); !ok || delim != '[' {
- return fmt.Errorf("dictionary builder must upack from json array, found %s", delim)
+ return fmt.Errorf("dictionary builder must unpack from json array, found %s", delim)
}
return b.Unmarshal(dec)
@@ -1533,7 +1533,7 @@ type DictionaryUnifier interface {
// values, an error will be returned instead. The new unified dictionary
// is returned.
GetResultWithIndexType(indexType arrow.DataType) (arrow.Array, error)
- // Release should be called to clean up any allocated scrach memo-table used
+ // Release should be called to clean up any allocated scratch memo-table used
// for building the unified dictionary.
Release()
}
diff --git a/go/arrow/array/list.go b/go/arrow/array/list.go
index f10e2072c4..4b62734116 100644
--- a/go/arrow/array/list.go
+++ b/go/arrow/array/list.go
@@ -926,7 +926,7 @@ func (a *LargeListView) Release() {
a.values.Release()
}
-// Acessors for offsets and sizes to make ListView and LargeListView validation generic.
+// Accessors for offsets and sizes to make ListView and LargeListView validation generic.
type offsetsAndSizes interface {
offsetAt(slot int64) int64
sizeAt(slot int64) int64
diff --git a/go/arrow/array/list_test.go b/go/arrow/array/list_test.go
index 11404b2d8b..011b5d7426 100644
--- a/go/arrow/array/list_test.go
+++ b/go/arrow/array/list_test.go
@@ -541,7 +541,7 @@ func TestListArraySlice(t *testing.T) {
}
}
-func TestLisViewtArraySlice(t *testing.T) {
+func TestListViewArraySlice(t *testing.T) {
tests := []struct {
typeID arrow.Type
offsets interface{}
diff --git a/go/arrow/array/string_test.go b/go/arrow/array/string_test.go
index 803fae5134..3df56a2675 100644
--- a/go/arrow/array/string_test.go
+++ b/go/arrow/array/string_test.go
@@ -189,7 +189,7 @@ func TestStringBuilder_Empty(t *testing.T) {
}
// TestStringReset tests the Reset() method on the String type by creating two different Strings and then
-// reseting the contents of string2 with the values from string1.
+// resetting the contents of string2 with the values from string1.
func TestStringReset(t *testing.T) {
mem := memory.NewCheckedAllocator(memory.NewGoAllocator())
sb1 := array.NewStringBuilder(mem)
@@ -471,7 +471,7 @@ func TestLargeStringBuilder_Empty(t *testing.T) {
}
// TestStringReset tests the Reset() method on the String type by creating two different Strings and then
-// reseting the contents of string2 with the values from string1.
+// resetting the contents of string2 with the values from string1.
func TestLargeStringReset(t *testing.T) {
mem := memory.NewCheckedAllocator(memory.NewGoAllocator())
sb1 := array.NewLargeStringBuilder(mem)
@@ -771,7 +771,7 @@ func TestStringViewBuilder_Empty(t *testing.T) {
}
// TestStringReset tests the Reset() method on the String type by creating two different Strings and then
-// reseting the contents of string2 with the values from string1.
+// resetting the contents of string2 with the values from string1.
func TestStringViewReset(t *testing.T) {
mem := memory.NewCheckedAllocator(memory.NewGoAllocator())
sb1 := array.NewStringViewBuilder(mem)
diff --git a/go/arrow/array/union.go b/go/arrow/array/union.go
index 0ecef4fb8e..1af3e70472 100644
--- a/go/arrow/array/union.go
+++ b/go/arrow/array/union.go
@@ -69,7 +69,7 @@ type Union interface {
// or arrow.DenseMode.
Mode() arrow.UnionMode
// Field returns the requested child array for this union. Returns nil if a
- // non-existent position is passed in.
+ // nonexistent position is passed in.
//
// The appropriate child for an index can be retrieved with Field(ChildID(index))
Field(pos int) arrow.Array
@@ -980,7 +980,7 @@ func (b *SparseUnionBuilder) AppendEmptyValues(n int) {
//
// After appending to the corresponding child builder, all other child
// builders should have a null or empty value appended to them (although
-// this is not enfoced and any value is theoretically allowed and will be
+// this is not enforced and any value is theoretically allowed and will be
// ignored).
func (b *SparseUnionBuilder) Append(nextType arrow.UnionTypeCode) {
b.typesBuilder.AppendValue(nextType)
diff --git a/go/arrow/bitutil/bitmaps.go b/go/arrow/bitutil/bitmaps.go
index d7516771de..887a1920bc 100644
--- a/go/arrow/bitutil/bitmaps.go
+++ b/go/arrow/bitutil/bitmaps.go
@@ -360,7 +360,7 @@ func (bm *BitmapWordWriter) PutNextTrailingByte(b byte, validBits int) {
bm.bitmap = bm.bitmap[1:]
} else {
debug.Assert(validBits > 0 && validBits < 8, "invalid valid bits in bitmap word writer")
- debug.Assert(BytesForBits(int64(bm.offset+validBits)) <= int64(len(bm.bitmap)), "writing trailiing byte outside of bounds of bitmap")
+ debug.Assert(BytesForBits(int64(bm.offset+validBits)) <= int64(len(bm.bitmap)), "writing trailing byte outside of bounds of bitmap")
wr := NewBitmapWriter(bm.bitmap, int(bm.offset), validBits)
for i := 0; i < validBits; i++ {
if b&0x01 != 0 {
diff --git a/go/arrow/cdata/interface.go b/go/arrow/cdata/interface.go
index 8ce06280a0..d55a068aa1 100644
--- a/go/arrow/cdata/interface.go
+++ b/go/arrow/cdata/interface.go
@@ -266,7 +266,7 @@ func ExportArrowArray(arr arrow.Array, out *CArrowArray, outSchema *CArrowSchema
// ExportRecordReader populates the CArrowArrayStream that is passed in with the appropriate
// callbacks to be a working ArrowArrayStream utilizing the passed in RecordReader. The
// CArrowArrayStream takes ownership of the RecordReader until the consumer calls the release
-// callback, as such it is unnecesary to call Release on the passed in reader unless it has
+// callback, as such it is unnecessary to call Release on the passed in reader unless it has
// previously been retained.
//
// WARNING: the output ArrowArrayStream MUST BE ZERO INITIALIZED, or the Go garbage
diff --git a/go/arrow/compute/arithmetic_test.go b/go/arrow/compute/arithmetic_test.go
index 821ffd9e06..c9c3f1ceb0 100644
--- a/go/arrow/compute/arithmetic_test.go
+++ b/go/arrow/compute/arithmetic_test.go
@@ -393,7 +393,7 @@ func (b *BinaryArithmeticSuite[T]) TestSub() {
})
}
-func (b *BinaryArithmeticSuite[T]) TestMuliply() {
+func (b *BinaryArithmeticSuite[T]) TestMultiply() {
b.Run(b.DataType().String(), func() {
for _, overflow := range []bool{false, true} {
b.Run(fmt.Sprintf("no_overflow_check=%t", overflow), func() {
diff --git a/go/arrow/compute/datum.go b/go/arrow/compute/datum.go
index 98bd1f1a0a..388cfa1015 100644
--- a/go/arrow/compute/datum.go
+++ b/go/arrow/compute/datum.go
@@ -250,7 +250,7 @@ func (d *TableDatum) Equals(other Datum) bool {
// an array.Table gets a TableDatum
// a scalar.Scalar gets a ScalarDatum
//
-// Anything else is passed to scalar.MakeScalar and recieves a scalar
+// Anything else is passed to scalar.MakeScalar and receives a scalar
// datum of that appropriate type.
func NewDatum(value interface{}) Datum {
switch v := value.(type) {
diff --git a/go/arrow/compute/doc.go b/go/arrow/compute/doc.go
index 53a164e61e..7c763cb18d 100644
--- a/go/arrow/compute/doc.go
+++ b/go/arrow/compute/doc.go
@@ -23,7 +23,7 @@
// is an attempt to provide for those users, and in general create a
// native-go arrow compute engine.
//
-// The overwhemling majority of things in this package require go1.18 as
+// The overwhelming majority of things in this package require go1.18 as
// it utilizes generics. The files in this package and its sub-packages
// are all excluded from being built by go versions lower than 1.18 so
// that the larger Arrow module itself is still compatible with go1.17.
diff --git a/go/arrow/compute/exec/utils.go b/go/arrow/compute/exec/utils.go
index 17bc30ef2a..276e4570ca 100644
--- a/go/arrow/compute/exec/utils.go
+++ b/go/arrow/compute/exec/utils.go
@@ -194,7 +194,7 @@ func GetDataType[T NumericTypes | bool | string | []byte | float16.Num]() arrow.
return typMap[reflect.TypeOf(z)]
}
-// GetType returns the appropriate arrow.Type type T, only for non-parameteric
+// GetType returns the appropriate arrow.Type type T, only for non-parametric
// types. This uses a map and reflection internally so don't call this in
// a tight loop, instead call it once and then use a closure with the result.
func GetType[T NumericTypes | bool | string]() arrow.Type {
diff --git a/go/arrow/compute/executor.go b/go/arrow/compute/executor.go
index db89b206da..b8144a4a8d 100644
--- a/go/arrow/compute/executor.go
+++ b/go/arrow/compute/executor.go
@@ -391,7 +391,7 @@ func inferBatchLength(values []Datum) (length int64, allSame bool) {
type KernelExecutor interface {
// Init must be called *after* the kernel's init method and any
// KernelState must be set into the KernelCtx *before* calling
- // this Init method. This is to faciliate the case where
+ // this Init method. This is to facilitate the case where
// Init may be expensive and does not need to be called
// again for each execution of the kernel. For example,
// the same lookup table can be re-used for all scanned batches
diff --git a/go/arrow/compute/exprs/types.go b/go/arrow/compute/exprs/types.go
index ef8363bdfd..87e08233cc 100644
--- a/go/arrow/compute/exprs/types.go
+++ b/go/arrow/compute/exprs/types.go
@@ -35,7 +35,7 @@ const (
// URI for official Arrow Substrait Extension Types
ArrowExtTypesUri = "https://github.com/apache/arrow/blob/main/format/substrait/extension_types.yaml"
SubstraitDefaultURIPrefix = extensions.SubstraitDefaultURIPrefix
- // URI for official Substrait Arithemetic funcs extensions
+ // URI for official Substrait Arithmetic funcs extensions
SubstraitArithmeticFuncsURI = SubstraitDefaultURIPrefix + "functions_arithmetic.yaml"
// URI for official Substrait Comparison funcs extensions
SubstraitComparisonFuncsURI = SubstraitDefaultURIPrefix + "functions_comparison.yaml"
@@ -235,7 +235,7 @@ func encodeOptionlessOverflowableArithmetic(id extensions.ID) arrowToSubstrait {
}
}
-// NewExtensionSetDefault is a convenince function to create a new extension
+// NewExtensionSetDefault is a convenience function to create a new extension
// set using the Default arrow extension ID registry.
//
// See NewExtensionSet for more info.
diff --git a/go/arrow/compute/functions.go b/go/arrow/compute/functions.go
index b85062721d..f35d9facaf 100644
--- a/go/arrow/compute/functions.go
+++ b/go/arrow/compute/functions.go
@@ -179,7 +179,7 @@ func (b *baseFunction) checkArity(nargs int) error {
return nil
}
-// kernelType is a type contstraint interface that is used for funcImpl
+// kernelType is a type constraint interface that is used for funcImpl
// generic definitions. It will be extended as other kernel types
// are defined.
//
@@ -227,7 +227,7 @@ func (fi *funcImpl[KT]) Kernels() []*KT {
// A ScalarFunction is a function that executes element-wise operations
// on arrays or scalars, and therefore whose results generally do not
-// depent on the order of the values in the arguments. Accepts and returns
+// depend on the order of the values in the arguments. Accepts and returns
// arrays that are all of the same size. These functions roughly correspond
// to the functions used in most SQL expressions.
type ScalarFunction struct {
diff --git a/go/arrow/compute/internal/kernels/base_arithmetic.go b/go/arrow/compute/internal/kernels/base_arithmetic.go
index c795087726..4ef0031f31 100644
--- a/go/arrow/compute/internal/kernels/base_arithmetic.go
+++ b/go/arrow/compute/internal/kernels/base_arithmetic.go
@@ -795,7 +795,7 @@ func getArithmeticOpDecimalImpl[T decimal128.Num | decimal256.Num](op Arithmetic
return int64(fns.Sign(arg))
})
}
- debug.Assert(false, "unimplemented arithemtic op")
+ debug.Assert(false, "unimplemented arithmetic op")
return nil
}
diff --git a/go/arrow/compute/internal/kernels/rounding.go b/go/arrow/compute/internal/kernels/rounding.go
index 8a1bec1180..345c779085 100644
--- a/go/arrow/compute/internal/kernels/rounding.go
+++ b/go/arrow/compute/internal/kernels/rounding.go
@@ -619,7 +619,7 @@ func (rnd *roundToMultipleDec[T]) call(_ *exec.KernelCtx, arg T, e *error) T {
if rnd.mode >= HalfDown {
if rnd.hasHalfwayPoint && (remainder == rnd.halfMult || remainder == rnd.negHalfMult) {
// on the halfway point, use tiebreaker
- // manually implement rounding since we're not actually rounding
+ // manually implement rounding since we aren't actually rounding
// a decimal value, but rather manipulating the multiple
switch rnd.mode {
case HalfDown:
@@ -666,7 +666,7 @@ func (rnd *roundToMultipleDec[T]) call(_ *exec.KernelCtx, arg T, e *error) T {
}
}
} else {
- // manually implement rounding since we're not actually rounding
+ // manually implement rounding since we aren't actually rounding
// a decimal value, but rather manipulating the multiple
switch rnd.mode {
case RoundDown:
diff --git a/go/arrow/compute/internal/kernels/vector_run_end_encode.go b/go/arrow/compute/internal/kernels/vector_run_end_encode.go
index a147bf7d50..076bef1368 100644
--- a/go/arrow/compute/internal/kernels/vector_run_end_encode.go
+++ b/go/arrow/compute/internal/kernels/vector_run_end_encode.go
@@ -394,7 +394,7 @@ func (re *runEndEncodeLoopBinary[R, O]) WriteEncodedRuns(out *exec.ExecResult) i
outputValues := out.Children[1].Buffers[2].Buf
// re.offsetValues already accounts for the input.offset so we don't
- // need to initalize readOffset to re.inputOffset
+ // need to initialize readOffset to re.inputOffset
var readOffset int64
currentRun, curRunValid := re.readValue(readOffset)
readOffset++
diff --git a/go/arrow/compute/registry_test.go b/go/arrow/compute/registry_test.go
index 4e4f44f1d3..b725091090 100644
--- a/go/arrow/compute/registry_test.go
+++ b/go/arrow/compute/registry_test.go
@@ -81,7 +81,7 @@ func TestRegistryBasics(t *testing.T) {
assert.True(t, ok)
assert.Same(t, fn, f1)
- // non-existent
+ // nonexistent
_, ok = registry.GetFunction("f2")
assert.False(t, ok)
diff --git a/go/arrow/csv/common.go b/go/arrow/csv/common.go
index 2a1f7300a9..99dac29f4d 100644
--- a/go/arrow/csv/common.go
+++ b/go/arrow/csv/common.go
@@ -172,7 +172,7 @@ func WithNullWriter(null string) Option {
}
// WithBoolWriter override the default bool formatter with a function that returns
-// a string representaton of bool states. i.e. True, False, 1, 0
+// a string representation of bool states. i.e. True, False, 1, 0
func WithBoolWriter(fmtr func(bool) string) Option {
return func(cfg config) {
switch cfg := cfg.(type) {
diff --git a/go/arrow/csv/writer_test.go b/go/arrow/csv/writer_test.go
index 1918e2e492..644cae0933 100644
--- a/go/arrow/csv/writer_test.go
+++ b/go/arrow/csv/writer_test.go
@@ -316,7 +316,7 @@ func testCSVWriter(t *testing.T, data [][]string, writeHeader bool, fmtr func(bo
t.Fatal(err)
}
- bdata, err := expectedOutout(data)
+ bdata, err := expectedOutput(data)
if err != nil {
t.Fatal(err)
}
@@ -326,7 +326,7 @@ func testCSVWriter(t *testing.T, data [][]string, writeHeader bool, fmtr func(bo
}
}
-func expectedOutout(data [][]string) (*bytes.Buffer, error) {
+func expectedOutput(data [][]string) (*bytes.Buffer, error) {
b := bytes.NewBuffer(nil)
w := ecsv.NewWriter(b)
w.Comma = separator
diff --git a/go/arrow/datatype.go b/go/arrow/datatype.go
index 1e5d8fb98a..b2f2329e5c 100644
--- a/go/arrow/datatype.go
+++ b/go/arrow/datatype.go
@@ -144,7 +144,7 @@ const (
// like BINARY but with 64-bit offsets, not yet implemented
LARGE_BINARY
- // like LIST but with 64-bit offsets. not yet implmented
+ // like LIST but with 64-bit offsets. not yet implemented
LARGE_LIST
// calendar interval with three fields
diff --git a/go/arrow/datatype_extension.go b/go/arrow/datatype_extension.go
index 50ae107583..f0bcccdf2b 100644
--- a/go/arrow/datatype_extension.go
+++ b/go/arrow/datatype_extension.go
@@ -46,7 +46,7 @@ func getExtTypeRegistry() *sync.Map {
}
// RegisterExtensionType registers the provided ExtensionType by calling ExtensionName
-// to use as a Key for registrying the type. If a type with the same name is already
+// to use as a Key for registering the type. If a type with the same name is already
// registered then this will return an error saying so, otherwise it will return nil
// if successful registering the type.
// This function is safe to call from multiple goroutines simultaneously.
@@ -117,7 +117,7 @@ type ExtensionType interface {
// concurrently.
Serialize() string
// Deserialize is called when reading in extension arrays and types via the IPC format
- // in order to construct an instance of the appropriate extension type. The data passed in
+ // in order to construct an instance of the appropriate extension type. The passed in data
// is pulled from the ARROW:extension:metadata key and may be nil or an empty slice.
// If the storage type is incorrect or something else is invalid with the data this should
// return nil and an appropriate error.
diff --git a/go/arrow/datatype_nested.go b/go/arrow/datatype_nested.go
index 2f709b7f25..9a8873a50e 100644
--- a/go/arrow/datatype_nested.go
+++ b/go/arrow/datatype_nested.go
@@ -476,7 +476,7 @@ func (t *StructType) FieldByName(name string) (Field, bool) {
// FieldIdx gets the index of the field with the given name.
//
// If there are multiple fields with the given name, FieldIdx returns
-// the index of the first first such field.
+// the index of the first such field.
func (t *StructType) FieldIdx(name string) (int, bool) {
i, ok := t.index[name]
if ok {
diff --git a/go/arrow/decimal128/decimal128.go b/go/arrow/decimal128/decimal128.go
index 3b88dce1fa..7ce8cd51b0 100644
--- a/go/arrow/decimal128/decimal128.go
+++ b/go/arrow/decimal128/decimal128.go
@@ -237,7 +237,7 @@ func FromString(v string, prec, scale int32) (n Num, err error) {
// math/big library refers to precision in floating point terms
// where it refers to the "number of bits of precision in the mantissa".
// So we need to figure out how many bits we should use for precision,
- // based on the input precision. Too much precision and we're not rounding
+ // based on the input precision. Too much precision and we aren't rounding
// when we should. Too little precision and we round when we shouldn't.
//
// In general, the number of decimal digits you get from a given number
diff --git a/go/arrow/decimal128/decimal128_test.go b/go/arrow/decimal128/decimal128_test.go
index 4cfd7db20d..05af1f557f 100644
--- a/go/arrow/decimal128/decimal128_test.go
+++ b/go/arrow/decimal128/decimal128_test.go
@@ -492,7 +492,7 @@ func TestDecimalToReal(t *testing.T) {
checkDecimalToFloat(t, "9223373136366403584", float64(9.223373136366404e+18), 0)
checkDecimalToFloat(t, "-9223373136366403584", float64(-9.223373136366404e+18), 0)
- // 2**64 - 2**11 (exactly represntable in a float64)
+ // 2**64 - 2**11 (exactly representable in a float64)
checkDecimalToFloat(t, "18446746272732807168", float64(1.8446746272732807e+19), 0)
checkDecimalToFloat(t, "-18446746272732807168", float64(-1.8446746272732807e+19), 0)
diff --git a/go/arrow/decimal256/decimal256.go b/go/arrow/decimal256/decimal256.go
index 5f2ad5f321..65be0df9dd 100644
--- a/go/arrow/decimal256/decimal256.go
+++ b/go/arrow/decimal256/decimal256.go
@@ -125,7 +125,7 @@ func FromString(v string, prec, scale int32) (n Num, err error) {
// math/big library refers to precision in floating point terms
// where it refers to the "number of bits of precision in the mantissa".
// So we need to figure out how many bits we should use for precision,
- // based on the input precision. Too much precision and we're not rounding
+ // based on the input precision. Too much precision and we aren't rounding
// when we should. Too little precision and we round when we shouldn't.
//
// In general, the number of decimal digits you get from a given number
diff --git a/go/arrow/encoded/ree_utils_test.go b/go/arrow/encoded/ree_utils_test.go
index 9470331002..57d11e9b4e 100644
--- a/go/arrow/encoded/ree_utils_test.go
+++ b/go/arrow/encoded/ree_utils_test.go
@@ -84,9 +84,9 @@ func TestMergedRunsIter(t *testing.T) {
expectedRunLengths = []int32{5, 4, 6, 5, 5, 25}
expectedLeftVisits = []int32{110, 111, 111, 112, 113, 114}
expectedRightVisits = []int32{205, 206, 207, 207, 207, 208}
- leftPrntOffset int32 = 1000
+ leftPrintOffset int32 = 1000
leftChildOffset int32 = 100
- rightPrntOffset int32 = 2000
+ rightPrintOffset int32 = 2000
rightChildOffset int32 = 200
leftChild arrow.Array = array.NewNull(int(leftChildOffset) + leftRunEnds.Len())
@@ -101,9 +101,9 @@ func TestMergedRunsIter(t *testing.T) {
rightArray := arrow.Array(array.NewRunEndEncodedArray(rightRunEnds, rightChild, 2050, 0))
defer rightArray.Release()
- leftArray = array.NewSlice(leftArray, int64(leftPrntOffset), int64(leftArray.Len()))
+ leftArray = array.NewSlice(leftArray, int64(leftPrintOffset), int64(leftArray.Len()))
defer leftArray.Release()
- rightArray = array.NewSlice(rightArray, int64(rightPrntOffset), int64(rightArray.Len()))
+ rightArray = array.NewSlice(rightArray, int64(rightPrintOffset), int64(rightArray.Len()))
defer rightArray.Release()
pos, logicalPos := 0, 0
diff --git a/go/arrow/flight/client.go b/go/arrow/flight/client.go
index 8c400eb66b..4f44bdc5eb 100644
--- a/go/arrow/flight/client.go
+++ b/go/arrow/flight/client.go
@@ -265,7 +265,7 @@ func NewFlightClient(addr string, auth ClientAuthHandler, opts ...grpc.DialOptio
return &client{conn: conn, FlightServiceClient: flight.NewFlightServiceClient(conn), authHandler: auth}, nil
}
-// NewClientWithMiddleware takes a slice of middlewares in addition to the auth and address which will be
+// NewClientWithMiddleware takes a slice of middleware in addition to the auth and address which will be
// used by grpc and chained, the first middleware will be the outer most with the last middleware
// being the inner most wrapper around the actual call. It also passes along the dialoptions passed in such
// as TLS certs and so on.
diff --git a/go/arrow/flight/flightsql/driver/README.md b/go/arrow/flight/flightsql/driver/README.md
index f1447a7d24..fade2cc5c4 100644
--- a/go/arrow/flight/flightsql/driver/README.md
+++ b/go/arrow/flight/flightsql/driver/README.md
@@ -25,7 +25,7 @@ connection pooling, transactions combined with ease of use (see (#usage)).
---------------------------------------
-* [Prerequisits](#prerequisits)
+* [Prerequisites](#prerequisites)
* [Usage](#usage)
* [Data Source Name (DSN)](#data-source-name-dsn)
* [Driver config usage](#driver-config-usage)
@@ -218,7 +218,7 @@ configuration. In this case you need to call `RegisterTLSConfig()` in your code
...
```
-This will register the custom configuration, constraining the minimim TLS
+This will register the custom configuration, constraining the minimum TLS
version, as `myconfig` and then references the registered configuration by
name in the DSN. You can reuse the same TLS configuration by registering once
and then reference in multiple DSNs. Registering multiple configurations with
diff --git a/go/arrow/flight/flightsql/example/sqlite_server.go b/go/arrow/flight/flightsql/example/sqlite_server.go
index f06dd02106..24cadd957e 100644
--- a/go/arrow/flight/flightsql/example/sqlite_server.go
+++ b/go/arrow/flight/flightsql/example/sqlite_server.go
@@ -684,7 +684,7 @@ func (s *SQLiteFlightSQLServer) GetFlightInfoPrimaryKeys(_ context.Context, cmd
}
func (s *SQLiteFlightSQLServer) DoGetPrimaryKeys(ctx context.Context, cmd flightsql.TableRef) (*arrow.Schema, <-chan flight.StreamChunk, error) {
- // the field key_name can not be recovered by sqlite so it is
+ // the field key_name cannot be recovered by sqlite so it is
// being set to null following the same pattern for catalog name and schema_name
var b strings.Builder
diff --git a/go/arrow/flight/flightsql/server.go b/go/arrow/flight/flightsql/server.go
index a086610433..5b1764707c 100644
--- a/go/arrow/flight/flightsql/server.go
+++ b/go/arrow/flight/flightsql/server.go
@@ -274,7 +274,7 @@ type BaseServer struct {
sqlInfoToResult SqlInfoResultMap
// Alloc allows specifying a particular allocator to use for any
// allocations done by the base implementation.
- // Will use memory.DefaultAlloctor if nil
+ // Will use memory.DefaultAllocator if nil
Alloc memory.Allocator
}
@@ -646,7 +646,7 @@ type Server interface {
BeginSavepoint(context.Context, ActionBeginSavepointRequest) (id []byte, err error)
// EndSavepoint releases or rolls back a savepoint
EndSavepoint(context.Context, ActionEndSavepointRequest) error
- // EndTransaction commits or rollsback a transaction
+ // EndTransaction commits or rolls back a transaction
EndTransaction(context.Context, ActionEndTransactionRequest) error
// CancelFlightInfo attempts to explicitly cancel a FlightInfo
CancelFlightInfo(context.Context, *flight.CancelFlightInfoRequest) (flight.CancelFlightInfoResult, error)
diff --git a/go/arrow/flight/flightsql/types.go b/go/arrow/flight/flightsql/types.go
index 2b7419482e..5a26414d8c 100644
--- a/go/arrow/flight/flightsql/types.go
+++ b/go/arrow/flight/flightsql/types.go
@@ -525,7 +525,7 @@ const (
SqlInfoMaxCharLiteralLen = SqlInfo(pb.SqlInfo_SQL_MAX_CHAR_LITERAL_LENGTH)
// Retrieves a int64 value representing the maximum number of characters allowed for a column name.
SqlInfoMaxColumnNameLen = SqlInfo(pb.SqlInfo_SQL_MAX_COLUMN_NAME_LENGTH)
- // Retrieves a int64 value representing the the maximum number of columns allowed in a GROUP BY clause.
+ // Retrieves a int64 value representing the maximum number of columns allowed in a GROUP BY clause.
SqlInfoMaxColumnsInGroupBy = SqlInfo(pb.SqlInfo_SQL_MAX_COLUMNS_IN_GROUP_BY)
// Retrieves a int64 value representing the maximum number of columns allowed in an index.
SqlInfoMaxColumnsInIndex = SqlInfo(pb.SqlInfo_SQL_MAX_COLUMNS_IN_INDEX)
@@ -705,7 +705,7 @@ const (
// - return 6 (\b110) => [SQL_RESULT_SET_CONCURRENCY_READ_ONLY, SQL_RESULT_SET_CONCURRENCY_UPDATABLE]
// - return 7 (\b111) => [SQL_RESULT_SET_CONCURRENCY_UNSPECIFIED, SQL_RESULT_SET_CONCURRENCY_READ_ONLY, SQL_RESULT_SET_CONCURRENCY_UPDATABLE]
// Valid result set types are described under `arrow.flight.protocol.sql.SqlSupportedResultSetConcurrency`.
- SqlInfoSupportedConcurrenciesForResultSetScrollInensitive = SqlInfo(pb.SqlInfo_SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_SCROLL_INSENSITIVE)
+ SqlInfoSupportedConcurrenciesForResultSetScrollInsensitive = SqlInfo(pb.SqlInfo_SQL_SUPPORTED_CONCURRENCIES_FOR_RESULT_SET_SCROLL_INSENSITIVE)
// Retrieves a boolean value indicating whether this database supports batch updates.
//
diff --git a/go/arrow/flight/gen/flight/FlightSql.pb.go b/go/arrow/flight/gen/flight/FlightSql.pb.go
index 494bf8bcca..279dc29c42 100644
--- a/go/arrow/flight/gen/flight/FlightSql.pb.go
+++ b/go/arrow/flight/gen/flight/FlightSql.pb.go
@@ -421,7 +421,7 @@ const (
SqlInfo_SQL_MAX_CHAR_LITERAL_LENGTH SqlInfo = 542
// Retrieves a int64 value representing the maximum number of characters allowed for a column name.
SqlInfo_SQL_MAX_COLUMN_NAME_LENGTH SqlInfo = 543
- // Retrieves a int64 value representing the the maximum number of columns allowed in a GROUP BY clause.
+ // Retrieves a int64 value representing the maximum number of columns allowed in a GROUP BY clause.
SqlInfo_SQL_MAX_COLUMNS_IN_GROUP_BY SqlInfo = 544
// Retrieves a int64 value representing the maximum number of columns allowed in an index.
SqlInfo_SQL_MAX_COLUMNS_IN_INDEX SqlInfo = 545
@@ -1704,7 +1704,7 @@ func (SqlSupportsConvert) EnumDescriptor() ([]byte, []int) {
//*
// The JDBC/ODBC-defined type of any object.
-// All the values here are the sames as in the JDBC and ODBC specs.
+// All the values here are the same as in the JDBC and ODBC specs.
type XdbcDataType int32
const (
@@ -1965,7 +1965,7 @@ const (
// Indicates that the fields allow the use of null values.
Nullable_NULLABILITY_NULLABLE Nullable = 1
//*
- // Indicates that nullability of the fields can not be determined.
+ // Indicates that nullability of the fields cannot be determined.
Nullable_NULLABILITY_UNKNOWN Nullable = 2
)
@@ -2014,7 +2014,7 @@ type Searchable int32
const (
//*
- // Indicates that column can not be used in a WHERE clause.
+ // Indicates that column cannot be used in a WHERE clause.
Searchable_SEARCHABLE_NONE Searchable = 0
//*
// Indicates that the column can be used in a WHERE clause if it is using a
@@ -2633,7 +2633,7 @@ func (x *CommandGetDbSchemas) GetDbSchemaFilterPattern() string {
// - ARROW:FLIGHT:SQL:PRECISION - Column precision/size
// - ARROW:FLIGHT:SQL:SCALE - Column scale/decimal digits if applicable
// - ARROW:FLIGHT:SQL:IS_AUTO_INCREMENT - "1" indicates if the column is auto incremented, "0" otherwise.
-// - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case sensitive, "0" otherwise.
+// - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case-sensitive, "0" otherwise.
// - ARROW:FLIGHT:SQL:IS_READ_ONLY - "1" indicates if the column is read only, "0" otherwise.
// - ARROW:FLIGHT:SQL:IS_SEARCHABLE - "1" indicates if the column is searchable via WHERE clause, "0" otherwise.
// The returned data should be ordered by catalog_name, db_schema_name, table_name, then table_type, followed by table_schema if requested.
@@ -3881,7 +3881,7 @@ func (x *ActionEndSavepointRequest) GetAction() ActionEndSavepointRequest_EndSav
// - ARROW:FLIGHT:SQL:PRECISION - Column precision/size
// - ARROW:FLIGHT:SQL:SCALE - Column scale/decimal digits if applicable
// - ARROW:FLIGHT:SQL:IS_AUTO_INCREMENT - "1" indicates if the column is auto incremented, "0" otherwise.
-// - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case sensitive, "0" otherwise.
+// - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case-sensitive, "0" otherwise.
// - ARROW:FLIGHT:SQL:IS_READ_ONLY - "1" indicates if the column is read only, "0" otherwise.
// - ARROW:FLIGHT:SQL:IS_SEARCHABLE - "1" indicates if the column is searchable via WHERE clause, "0" otherwise.
// - GetFlightInfo: execute the query.
@@ -3954,7 +3954,7 @@ func (x *CommandStatementQuery) GetTransactionId() []byte {
// - ARROW:FLIGHT:SQL:PRECISION - Column precision/size
// - ARROW:FLIGHT:SQL:SCALE - Column scale/decimal digits if applicable
// - ARROW:FLIGHT:SQL:IS_AUTO_INCREMENT - "1" indicates if the column is auto incremented, "0" otherwise.
-// - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case sensitive, "0" otherwise.
+// - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case-sensitive, "0" otherwise.
// - ARROW:FLIGHT:SQL:IS_READ_ONLY - "1" indicates if the column is read only, "0" otherwise.
// - ARROW:FLIGHT:SQL:IS_SEARCHABLE - "1" indicates if the column is searchable via WHERE clause, "0" otherwise.
// - GetFlightInfo: execute the query.
@@ -4079,7 +4079,7 @@ func (x *TicketStatementQuery) GetStatementHandle() []byte {
// - ARROW:FLIGHT:SQL:PRECISION - Column precision/size
// - ARROW:FLIGHT:SQL:SCALE - Column scale/decimal digits if applicable
// - ARROW:FLIGHT:SQL:IS_AUTO_INCREMENT - "1" indicates if the column is auto incremented, "0" otherwise.
-// - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case sensitive, "0" otherwise.
+// - ARROW:FLIGHT:SQL:IS_CASE_SENSITIVE - "1" indicates if the column is case-sensitive, "0" otherwise.
// - ARROW:FLIGHT:SQL:IS_READ_ONLY - "1" indicates if the column is read only, "0" otherwise.
// - ARROW:FLIGHT:SQL:IS_SEARCHABLE - "1" indicates if the column is searchable via WHERE clause, "0" otherwise.
// - DoPut: bind parameter values. All of the bound parameter sets will be executed as a single atomic execution.
@@ -4134,7 +4134,7 @@ func (x *CommandPreparedStatementQuery) GetPreparedStatementHandle() []byte {
//
// Represents a SQL update query. Used in the command member of FlightDescriptor
-// for the the RPC call DoPut to cause the server to execute the included SQL update.
+// for the RPC call DoPut to cause the server to execute the included SQL update.
type CommandStatementUpdate struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@@ -4194,7 +4194,7 @@ func (x *CommandStatementUpdate) GetTransactionId() []byte {
//
// Represents a SQL update query. Used in the command member of FlightDescriptor
-// for the the RPC call DoPut to cause the server to execute the included
+// for the RPC call DoPut to cause the server to execute the included
// prepared statement handle as an update.
type CommandPreparedStatementUpdate struct {
state protoimpl.MessageState
diff --git a/go/arrow/flight/server.go b/go/arrow/flight/server.go
index 8676b15644..c9c8b390a8 100644
--- a/go/arrow/flight/server.go
+++ b/go/arrow/flight/server.go
@@ -165,7 +165,7 @@ func (s *BaseFlightServer) Handshake(stream flight.FlightService_HandshakeServer
}
// CustomerServerMiddleware is a helper interface for more easily defining custom
-// grpc middlware without having to expose or understand all the grpc bells and whistles.
+// grpc middleware without having to expose or understand all the grpc bells and whistles.
type CustomServerMiddleware interface {
// StartCall will be called with the current context of the call, grpc.SetHeader can be used to add outgoing headers
// if the returned context is non-nil, then it will be used as the new context being passed through the calls
@@ -224,7 +224,7 @@ type server struct {
// the utility of the helpers
//
// Deprecated: prefer to use NewServerWithMiddleware, due to auth handler middleware
-// this function will be problematic if any of the grpc options specify other middlewares.
+// this function will be problematic if any of the grpc options specify other middleware.
func NewFlightServer(opt ...grpc.ServerOption) Server {
opt = append([]grpc.ServerOption{
grpc.ChainStreamInterceptor(serverAuthStreamInterceptor),
diff --git a/go/arrow/internal/arrjson/writer.go b/go/arrow/internal/arrjson/writer.go
index af7032d581..fdd36e97d9 100644
--- a/go/arrow/internal/arrjson/writer.go
+++ b/go/arrow/internal/arrjson/writer.go
@@ -90,7 +90,7 @@ func (w *Writer) Close() error {
enc := json.NewEncoder(w.w)
enc.SetIndent("", jsonIndent)
// ensure that we don't convert <, >, !, etc. to their unicode equivalents
- // in the output json since we're not using this in an HTML context so that
+ // in the output json since we aren't using this in an HTML context so that
// we can make sure that the json files match.
enc.SetEscapeHTML(false)
return enc.Encode(w.raw)
diff --git a/go/arrow/internal/flatbuf/Timestamp.go b/go/arrow/internal/flatbuf/Timestamp.go
index f53211455c..d0058e13e6 100644
--- a/go/arrow/internal/flatbuf/Timestamp.go
+++ b/go/arrow/internal/flatbuf/Timestamp.go
@@ -121,7 +121,7 @@ import (
/// no indication of how to map this information to a physical point in time.
/// Naive date-times must be handled with care because of this missing
/// information, and also because daylight saving time (DST) may make
-/// some values ambiguous or non-existent. A naive date-time may be
+/// some values ambiguous or nonexistent. A naive date-time may be
/// stored as a struct with Date and Time fields. However, it may also be
/// encoded into a Timestamp column with an empty timezone. The timestamp
/// values should be computed "as if" the timezone of the date-time values
diff --git a/go/arrow/internal/flight_integration/scenario.go b/go/arrow/internal/flight_integration/scenario.go
index 3ec905e2d6..0b12d22cc7 100644
--- a/go/arrow/internal/flight_integration/scenario.go
+++ b/go/arrow/internal/flight_integration/scenario.go
@@ -1790,7 +1790,7 @@ func (m *flightSqlScenarioTester) GetSchemaPreparedStatement(ctx context.Context
case "SELECT PREPARED STATEMENT WITH TXN HANDLE", "PLAN WITH TXN HANDLE":
return &flight.SchemaResult{Schema: flight.SerializeSchema(getQueryWithTransactionSchema(), memory.DefaultAllocator)}, nil
}
- return nil, fmt.Errorf("%w: invalid handle for GetSchemaPreparedStaement %s",
+ return nil, fmt.Errorf("%w: invalid handle for GetSchemaPreparedStatement %s",
arrow.ErrInvalid, string(cmd.GetPreparedStatementHandle()))
}
diff --git a/go/arrow/internal/testing/gen/random_array_gen.go b/go/arrow/internal/testing/gen/random_array_gen.go
index 57b417bd2b..3e5a11fe88 100644
--- a/go/arrow/internal/testing/gen/random_array_gen.go
+++ b/go/arrow/internal/testing/gen/random_array_gen.go
@@ -52,7 +52,7 @@ func (r *RandomArrayGenerator) GenerateBitmap(buffer []byte, n int64, prob float
count := int64(0)
r.extra++
- // bernoulli distribution uses P to determine the probabitiliy of a 0 or a 1,
+ // bernoulli distribution uses P to determine the probability of a 0 or a 1,
// which we'll use to generate the bitmap.
dist := distuv.Bernoulli{P: 1 - prob, Src: rand.NewSource(r.seed + r.extra)}
for i := 0; int64(i) < n; i++ {
diff --git a/go/arrow/memory/mallocator/mallocator.go b/go/arrow/memory/mallocator/mallocator.go
index 18e0377c4f..a111f009ec 100644
--- a/go/arrow/memory/mallocator/mallocator.go
+++ b/go/arrow/memory/mallocator/mallocator.go
@@ -37,7 +37,7 @@ import (
// Mallocator is an allocator which defers to libc malloc.
//
-// The priamry reason to use this is when exporting data across the C Data
+// The primary reason to use this is when exporting data across the C Data
// Interface. CGO requires that pointers to Go memory are not stored in C
// memory, which is exactly what the C Data Interface would otherwise
// require. By allocating with Mallocator up front, we can safely export the
diff --git a/go/internal/bitutils/bit_block_counter.go b/go/internal/bitutils/bit_block_counter.go
index 99eece34cd..50996b10e8 100644
--- a/go/internal/bitutils/bit_block_counter.go
+++ b/go/internal/bitutils/bit_block_counter.go
@@ -165,7 +165,7 @@ func (b *BitBlockCounter) NextWord() BitBlockCount {
}
// OptionalBitBlockCounter is a useful counter to iterate through a possibly
-// non-existent validity bitmap to allow us to write one code path for both
+// nonexistent validity bitmap to allow us to write one code path for both
// the with-nulls and no-nulls cases without giving up a lot of performance.
type OptionalBitBlockCounter struct {
hasBitmap bool
diff --git a/go/internal/hashing/xxh3_memo_table.go b/go/internal/hashing/xxh3_memo_table.go
index 81994f0a88..283bc1a953 100644
--- a/go/internal/hashing/xxh3_memo_table.go
+++ b/go/internal/hashing/xxh3_memo_table.go
@@ -57,7 +57,7 @@ type MemoTable interface {
// and a boolean indicating whether or not the value was found in
// the table (if false, the value was inserted). An error is returned
// if val is not the appropriate type for the table. This function is intended to be used by
- // the BinaryMemoTable to prevent uncessary allocations of the data when converting from a []byte to interface{}.
+ // the BinaryMemoTable to prevent unnecessary allocations of the data when converting from a []byte to interface{}.
GetOrInsertBytes(val []byte) (idx int, existed bool, err error)
// GetOrInsertNull returns the index of the null value in the table,
// inserting one if it hasn't already been inserted. It returns a boolean
@@ -67,7 +67,7 @@ type MemoTable interface {
// insert one if it doesn't already exist. Will return -1 if it doesn't exist
// indicated by a false value for the boolean.
GetNull() (idx int, exists bool)
- // WriteOut copys the unique values of the memotable out to the byte slice
+ // WriteOut copies the unique values of the memotable out to the byte slice
// provided. Must have allocated enough bytes for all the values.
WriteOut(out []byte)
// WriteOutSubset is like WriteOut, but only writes a subset of values
diff --git a/go/parquet/encryption_properties.go b/go/parquet/encryption_properties.go
index 6eb6cf1fe5..0eadc5fb04 100644
--- a/go/parquet/encryption_properties.go
+++ b/go/parquet/encryption_properties.go
@@ -104,7 +104,7 @@ type colEncryptConfig struct {
encrypted bool
}
-// ColumnEncryptOption how to specify options to the the NewColumnEncryptionProperties function.
+// ColumnEncryptOption how to specify options to the NewColumnEncryptionProperties function.
type ColumnEncryptOption func(*colEncryptConfig)
// WithKey sets a column specific key.
@@ -350,7 +350,7 @@ type FileDecryptionOption func(*fileDecryptConfig)
// metadata the metadata will be ignored, the footer will be decrypted/verified with this key.
//
// If the explicit key is not set, footer key will be fetched from the key retriever.
-// With explcit keys or AAD prefix, new encryption properties object must be created for each
+// With explicit keys or AAD prefix, new encryption properties object must be created for each
// encrypted file.
//
// Explicit encryption keys (footer and column) are cloned.
@@ -379,7 +379,7 @@ func WithPrefixVerifier(verifier AADPrefixVerifier) FileDecryptionOption {
// It's also possible to set a key retriever on this property object.
//
// Upon file decryption, availability of explicit keys is checked before invocation
-// of the retreiver callback.
+// of the retriever callback.
//
// If an explicit key is available for a footer or a column, its key metadata will be ignored.
func WithColumnKeys(decrypt ColumnPathToDecryptionPropsMap) FileDecryptionOption {
diff --git a/go/parquet/file/column_writer_test.go b/go/parquet/file/column_writer_test.go
index 134c290fa6..05c1cadebf 100755
--- a/go/parquet/file/column_writer_test.go
+++ b/go/parquet/file/column_writer_test.go
@@ -304,7 +304,7 @@ func (p *PrimitiveWriterTestSuite) writeRequiredWithSettings(encoding parquet.En
}
writer := p.buildWriter(nrows, columnProperties, parquet.WithVersion(parquet.V1_0))
p.WriteBatchValues(writer, nil, nil)
- // behavior should be independant of the number of calls to Close
+ // behavior should be independent of the number of calls to Close
writer.Close()
writer.Close()
}
@@ -321,7 +321,7 @@ func (p *PrimitiveWriterTestSuite) writeRequiredWithSettingsSpaced(encoding parq
}
writer := p.buildWriter(nrows, columnProperties, parquet.WithVersion(parquet.V1_0))
p.WriteBatchValuesSpaced(writer, nil, nil, validBits, 0)
- // behavior should be independant from the number of close calls
+ // behavior should be independent from the number of close calls
writer.Close()
writer.Close()
}
diff --git a/go/parquet/file/file_reader.go b/go/parquet/file/file_reader.go
index afff579ded..29162e4a4e 100644
--- a/go/parquet/file/file_reader.go
+++ b/go/parquet/file/file_reader.go
@@ -237,7 +237,7 @@ func (f *Reader) handleAadPrefix(fileDecrypt *parquet.FileDecryptionProperties,
aadPrefixInFile := algo.Aad.AadPrefix
if algo.Aad.SupplyAadPrefix && aadPrefixInProps == "" {
- return "", xerrors.New("AAD Prefix used for file encryption but not stored in file and not suppliedin decryption props")
+ return "", xerrors.New("AAD Prefix used for file encryption but not stored in file and not supplied in decryption props")
}
if fileHasAadPrefix {
diff --git a/go/parquet/file/level_conversion.go b/go/parquet/file/level_conversion.go
index c23bdda445..f6707fce86 100755
--- a/go/parquet/file/level_conversion.go
+++ b/go/parquet/file/level_conversion.go
@@ -94,7 +94,7 @@ func (l *LevelInfo) IncrementRepeated() int16 {
l.RepLevel++
l.DefLevel++
- // For levels >= repeated_ancenstor_def_level it indicates the list was
+ // For levels >= repeated_ancestor_def_level it indicates the list was
// non-null and had at least one element. This is important
// for later decoding because we need to add a slot for these
// values. for levels < current_def_level no slots are added
diff --git a/go/parquet/file/level_conversion_test.go b/go/parquet/file/level_conversion_test.go
index 5d5bdde90d..54e52c5e7a 100644
--- a/go/parquet/file/level_conversion_test.go
+++ b/go/parquet/file/level_conversion_test.go
@@ -66,7 +66,7 @@ func TestDefLevelsToBitmap(t *testing.T) {
assert.Equal(t, curByte, validBits[1])
}
-func TestDefLevelstToBitmapPowerOf2(t *testing.T) {
+func TestDefLevelsToBitmapPowerOf2(t *testing.T) {
defLevels := []int16{3, 3, 3, 2, 3, 3, 3, 3}
validBits := []byte{1, 0}
diff --git a/go/parquet/file/record_reader.go b/go/parquet/file/record_reader.go
index ad836d29ef..5698f49d9f 100755
--- a/go/parquet/file/record_reader.go
+++ b/go/parquet/file/record_reader.go
@@ -486,7 +486,7 @@ func (rr *recordReader) delimitRecords(numRecords int64) (recordsRead, valsToRea
// if at record start, we are seeing the start of a record
// for the second time, such as after repeated calls to delimitrecords.
// in this case we must continue until we find another record start
- // or exaust the column chunk
+ // or exhaust the column chunk
if !rr.atRecStart {
// end of a record, increment count
recordsRead++
diff --git a/go/parquet/file/row_group_writer.go b/go/parquet/file/row_group_writer.go
index 935c13d13a..74f4becb55 100644
--- a/go/parquet/file/row_group_writer.go
+++ b/go/parquet/file/row_group_writer.go
@@ -52,7 +52,7 @@ type SerialRowGroupWriter interface {
RowGroupWriter
NextColumn() (ColumnChunkWriter, error)
// returns the current column being built, if buffered it will equal NumColumns
- // if serialized then it will return which column is currenly being written
+ // if serialized then it will return which column is currently being written
CurrentColumn() int
}
diff --git a/go/parquet/internal/encoding/delta_byte_array.go b/go/parquet/internal/encoding/delta_byte_array.go
index b35d022fd5..57b0c8a70e 100644
--- a/go/parquet/internal/encoding/delta_byte_array.go
+++ b/go/parquet/internal/encoding/delta_byte_array.go
@@ -148,7 +148,7 @@ func (DeltaByteArrayDecoder) Type() parquet.Type {
func (d *DeltaByteArrayDecoder) Allocator() memory.Allocator { return d.mem }
-// SetData expects the data passed in to be the prefix lengths, followed by the
+// SetData expects the passed in data to be the prefix lengths, followed by the
// blocks of suffix data in order to initialize the decoder.
func (d *DeltaByteArrayDecoder) SetData(nvalues int, data []byte) error {
prefixLenDec := DeltaBitPackInt32Decoder{
diff --git a/go/parquet/internal/encoding/memo_table.go b/go/parquet/internal/encoding/memo_table.go
index 810e8633b8..a36ad32973 100644
--- a/go/parquet/internal/encoding/memo_table.go
+++ b/go/parquet/internal/encoding/memo_table.go
@@ -100,7 +100,7 @@ type BinaryMemoTable interface {
Retain()
// Release decreases the reference count by 1 of the separately stored binary data
// kept alongside the table containing the values. When the reference count goes to
- // 0, the memory is freed. This is safe to call across multiple goroutines simultaneoulsy.
+ // 0, the memory is freed. This is safe to call across multiple goroutines simultaneously.
Release()
}
diff --git a/go/parquet/internal/encoding/typed_encoder.gen.go b/go/parquet/internal/encoding/typed_encoder.gen.go
index 25fa309e0a..4bc18e8c63 100644
--- a/go/parquet/internal/encoding/typed_encoder.gen.go
+++ b/go/parquet/internal/encoding/typed_encoder.gen.go
@@ -192,7 +192,7 @@ func (DictInt32Decoder) Type() parquet.Type {
}
// Decode populates the passed in slice with min(len(out), remaining values) values,
-// decoding using hte dictionary to get the actual values. Returns the number of values
+// decoding using the dictionary to get the actual values. Returns the number of values
// actually decoded and any error encountered.
func (d *DictInt32Decoder) Decode(out []int32) (int, error) {
vals := shared_utils.MinInt(len(out), d.nvals)
@@ -429,7 +429,7 @@ func (DictInt64Decoder) Type() parquet.Type {
}
// Decode populates the passed in slice with min(len(out), remaining values) values,
-// decoding using hte dictionary to get the actual values. Returns the number of values
+// decoding using the dictionary to get the actual values. Returns the number of values
// actually decoded and any error encountered.
func (d *DictInt64Decoder) Decode(out []int64) (int, error) {
vals := shared_utils.MinInt(len(out), d.nvals)
@@ -644,7 +644,7 @@ func (DictInt96Decoder) Type() parquet.Type {
}
// Decode populates the passed in slice with min(len(out), remaining values) values,
-// decoding using hte dictionary to get the actual values. Returns the number of values
+// decoding using the dictionary to get the actual values. Returns the number of values
// actually decoded and any error encountered.
func (d *DictInt96Decoder) Decode(out []parquet.Int96) (int, error) {
vals := shared_utils.MinInt(len(out), d.nvals)
@@ -869,7 +869,7 @@ func (DictFloat32Decoder) Type() parquet.Type {
}
// Decode populates the passed in slice with min(len(out), remaining values) values,
-// decoding using hte dictionary to get the actual values. Returns the number of values
+// decoding using the dictionary to get the actual values. Returns the number of values
// actually decoded and any error encountered.
func (d *DictFloat32Decoder) Decode(out []float32) (int, error) {
vals := shared_utils.MinInt(len(out), d.nvals)
@@ -1094,7 +1094,7 @@ func (DictFloat64Decoder) Type() parquet.Type {
}
// Decode populates the passed in slice with min(len(out), remaining values) values,
-// decoding using hte dictionary to get the actual values. Returns the number of values
+// decoding using the dictionary to get the actual values. Returns the number of values
// actually decoded and any error encountered.
func (d *DictFloat64Decoder) Decode(out []float64) (int, error) {
vals := shared_utils.MinInt(len(out), d.nvals)
@@ -1362,7 +1362,7 @@ func (DictByteArrayDecoder) Type() parquet.Type {
}
// Decode populates the passed in slice with min(len(out), remaining values) values,
-// decoding using hte dictionary to get the actual values. Returns the number of values
+// decoding using the dictionary to get the actual values. Returns the number of values
// actually decoded and any error encountered.
func (d *DictByteArrayDecoder) Decode(out []parquet.ByteArray) (int, error) {
vals := shared_utils.MinInt(len(out), d.nvals)
@@ -1541,7 +1541,7 @@ func (DictFixedLenByteArrayDecoder) Type() parquet.Type {
}
// Decode populates the passed in slice with min(len(out), remaining values) values,
-// decoding using hte dictionary to get the actual values. Returns the number of values
+// decoding using the dictionary to get the actual values. Returns the number of values
// actually decoded and any error encountered.
func (d *DictFixedLenByteArrayDecoder) Decode(out []parquet.FixedLenByteArray) (int, error) {
vals := shared_utils.MinInt(len(out), d.nvals)
diff --git a/go/parquet/internal/encoding/typed_encoder.gen.go.tmpl b/go/parquet/internal/encoding/typed_encoder.gen.go.tmpl
index 66c2649d59..d72f315120 100644
--- a/go/parquet/internal/encoding/typed_encoder.gen.go.tmpl
+++ b/go/parquet/internal/encoding/typed_encoder.gen.go.tmpl
@@ -268,7 +268,7 @@ func (Dict{{.Name}}Decoder) Type() parquet.Type {
}
// Decode populates the passed in slice with min(len(out), remaining values) values,
-// decoding using hte dictionary to get the actual values. Returns the number of values
+// decoding using the dictionary to get the actual values. Returns the number of values
// actually decoded and any error encountered.
func (d *Dict{{.Name}}Decoder) Decode(out []{{.name}}) (int, error) {
vals := shared_utils.MinInt(len(out), d.nvals)
diff --git a/go/parquet/internal/testutils/primitive_typed.go b/go/parquet/internal/testutils/primitive_typed.go
index daab0d427b..50627b2e27 100644
--- a/go/parquet/internal/testutils/primitive_typed.go
+++ b/go/parquet/internal/testutils/primitive_typed.go
@@ -116,7 +116,7 @@ func (p *PrimitiveTypedTest) UpdateStatsSpaced(stat metadata.TypedStatistics, nu
case *metadata.FixedLenByteArrayStatistics:
s.UpdateSpaced(p.Values.([]parquet.FixedLenByteArray), validBits, validBitsOffset, numNull)
default:
- panic("uninplemented")
+ panic("unimplemented")
}
}
diff --git a/go/parquet/internal/testutils/random.go b/go/parquet/internal/testutils/random.go
index bb9ee0cdf2..4d69769351 100644
--- a/go/parquet/internal/testutils/random.go
+++ b/go/parquet/internal/testutils/random.go
@@ -60,7 +60,7 @@ func (r *RandomArrayGenerator) GenerateBitmap(buffer []byte, n int64, prob float
count := int64(0)
r.extra++
- // bernoulli distribution uses P to determine the probabitiliy of a 0 or a 1,
+ // bernoulli distribution uses P to determine the probability of a 0 or a 1,
// which we'll use to generate the bitmap.
dist := distuv.Bernoulli{P: prob, Src: rand.NewSource(r.seed + r.extra)}
for i := 0; int64(i) < n; i++ {
diff --git a/go/parquet/internal/utils/_lib/README.md b/go/parquet/internal/utils/_lib/README.md
index 10cc9a257e..17c3006a5c 100644
--- a/go/parquet/internal/utils/_lib/README.md
+++ b/go/parquet/internal/utils/_lib/README.md
@@ -144,10 +144,10 @@ resulting assembly.
function, ends with something akin to `MOVD R0, num+32(FP)`. Where `num` is the
local variable name of the return value, and `32` is the byte size of the arguments.
-To faciliate some automation, a `script.sed` file is provided in this directory which
+To facilitate some automation, a `script.sed` file is provided in this directory which
can be run against the generated assembly from `c2goasm` as
`sed -f _lib/script.sed -i bit_packing_neon_arm64.s` which will perform several of
-these steps on the generated assembly such as convering `b.le`/etc calls with labels
+these steps on the generated assembly such as converting `b.le`/etc calls with labels
to proper `BLE LBB0_....` lines, and converting `adrp`/`ldr` pairs to `VMOVD` and
`VMOVQ` instructions.
diff --git a/go/parquet/internal/utils/_lib/bit_packing_neon.c b/go/parquet/internal/utils/_lib/bit_packing_neon.c
index c8dd97c2a3..6d09eeb75b 100755
--- a/go/parquet/internal/utils/_lib/bit_packing_neon.c
+++ b/go/parquet/internal/utils/_lib/bit_packing_neon.c
@@ -38,7 +38,7 @@ inline static const uint32_t* unpack1_32_neon(const uint32_t* in, uint32_t* out)
uint32_t shifts_6th[4] = {20, 21, 22, 23};
uint32_t shifts_7th[4] = {24, 25, 26, 27};
uint32_t shifts_8th[4] = {28, 29, 30, 31};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -48,8 +48,8 @@ inline static const uint32_t* unpack1_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[0] >> shifts_1st[1];
ind[2] = in[0] >> shifts_1st[2];
ind[3] = in[0] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -58,8 +58,8 @@ inline static const uint32_t* unpack1_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[0] >> shifts_2nd[1];
ind[2] = in[0] >> shifts_2nd[2];
ind[3] = in[0] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -68,8 +68,8 @@ inline static const uint32_t* unpack1_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[0] >> shifts_3rd[1];
ind[2] = in[0] >> shifts_3rd[2];
ind[3] = in[0] >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -78,8 +78,8 @@ inline static const uint32_t* unpack1_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[0] >> shifts_4th[1];
ind[2] = in[0] >> shifts_4th[2];
ind[3] = in[0] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -88,8 +88,8 @@ inline static const uint32_t* unpack1_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[0] >> shifts_5th[1];
ind[2] = in[0] >> shifts_5th[2];
ind[3] = in[0] >> shifts_5th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -98,8 +98,8 @@ inline static const uint32_t* unpack1_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[0] >> shifts_6th[1];
ind[2] = in[0] >> shifts_6th[2];
ind[3] = in[0] >> shifts_6th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -108,8 +108,8 @@ inline static const uint32_t* unpack1_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[0] >> shifts_7th[1];
ind[2] = in[0] >> shifts_7th[2];
ind[3] = in[0] >> shifts_7th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -118,8 +118,8 @@ inline static const uint32_t* unpack1_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[0] >> shifts_8th[1];
ind[2] = in[0] >> shifts_8th[2];
ind[3] = in[0] >> shifts_8th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -136,7 +136,7 @@ inline static const uint32_t* unpack2_32_neon(const uint32_t* in, uint32_t* out)
uint32_t shifts_3rd[4] = {16, 18, 20, 22};
uint32_t shifts_4th[4] = {24, 26, 28, 30};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -146,8 +146,8 @@ inline static const uint32_t* unpack2_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[0] >> shifts_1st[1];
ind[2] = in[0] >> shifts_1st[2];
ind[3] = in[0] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -156,8 +156,8 @@ inline static const uint32_t* unpack2_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[0] >> shifts_2nd[1];
ind[2] = in[0] >> shifts_2nd[2];
ind[3] = in[0] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -166,8 +166,8 @@ inline static const uint32_t* unpack2_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[0] >> shifts_3rd[1];
ind[2] = in[0] >> shifts_3rd[2];
ind[3] = in[0] >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -176,8 +176,8 @@ inline static const uint32_t* unpack2_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[0] >> shifts_4th[1];
ind[2] = in[0] >> shifts_4th[2];
ind[3] = in[0] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -186,8 +186,8 @@ inline static const uint32_t* unpack2_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[1] >> shifts_1st[1];
ind[2] = in[1] >> shifts_1st[2];
ind[3] = in[1] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -196,8 +196,8 @@ inline static const uint32_t* unpack2_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[1] >> shifts_2nd[1];
ind[2] = in[1] >> shifts_2nd[2];
ind[3] = in[1] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -206,8 +206,8 @@ inline static const uint32_t* unpack2_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[1] >> shifts_3rd[1];
ind[2] = in[1] >> shifts_3rd[2];
ind[3] = in[1] >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -216,8 +216,8 @@ inline static const uint32_t* unpack2_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[1] >> shifts_4th[1];
ind[2] = in[1] >> shifts_4th[2];
ind[3] = in[1] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -237,7 +237,7 @@ inline static const uint32_t* unpack3_32_neon(const uint32_t* in, uint32_t* out)
uint32_t shifts_6th[4] = {28, 0, 2, 5};
uint32_t shifts_7th[4] = {8, 11, 14, 17};
uint32_t shifts_8th[4] = {20, 23, 26, 29};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -247,8 +247,8 @@ inline static const uint32_t* unpack3_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[0] >> shifts_1st[1];
ind[2] = in[0] >> shifts_1st[2];
ind[3] = in[0] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -257,8 +257,8 @@ inline static const uint32_t* unpack3_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[0] >> shifts_2nd[1];
ind[2] = in[0] >> shifts_2nd[2];
ind[3] = in[0] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -267,8 +267,8 @@ inline static const uint32_t* unpack3_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[0] >> shifts_3rd[1];
ind[2] = (in[0] >> 30 | in[1] << 2) >> shifts_3rd[2];
ind[3] = in[1] >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -277,8 +277,8 @@ inline static const uint32_t* unpack3_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[1] >> shifts_4th[1];
ind[2] = in[1] >> shifts_4th[2];
ind[3] = in[1] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -287,8 +287,8 @@ inline static const uint32_t* unpack3_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[1] >> shifts_5th[1];
ind[2] = in[1] >> shifts_5th[2];
ind[3] = in[1] >> shifts_5th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -297,8 +297,8 @@ inline static const uint32_t* unpack3_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = (in[1] >> 31 | in[2] << 1) >> shifts_6th[1];
ind[2] = in[2] >> shifts_6th[2];
ind[3] = in[2] >> shifts_6th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -307,8 +307,8 @@ inline static const uint32_t* unpack3_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[2] >> shifts_7th[1];
ind[2] = in[2] >> shifts_7th[2];
ind[3] = in[2] >> shifts_7th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -317,8 +317,8 @@ inline static const uint32_t* unpack3_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[2] >> shifts_8th[1];
ind[2] = in[2] >> shifts_8th[2];
ind[3] = in[2] >> shifts_8th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -332,7 +332,7 @@ inline static const uint32_t* unpack4_32_neon(const uint32_t* in, uint32_t* out)
uint32_t ind[4];
uint32_t shifts_1st[4] = {0, 4, 8, 12};
uint32_t shifts_2nd[4] = {16, 20, 24, 28};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -342,8 +342,8 @@ inline static const uint32_t* unpack4_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[0] >> shifts_1st[1];
ind[2] = in[0] >> shifts_1st[2];
ind[3] = in[0] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -352,8 +352,8 @@ inline static const uint32_t* unpack4_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[0] >> shifts_2nd[1];
ind[2] = in[0] >> shifts_2nd[2];
ind[3] = in[0] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -362,8 +362,8 @@ inline static const uint32_t* unpack4_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[1] >> shifts_1st[1];
ind[2] = in[1] >> shifts_1st[2];
ind[3] = in[1] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -372,8 +372,8 @@ inline static const uint32_t* unpack4_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[1] >> shifts_2nd[1];
ind[2] = in[1] >> shifts_2nd[2];
ind[3] = in[1] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -382,8 +382,8 @@ inline static const uint32_t* unpack4_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[2] >> shifts_1st[1];
ind[2] = in[2] >> shifts_1st[2];
ind[3] = in[2] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -392,8 +392,8 @@ inline static const uint32_t* unpack4_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[2] >> shifts_2nd[1];
ind[2] = in[2] >> shifts_2nd[2];
ind[3] = in[2] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -402,8 +402,8 @@ inline static const uint32_t* unpack4_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[3] >> shifts_1st[1];
ind[2] = in[3] >> shifts_1st[2];
ind[3] = in[3] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -412,8 +412,8 @@ inline static const uint32_t* unpack4_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[3] >> shifts_2nd[1];
ind[2] = in[3] >> shifts_2nd[2];
ind[3] = in[3] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -433,7 +433,7 @@ inline static const uint32_t* unpack5_32_neon(const uint32_t* in, uint32_t* out)
uint32_t shifts_6th[4] = {4, 9, 14, 19};
uint32_t shifts_7th[4] = {24, 0, 2, 7};
uint32_t shifts_8th[4] = {12, 17, 22, 27};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -443,8 +443,8 @@ inline static const uint32_t* unpack5_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[0] >> shifts_1st[1];
ind[2] = in[0] >> shifts_1st[2];
ind[3] = in[0] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -453,8 +453,8 @@ inline static const uint32_t* unpack5_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[0] >> shifts_2nd[1];
ind[2] = (in[0] >> 30 | in[1] << 2) >> shifts_2nd[2];
ind[3] = in[1] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -463,8 +463,8 @@ inline static const uint32_t* unpack5_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[1] >> shifts_3rd[1];
ind[2] = in[1] >> shifts_3rd[2];
ind[3] = in[1] >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -473,8 +473,8 @@ inline static const uint32_t* unpack5_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[2] >> shifts_4th[1];
ind[2] = in[2] >> shifts_4th[2];
ind[3] = in[2] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -483,8 +483,8 @@ inline static const uint32_t* unpack5_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[2] >> shifts_5th[1];
ind[2] = in[2] >> shifts_5th[2];
ind[3] = (in[2] >> 31 | in[3] << 1) >> shifts_5th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -493,8 +493,8 @@ inline static const uint32_t* unpack5_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[3] >> shifts_6th[1];
ind[2] = in[3] >> shifts_6th[2];
ind[3] = in[3] >> shifts_6th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -503,8 +503,8 @@ inline static const uint32_t* unpack5_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = (in[3] >> 29 | in[4] << 3) >> shifts_7th[1];
ind[2] = in[4] >> shifts_7th[2];
ind[3] = in[4] >> shifts_7th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -513,8 +513,8 @@ inline static const uint32_t* unpack5_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[4] >> shifts_8th[1];
ind[2] = in[4] >> shifts_8th[2];
ind[3] = in[4] >> shifts_8th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -531,7 +531,7 @@ inline static const uint32_t* unpack6_32_neon(const uint32_t* in, uint32_t* out)
uint32_t shifts_3rd[4] = {16, 22, 0, 2};
uint32_t shifts_4th[4] = {8, 14, 20, 26};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -541,8 +541,8 @@ inline static const uint32_t* unpack6_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[0] >> shifts_1st[1];
ind[2] = in[0] >> shifts_1st[2];
ind[3] = in[0] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -551,8 +551,8 @@ inline static const uint32_t* unpack6_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = (in[0] >> 30 | in[1] << 2) >> shifts_2nd[1];
ind[2] = in[1] >> shifts_2nd[2];
ind[3] = in[1] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -561,8 +561,8 @@ inline static const uint32_t* unpack6_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[1] >> shifts_3rd[1];
ind[2] = (in[1] >> 28 | in[2] << 4) >> shifts_3rd[2];
ind[3] = in[2] >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -571,8 +571,8 @@ inline static const uint32_t* unpack6_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[2] >> shifts_4th[1];
ind[2] = in[2] >> shifts_4th[2];
ind[3] = in[2] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -581,8 +581,8 @@ inline static const uint32_t* unpack6_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[3] >> shifts_1st[1];
ind[2] = in[3] >> shifts_1st[2];
ind[3] = in[3] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -591,8 +591,8 @@ inline static const uint32_t* unpack6_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = (in[3] >> 30 | in[4] << 2) >> shifts_2nd[1];
ind[2] = in[4] >> shifts_2nd[2];
ind[3] = in[4] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -601,8 +601,8 @@ inline static const uint32_t* unpack6_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[4] >> shifts_3rd[1];
ind[2] = (in[4] >> 28 | in[5] << 4) >> shifts_3rd[2];
ind[3] = in[5] >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -611,8 +611,8 @@ inline static const uint32_t* unpack6_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[5] >> shifts_4th[1];
ind[2] = in[5] >> shifts_4th[2];
ind[3] = in[5] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -632,7 +632,7 @@ inline static const uint32_t* unpack7_32_neon(const uint32_t* in, uint32_t* out)
uint32_t shifts_6th[4] = {12, 19, 0, 1};
uint32_t shifts_7th[4] = {8, 15, 22, 0};
uint32_t shifts_8th[4] = {4, 11, 18, 25};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -642,8 +642,8 @@ inline static const uint32_t* unpack7_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[0] >> shifts_1st[1];
ind[2] = in[0] >> shifts_1st[2];
ind[3] = in[0] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -652,8 +652,8 @@ inline static const uint32_t* unpack7_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[1] >> shifts_2nd[1];
ind[2] = in[1] >> shifts_2nd[2];
ind[3] = in[1] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -662,8 +662,8 @@ inline static const uint32_t* unpack7_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = (in[1] >> 31 | in[2] << 1) >> shifts_3rd[1];
ind[2] = in[2] >> shifts_3rd[2];
ind[3] = in[2] >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -672,8 +672,8 @@ inline static const uint32_t* unpack7_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = (in[2] >> 27 | in[3] << 5) >> shifts_4th[1];
ind[2] = in[3] >> shifts_4th[2];
ind[3] = in[3] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -682,8 +682,8 @@ inline static const uint32_t* unpack7_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[3] >> shifts_5th[1];
ind[2] = (in[3] >> 30 | in[4] << 2) >> shifts_5th[2];
ind[3] = in[4] >> shifts_5th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -692,8 +692,8 @@ inline static const uint32_t* unpack7_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[4] >> shifts_6th[1];
ind[2] = (in[4] >> 26 | in[5] << 6) >> shifts_6th[2];
ind[3] = in[5] >> shifts_6th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -702,8 +702,8 @@ inline static const uint32_t* unpack7_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[5] >> shifts_7th[1];
ind[2] = in[5] >> shifts_7th[2];
ind[3] = (in[5] >> 29 | in[6] << 3) >> shifts_7th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -712,8 +712,8 @@ inline static const uint32_t* unpack7_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[6] >> shifts_8th[1];
ind[2] = in[6] >> shifts_8th[2];
ind[3] = in[6] >> shifts_8th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -726,7 +726,7 @@ inline static const uint32_t* unpack8_32_neon(const uint32_t* in, uint32_t* out)
uint32_t mask = 0xff;
uint32_t ind[4];
uint32_t shifts_1st[4] = {0, 8, 16, 24};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -736,8 +736,8 @@ inline static const uint32_t* unpack8_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[0] >> shifts_1st[1];
ind[2] = in[0] >> shifts_1st[2];
ind[3] = in[0] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -746,8 +746,8 @@ inline static const uint32_t* unpack8_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[1] >> shifts_1st[1];
ind[2] = in[1] >> shifts_1st[2];
ind[3] = in[1] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -756,8 +756,8 @@ inline static const uint32_t* unpack8_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[2] >> shifts_1st[1];
ind[2] = in[2] >> shifts_1st[2];
ind[3] = in[2] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -766,8 +766,8 @@ inline static const uint32_t* unpack8_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[3] >> shifts_1st[1];
ind[2] = in[3] >> shifts_1st[2];
ind[3] = in[3] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -776,8 +776,8 @@ inline static const uint32_t* unpack8_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[4] >> shifts_1st[1];
ind[2] = in[4] >> shifts_1st[2];
ind[3] = in[4] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -786,8 +786,8 @@ inline static const uint32_t* unpack8_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[5] >> shifts_1st[1];
ind[2] = in[5] >> shifts_1st[2];
ind[3] = in[5] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -796,8 +796,8 @@ inline static const uint32_t* unpack8_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[6] >> shifts_1st[1];
ind[2] = in[6] >> shifts_1st[2];
ind[3] = in[6] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -806,8 +806,8 @@ inline static const uint32_t* unpack8_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[7] >> shifts_1st[1];
ind[2] = in[7] >> shifts_1st[2];
ind[3] = in[7] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -827,7 +827,7 @@ inline static const uint32_t* unpack9_32_neon(const uint32_t* in, uint32_t* out)
uint32_t shifts_6th[4] = {20, 0, 6, 15};
uint32_t shifts_7th[4] = {0, 1, 10, 19};
uint32_t shifts_8th[4] = {0, 5, 14, 23};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -837,8 +837,8 @@ inline static const uint32_t* unpack9_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[0] >> shifts_1st[1];
ind[2] = in[0] >> shifts_1st[2];
ind[3] = (in[0] >> 27 | in[1] << 5) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -847,8 +847,8 @@ inline static const uint32_t* unpack9_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[1] >> shifts_2nd[1];
ind[2] = in[1] >> shifts_2nd[2];
ind[3] = (in[1] >> 31 | in[2] << 1) >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -857,8 +857,8 @@ inline static const uint32_t* unpack9_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[2] >> shifts_3rd[1];
ind[2] = (in[2] >> 26 | in[3] << 6) >> shifts_3rd[2];
ind[3] = in[3] >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -867,8 +867,8 @@ inline static const uint32_t* unpack9_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[3] >> shifts_4th[1];
ind[2] = (in[3] >> 30 | in[4] << 2) >> shifts_4th[2];
ind[3] = in[4] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -877,8 +877,8 @@ inline static const uint32_t* unpack9_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = (in[4] >> 25 | in[5] << 7) >> shifts_5th[1];
ind[2] = in[5] >> shifts_5th[2];
ind[3] = in[5] >> shifts_5th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -887,8 +887,8 @@ inline static const uint32_t* unpack9_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = (in[5] >> 29 | in[6] << 3) >> shifts_6th[1];
ind[2] = in[6] >> shifts_6th[2];
ind[3] = in[6] >> shifts_6th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -897,8 +897,8 @@ inline static const uint32_t* unpack9_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[7] >> shifts_7th[1];
ind[2] = in[7] >> shifts_7th[2];
ind[3] = in[7] >> shifts_7th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -907,8 +907,8 @@ inline static const uint32_t* unpack9_32_neon(const uint32_t* in, uint32_t* out)
ind[1] = in[8] >> shifts_8th[1];
ind[2] = in[8] >> shifts_8th[2];
ind[3] = in[8] >> shifts_8th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -924,7 +924,7 @@ inline static const uint32_t* unpack10_32_neon(const uint32_t* in, uint32_t* out
uint32_t shifts_2nd[4] = {8, 18, 0, 6};
uint32_t shifts_3rd[4] = {16, 0, 4, 14};
uint32_t shifts_4th[4] = {0, 2, 12, 22};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -934,8 +934,8 @@ inline static const uint32_t* unpack10_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[0] >> shifts_1st[1];
ind[2] = in[0] >> shifts_1st[2];
ind[3] = (in[0] >> 30 | in[1] << 2) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -944,8 +944,8 @@ inline static const uint32_t* unpack10_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[1] >> shifts_2nd[1];
ind[2] = (in[1] >> 28 | in[2] << 4) >> shifts_2nd[2];
ind[3] = in[2] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -954,8 +954,8 @@ inline static const uint32_t* unpack10_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[2] >> 26 | in[3] << 6) >> shifts_3rd[1];
ind[2] = in[3] >> shifts_3rd[2];
ind[3] = in[3] >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -964,8 +964,8 @@ inline static const uint32_t* unpack10_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[4] >> shifts_4th[1];
ind[2] = in[4] >> shifts_4th[2];
ind[3] = in[4] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -974,8 +974,8 @@ inline static const uint32_t* unpack10_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[5] >> shifts_1st[1];
ind[2] = in[5] >> shifts_1st[2];
ind[3] = (in[5] >> 30 | in[6] << 2) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -984,8 +984,8 @@ inline static const uint32_t* unpack10_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[6] >> shifts_2nd[1];
ind[2] = (in[6] >> 28 | in[7] << 4) >> shifts_2nd[2];
ind[3] = in[7] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -994,8 +994,8 @@ inline static const uint32_t* unpack10_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[7] >> 26 | in[8] << 6) >> shifts_3rd[1];
ind[2] = in[8] >> shifts_3rd[2];
ind[3] = in[8] >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1004,8 +1004,8 @@ inline static const uint32_t* unpack10_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[9] >> shifts_4th[1];
ind[2] = in[9] >> shifts_4th[2];
ind[3] = in[9] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1025,7 +1025,7 @@ inline static const uint32_t* unpack11_32_neon(const uint32_t* in, uint32_t* out
uint32_t shifts_6th[4] = {0, 7, 18, 0};
uint32_t shifts_7th[4] = {8, 19, 0, 9};
uint32_t shifts_8th[4] = {20, 0, 10, 21};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -1035,8 +1035,8 @@ inline static const uint32_t* unpack11_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[0] >> shifts_1st[1];
ind[2] = (in[0] >> 22 | in[1] << 10) >> shifts_1st[2];
ind[3] = in[1] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1045,8 +1045,8 @@ inline static const uint32_t* unpack11_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[1] >> 23 | in[2] << 9) >> shifts_2nd[1];
ind[2] = in[2] >> shifts_2nd[2];
ind[3] = in[2] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1055,8 +1055,8 @@ inline static const uint32_t* unpack11_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[3] >> shifts_3rd[1];
ind[2] = in[3] >> shifts_3rd[2];
ind[3] = (in[3] >> 25 | in[4] << 7) >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1065,8 +1065,8 @@ inline static const uint32_t* unpack11_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[4] >> shifts_4th[1];
ind[2] = (in[4] >> 26 | in[5] << 6) >> shifts_4th[2];
ind[3] = in[5] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1075,8 +1075,8 @@ inline static const uint32_t* unpack11_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[5] >> 27 | in[6] << 5) >> shifts_5th[1];
ind[2] = in[6] >> shifts_5th[2];
ind[3] = in[6] >> shifts_5th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1085,8 +1085,8 @@ inline static const uint32_t* unpack11_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[7] >> shifts_6th[1];
ind[2] = in[7] >> shifts_6th[2];
ind[3] = (in[7] >> 29 | in[8] << 3) >> shifts_6th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1095,8 +1095,8 @@ inline static const uint32_t* unpack11_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[8] >> shifts_7th[1];
ind[2] = (in[8] >> 30 | in[9] << 2) >> shifts_7th[2];
ind[3] = in[9] >> shifts_7th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1105,8 +1105,8 @@ inline static const uint32_t* unpack11_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[9] >> 31 | in[10] << 1) >> shifts_8th[1];
ind[2] = in[10] >> shifts_8th[2];
ind[3] = in[10] >> shifts_8th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1120,7 +1120,7 @@ inline static const uint32_t* unpack12_32_neon(const uint32_t* in, uint32_t* out
uint32_t ind[4];
uint32_t shifts_1st[4] = {0, 12, 0, 4};
uint32_t shifts_2nd[4] = {16, 0, 8, 20};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -1130,8 +1130,8 @@ inline static const uint32_t* unpack12_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[0] >> shifts_1st[1];
ind[2] = (in[0] >> 24 | in[1] << 8) >> shifts_1st[2];
ind[3] = in[1] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1140,8 +1140,8 @@ inline static const uint32_t* unpack12_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[1] >> 28 | in[2] << 4) >> shifts_2nd[1];
ind[2] = in[2] >> shifts_2nd[2];
ind[3] = in[2] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1150,8 +1150,8 @@ inline static const uint32_t* unpack12_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[3] >> shifts_1st[1];
ind[2] = (in[3] >> 24 | in[4] << 8) >> shifts_1st[2];
ind[3] = in[4] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1160,8 +1160,8 @@ inline static const uint32_t* unpack12_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[4] >> 28 | in[5] << 4) >> shifts_2nd[1];
ind[2] = in[5] >> shifts_2nd[2];
ind[3] = in[5] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1170,8 +1170,8 @@ inline static const uint32_t* unpack12_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[6] >> shifts_1st[1];
ind[2] = (in[6] >> 24 | in[7] << 8) >> shifts_1st[2];
ind[3] = in[7] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1180,8 +1180,8 @@ inline static const uint32_t* unpack12_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[7] >> 28 | in[8] << 4) >> shifts_2nd[1];
ind[2] = in[8] >> shifts_2nd[2];
ind[3] = in[8] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1190,8 +1190,8 @@ inline static const uint32_t* unpack12_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[9] >> shifts_1st[1];
ind[2] = (in[9] >> 24 | in[10] << 8) >> shifts_1st[2];
ind[3] = in[10] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1200,8 +1200,8 @@ inline static const uint32_t* unpack12_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[10] >> 28 | in[11] << 4) >> shifts_2nd[1];
ind[2] = in[11] >> shifts_2nd[2];
ind[3] = in[11] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1221,7 +1221,7 @@ inline static const uint32_t* unpack13_32_neon(const uint32_t* in, uint32_t* out
uint32_t shifts_6th[4] = {4, 17, 0, 11};
uint32_t shifts_7th[4] = {0, 5, 18, 0};
uint32_t shifts_8th[4] = {12, 0, 6, 19};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -1231,8 +1231,8 @@ inline static const uint32_t* unpack13_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[0] >> shifts_1st[1];
ind[2] = (in[0] >> 26 | in[1] << 6) >> shifts_1st[2];
ind[3] = in[1] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1241,8 +1241,8 @@ inline static const uint32_t* unpack13_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[2] >> shifts_2nd[1];
ind[2] = in[2] >> shifts_2nd[2];
ind[3] = (in[2] >> 27 | in[3] << 5) >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1251,8 +1251,8 @@ inline static const uint32_t* unpack13_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[3] >> 21 | in[4] << 11) >> shifts_3rd[1];
ind[2] = in[4] >> shifts_3rd[2];
ind[3] = in[4] >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1261,8 +1261,8 @@ inline static const uint32_t* unpack13_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[5] >> shifts_4th[1];
ind[2] = (in[5] >> 22 | in[6] << 10) >> shifts_4th[2];
ind[3] = in[6] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1271,8 +1271,8 @@ inline static const uint32_t* unpack13_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[6] >> 29 | in[7] << 3) >> shifts_5th[1];
ind[2] = in[7] >> shifts_5th[2];
ind[3] = (in[7] >> 23 | in[8] << 9) >> shifts_5th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1281,8 +1281,8 @@ inline static const uint32_t* unpack13_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[8] >> shifts_6th[1];
ind[2] = (in[8] >> 30 | in[9] << 2) >> shifts_6th[2];
ind[3] = in[9] >> shifts_6th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1291,8 +1291,8 @@ inline static const uint32_t* unpack13_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[10] >> shifts_7th[1];
ind[2] = in[10] >> shifts_7th[2];
ind[3] = (in[10] >> 31 | in[11] << 1) >> shifts_7th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1301,8 +1301,8 @@ inline static const uint32_t* unpack13_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[11] >> 25 | in[12] << 7) >> shifts_8th[1];
ind[2] = in[12] >> shifts_8th[2];
ind[3] = in[12] >> shifts_8th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1318,7 +1318,7 @@ inline static const uint32_t* unpack14_32_neon(const uint32_t* in, uint32_t* out
uint32_t shifts_2nd[4] = {0, 6, 0, 2};
uint32_t shifts_3rd[4] = {16, 0, 12, 0};
uint32_t shifts_4th[4] = {8, 0, 4, 18};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -1328,8 +1328,8 @@ inline static const uint32_t* unpack14_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[0] >> shifts_1st[1];
ind[2] = (in[0] >> 28 | in[1] << 4) >> shifts_1st[2];
ind[3] = in[1] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1338,8 +1338,8 @@ inline static const uint32_t* unpack14_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[2] >> shifts_2nd[1];
ind[2] = (in[2] >> 20 | in[3] << 12) >> shifts_2nd[2];
ind[3] = in[3] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1348,8 +1348,8 @@ inline static const uint32_t* unpack14_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[3] >> 30 | in[4] << 2) >> shifts_3rd[1];
ind[2] = in[4] >> shifts_3rd[2];
ind[3] = (in[4] >> 26 | in[5] << 6) >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1358,8 +1358,8 @@ inline static const uint32_t* unpack14_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[5] >> 22 | in[6] << 10) >> shifts_4th[1];
ind[2] = in[6] >> shifts_4th[2];
ind[3] = in[6] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1368,8 +1368,8 @@ inline static const uint32_t* unpack14_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[7] >> shifts_1st[1];
ind[2] = (in[7] >> 28 | in[8] << 4) >> shifts_1st[2];
ind[3] = in[8] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1378,8 +1378,8 @@ inline static const uint32_t* unpack14_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[9] >> shifts_2nd[1];
ind[2] = (in[9] >> 20 | in[10] << 12) >> shifts_2nd[2];
ind[3] = in[10] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1388,8 +1388,8 @@ inline static const uint32_t* unpack14_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[10] >> 30 | in[11] << 2) >> shifts_3rd[1];
ind[2] = in[11] >> shifts_3rd[2];
ind[3] = (in[11] >> 26 | in[12] << 6) >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1398,8 +1398,8 @@ inline static const uint32_t* unpack14_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[12] >> 22 | in[13] << 10) >> shifts_4th[1];
ind[2] = in[13] >> shifts_4th[2];
ind[3] = in[13] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1419,7 +1419,7 @@ inline static const uint32_t* unpack15_32_neon(const uint32_t* in, uint32_t* out
uint32_t shifts_6th[4] = {12, 0, 10, 0};
uint32_t shifts_7th[4] = {8, 0, 6, 0};
uint32_t shifts_8th[4] = {4, 0, 2, 17};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -1429,8 +1429,8 @@ inline static const uint32_t* unpack15_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[0] >> shifts_1st[1];
ind[2] = (in[0] >> 30 | in[1] << 2) >> shifts_1st[2];
ind[3] = in[1] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1439,8 +1439,8 @@ inline static const uint32_t* unpack15_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[2] >> shifts_2nd[1];
ind[2] = (in[2] >> 26 | in[3] << 6) >> shifts_2nd[2];
ind[3] = in[3] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1449,8 +1449,8 @@ inline static const uint32_t* unpack15_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[4] >> shifts_3rd[1];
ind[2] = (in[4] >> 22 | in[5] << 10) >> shifts_3rd[2];
ind[3] = in[5] >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1459,8 +1459,8 @@ inline static const uint32_t* unpack15_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[6] >> shifts_4th[1];
ind[2] = (in[6] >> 18 | in[7] << 14) >> shifts_4th[2];
ind[3] = in[7] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1469,8 +1469,8 @@ inline static const uint32_t* unpack15_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[7] >> 31 | in[8] << 1) >> shifts_5th[1];
ind[2] = in[8] >> shifts_5th[2];
ind[3] = (in[8] >> 29 | in[9] << 3) >> shifts_5th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1479,8 +1479,8 @@ inline static const uint32_t* unpack15_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[9] >> 27 | in[10] << 5) >> shifts_6th[1];
ind[2] = in[10] >> shifts_6th[2];
ind[3] = (in[10] >> 25 | in[11] << 7) >> shifts_6th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1489,8 +1489,8 @@ inline static const uint32_t* unpack15_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[11] >> 23 | in[12] << 9) >> shifts_7th[1];
ind[2] = in[12] >> shifts_7th[2];
ind[3] = (in[12] >> 21 | in[13] << 11) >> shifts_7th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1499,8 +1499,8 @@ inline static const uint32_t* unpack15_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[13] >> 19 | in[14] << 13) >> shifts_8th[1];
ind[2] = in[14] >> shifts_8th[2];
ind[3] = in[14] >> shifts_8th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1513,7 +1513,7 @@ inline static const uint32_t* unpack16_32_neon(const uint32_t* in, uint32_t* out
uint32_t mask = 0xffff;
uint32_t ind[4];
uint32_t shifts_1st[4] = {0, 16, 0, 16};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -1523,8 +1523,8 @@ inline static const uint32_t* unpack16_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[0] >> shifts_1st[1];
ind[2] = in[1] >> shifts_1st[2];
ind[3] = in[1] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1533,8 +1533,8 @@ inline static const uint32_t* unpack16_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[2] >> shifts_1st[1];
ind[2] = in[3] >> shifts_1st[2];
ind[3] = in[3] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1543,8 +1543,8 @@ inline static const uint32_t* unpack16_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[4] >> shifts_1st[1];
ind[2] = in[5] >> shifts_1st[2];
ind[3] = in[5] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1553,8 +1553,8 @@ inline static const uint32_t* unpack16_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[6] >> shifts_1st[1];
ind[2] = in[7] >> shifts_1st[2];
ind[3] = in[7] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1563,8 +1563,8 @@ inline static const uint32_t* unpack16_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[8] >> shifts_1st[1];
ind[2] = in[9] >> shifts_1st[2];
ind[3] = in[9] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1573,8 +1573,8 @@ inline static const uint32_t* unpack16_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[10] >> shifts_1st[1];
ind[2] = in[11] >> shifts_1st[2];
ind[3] = in[11] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1583,8 +1583,8 @@ inline static const uint32_t* unpack16_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[12] >> shifts_1st[1];
ind[2] = in[13] >> shifts_1st[2];
ind[3] = in[13] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1593,8 +1593,8 @@ inline static const uint32_t* unpack16_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[14] >> shifts_1st[1];
ind[2] = in[15] >> shifts_1st[2];
ind[3] = in[15] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1614,7 +1614,7 @@ inline static const uint32_t* unpack17_32_neon(const uint32_t* in, uint32_t* out
uint32_t shifts_6th[4] = {0, 5, 0, 7};
uint32_t shifts_7th[4] = {0, 9, 0, 11};
uint32_t shifts_8th[4] = {0, 13, 0, 15};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -1624,8 +1624,8 @@ inline static const uint32_t* unpack17_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[0] >> 17 | in[1] << 15) >> shifts_1st[1];
ind[2] = in[1] >> shifts_1st[2];
ind[3] = (in[1] >> 19 | in[2] << 13) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1634,8 +1634,8 @@ inline static const uint32_t* unpack17_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[2] >> 21 | in[3] << 11) >> shifts_2nd[1];
ind[2] = in[3] >> shifts_2nd[2];
ind[3] = (in[3] >> 23 | in[4] << 9) >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1644,8 +1644,8 @@ inline static const uint32_t* unpack17_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[4] >> 25 | in[5] << 7) >> shifts_3rd[1];
ind[2] = in[5] >> shifts_3rd[2];
ind[3] = (in[5] >> 27 | in[6] << 5) >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1654,8 +1654,8 @@ inline static const uint32_t* unpack17_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[6] >> 29 | in[7] << 3) >> shifts_4th[1];
ind[2] = in[7] >> shifts_4th[2];
ind[3] = (in[7] >> 31 | in[8] << 1) >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1664,8 +1664,8 @@ inline static const uint32_t* unpack17_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[9] >> shifts_5th[1];
ind[2] = (in[9] >> 18 | in[10] << 14) >> shifts_5th[2];
ind[3] = in[10] >> shifts_5th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1674,8 +1674,8 @@ inline static const uint32_t* unpack17_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[11] >> shifts_6th[1];
ind[2] = (in[11] >> 22 | in[12] << 10) >> shifts_6th[2];
ind[3] = in[12] >> shifts_6th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1684,8 +1684,8 @@ inline static const uint32_t* unpack17_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[13] >> shifts_7th[1];
ind[2] = (in[13] >> 26 | in[14] << 6) >> shifts_7th[2];
ind[3] = in[14] >> shifts_7th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1694,8 +1694,8 @@ inline static const uint32_t* unpack17_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[15] >> shifts_8th[1];
ind[2] = (in[15] >> 30 | in[16] << 2) >> shifts_8th[2];
ind[3] = in[16] >> shifts_8th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1711,7 +1711,7 @@ inline static const uint32_t* unpack18_32_neon(const uint32_t* in, uint32_t* out
uint32_t shifts_2nd[4] = {8, 0, 12, 0};
uint32_t shifts_3rd[4] = {0, 2, 0, 6};
uint32_t shifts_4th[4] = {0, 10, 0, 14};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -1721,8 +1721,8 @@ inline static const uint32_t* unpack18_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[0] >> 18 | in[1] << 14) >> shifts_1st[1];
ind[2] = in[1] >> shifts_1st[2];
ind[3] = (in[1] >> 22 | in[2] << 10) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1731,8 +1731,8 @@ inline static const uint32_t* unpack18_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[2] >> 26 | in[3] << 6) >> shifts_2nd[1];
ind[2] = in[3] >> shifts_2nd[2];
ind[3] = (in[3] >> 30 | in[4] << 2) >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1741,8 +1741,8 @@ inline static const uint32_t* unpack18_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[5] >> shifts_3rd[1];
ind[2] = (in[5] >> 20 | in[6] << 12) >> shifts_3rd[2];
ind[3] = in[6] >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1751,8 +1751,8 @@ inline static const uint32_t* unpack18_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[7] >> shifts_4th[1];
ind[2] = (in[7] >> 28 | in[8] << 4) >> shifts_4th[2];
ind[3] = in[8] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1761,8 +1761,8 @@ inline static const uint32_t* unpack18_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[9] >> 18 | in[10] << 14) >> shifts_1st[1];
ind[2] = in[10] >> shifts_1st[2];
ind[3] = (in[10] >> 22 | in[11] << 10) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1771,8 +1771,8 @@ inline static const uint32_t* unpack18_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[11] >> 26 | in[12] << 6) >> shifts_2nd[1];
ind[2] = in[12] >> shifts_2nd[2];
ind[3] = (in[12] >> 30 | in[13] << 2) >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1781,8 +1781,8 @@ inline static const uint32_t* unpack18_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[14] >> shifts_3rd[1];
ind[2] = (in[14] >> 20 | in[15] << 12) >> shifts_3rd[2];
ind[3] = in[15] >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1791,8 +1791,8 @@ inline static const uint32_t* unpack18_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[16] >> shifts_4th[1];
ind[2] = (in[16] >> 28 | in[17] << 4) >> shifts_4th[2];
ind[3] = in[17] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1812,7 +1812,7 @@ inline static const uint32_t* unpack19_32_neon(const uint32_t* in, uint32_t* out
uint32_t shifts_6th[4] = {0, 0, 2, 0};
uint32_t shifts_7th[4] = {8, 0, 0, 1};
uint32_t shifts_8th[4] = {0, 7, 0, 13};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -1822,8 +1822,8 @@ inline static const uint32_t* unpack19_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[0] >> 19 | in[1] << 13) >> shifts_1st[1];
ind[2] = in[1] >> shifts_1st[2];
ind[3] = (in[1] >> 25 | in[2] << 7) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1832,8 +1832,8 @@ inline static const uint32_t* unpack19_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[2] >> 31 | in[3] << 1) >> shifts_2nd[1];
ind[2] = (in[3] >> 18 | in[4] << 14) >> shifts_2nd[2];
ind[3] = in[4] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1842,8 +1842,8 @@ inline static const uint32_t* unpack19_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[5] >> shifts_3rd[1];
ind[2] = (in[5] >> 30 | in[6] << 2) >> shifts_3rd[2];
ind[3] = (in[6] >> 17 | in[7] << 15) >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1852,8 +1852,8 @@ inline static const uint32_t* unpack19_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[7] >> 23 | in[8] << 9) >> shifts_4th[1];
ind[2] = in[8] >> shifts_4th[2];
ind[3] = (in[8] >> 29 | in[9] << 3) >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1862,8 +1862,8 @@ inline static const uint32_t* unpack19_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[10] >> shifts_5th[1];
ind[2] = (in[10] >> 22 | in[11] << 10) >> shifts_5th[2];
ind[3] = in[11] >> shifts_5th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1872,8 +1872,8 @@ inline static const uint32_t* unpack19_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[12] >> 15 | in[13] << 17) >> shifts_6th[1];
ind[2] = in[13] >> shifts_6th[2];
ind[3] = (in[13] >> 21 | in[14] << 11) >> shifts_6th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1882,8 +1882,8 @@ inline static const uint32_t* unpack19_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[14] >> 27 | in[15] << 5) >> shifts_7th[1];
ind[2] = (in[15] >> 14 | in[16] << 18) >> shifts_7th[2];
ind[3] = in[16] >> shifts_7th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1892,8 +1892,8 @@ inline static const uint32_t* unpack19_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[17] >> shifts_8th[1];
ind[2] = (in[17] >> 26 | in[18] << 6) >> shifts_8th[2];
ind[3] = in[18] >> shifts_8th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1907,7 +1907,7 @@ inline static const uint32_t* unpack20_32_neon(const uint32_t* in, uint32_t* out
uint32_t ind[4];
uint32_t shifts_1st[4] = {0, 0, 8, 0};
uint32_t shifts_2nd[4] = {0, 4, 0, 12};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -1917,8 +1917,8 @@ inline static const uint32_t* unpack20_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[0] >> 20 | in[1] << 12) >> shifts_1st[1];
ind[2] = in[1] >> shifts_1st[2];
ind[3] = (in[1] >> 28 | in[2] << 4) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1927,8 +1927,8 @@ inline static const uint32_t* unpack20_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[3] >> shifts_2nd[1];
ind[2] = (in[3] >> 24 | in[4] << 8) >> shifts_2nd[2];
ind[3] = in[4] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1937,8 +1937,8 @@ inline static const uint32_t* unpack20_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[5] >> 20 | in[6] << 12) >> shifts_1st[1];
ind[2] = in[6] >> shifts_1st[2];
ind[3] = (in[6] >> 28 | in[7] << 4) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1947,8 +1947,8 @@ inline static const uint32_t* unpack20_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[8] >> shifts_2nd[1];
ind[2] = (in[8] >> 24 | in[9] << 8) >> shifts_2nd[2];
ind[3] = in[9] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1957,8 +1957,8 @@ inline static const uint32_t* unpack20_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[10] >> 20 | in[11] << 12) >> shifts_1st[1];
ind[2] = in[11] >> shifts_1st[2];
ind[3] = (in[11] >> 28 | in[12] << 4) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1967,8 +1967,8 @@ inline static const uint32_t* unpack20_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[13] >> shifts_2nd[1];
ind[2] = (in[13] >> 24 | in[14] << 8) >> shifts_2nd[2];
ind[3] = in[14] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1977,8 +1977,8 @@ inline static const uint32_t* unpack20_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[15] >> 20 | in[16] << 12) >> shifts_1st[1];
ind[2] = in[16] >> shifts_1st[2];
ind[3] = (in[16] >> 28 | in[17] << 4) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -1987,8 +1987,8 @@ inline static const uint32_t* unpack20_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[18] >> shifts_2nd[1];
ind[2] = (in[18] >> 24 | in[19] << 8) >> shifts_2nd[2];
ind[3] = in[19] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2008,7 +2008,7 @@ inline static const uint32_t* unpack21_32_neon(const uint32_t* in, uint32_t* out
uint32_t shifts_6th[4] = {4, 0, 0, 3};
uint32_t shifts_7th[4] = {0, 0, 2, 0};
uint32_t shifts_8th[4] = {0, 1, 0, 11};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -2018,8 +2018,8 @@ inline static const uint32_t* unpack21_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[0] >> 21 | in[1] << 11) >> shifts_1st[1];
ind[2] = in[1] >> shifts_1st[2];
ind[3] = (in[1] >> 31 | in[2] << 1) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2028,8 +2028,8 @@ inline static const uint32_t* unpack21_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[3] >> shifts_2nd[1];
ind[2] = (in[3] >> 30 | in[4] << 2) >> shifts_2nd[2];
ind[3] = (in[4] >> 19 | in[5] << 13) >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2038,8 +2038,8 @@ inline static const uint32_t* unpack21_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[5] >> 29 | in[6] << 3) >> shifts_3rd[1];
ind[2] = (in[6] >> 18 | in[7] << 14) >> shifts_3rd[2];
ind[3] = in[7] >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2048,8 +2048,8 @@ inline static const uint32_t* unpack21_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[8] >> 17 | in[9] << 15) >> shifts_4th[1];
ind[2] = in[9] >> shifts_4th[2];
ind[3] = (in[9] >> 27 | in[10] << 5) >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2058,8 +2058,8 @@ inline static const uint32_t* unpack21_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[11] >> shifts_5th[1];
ind[2] = (in[11] >> 26 | in[12] << 6) >> shifts_5th[2];
ind[3] = (in[12] >> 15 | in[13] << 17) >> shifts_5th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2068,8 +2068,8 @@ inline static const uint32_t* unpack21_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[13] >> 25 | in[14] << 7) >> shifts_6th[1];
ind[2] = (in[14] >> 14 | in[15] << 18) >> shifts_6th[2];
ind[3] = in[15] >> shifts_6th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2078,8 +2078,8 @@ inline static const uint32_t* unpack21_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[16] >> 13 | in[17] << 19) >> shifts_7th[1];
ind[2] = in[17] >> shifts_7th[2];
ind[3] = (in[17] >> 23 | in[18] << 9) >> shifts_7th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2088,8 +2088,8 @@ inline static const uint32_t* unpack21_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[19] >> shifts_8th[1];
ind[2] = (in[19] >> 22 | in[20] << 10) >> shifts_8th[2];
ind[3] = in[20] >> shifts_8th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2105,7 +2105,7 @@ inline static const uint32_t* unpack22_32_neon(const uint32_t* in, uint32_t* out
uint32_t shifts_2nd[4] = {0, 0, 4, 0};
uint32_t shifts_3rd[4] = {0, 6, 0, 0};
uint32_t shifts_4th[4] = {8, 0, 0, 10};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -2115,8 +2115,8 @@ inline static const uint32_t* unpack22_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[0] >> 22 | in[1] << 10) >> shifts_1st[1];
ind[2] = (in[1] >> 12 | in[2] << 20) >> shifts_1st[2];
ind[3] = in[2] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2125,8 +2125,8 @@ inline static const uint32_t* unpack22_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[3] >> 14 | in[4] << 18) >> shifts_2nd[1];
ind[2] = in[4] >> shifts_2nd[2];
ind[3] = (in[4] >> 26 | in[5] << 6) >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2135,8 +2135,8 @@ inline static const uint32_t* unpack22_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[6] >> shifts_3rd[1];
ind[2] = (in[6] >> 28 | in[7] << 4) >> shifts_3rd[2];
ind[3] = (in[7] >> 18 | in[8] << 14) >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2145,8 +2145,8 @@ inline static const uint32_t* unpack22_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[8] >> 30 | in[9] << 2) >> shifts_4th[1];
ind[2] = (in[9] >> 20 | in[10] << 12) >> shifts_4th[2];
ind[3] = in[10] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2155,8 +2155,8 @@ inline static const uint32_t* unpack22_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[11] >> 22 | in[12] << 10) >> shifts_1st[1];
ind[2] = (in[12] >> 12 | in[13] << 20) >> shifts_1st[2];
ind[3] = in[13] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2165,8 +2165,8 @@ inline static const uint32_t* unpack22_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[14] >> 14 | in[15] << 18) >> shifts_2nd[1];
ind[2] = in[15] >> shifts_2nd[2];
ind[3] = (in[15] >> 26 | in[16] << 6) >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2175,8 +2175,8 @@ inline static const uint32_t* unpack22_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[17] >> shifts_3rd[1];
ind[2] = (in[17] >> 28 | in[18] << 4) >> shifts_3rd[2];
ind[3] = (in[18] >> 18 | in[19] << 14) >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2185,8 +2185,8 @@ inline static const uint32_t* unpack22_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[19] >> 30 | in[20] << 2) >> shifts_4th[1];
ind[2] = (in[20] >> 20 | in[21] << 12) >> shifts_4th[2];
ind[3] = in[21] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2206,7 +2206,7 @@ inline static const uint32_t* unpack23_32_neon(const uint32_t* in, uint32_t* out
uint32_t shifts_6th[4] = {0, 3, 0, 0};
uint32_t shifts_7th[4] = {8, 0, 0, 0};
uint32_t shifts_8th[4] = {4, 0, 0, 9};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -2216,8 +2216,8 @@ inline static const uint32_t* unpack23_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[0] >> 23 | in[1] << 9) >> shifts_1st[1];
ind[2] = (in[1] >> 14 | in[2] << 18) >> shifts_1st[2];
ind[3] = in[2] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2226,8 +2226,8 @@ inline static const uint32_t* unpack23_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[3] >> 19 | in[4] << 13) >> shifts_2nd[1];
ind[2] = (in[4] >> 10 | in[5] << 22) >> shifts_2nd[2];
ind[3] = in[5] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2236,8 +2236,8 @@ inline static const uint32_t* unpack23_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[6] >> 15 | in[7] << 17) >> shifts_3rd[1];
ind[2] = in[7] >> shifts_3rd[2];
ind[3] = (in[7] >> 29 | in[8] << 3) >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2246,8 +2246,8 @@ inline static const uint32_t* unpack23_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[9] >> 11 | in[10] << 21) >> shifts_4th[1];
ind[2] = in[10] >> shifts_4th[2];
ind[3] = (in[10] >> 25 | in[11] << 7) >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2256,8 +2256,8 @@ inline static const uint32_t* unpack23_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[12] >> shifts_5th[1];
ind[2] = (in[12] >> 30 | in[13] << 2) >> shifts_5th[2];
ind[3] = (in[13] >> 21 | in[14] << 11) >> shifts_5th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2266,8 +2266,8 @@ inline static const uint32_t* unpack23_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[15] >> shifts_6th[1];
ind[2] = (in[15] >> 26 | in[16] << 6) >> shifts_6th[2];
ind[3] = (in[16] >> 17 | in[17] << 15) >> shifts_6th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2276,8 +2276,8 @@ inline static const uint32_t* unpack23_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[17] >> 31 | in[18] << 1) >> shifts_7th[1];
ind[2] = (in[18] >> 22 | in[19] << 10) >> shifts_7th[2];
ind[3] = (in[19] >> 13 | in[20] << 19) >> shifts_7th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2286,8 +2286,8 @@ inline static const uint32_t* unpack23_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[20] >> 27 | in[21] << 5) >> shifts_8th[1];
ind[2] = (in[21] >> 18 | in[22] << 14) >> shifts_8th[2];
ind[3] = in[22] >> shifts_8th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2300,7 +2300,7 @@ inline static const uint32_t* unpack24_32_neon(const uint32_t* in, uint32_t* out
uint32_t mask = 0xffffff;
uint32_t ind[4];
uint32_t shifts_1st[4] = {0, 0, 0, 8};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -2310,8 +2310,8 @@ inline static const uint32_t* unpack24_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[0] >> 24 | in[1] << 8) >> shifts_1st[1];
ind[2] = (in[1] >> 16 | in[2] << 16) >> shifts_1st[2];
ind[3] = in[2] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2320,8 +2320,8 @@ inline static const uint32_t* unpack24_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[3] >> 24 | in[4] << 8) >> shifts_1st[1];
ind[2] = (in[4] >> 16 | in[5] << 16) >> shifts_1st[2];
ind[3] = in[5] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2330,8 +2330,8 @@ inline static const uint32_t* unpack24_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[6] >> 24 | in[7] << 8) >> shifts_1st[1];
ind[2] = (in[7] >> 16 | in[8] << 16) >> shifts_1st[2];
ind[3] = in[8] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2340,8 +2340,8 @@ inline static const uint32_t* unpack24_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[9] >> 24 | in[10] << 8) >> shifts_1st[1];
ind[2] = (in[10] >> 16 | in[11] << 16) >> shifts_1st[2];
ind[3] = in[11] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2350,8 +2350,8 @@ inline static const uint32_t* unpack24_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[12] >> 24 | in[13] << 8) >> shifts_1st[1];
ind[2] = (in[13] >> 16 | in[14] << 16) >> shifts_1st[2];
ind[3] = in[14] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2360,8 +2360,8 @@ inline static const uint32_t* unpack24_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[15] >> 24 | in[16] << 8) >> shifts_1st[1];
ind[2] = (in[16] >> 16 | in[17] << 16) >> shifts_1st[2];
ind[3] = in[17] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2370,8 +2370,8 @@ inline static const uint32_t* unpack24_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[18] >> 24 | in[19] << 8) >> shifts_1st[1];
ind[2] = (in[19] >> 16 | in[20] << 16) >> shifts_1st[2];
ind[3] = in[20] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2380,8 +2380,8 @@ inline static const uint32_t* unpack24_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[21] >> 24 | in[22] << 8) >> shifts_1st[1];
ind[2] = (in[22] >> 16 | in[23] << 16) >> shifts_1st[2];
ind[3] = in[23] >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2401,7 +2401,7 @@ inline static const uint32_t* unpack25_32_neon(const uint32_t* in, uint32_t* out
uint32_t shifts_6th[4] = {0, 0, 6, 0};
uint32_t shifts_7th[4] = {0, 0, 0, 3};
uint32_t shifts_8th[4] = {0, 0, 0, 7};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -2411,8 +2411,8 @@ inline static const uint32_t* unpack25_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[0] >> 25 | in[1] << 7) >> shifts_1st[1];
ind[2] = (in[1] >> 18 | in[2] << 14) >> shifts_1st[2];
ind[3] = (in[2] >> 11 | in[3] << 21) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2421,8 +2421,8 @@ inline static const uint32_t* unpack25_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[3] >> 29 | in[4] << 3) >> shifts_2nd[1];
ind[2] = (in[4] >> 22 | in[5] << 10) >> shifts_2nd[2];
ind[3] = (in[5] >> 15 | in[6] << 17) >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2431,8 +2431,8 @@ inline static const uint32_t* unpack25_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[7] >> shifts_3rd[1];
ind[2] = (in[7] >> 26 | in[8] << 6) >> shifts_3rd[2];
ind[3] = (in[8] >> 19 | in[9] << 13) >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2441,8 +2441,8 @@ inline static const uint32_t* unpack25_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[10] >> shifts_4th[1];
ind[2] = (in[10] >> 30 | in[11] << 2) >> shifts_4th[2];
ind[3] = (in[11] >> 23 | in[12] << 9) >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2451,8 +2451,8 @@ inline static const uint32_t* unpack25_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[13] >> 9 | in[14] << 23) >> shifts_5th[1];
ind[2] = in[14] >> shifts_5th[2];
ind[3] = (in[14] >> 27 | in[15] << 5) >> shifts_5th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2461,8 +2461,8 @@ inline static const uint32_t* unpack25_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[16] >> 13 | in[17] << 19) >> shifts_6th[1];
ind[2] = in[17] >> shifts_6th[2];
ind[3] = (in[17] >> 31 | in[18] << 1) >> shifts_6th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2471,8 +2471,8 @@ inline static const uint32_t* unpack25_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[19] >> 17 | in[20] << 15) >> shifts_7th[1];
ind[2] = (in[20] >> 10 | in[21] << 22) >> shifts_7th[2];
ind[3] = in[21] >> shifts_7th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2481,8 +2481,8 @@ inline static const uint32_t* unpack25_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[22] >> 21 | in[23] << 11) >> shifts_8th[1];
ind[2] = (in[23] >> 14 | in[24] << 18) >> shifts_8th[2];
ind[3] = in[24] >> shifts_8th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2498,7 +2498,7 @@ inline static const uint32_t* unpack26_32_neon(const uint32_t* in, uint32_t* out
uint32_t shifts_2nd[4] = {0, 2, 0, 0};
uint32_t shifts_3rd[4] = {0, 0, 4, 0};
uint32_t shifts_4th[4] = {0, 0, 0, 6};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -2508,8 +2508,8 @@ inline static const uint32_t* unpack26_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[0] >> 26 | in[1] << 6) >> shifts_1st[1];
ind[2] = (in[1] >> 20 | in[2] << 12) >> shifts_1st[2];
ind[3] = (in[2] >> 14 | in[3] << 18) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2518,8 +2518,8 @@ inline static const uint32_t* unpack26_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[4] >> shifts_2nd[1];
ind[2] = (in[4] >> 28 | in[5] << 4) >> shifts_2nd[2];
ind[3] = (in[5] >> 22 | in[6] << 10) >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2528,8 +2528,8 @@ inline static const uint32_t* unpack26_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[7] >> 10 | in[8] << 22) >> shifts_3rd[1];
ind[2] = in[8] >> shifts_3rd[2];
ind[3] = (in[8] >> 30 | in[9] << 2) >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2538,8 +2538,8 @@ inline static const uint32_t* unpack26_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[10] >> 18 | in[11] << 14) >> shifts_4th[1];
ind[2] = (in[11] >> 12 | in[12] << 20) >> shifts_4th[2];
ind[3] = in[12] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2548,8 +2548,8 @@ inline static const uint32_t* unpack26_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[13] >> 26 | in[14] << 6) >> shifts_1st[1];
ind[2] = (in[14] >> 20 | in[15] << 12) >> shifts_1st[2];
ind[3] = (in[15] >> 14 | in[16] << 18) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2558,8 +2558,8 @@ inline static const uint32_t* unpack26_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[17] >> shifts_2nd[1];
ind[2] = (in[17] >> 28 | in[18] << 4) >> shifts_2nd[2];
ind[3] = (in[18] >> 22 | in[19] << 10) >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2568,8 +2568,8 @@ inline static const uint32_t* unpack26_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[20] >> 10 | in[21] << 22) >> shifts_3rd[1];
ind[2] = in[21] >> shifts_3rd[2];
ind[3] = (in[21] >> 30 | in[22] << 2) >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2578,8 +2578,8 @@ inline static const uint32_t* unpack26_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[23] >> 18 | in[24] << 14) >> shifts_4th[1];
ind[2] = (in[24] >> 12 | in[25] << 20) >> shifts_4th[2];
ind[3] = in[25] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2599,7 +2599,7 @@ inline static const uint32_t* unpack27_32_neon(const uint32_t* in, uint32_t* out
uint32_t shifts_6th[4] = {0, 0, 0, 0};
uint32_t shifts_7th[4] = {0, 3, 0, 0};
uint32_t shifts_8th[4] = {0, 0, 0, 5};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -2609,8 +2609,8 @@ inline static const uint32_t* unpack27_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[0] >> 27 | in[1] << 5) >> shifts_1st[1];
ind[2] = (in[1] >> 22 | in[2] << 10) >> shifts_1st[2];
ind[3] = (in[2] >> 17 | in[3] << 15) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2619,8 +2619,8 @@ inline static const uint32_t* unpack27_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[4] >> 7 | in[5] << 25) >> shifts_2nd[1];
ind[2] = in[5] >> shifts_2nd[2];
ind[3] = (in[5] >> 29 | in[6] << 3) >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2629,8 +2629,8 @@ inline static const uint32_t* unpack27_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[7] >> 19 | in[8] << 13) >> shifts_3rd[1];
ind[2] = (in[8] >> 14 | in[9] << 18) >> shifts_3rd[2];
ind[3] = (in[9] >> 9 | in[10] << 23) >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2639,8 +2639,8 @@ inline static const uint32_t* unpack27_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[10] >> 31 | in[11] << 1) >> shifts_4th[1];
ind[2] = (in[11] >> 26 | in[12] << 6) >> shifts_4th[2];
ind[3] = (in[12] >> 21 | in[13] << 11) >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2649,8 +2649,8 @@ inline static const uint32_t* unpack27_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[14] >> 11 | in[15] << 21) >> shifts_5th[1];
ind[2] = (in[15] >> 6 | in[16] << 26) >> shifts_5th[2];
ind[3] = in[16] >> shifts_5th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2659,8 +2659,8 @@ inline static const uint32_t* unpack27_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[17] >> 23 | in[18] << 9) >> shifts_6th[1];
ind[2] = (in[18] >> 18 | in[19] << 14) >> shifts_6th[2];
ind[3] = (in[19] >> 13 | in[20] << 19) >> shifts_6th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2669,8 +2669,8 @@ inline static const uint32_t* unpack27_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[21] >> shifts_7th[1];
ind[2] = (in[21] >> 30 | in[22] << 2) >> shifts_7th[2];
ind[3] = (in[22] >> 25 | in[23] << 7) >> shifts_7th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2679,8 +2679,8 @@ inline static const uint32_t* unpack27_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[24] >> 15 | in[25] << 17) >> shifts_8th[1];
ind[2] = (in[25] >> 10 | in[26] << 22) >> shifts_8th[2];
ind[3] = in[26] >> shifts_8th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2694,7 +2694,7 @@ inline static const uint32_t* unpack28_32_neon(const uint32_t* in, uint32_t* out
uint32_t ind[4];
uint32_t shifts_1st[4] = {0, 0, 0, 0};
uint32_t shifts_2nd[4] = {0, 0, 0, 4};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -2704,8 +2704,8 @@ inline static const uint32_t* unpack28_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[0] >> 28 | in[1] << 4) >> shifts_1st[1];
ind[2] = (in[1] >> 24 | in[2] << 8) >> shifts_1st[2];
ind[3] = (in[2] >> 20 | in[3] << 12) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2714,8 +2714,8 @@ inline static const uint32_t* unpack28_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[4] >> 12 | in[5] << 20) >> shifts_2nd[1];
ind[2] = (in[5] >> 8 | in[6] << 24) >> shifts_2nd[2];
ind[3] = in[6] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2724,8 +2724,8 @@ inline static const uint32_t* unpack28_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[7] >> 28 | in[8] << 4) >> shifts_1st[1];
ind[2] = (in[8] >> 24 | in[9] << 8) >> shifts_1st[2];
ind[3] = (in[9] >> 20 | in[10] << 12) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2734,8 +2734,8 @@ inline static const uint32_t* unpack28_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[11] >> 12 | in[12] << 20) >> shifts_2nd[1];
ind[2] = (in[12] >> 8 | in[13] << 24) >> shifts_2nd[2];
ind[3] = in[13] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2744,8 +2744,8 @@ inline static const uint32_t* unpack28_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[14] >> 28 | in[15] << 4) >> shifts_1st[1];
ind[2] = (in[15] >> 24 | in[16] << 8) >> shifts_1st[2];
ind[3] = (in[16] >> 20 | in[17] << 12) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2754,8 +2754,8 @@ inline static const uint32_t* unpack28_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[18] >> 12 | in[19] << 20) >> shifts_2nd[1];
ind[2] = (in[19] >> 8 | in[20] << 24) >> shifts_2nd[2];
ind[3] = in[20] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2764,8 +2764,8 @@ inline static const uint32_t* unpack28_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[21] >> 28 | in[22] << 4) >> shifts_1st[1];
ind[2] = (in[22] >> 24 | in[23] << 8) >> shifts_1st[2];
ind[3] = (in[23] >> 20 | in[24] << 12) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2774,8 +2774,8 @@ inline static const uint32_t* unpack28_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[25] >> 12 | in[26] << 20) >> shifts_2nd[1];
ind[2] = (in[26] >> 8 | in[27] << 24) >> shifts_2nd[2];
ind[3] = in[27] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2795,7 +2795,7 @@ inline static const uint32_t* unpack29_32_neon(const uint32_t* in, uint32_t* out
uint32_t shifts_6th[4] = {0, 1, 0, 0};
uint32_t shifts_7th[4] = {0, 0, 0, 0};
uint32_t shifts_8th[4] = {0, 0, 0, 3};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -2805,8 +2805,8 @@ inline static const uint32_t* unpack29_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[0] >> 29 | in[1] << 3) >> shifts_1st[1];
ind[2] = (in[1] >> 26 | in[2] << 6) >> shifts_1st[2];
ind[3] = (in[2] >> 23 | in[3] << 9) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2815,8 +2815,8 @@ inline static const uint32_t* unpack29_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[4] >> 17 | in[5] << 15) >> shifts_2nd[1];
ind[2] = (in[5] >> 14 | in[6] << 18) >> shifts_2nd[2];
ind[3] = (in[6] >> 11 | in[7] << 21) >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2825,8 +2825,8 @@ inline static const uint32_t* unpack29_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[8] >> 5 | in[9] << 27) >> shifts_3rd[1];
ind[2] = in[9] >> shifts_3rd[2];
ind[3] = (in[9] >> 31 | in[10] << 1) >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2835,8 +2835,8 @@ inline static const uint32_t* unpack29_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[11] >> 25 | in[12] << 7) >> shifts_4th[1];
ind[2] = (in[12] >> 22 | in[13] << 10) >> shifts_4th[2];
ind[3] = (in[13] >> 19 | in[14] << 13) >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2845,8 +2845,8 @@ inline static const uint32_t* unpack29_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[15] >> 13 | in[16] << 19) >> shifts_5th[1];
ind[2] = (in[16] >> 10 | in[17] << 22) >> shifts_5th[2];
ind[3] = (in[17] >> 7 | in[18] << 25) >> shifts_5th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2855,8 +2855,8 @@ inline static const uint32_t* unpack29_32_neon(const uint32_t* in, uint32_t* out
ind[1] = in[19] >> shifts_6th[1];
ind[2] = (in[19] >> 30 | in[20] << 2) >> shifts_6th[2];
ind[3] = (in[20] >> 27 | in[21] << 5) >> shifts_6th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2865,8 +2865,8 @@ inline static const uint32_t* unpack29_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[22] >> 21 | in[23] << 11) >> shifts_7th[1];
ind[2] = (in[23] >> 18 | in[24] << 14) >> shifts_7th[2];
ind[3] = (in[24] >> 15 | in[25] << 17) >> shifts_7th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2875,8 +2875,8 @@ inline static const uint32_t* unpack29_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[26] >> 9 | in[27] << 23) >> shifts_8th[1];
ind[2] = (in[27] >> 6 | in[28] << 26) >> shifts_8th[2];
ind[3] = in[28] >> shifts_8th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2892,7 +2892,7 @@ inline static const uint32_t* unpack30_32_neon(const uint32_t* in, uint32_t* out
uint32_t shifts_2nd[4] = {0, 0, 0, 0};
uint32_t shifts_3rd[4] = {0, 0, 0, 0};
uint32_t shifts_4th[4] = {0, 0, 0, 2};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -2902,8 +2902,8 @@ inline static const uint32_t* unpack30_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[0] >> 30 | in[1] << 2) >> shifts_1st[1];
ind[2] = (in[1] >> 28 | in[2] << 4) >> shifts_1st[2];
ind[3] = (in[2] >> 26 | in[3] << 6) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2912,8 +2912,8 @@ inline static const uint32_t* unpack30_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[4] >> 22 | in[5] << 10) >> shifts_2nd[1];
ind[2] = (in[5] >> 20 | in[6] << 12) >> shifts_2nd[2];
ind[3] = (in[6] >> 18 | in[7] << 14) >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2922,8 +2922,8 @@ inline static const uint32_t* unpack30_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[8] >> 14 | in[9] << 18) >> shifts_3rd[1];
ind[2] = (in[9] >> 12 | in[10] << 20) >> shifts_3rd[2];
ind[3] = (in[10] >> 10 | in[11] << 22) >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2932,8 +2932,8 @@ inline static const uint32_t* unpack30_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[12] >> 6 | in[13] << 26) >> shifts_4th[1];
ind[2] = (in[13] >> 4 | in[14] << 28) >> shifts_4th[2];
ind[3] = in[14] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2942,8 +2942,8 @@ inline static const uint32_t* unpack30_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[15] >> 30 | in[16] << 2) >> shifts_1st[1];
ind[2] = (in[16] >> 28 | in[17] << 4) >> shifts_1st[2];
ind[3] = (in[17] >> 26 | in[18] << 6) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2952,8 +2952,8 @@ inline static const uint32_t* unpack30_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[19] >> 22 | in[20] << 10) >> shifts_2nd[1];
ind[2] = (in[20] >> 20 | in[21] << 12) >> shifts_2nd[2];
ind[3] = (in[21] >> 18 | in[22] << 14) >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2962,8 +2962,8 @@ inline static const uint32_t* unpack30_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[23] >> 14 | in[24] << 18) >> shifts_3rd[1];
ind[2] = (in[24] >> 12 | in[25] << 20) >> shifts_3rd[2];
ind[3] = (in[25] >> 10 | in[26] << 22) >> shifts_3rd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2972,8 +2972,8 @@ inline static const uint32_t* unpack30_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[27] >> 6 | in[28] << 26) >> shifts_4th[1];
ind[2] = (in[28] >> 4 | in[29] << 28) >> shifts_4th[2];
ind[3] = in[29] >> shifts_4th[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -2987,7 +2987,7 @@ inline static const uint32_t* unpack31_32_neon(const uint32_t* in, uint32_t* out
uint32_t ind[4];
uint32_t shifts_1st[4] = {0, 0, 0, 0};
uint32_t shifts_2nd[4] = {0, 0, 0, 1};
- uint32x4_t reg_shft, reg_masks;
+ uint32x4_t reg_shift, reg_masks;
uint32x4_t results;
reg_masks = vdupq_n_u32(mask);
@@ -2997,8 +2997,8 @@ inline static const uint32_t* unpack31_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[0] >> 31 | in[1] << 1) >> shifts_1st[1];
ind[2] = (in[1] >> 30 | in[2] << 2) >> shifts_1st[2];
ind[3] = (in[2] >> 29 | in[3] << 3) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -3007,8 +3007,8 @@ inline static const uint32_t* unpack31_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[4] >> 27 | in[5] << 5) >> shifts_1st[1];
ind[2] = (in[5] >> 26 | in[6] << 6) >> shifts_1st[2];
ind[3] = (in[6] >> 25 | in[7] << 7) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -3017,8 +3017,8 @@ inline static const uint32_t* unpack31_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[8] >> 23 | in[9] << 9) >> shifts_1st[1];
ind[2] = (in[9] >> 22 | in[10] << 10) >> shifts_1st[2];
ind[3] = (in[10] >> 21 | in[11] << 11) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -3027,8 +3027,8 @@ inline static const uint32_t* unpack31_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[12] >> 19 | in[13] << 13) >> shifts_1st[1];
ind[2] = (in[13] >> 18 | in[14] << 14) >> shifts_1st[2];
ind[3] = (in[14] >> 17 | in[15] << 15) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -3037,8 +3037,8 @@ inline static const uint32_t* unpack31_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[16] >> 15 | in[17] << 17) >> shifts_1st[1];
ind[2] = (in[17] >> 14 | in[18] << 18) >> shifts_1st[2];
ind[3] = (in[18] >> 13 | in[19] << 19) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -3047,8 +3047,8 @@ inline static const uint32_t* unpack31_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[20] >> 11 | in[21] << 21) >> shifts_1st[1];
ind[2] = (in[21] >> 10 | in[22] << 22) >> shifts_1st[2];
ind[3] = (in[22] >> 9 | in[23] << 23) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -3057,8 +3057,8 @@ inline static const uint32_t* unpack31_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[24] >> 7 | in[25] << 25) >> shifts_1st[1];
ind[2] = (in[25] >> 6 | in[26] << 26) >> shifts_1st[2];
ind[3] = (in[26] >> 5 | in[27] << 27) >> shifts_1st[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
@@ -3067,8 +3067,8 @@ inline static const uint32_t* unpack31_32_neon(const uint32_t* in, uint32_t* out
ind[1] = (in[28] >> 3 | in[29] << 29) >> shifts_2nd[1];
ind[2] = (in[29] >> 2 | in[30] << 30) >> shifts_2nd[2];
ind[3] = in[30] >> shifts_2nd[3];
- reg_shft = vld1q_u32(ind);
- results = vandq_u32(reg_shft, reg_masks);
+ reg_shift = vld1q_u32(ind);
+ results = vandq_u32(reg_shift, reg_masks);
vst1q_u32(out, results);
out += 4;
diff --git a/go/parquet/internal/utils/bit_reader.go b/go/parquet/internal/utils/bit_reader.go
index bf9741c798..0bf501e048 100644
--- a/go/parquet/internal/utils/bit_reader.go
+++ b/go/parquet/internal/utils/bit_reader.go
@@ -152,7 +152,7 @@ func (b *BitReader) GetAligned(nbytes int, v interface{}) bool {
if n != nbytes {
return false
}
- // zero pad the the bytes
+ // zero pad the bytes
memory.Set(b.raw[n:typBytes], 0)
switch v := v.(type) {
@@ -215,7 +215,7 @@ func (b *BitReader) GetBatchIndex(bits uint, out []IndexType) (i int, err error)
var val uint64
length := len(out)
- // if we're not currently byte-aligned, read bits until we are byte-aligned.
+ // if we aren't currently byte-aligned, read bits until we are byte-aligned.
for ; i < length && b.bitoffset != 0; i++ {
val, err = b.next(bits)
out[i] = IndexType(val)
diff --git a/go/parquet/internal/utils/rle.go b/go/parquet/internal/utils/rle.go
index 21ac2ce6b5..f367e7dc13 100644
--- a/go/parquet/internal/utils/rle.go
+++ b/go/parquet/internal/utils/rle.go
@@ -81,7 +81,7 @@ func MaxRLEBufferSize(width, numValues int) int {
// on a byte boundary without padding.
// Given that we know it is a multiple of 8, we store the number of 8-groups rather than
// the actual number of encoded ints. (This means that the total number of encoded values
-// can not be determined from the encoded data, since the number of values in the last
+// cannot be determined from the encoded data, since the number of values in the last
// group may not be a multiple of 8). For the last group of literal runs, we pad
// the group to 8 with zeros. This allows for 8 at a time decoding on the read side
// without the need for additional checks.
@@ -479,7 +479,7 @@ func (r *RleEncoder) Flush() int {
if r.repCount > 0 && allRep {
r.flushRepeated()
} else {
- // buffer the last grou pof literals to 8 by padding with 0s
+ // buffer the last group of literals to 8 by padding with 0s
for len(r.buffer) != 0 && len(r.buffer) < 8 {
r.buffer = append(r.buffer, 0)
}
diff --git a/go/parquet/metadata/file.go b/go/parquet/metadata/file.go
index 3335140c2e..fbbbae1eef 100644
--- a/go/parquet/metadata/file.go
+++ b/go/parquet/metadata/file.go
@@ -119,7 +119,7 @@ func (f *FileMetaDataBuilder) Finish() (*FileMetaData, error) {
createdBy := f.props.CreatedBy()
f.metadata.CreatedBy = &createdBy
- // Users cannot set the `ColumnOrder` since we do not not have user defined sort order
+ // Users cannot set the `ColumnOrder` since we do not have user defined sort order
// in the spec yet.
//
// We always default to `TYPE_DEFINED_ORDER`. We can expose it in
@@ -401,7 +401,7 @@ func (f *FileMetaData) KeyValueMetadata() KeyValueMetadata {
// Panics if f.FileDecryptor is nil
func (f *FileMetaData) VerifySignature(signature []byte) bool {
if f.FileDecryptor == nil {
- panic("decryption not set propertly, cannot verify signature")
+ panic("decryption not set properly, cannot verify signature")
}
serializer := thrift.NewThriftSerializer()
@@ -472,7 +472,7 @@ func (f *FileMetaData) Version() parquet.Version {
case 2:
return parquet.V2_LATEST
default:
- // imporperly set version, assume parquet 1.0
+ // improperly set version, assume parquet 1.0
return parquet.V1_0
}
}
diff --git a/go/parquet/metadata/statistics.go b/go/parquet/metadata/statistics.go
index 43294272de..a9bda405bb 100644
--- a/go/parquet/metadata/statistics.go
+++ b/go/parquet/metadata/statistics.go
@@ -271,7 +271,7 @@ func signedByteLess(a, b []byte) bool {
sa := *(*[]int8)(unsafe.Pointer(&a))
sb := *(*[]int8)(unsafe.Pointer(&b))
- // we can short circuit for different signd numbers or for equal length byte
+ // we can short circuit for different signed numbers or for equal length byte
// arrays that have different first bytes. The equality requirement is necessary
// for sign extension cases. 0xFF10 should be equal to 0x10 (due to big endian sign extension)
if int8(0x80&uint8(sa[0])) != int8(0x80&uint8(sb[0])) || (len(sa) == len(sb) && sa[0] != sb[0]) {
diff --git a/go/parquet/metadata/statistics_types.gen.go b/go/parquet/metadata/statistics_types.gen.go
index baecd185d1..a0e2949251 100644
--- a/go/parquet/metadata/statistics_types.gen.go
+++ b/go/parquet/metadata/statistics_types.gen.go
@@ -67,7 +67,7 @@ func NewInt32Statistics(descr *schema.Column, mem memory.Allocator) *Int32Statis
}
}
-// NewInt32StatisticsFromEncoded will construct a propertly typed statistics object
+// NewInt32StatisticsFromEncoded will construct a properly typed statistics object
// initializing it with the provided information.
func NewInt32StatisticsFromEncoded(descr *schema.Column, mem memory.Allocator, nvalues int64, encoded StatProvider) *Int32Statistics {
ret := NewInt32Statistics(descr, mem)
@@ -367,7 +367,7 @@ func NewInt64Statistics(descr *schema.Column, mem memory.Allocator) *Int64Statis
}
}
-// NewInt64StatisticsFromEncoded will construct a propertly typed statistics object
+// NewInt64StatisticsFromEncoded will construct a properly typed statistics object
// initializing it with the provided information.
func NewInt64StatisticsFromEncoded(descr *schema.Column, mem memory.Allocator, nvalues int64, encoded StatProvider) *Int64Statistics {
ret := NewInt64Statistics(descr, mem)
@@ -667,7 +667,7 @@ func NewInt96Statistics(descr *schema.Column, mem memory.Allocator) *Int96Statis
}
}
-// NewInt96StatisticsFromEncoded will construct a propertly typed statistics object
+// NewInt96StatisticsFromEncoded will construct a properly typed statistics object
// initializing it with the provided information.
func NewInt96StatisticsFromEncoded(descr *schema.Column, mem memory.Allocator, nvalues int64, encoded StatProvider) *Int96Statistics {
ret := NewInt96Statistics(descr, mem)
@@ -952,7 +952,7 @@ func NewFloat32Statistics(descr *schema.Column, mem memory.Allocator) *Float32St
}
}
-// NewFloat32StatisticsFromEncoded will construct a propertly typed statistics object
+// NewFloat32StatisticsFromEncoded will construct a properly typed statistics object
// initializing it with the provided information.
func NewFloat32StatisticsFromEncoded(descr *schema.Column, mem memory.Allocator, nvalues int64, encoded StatProvider) *Float32Statistics {
ret := NewFloat32Statistics(descr, mem)
@@ -1251,7 +1251,7 @@ func NewFloat64Statistics(descr *schema.Column, mem memory.Allocator) *Float64St
}
}
-// NewFloat64StatisticsFromEncoded will construct a propertly typed statistics object
+// NewFloat64StatisticsFromEncoded will construct a properly typed statistics object
// initializing it with the provided information.
func NewFloat64StatisticsFromEncoded(descr *schema.Column, mem memory.Allocator, nvalues int64, encoded StatProvider) *Float64Statistics {
ret := NewFloat64Statistics(descr, mem)
@@ -1550,7 +1550,7 @@ func NewBooleanStatistics(descr *schema.Column, mem memory.Allocator) *BooleanSt
}
}
-// NewBooleanStatisticsFromEncoded will construct a propertly typed statistics object
+// NewBooleanStatisticsFromEncoded will construct a properly typed statistics object
// initializing it with the provided information.
func NewBooleanStatisticsFromEncoded(descr *schema.Column, mem memory.Allocator, nvalues int64, encoded StatProvider) *BooleanStatistics {
ret := NewBooleanStatistics(descr, mem)
@@ -1838,7 +1838,7 @@ func NewByteArrayStatistics(descr *schema.Column, mem memory.Allocator) *ByteArr
}
}
-// NewByteArrayStatisticsFromEncoded will construct a propertly typed statistics object
+// NewByteArrayStatisticsFromEncoded will construct a properly typed statistics object
// initializing it with the provided information.
func NewByteArrayStatisticsFromEncoded(descr *schema.Column, mem memory.Allocator, nvalues int64, encoded StatProvider) *ByteArrayStatistics {
ret := NewByteArrayStatistics(descr, mem)
@@ -2149,7 +2149,7 @@ func NewFixedLenByteArrayStatistics(descr *schema.Column, mem memory.Allocator)
}
}
-// NewFixedLenByteArrayStatisticsFromEncoded will construct a propertly typed statistics object
+// NewFixedLenByteArrayStatisticsFromEncoded will construct a properly typed statistics object
// initializing it with the provided information.
func NewFixedLenByteArrayStatisticsFromEncoded(descr *schema.Column, mem memory.Allocator, nvalues int64, encoded StatProvider) *FixedLenByteArrayStatistics {
ret := NewFixedLenByteArrayStatistics(descr, mem)
@@ -2470,7 +2470,7 @@ func NewFloat16Statistics(descr *schema.Column, mem memory.Allocator) *Float16St
}
}
-// NewFloat16StatisticsFromEncoded will construct a propertly typed statistics object
+// NewFloat16StatisticsFromEncoded will construct a properly typed statistics object
// initializing it with the provided information.
func NewFloat16StatisticsFromEncoded(descr *schema.Column, mem memory.Allocator, nvalues int64, encoded StatProvider) *Float16Statistics {
ret := NewFloat16Statistics(descr, mem)
diff --git a/go/parquet/metadata/statistics_types.gen.go.tmpl b/go/parquet/metadata/statistics_types.gen.go.tmpl
index 93495527c7..26fe7f1531 100644
--- a/go/parquet/metadata/statistics_types.gen.go.tmpl
+++ b/go/parquet/metadata/statistics_types.gen.go.tmpl
@@ -74,7 +74,7 @@ func New{{.Name}}Statistics(descr *schema.Column, mem memory.Allocator) *{{.Name
}
}
-// New{{.Name}}StatisticsFromEncoded will construct a propertly typed statistics object
+// New{{.Name}}StatisticsFromEncoded will construct a properly typed statistics object
// initializing it with the provided information.
func New{{.Name}}StatisticsFromEncoded(descr *schema.Column, mem memory.Allocator, nvalues int64, encoded StatProvider) *{{.Name}}Statistics {
ret := New{{.Name}}Statistics(descr, mem)
diff --git a/go/parquet/pqarrow/column_readers.go b/go/parquet/pqarrow/column_readers.go
index 49f3fac0a3..3c38aba5c3 100644
--- a/go/parquet/pqarrow/column_readers.go
+++ b/go/parquet/pqarrow/column_readers.go
@@ -895,7 +895,7 @@ func transferDecimalBytes(rdr file.BinaryRecordReader, dt arrow.DataType) (*arro
rec := in.Value(i)
if len(rec) <= 0 {
- return nil, fmt.Errorf("invalud BYTEARRAY length for type: %s", dt)
+ return nil, fmt.Errorf("invalid BYTEARRAY length for type: %s", dt)
}
out[i], err = bigEndianToDecimal128(rec)
if err != nil {
diff --git a/go/parquet/pqarrow/encode_arrow.go b/go/parquet/pqarrow/encode_arrow.go
index 8926d0ba51..0836d13524 100644
--- a/go/parquet/pqarrow/encode_arrow.go
+++ b/go/parquet/pqarrow/encode_arrow.go
@@ -141,7 +141,7 @@ func newArrowColumnWriter(data *arrow.Chunked, offset, size int64, manifest *Sch
return arrowColumnWriter{}, nil
}
if leafCount != bldr.leafCount() {
- return arrowColumnWriter{}, fmt.Errorf("data type leaf_count != builder leafcount: %d - %d", leafCount, bldr.leafCount())
+ return arrowColumnWriter{}, fmt.Errorf("data type leaf_count != builder leaf_count: %d - %d", leafCount, bldr.leafCount())
}
builders = append(builders, bldr)
}
@@ -392,7 +392,7 @@ func writeDenseArrow(ctx *arrowWriteContext, cw file.ColumnChunkWriter, leafArr
return err
}
} else {
- // no data conversion neccessary
+ // no data conversion necessary
if leafArr.Data().Buffers()[1] != nil {
data = arrow.Int64Traits.CastFromBytes(leafArr.Data().Buffers()[1].Bytes())
data = data[leafArr.Data().Offset() : leafArr.Data().Offset()+leafArr.Len()]
diff --git a/go/parquet/pqarrow/file_reader.go b/go/parquet/pqarrow/file_reader.go
index b608a1099b..a55dbe46e0 100755
--- a/go/parquet/pqarrow/file_reader.go
+++ b/go/parquet/pqarrow/file_reader.go
@@ -293,7 +293,7 @@ type resultPair struct {
err error
}
-//! This is Super complicated. I would simpify the pattern, but it works and hesitant to change what works.
+//! This is Super complicated. I would simplify the pattern, but it works and hesitant to change what works.
// ReadRowGroups is for generating an array.Table from the file but filtering to only read the requested
// columns and row groups rather than the entire file which ReadTable does.
diff --git a/go/parquet/pqarrow/path_builder.go b/go/parquet/pqarrow/path_builder.go
index 57a077956e..6b94205f5d 100644
--- a/go/parquet/pqarrow/path_builder.go
+++ b/go/parquet/pqarrow/path_builder.go
@@ -665,7 +665,7 @@ func fillRepLevels(count int, repLvl int16, ctx *pathWriteCtx) {
fillCount := count
// this condition occurs (rep and def levels equals), in one of a few cases:
- // 1. before any list is encounted
+ // 1. before any list is encountered
// 2. after rep-level has been filled in due to null/empty values above
// 3. after finishing a list
if !ctx.equalRepDeflevlsLen() {
diff --git a/go/parquet/pqarrow/schema.go b/go/parquet/pqarrow/schema.go
index 3322e21b93..ccb3dc0350 100644
--- a/go/parquet/pqarrow/schema.go
+++ b/go/parquet/pqarrow/schema.go
@@ -174,7 +174,7 @@ func getTimestampMeta(typ *arrow.TimestampType, props *parquet.WriterProperties,
return physical, nil, fmt.Errorf("parquet version %s files can only coerce arrow timestamps to millis or micros", props.Version())
}
} else if target == arrow.Second {
- return physical, nil, fmt.Errorf("parquet version %s files can only coerce arrow timestampts to millis, micros or nanos", props.Version())
+ return physical, nil, fmt.Errorf("parquet version %s files can only coerce arrow timestamps to millis, micros or nanos", props.Version())
}
return physical, logicalType, nil
}
diff --git a/go/parquet/pqarrow/schema_test.go b/go/parquet/pqarrow/schema_test.go
index ee5aad8913..bc33663414 100644
--- a/go/parquet/pqarrow/schema_test.go
+++ b/go/parquet/pqarrow/schema_test.go
@@ -386,7 +386,7 @@ func TestListStructBackwardCompatible(t *testing.T) {
// }
// }
//
- // Instaed of the proper 3-level encoding which would be:
+ // Instead of the proper 3-level encoding which would be:
//
// repeated group field_id=-1 schema {
// optional group field_id=-1 answers (List) {
diff --git a/go/parquet/schema/logical_types_test.go b/go/parquet/schema/logical_types_test.go
index c371b47714..0fd91daf8d 100644
--- a/go/parquet/schema/logical_types_test.go
+++ b/go/parquet/schema/logical_types_test.go
@@ -89,10 +89,10 @@ func TestConvertedTypeCompatibility(t *testing.T) {
{"list", schema.NewListLogicalType(), schema.ConvertedTypes.List},
{"enum", schema.EnumLogicalType{}, schema.ConvertedTypes.Enum},
{"date", schema.DateLogicalType{}, schema.ConvertedTypes.Date},
- {"time_milli", schema.NewTimeLogicalType(true /* adjutedToUTC */, schema.TimeUnitMillis), schema.ConvertedTypes.TimeMillis},
- {"time_micro", schema.NewTimeLogicalType(true /* adjutedToUTC */, schema.TimeUnitMicros), schema.ConvertedTypes.TimeMicros},
- {"timestamp_milli", schema.NewTimestampLogicalType(true /* adjutedToUTC */, schema.TimeUnitMillis), schema.ConvertedTypes.TimestampMillis},
- {"timestamp_micro", schema.NewTimestampLogicalType(true /* adjutedToUTC */, schema.TimeUnitMicros), schema.ConvertedTypes.TimestampMicros},
+ {"time_milli", schema.NewTimeLogicalType(true /* adjustedToUTC */, schema.TimeUnitMillis), schema.ConvertedTypes.TimeMillis},
+ {"time_micro", schema.NewTimeLogicalType(true /* adjustedToUTC */, schema.TimeUnitMicros), schema.ConvertedTypes.TimeMicros},
+ {"timestamp_milli", schema.NewTimestampLogicalType(true /* adjustedToUTC */, schema.TimeUnitMillis), schema.ConvertedTypes.TimestampMillis},
+ {"timestamp_micro", schema.NewTimestampLogicalType(true /* adjustedToUTC */, schema.TimeUnitMicros), schema.ConvertedTypes.TimestampMicros},
{"timestamp_milli_opts", schema.NewTimestampLogicalTypeWithOpts(schema.WithTSIsAdjustedToUTC(), schema.WithTSTimeUnitType(schema.TimeUnitMillis)), schema.ConvertedTypes.TimestampMillis},
{"uint8", schema.NewIntLogicalType(8 /* bitWidth */, false /* signed */), schema.ConvertedTypes.Uint8},
{"uint16", schema.NewIntLogicalType(16 /* bitWidth */, false /* signed */), schema.ConvertedTypes.Uint16},
@@ -160,12 +160,12 @@ func TestNewTypeIncompatibility(t *testing.T) {
{"uuid", schema.UUIDLogicalType{}, schema.UUIDLogicalType{}},
{"float16", schema.Float16LogicalType{}, schema.Float16LogicalType{}},
{"null", schema.NullLogicalType{}, schema.NullLogicalType{}},
- {"not-utc-time_milli", schema.NewTimeLogicalType(false /* adjutedToUTC */, schema.TimeUnitMillis), &schema.TimeLogicalType{}},
- {"not-utc-time-micro", schema.NewTimeLogicalType(false /* adjutedToUTC */, schema.TimeUnitMicros), &schema.TimeLogicalType{}},
- {"not-utc-time-nano", schema.NewTimeLogicalType(false /* adjutedToUTC */, schema.TimeUnitNanos), &schema.TimeLogicalType{}},
- {"utc-time-nano", schema.NewTimeLogicalType(true /* adjutedToUTC */, schema.TimeUnitNanos), &schema.TimeLogicalType{}},
- {"not-utc-timestamp-nano", schema.NewTimestampLogicalType(false /* adjutedToUTC */, schema.TimeUnitNanos), &schema.TimestampLogicalType{}},
- {"utc-timestamp-nano", schema.NewTimestampLogicalType(true /* adjutedToUTC */, schema.TimeUnitNanos), &schema.TimestampLogicalType{}},
+ {"not-utc-time_milli", schema.NewTimeLogicalType(false /* adjustedToUTC */, schema.TimeUnitMillis), &schema.TimeLogicalType{}},
+ {"not-utc-time-micro", schema.NewTimeLogicalType(false /* adjustedToUTC */, schema.TimeUnitMicros), &schema.TimeLogicalType{}},
+ {"not-utc-time-nano", schema.NewTimeLogicalType(false /* adjustedToUTC */, schema.TimeUnitNanos), &schema.TimeLogicalType{}},
+ {"utc-time-nano", schema.NewTimeLogicalType(true /* adjustedToUTC */, schema.TimeUnitNanos), &schema.TimeLogicalType{}},
+ {"not-utc-timestamp-nano", schema.NewTimestampLogicalType(false /* adjustedToUTC */, schema.TimeUnitNanos), &schema.TimestampLogicalType{}},
+ {"utc-timestamp-nano", schema.NewTimestampLogicalType(true /* adjustedToUTC */, schema.TimeUnitNanos), &schema.TimestampLogicalType{}},
}
for _, tt := range tests {
@@ -184,8 +184,8 @@ func TestFactoryPanic(t *testing.T) {
name string
f func()
}{
- {"invalid TimeUnit", func() { schema.NewTimeLogicalType(true /* adjutedToUTC */, schema.TimeUnitUnknown) }},
- {"invalid timestamp unit", func() { schema.NewTimestampLogicalType(true /* adjutedToUTC */, schema.TimeUnitUnknown) }},
+ {"invalid TimeUnit", func() { schema.NewTimeLogicalType(true /* adjustedToUTC */, schema.TimeUnitUnknown) }},
+ {"invalid timestamp unit", func() { schema.NewTimestampLogicalType(true /* adjustedToUTC */, schema.TimeUnitUnknown) }},
{"negative bitwidth", func() { schema.NewIntLogicalType(-1 /* bitWidth */, false /* signed */) }},
{"zero bitwidth", func() { schema.NewIntLogicalType(0 /* bitWidth */, false /* signed */) }},
{"bitwidth one", func() { schema.NewIntLogicalType(1 /* bitWidth */, false /* signed */) }},
diff --git a/go/parquet/schema/node.go b/go/parquet/schema/node.go
index ff23624afa..c1b325eb90 100644
--- a/go/parquet/schema/node.go
+++ b/go/parquet/schema/node.go
@@ -148,7 +148,7 @@ type PrimitiveNode struct {
decimalMetaData DecimalMetadata
}
-// NewPrimitiveNodeLogical constructs a Primtive node using the provided logical type for a given
+// NewPrimitiveNodeLogical constructs a Primitive node using the provided logical type for a given
// physical type and typelength.
func NewPrimitiveNodeLogical(name string, repetition parquet.Repetition, logicalType LogicalType, physicalType parquet.Type, typeLen int, id int32) (*PrimitiveNode, error) {
n := &PrimitiveNode{
@@ -165,7 +165,7 @@ func NewPrimitiveNodeLogical(name string, repetition parquet.Repetition, logical
return nil, fmt.Errorf("%s cannot be applied to primitive type %s", logicalType, physicalType)
}
} else {
- return nil, fmt.Errorf("nested logical type %s can not be applied to a non-group node", logicalType)
+ return nil, fmt.Errorf("nested logical type %s cannot be applied to a non-group node", logicalType)
}
} else {
n.logicalType = NoLogicalType{}
@@ -373,7 +373,7 @@ type FieldList []Node
// Len is equivalent to len(fieldlist)
func (f FieldList) Len() int { return len(f) }
-// GroupNode is for mananging nested nodes like List, Map, etc.
+// GroupNode is for managing nested nodes like List, Map, etc.
type GroupNode struct {
node
fields FieldList
diff --git a/go/parquet/schema/reflection.go b/go/parquet/schema/reflection.go
index c0c8e0533e..7f8b337795 100644
--- a/go/parquet/schema/reflection.go
+++ b/go/parquet/schema/reflection.go
@@ -314,7 +314,7 @@ func infoFromTags(f reflect.StructTag) *taggedInfo {
return nil
}
-// typeToNode recurseively converts a physical type and the tag info into parquet Nodes
+// typeToNode recursively converts a physical type and the tag info into parquet Nodes
//
// to avoid having to propagate errors up potentially high numbers of recursive calls
// we use panics and then recover in the public function NewSchemaFromStruct so that a
@@ -639,7 +639,7 @@ func typeFromNode(n Node) reflect.Type {
switch n.Type() {
case Primitive:
typ := parquetTypeToReflect[n.(*PrimitiveNode).PhysicalType()]
- // if a bytearray field is annoted as a String logical type or a UTF8 converted type
+ // if a bytearray field is annotated as a String logical type or a UTF8 converted type
// then use a string instead of parquet.ByteArray / parquet.FixedLenByteArray which are []byte
if n.LogicalType().Equals(StringLogicalType{}) || n.ConvertedType() == ConvertedTypes.UTF8 {
typ = reflect.TypeOf(string(""))
diff --git a/go/parquet/schema/schema_test.go b/go/parquet/schema/schema_test.go
index cc43c3856d..232a386a25 100644
--- a/go/parquet/schema/schema_test.go
+++ b/go/parquet/schema/schema_test.go
@@ -380,7 +380,7 @@ func (s *SchemaConverterSuite) TestZeroColumns() {
func (s *SchemaConverterSuite) TestInvalidRoot() {
// According to the Parquet spec, the first element in the list<SchemaElement>
// is a group whose children (and their descendants) contain all of the rest of
- // the flattened schema elments. If the first element is not a group, it is malformed
+ // the flattened schema elements. If the first element is not a group, it is malformed
elements := []*format.SchemaElement{NewPrimitive("not-a-group" /* name */, format.FieldRepetitionType_REQUIRED,
format.Type_INT32, 0 /* fieldID */), format.NewSchemaElement()}
s.Panics(func() { s.convert(elements) })
diff --git a/go/parquet/types.go b/go/parquet/types.go
index 5b6f8fb025..0020a079d9 100644
--- a/go/parquet/types.go
+++ b/go/parquet/types.go
@@ -295,7 +295,7 @@ var (
Double Type
ByteArray Type
FixedLenByteArray Type
- // this only exists as a convienence so we can denote it when necessary
+ // this only exists as a convenience so we can denote it when necessary
// nearly all functions that take a parquet.Type will error/panic if given
// Undefined
Undefined Type