diff options
author | breakneck <breakneck@yandex-team.ru> | 2022-02-10 16:47:58 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:47:58 +0300 |
commit | f860932520ce9bc8540a3c19e84c0109c3437dc5 (patch) | |
tree | c0748b5dcbade83af788c0abfa89c0383d6b779c /library/cpp | |
parent | e2021f9a0e54d13b7c48796318b13b66dc625e74 (diff) | |
download | ydb-f860932520ce9bc8540a3c19e84c0109c3437dc5.tar.gz |
Restoring authorship annotation for <breakneck@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'library/cpp')
-rw-r--r-- | library/cpp/bit_io/bitinput.h | 26 | ||||
-rw-r--r-- | library/cpp/bit_io/bitinput_impl.h | 16 | ||||
-rw-r--r-- | library/cpp/bit_io/bitoutput.h | 8 | ||||
-rw-r--r-- | library/cpp/containers/comptrie/comptrie_impl.h | 10 | ||||
-rw-r--r-- | library/cpp/containers/sorted_vector/sorted_vector.h | 30 | ||||
-rw-r--r-- | library/cpp/deprecated/split/split_iterator.h | 6 | ||||
-rw-r--r-- | library/cpp/deprecated/ya.make | 14 | ||||
-rw-r--r-- | library/cpp/digest/old_crc/crc.h | 2 | ||||
-rw-r--r-- | library/cpp/lfalloc/lf_allocX64.h | 10 | ||||
-rw-r--r-- | library/cpp/logger/system.h | 2 | ||||
-rw-r--r-- | library/cpp/packedtypes/packed.h | 6 | ||||
-rw-r--r-- | library/cpp/sse/sse2neon.h | 52 | ||||
-rw-r--r-- | library/cpp/streams/zc_memory_input/zc_memory_input.h | 4 | ||||
-rw-r--r-- | library/cpp/testing/unittest/utmain.cpp | 2 |
14 files changed, 94 insertions, 94 deletions
diff --git a/library/cpp/bit_io/bitinput.h b/library/cpp/bit_io/bitinput.h index 288f04c96f..85711eb7f9 100644 --- a/library/cpp/bit_io/bitinput.h +++ b/library/cpp/bit_io/bitinput.h @@ -43,7 +43,7 @@ namespace NBitIO { // Read with static number of bits. // Preserves what's in result. template <ui64 bits, typename T> - Y_FORCE_INLINE bool ReadK(T& result, ui64 skipbits) { + Y_FORCE_INLINE bool ReadK(T& result, ui64 skipbits) { ui64 r64 = 0; bool ret = bits <= 56 ? ReadKImpl<bits>(r64) : ReadSafe(r64, bits); CopyToResultK<bits>(result, r64, skipbits); @@ -53,7 +53,7 @@ namespace NBitIO { // Read with static number of bits. // Zeroes other bits in result. template <ui64 bits, typename T> - Y_FORCE_INLINE bool ReadK(T& result) { + Y_FORCE_INLINE bool ReadK(T& result) { ui64 r = 0; bool res = ReadK<bits>(r); result = r; @@ -62,7 +62,7 @@ namespace NBitIO { // Shortcut to impl. template <ui64 bits> - Y_FORCE_INLINE bool ReadK(ui64& result) { + Y_FORCE_INLINE bool ReadK(ui64& result) { if (bits <= 56) return ReadKImpl<bits>(result); @@ -80,7 +80,7 @@ namespace NBitIO { // It's safe to read up to 64 bits. // Zeroes other bits in result. template <typename T> - Y_FORCE_INLINE bool ReadSafe(T& result, ui64 bits) { + Y_FORCE_INLINE bool ReadSafe(T& result, ui64 bits) { if (bits <= 56ULL) return Read(result, bits); @@ -98,7 +98,7 @@ namespace NBitIO { // It's safe to read up to 64 bits. // Preserves what's in result. template <typename T> - Y_FORCE_INLINE bool ReadSafe(T& result, ui64 bits, ui64 skipbits) { + Y_FORCE_INLINE bool ReadSafe(T& result, ui64 bits, ui64 skipbits) { ui64 r64 = 0; bool ret = ReadSafe(r64, bits); CopyToResult(result, r64, bits, skipbits); @@ -108,7 +108,7 @@ namespace NBitIO { // Do not try to read more than 56 bits at once. Split in two reads or use ReadSafe. // Zeroes other bits in result. template <typename T> - Y_FORCE_INLINE bool Read(T& result, ui64 bits) { + Y_FORCE_INLINE bool Read(T& result, ui64 bits) { ui64 r64 = 0; bool ret = ReadImpl(r64, bits); result = r64; @@ -116,14 +116,14 @@ namespace NBitIO { } // Shortcut to impl. - Y_FORCE_INLINE bool Read(ui64& result, ui64 bits) { + Y_FORCE_INLINE bool Read(ui64& result, ui64 bits) { return ReadImpl(result, bits); } // Do not try to read more than 56 bits at once. Split in two reads or use ReadSafe. // Preserves what's in result. template <typename T> - Y_FORCE_INLINE bool Read(T& result, ui64 bits, ui64 skipbits) { + Y_FORCE_INLINE bool Read(T& result, ui64 bits, ui64 skipbits) { ui64 r64 = 0; bool ret = ReadImpl(r64, bits); CopyToResult(result, r64, bits, skipbits); @@ -134,7 +134,7 @@ namespace NBitIO { // Like this: (unsigned char)0x2E<3> (0010 1110) <=> 1110 0101 // fddd fddd template <ui64 bits, typename T> - Y_FORCE_INLINE bool ReadWords(T& result) { + Y_FORCE_INLINE bool ReadWords(T& result) { ui64 r64 = 0; bool retCode = ReadWordsImpl<bits>(r64); @@ -145,22 +145,22 @@ namespace NBitIO { // Shortcut to impl. template <ui64 bits> - Y_FORCE_INLINE bool ReadWords(ui64& result) { + Y_FORCE_INLINE bool ReadWords(ui64& result) { return ReadWordsImpl<bits>(result); } - Y_FORCE_INLINE bool Back(int bits) { + Y_FORCE_INLINE bool Back(int bits) { return Seek(BitOffset() - bits); } - Y_FORCE_INLINE bool Seek(int bitoffset) { + Y_FORCE_INLINE bool Seek(int bitoffset) { return TBitInputImpl::Seek(bitoffset); } // A way to read a portion of bits at random location. // Didn't want to complicate sequential read, neither to copypaste. template <typename T> - Y_FORCE_INLINE bool ReadRandom(ui64 bitoffset, T& result, ui64 bits, ui64 skipbits) { + Y_FORCE_INLINE bool ReadRandom(ui64 bitoffset, T& result, ui64 bits, ui64 skipbits) { const ui64 curr = BitOffset(); Seek(bitoffset); bool ret = ReadSafe<T>(result, bits, skipbits); diff --git a/library/cpp/bit_io/bitinput_impl.h b/library/cpp/bit_io/bitinput_impl.h index 0a5320790c..b13fbef101 100644 --- a/library/cpp/bit_io/bitinput_impl.h +++ b/library/cpp/bit_io/bitinput_impl.h @@ -32,7 +32,7 @@ namespace NBitIO { protected: template <ui32 bits> - Y_FORCE_INLINE bool ReadKImpl(ui64& result) { + Y_FORCE_INLINE bool ReadKImpl(ui64& result) { result = (ReadUnaligned<ui64>((const void*)(Start + (BOffset >> 3))) >> (BOffset & 7)) & Mask64(bits); BOffset += bits; if (BOffset < FakeStart) @@ -46,7 +46,7 @@ namespace NBitIO { return true; } - Y_FORCE_INLINE bool ReadImpl(ui64& result, ui32 bits) { + Y_FORCE_INLINE bool ReadImpl(ui64& result, ui32 bits) { result = (ReadUnaligned<ui64>((const void*)(Start + (BOffset >> 3))) >> (BOffset & 7)) & MaskLowerBits(bits); BOffset += bits; if (BOffset < FakeStart) @@ -60,15 +60,15 @@ namespace NBitIO { return true; } - Y_FORCE_INLINE bool EofImpl() const { + Y_FORCE_INLINE bool EofImpl() const { return BOffset >= Length; } - Y_FORCE_INLINE ui64 BitOffset() const { + Y_FORCE_INLINE ui64 BitOffset() const { return BOffset; } - Y_FORCE_INLINE bool Seek(i64 offset) { + Y_FORCE_INLINE bool Seek(i64 offset) { if (offset < 0 || offset > (i64)Length) return false; BOffset = offset; @@ -78,18 +78,18 @@ namespace NBitIO { protected: template <ui64 bits, typename T> - Y_FORCE_INLINE static void CopyToResultK(T& result, ui64 r64, ui64 skipbits) { + Y_FORCE_INLINE static void CopyToResultK(T& result, ui64 r64, ui64 skipbits) { result = (result & ~(Mask64(bits) << skipbits)) | (r64 << skipbits); } template <typename T> - Y_FORCE_INLINE static void CopyToResult(T& result, ui64 r64, ui64 bits, ui64 skipbits) { + Y_FORCE_INLINE static void CopyToResult(T& result, ui64 r64, ui64 bits, ui64 skipbits) { result = (result & InverseMaskLowerBits(bits, skipbits)) | (r64 << skipbits); } public: template <ui64 bits> - Y_FORCE_INLINE bool ReadWordsImpl(ui64& data) { + Y_FORCE_INLINE bool ReadWordsImpl(ui64& data) { data = 0; const ui64 haveMore = NthBit64(bits); diff --git a/library/cpp/bit_io/bitoutput.h b/library/cpp/bit_io/bitoutput.h index edadc5da0c..2b886c1f02 100644 --- a/library/cpp/bit_io/bitoutput.h +++ b/library/cpp/bit_io/bitoutput.h @@ -51,7 +51,7 @@ namespace NBitIO { // interface // Write "bits" lower bits. - Y_FORCE_INLINE void Write(ui64 data, ui64 bits) { + Y_FORCE_INLINE void Write(ui64 data, ui64 bits) { if (FreeBits < bits) { if (FreeBits) { bits -= FreeBits; @@ -70,7 +70,7 @@ namespace NBitIO { } // Write "bits" lower bits starting from "skipbits" bit. - Y_FORCE_INLINE void Write(ui64 data, ui64 bits, ui64 skipbits) { + Y_FORCE_INLINE void Write(ui64 data, ui64 bits, ui64 skipbits) { Write(data >> skipbits, bits); } @@ -78,7 +78,7 @@ namespace NBitIO { // Like this: (unsigned char)0x2E<3> (0000 0010 1110) <=> 1110 0101 // fddd fddd template <ui64 bits> - Y_FORCE_INLINE void WriteWords(ui64 data) { + Y_FORCE_INLINE void WriteWords(ui64 data) { do { ui64 part = data; @@ -88,7 +88,7 @@ namespace NBitIO { } while (data); } - Y_FORCE_INLINE ui64 /* padded bits */ Flush() { + Y_FORCE_INLINE ui64 /* padded bits */ Flush() { const ui64 ubytes = 8ULL - (FreeBits >> 3ULL); if (ubytes) { diff --git a/library/cpp/containers/comptrie/comptrie_impl.h b/library/cpp/containers/comptrie/comptrie_impl.h index a2b1f8f124..f41c38311a 100644 --- a/library/cpp/containers/comptrie/comptrie_impl.h +++ b/library/cpp/containers/comptrie/comptrie_impl.h @@ -15,11 +15,11 @@ namespace NCompactTrie { const size_t MT_LEFTSHIFT = 3; const size_t MT_RIGHTSHIFT = 0; - Y_FORCE_INLINE size_t UnpackOffset(const char* p, size_t len); + Y_FORCE_INLINE size_t UnpackOffset(const char* p, size_t len); size_t MeasureOffset(size_t offset); size_t PackOffset(char* buffer, size_t offset); static inline ui64 ArcSaveOffset(size_t offset, IOutputStream& os); - Y_FORCE_INLINE char LeapByte(const char*& datapos, const char* dataend, char label); + Y_FORCE_INLINE char LeapByte(const char*& datapos, const char* dataend, char label); template <class T> inline static size_t ExtraBits() { @@ -103,7 +103,7 @@ namespace NCompactTrie { // Unpack the offset to the next node. The encoding scheme can store offsets // up to 7 bytes; whether they fit into size_t is another issue. - Y_FORCE_INLINE size_t UnpackOffset(const char* p, size_t len) { + Y_FORCE_INLINE size_t UnpackOffset(const char* p, size_t len) { size_t result = 0; while (len--) @@ -116,7 +116,7 @@ namespace NCompactTrie { // to the position immediately preceding the value for the link just traversed (if any); // returns flags associated with the link. If no arc with the required label is present, // zeroes the data pointer. - Y_FORCE_INLINE char LeapByte(const char*& datapos, const char* dataend, char label) { + Y_FORCE_INLINE char LeapByte(const char*& datapos, const char* dataend, char label) { while (datapos < dataend) { size_t offsetlength, offset; const char* startpos = datapos; @@ -183,7 +183,7 @@ namespace NCompactTrie { // otherwise sets it to nullptr. // Returns true if the symbol was succesfully found in the trie, false otherwise. template <typename TSymbol, class TPacker> - Y_FORCE_INLINE bool Advance(const char*& datapos, const char* const dataend, const char*& value, + Y_FORCE_INLINE bool Advance(const char*& datapos, const char* const dataend, const char*& value, TSymbol label, TPacker packer) { Y_ASSERT(datapos < dataend); char flags = MT_NEXT; diff --git a/library/cpp/containers/sorted_vector/sorted_vector.h b/library/cpp/containers/sorted_vector/sorted_vector.h index ef709bf782..123539af9e 100644 --- a/library/cpp/containers/sorted_vector/sorted_vector.h +++ b/library/cpp/containers/sorted_vector/sorted_vector.h @@ -106,7 +106,7 @@ namespace NSorted { } // STL-compatible synonym - Y_FORCE_INLINE iterator insert(const value_type& value) { + Y_FORCE_INLINE iterator insert(const value_type& value) { return this->Insert(value); } @@ -119,7 +119,7 @@ namespace NSorted { // STL-compatible synonym template <class TIter> - Y_FORCE_INLINE void insert(TIter first, TIter last) { + Y_FORCE_INLINE void insert(TIter first, TIter last) { this->Insert(first, last); } @@ -136,7 +136,7 @@ namespace NSorted { } // STL-compatible synonym - Y_FORCE_INLINE std::pair<iterator, bool> insert_unique(const value_type& value) { + Y_FORCE_INLINE std::pair<iterator, bool> insert_unique(const value_type& value) { return this->InsertUnique(value); } @@ -150,7 +150,7 @@ namespace NSorted { // STL-compatible synonym template <class TIter> - Y_FORCE_INLINE void insert_unique(TIter first, TIter last) { + Y_FORCE_INLINE void insert_unique(TIter first, TIter last) { this->InsertUnique(first, last); } @@ -166,25 +166,25 @@ namespace NSorted { } // STL-compatible synonym - Y_FORCE_INLINE iterator insert_or_replace(const value_type& value) { + Y_FORCE_INLINE iterator insert_or_replace(const value_type& value) { return this->InsertOrReplace(value); } - Y_FORCE_INLINE void Sort() { + Y_FORCE_INLINE void Sort() { ::Sort(TBase::begin(), TBase::end(), TKeyCompare()); } // STL-compatible synonym - Y_FORCE_INLINE void sort() { + Y_FORCE_INLINE void sort() { this->Sort(); } - Y_FORCE_INLINE void Sort(iterator from, iterator to) { + Y_FORCE_INLINE void Sort(iterator from, iterator to) { ::Sort(from, to, TKeyCompare()); } // STL-compatible synonym - Y_FORCE_INLINE void sort(iterator from, iterator to) { + Y_FORCE_INLINE void sort(iterator from, iterator to) { this->Sort(from, to); } @@ -193,7 +193,7 @@ namespace NSorted { } // STL-compatible synonym - Y_FORCE_INLINE void make_unique() { + Y_FORCE_INLINE void make_unique() { this->MakeUnique(); } @@ -310,7 +310,7 @@ namespace NSorted { } // STL-compatible synonym - Y_FORCE_INLINE void erase(const key_type& key) { + Y_FORCE_INLINE void erase(const key_type& key) { this->Erase(key); } @@ -455,24 +455,24 @@ namespace NSorted { // Inserts value with unique key. Returns <iterator, bool> pair, // where the first member is the pointer to the inserted/existing value, and the // second member indicates either the value is inserted or not. - Y_FORCE_INLINE std::pair<iterator, bool> Insert(const TValueType& value) { + Y_FORCE_INLINE std::pair<iterator, bool> Insert(const TValueType& value) { return TBase::InsertUnique(value); } // STL-compatible synonym - Y_FORCE_INLINE std::pair<iterator, bool> insert(const TValueType& value) { + Y_FORCE_INLINE std::pair<iterator, bool> insert(const TValueType& value) { return TBase::InsertUnique(value); } // Inserts value range with unique keys. template <class TIter> - Y_FORCE_INLINE void Insert(TIter first, TIter last) { + Y_FORCE_INLINE void Insert(TIter first, TIter last) { TBase::InsertUnique(first, last); } // STL-compatible synonym template <class TIter> - Y_FORCE_INLINE void insert(TIter first, TIter last) { + Y_FORCE_INLINE void insert(TIter first, TIter last) { TBase::InsertUnique(first, last); } }; diff --git a/library/cpp/deprecated/split/split_iterator.h b/library/cpp/deprecated/split/split_iterator.h index d9b8c63858..0eacc29228 100644 --- a/library/cpp/deprecated/split/split_iterator.h +++ b/library/cpp/deprecated/split/split_iterator.h @@ -63,7 +63,7 @@ private: public: explicit TSplitDelimiters(const char* s); - Y_FORCE_INLINE bool IsDelimiter(ui8 ch) const { + Y_FORCE_INLINE bool IsDelimiter(ui8 ch) const { return Delims[ch]; } }; @@ -80,11 +80,11 @@ public: TSplitBase(const char* str, size_t length); TSplitBase(const TString& s); - Y_FORCE_INLINE const char* GetString() const { + Y_FORCE_INLINE const char* GetString() const { return Str; } - Y_FORCE_INLINE size_t GetLength() const { + Y_FORCE_INLINE size_t GetLength() const { return Len; } diff --git a/library/cpp/deprecated/ya.make b/library/cpp/deprecated/ya.make index 0db584e196..6c753f68a9 100644 --- a/library/cpp/deprecated/ya.make +++ b/library/cpp/deprecated/ya.make @@ -1,17 +1,17 @@ RECURSE( - abstract_iterator - abstract_iterator/ut + abstract_iterator + abstract_iterator/ut accessors accessors/ut autoarray base64 datafile - dater_old - dater_old/ut + dater_old + dater_old/ut enum_codegen enum_codegen/ut - fgood - fgood/ut + fgood + fgood/ut histogram ipreg1 ipreg1/ut @@ -22,7 +22,7 @@ RECURSE( kmp/ut mapped_file mapped_file/ut - mbitmap + mbitmap omni text_norm omni/print_omni diff --git a/library/cpp/digest/old_crc/crc.h b/library/cpp/digest/old_crc/crc.h index ef548cea35..4a3ce6d05e 100644 --- a/library/cpp/digest/old_crc/crc.h +++ b/library/cpp/digest/old_crc/crc.h @@ -20,7 +20,7 @@ inline ui16 crc16(const char* buf, size_t buflen, ui32 crcinit = CRC16INIT) { } struct IdTR { - Y_FORCE_INLINE static ui8 T(ui8 a) { + Y_FORCE_INLINE static ui8 T(ui8 a) { return a; } }; diff --git a/library/cpp/lfalloc/lf_allocX64.h b/library/cpp/lfalloc/lf_allocX64.h index 613cb8dab3..fd2a906d6f 100644 --- a/library/cpp/lfalloc/lf_allocX64.h +++ b/library/cpp/lfalloc/lf_allocX64.h @@ -29,7 +29,7 @@ #define PERTHREAD __declspec(thread) #define _win_ -#define Y_FORCE_INLINE __forceinline +#define Y_FORCE_INLINE __forceinline using TAtomic = volatile long; @@ -293,7 +293,7 @@ enum ELFAllocCounter { CT_MAX }; -static Y_FORCE_INLINE void IncrementCounter(ELFAllocCounter counter, size_t value); +static Y_FORCE_INLINE void IncrementCounter(ELFAllocCounter counter, size_t value); ////////////////////////////////////////////////////////////////////////// enum EMMapMode { @@ -1011,20 +1011,20 @@ struct TLocalCounter { int Updates; TAtomic* Parent; - Y_FORCE_INLINE void Init(TAtomic* parent) { + Y_FORCE_INLINE void Init(TAtomic* parent) { Parent = parent; Value = 0; Updates = 0; } - Y_FORCE_INLINE void Increment(size_t value) { + Y_FORCE_INLINE void Increment(size_t value) { Value += value; if (++Updates > MAX_LOCAL_UPDATES || Value > MAX_LOCAL_DELTA) { Flush(); } } - Y_FORCE_INLINE void Flush() { + Y_FORCE_INLINE void Flush() { AtomicAdd(*Parent, Value); Value = 0; Updates = 0; diff --git a/library/cpp/logger/system.h b/library/cpp/logger/system.h index dfa361ba66..b8c60b3023 100644 --- a/library/cpp/logger/system.h +++ b/library/cpp/logger/system.h @@ -11,7 +11,7 @@ SysLogInstance().ResetBackend(THolder<TLogBackend>( \ (ident) ? (TLogBackend*)(new TSysLogBackend((ident), (facility), (flags))) : (TLogBackend*)(new TNullLogBackend())));\ } \ - } Y_CAT(loginit, __LINE__); + } Y_CAT(loginit, __LINE__); #define YSYSLOGINIT(ident, facility) YSYSLOGINIT_FLAGS((ident), (facility), 0) diff --git a/library/cpp/packedtypes/packed.h b/library/cpp/packedtypes/packed.h index d5d617613e..88cff26ae2 100644 --- a/library/cpp/packedtypes/packed.h +++ b/library/cpp/packedtypes/packed.h @@ -52,15 +52,15 @@ struct TZCMemoryInput_traits { return get<ui8>(in); } - static ui16 Y_FORCE_INLINE get_16(TZCMemoryInput& in) { + static ui16 Y_FORCE_INLINE get_16(TZCMemoryInput& in) { return get<ui16>(in); } - static ui32 Y_FORCE_INLINE get_32(TZCMemoryInput& in) { + static ui32 Y_FORCE_INLINE get_32(TZCMemoryInput& in) { return get<ui32>(in); } - static int Y_FORCE_INLINE is_good(TZCMemoryInput&) { + static int Y_FORCE_INLINE is_good(TZCMemoryInput&) { return 1; } }; diff --git a/library/cpp/sse/sse2neon.h b/library/cpp/sse/sse2neon.h index 8901c5a9d7..695dbd3041 100644 --- a/library/cpp/sse/sse2neon.h +++ b/library/cpp/sse/sse2neon.h @@ -165,12 +165,12 @@ template <typename TValue> struct TBaseWrapper { TValue Value; - Y_FORCE_INLINE + Y_FORCE_INLINE operator TValue&() { return Value; } - Y_FORCE_INLINE + Y_FORCE_INLINE operator const TValue&() const { return Value; } @@ -179,7 +179,7 @@ struct TBaseWrapper { template <typename TOp, typename TFunc, TFunc* func, typename TDup, TDup* dupfunc> struct TWrapperSingleDup: public TBaseWrapper<__m128i> { - Y_FORCE_INLINE + Y_FORCE_INLINE TWrapperSingleDup(const __m128i& op, const int shift) { TQType<TOp>::As(Value) = func(TQType<TOp>::As(op), dupfunc(shift)); } @@ -188,7 +188,7 @@ struct TWrapperSingleDup: public TBaseWrapper<__m128i> { template <typename TOp, typename TFunc, TFunc* func, typename TDup, TDup* dupfunc> struct TWrapperSingleNegDup: public TBaseWrapper<__m128i> { - Y_FORCE_INLINE + Y_FORCE_INLINE TWrapperSingleNegDup(const __m128i& op, const int shift) { TQType<TOp>::As(Value) = func(TQType<TOp>::As(op), dupfunc(-shift)); } @@ -267,7 +267,7 @@ using _mm_slli_epi64 = template <typename TOp, typename TFunc, TFunc* func, typename... TParams> struct TWrapperDual : TBaseWrapper<__m128i> { - Y_FORCE_INLINE + Y_FORCE_INLINE TWrapperDual(const __m128i& op1, const __m128i& op2, TParams... params) { TQType<TOp>::As(Value) = (TOp) func(TQType<TOp>::As(op1), @@ -278,7 +278,7 @@ struct TWrapperDual : TBaseWrapper<__m128i> { template <typename TOp, typename TFunc, TFunc* func, typename... TParams> struct TWrapperDualSwap : TBaseWrapper<__m128i> { - Y_FORCE_INLINE + Y_FORCE_INLINE TWrapperDualSwap(const __m128i& op1, const __m128i& op2, TParams... params) { TQType<TOp>::As(Value) = func(TQType<TOp>::As(op2), @@ -289,7 +289,7 @@ struct TWrapperDualSwap : TBaseWrapper<__m128i> { template <typename TOp, typename TFunc, TFunc* func, typename TArgument = __m128> struct TWrapperDualF : TBaseWrapper<TArgument> { - Y_FORCE_INLINE + Y_FORCE_INLINE TWrapperDualF(const TArgument& op1, const TArgument& op2) { TQType<TOp>::As(TBaseWrapper<TArgument>::Value) = (TOp) func(TQType<TOp>::As(op1), TQType<TOp>::As(op2)); } @@ -412,7 +412,7 @@ _mm_store_si128(__m128i* ptr, const __m128i& op) { template <typename TOp, typename TFunc, TFunc* func, typename... TParams> struct TWrapperSimple : TBaseWrapper<__m128i> { - Y_FORCE_INLINE + Y_FORCE_INLINE TWrapperSimple(TParams... params) { TQType<TOp>::As(Value) = func(params...); } @@ -420,7 +420,7 @@ struct TWrapperSimple : TBaseWrapper<__m128i> { template <typename TOp, typename TFunc, TFunc* func, typename... TParams> struct TWrapperSimpleF : TBaseWrapper<__m128> { - Y_FORCE_INLINE + Y_FORCE_INLINE TWrapperSimpleF(TParams... params) { TQType<TOp>::As(Value) = func(params...); } @@ -434,14 +434,14 @@ using _mm_set1_epi32 = TWrapperSimple<int32x4_t, decltype(vdupq_n_s32), vdupq_n_s32, const ui32>; struct _mm_setzero_si128 : TBaseWrapper<__m128i> { - Y_FORCE_INLINE + Y_FORCE_INLINE _mm_setzero_si128() { TQType<uint64x2_t>::As(Value) = vdupq_n_u64(0); } }; struct _mm_loadl_epi64 : TBaseWrapper<__m128i> { - Y_FORCE_INLINE + Y_FORCE_INLINE _mm_loadl_epi64(const __m128i* p) { uint64x1_t im = vld1_u64((const uint64_t*)p); TQType<uint64x2_t>::As(Value) = vcombine_u64(im, vdup_n_u64(0)); @@ -449,7 +449,7 @@ struct _mm_loadl_epi64 : TBaseWrapper<__m128i> { }; struct _mm_storel_epi64 : TBaseWrapper<__m128i> { - Y_FORCE_INLINE + Y_FORCE_INLINE _mm_storel_epi64(__m128i* a, __m128i op) { vst1_u64((uint64_t*)a, vget_low_u64(op.AsUi64x2)); } @@ -502,7 +502,7 @@ _mm_movemask_epi8(const __m128i& op) { template <int imm> struct THelper_mm_srli_si128 : TBaseWrapper<__m128i> { - Y_FORCE_INLINE + Y_FORCE_INLINE THelper_mm_srli_si128(const __m128i a) { const auto zero = vdupq_n_u8(0); TQType<uint8x16_t>::As(Value) = vextq_u8(a.AsUi8x16, zero, imm); @@ -533,7 +533,7 @@ inline uint8x16_t vextq_u8_function<16>(uint8x16_t /* a */, uint8x16_t b) { template <int imm> struct THelper_mm_slli_si128 : TBaseWrapper<__m128i> { - Y_FORCE_INLINE + Y_FORCE_INLINE THelper_mm_slli_si128(const __m128i a) { auto zero = vdupq_n_u8(0); TQType<uint8x16_t>::As(Value) = vextq_u8_function<16 - imm>(zero, a.AsUi8x16); @@ -547,7 +547,7 @@ Y_FORCE_INLINE int _mm_cvtsi128_si32(const __m128i& op) { } struct _mm_set_epi16 : TBaseWrapper<__m128i> { - Y_FORCE_INLINE + Y_FORCE_INLINE _mm_set_epi16(const short w7, const short w6, const short w5, const short w4, const short w3, const short w2, @@ -571,7 +571,7 @@ struct _mm_setr_epi16 : TBaseWrapper<__m128i> { }; struct _mm_set_epi32 : TBaseWrapper<__m128i> { - Y_FORCE_INLINE + Y_FORCE_INLINE _mm_set_epi32(const int x3, const int x2, const int x1, const int x0) { int32x2_t d0 = {x0, x1}; @@ -591,7 +591,7 @@ struct _mm_setr_epi32 : TBaseWrapper<__m128i> { }; struct _mm_cvtsi32_si128 : TBaseWrapper<__m128i> { - Y_FORCE_INLINE + Y_FORCE_INLINE _mm_cvtsi32_si128(int op) { auto zero = vdupq_n_s32(0); TQType<int32x4_t>::As(Value) = vsetq_lane_s32(op, zero, 0); @@ -610,7 +610,7 @@ template <typename TOpOut, typename TOpIn, typename TFunc, TFunc* func, typename TCombine, TCombine* combine> struct TCombineWrapper : TBaseWrapper<__m128i> { - Y_FORCE_INLINE + Y_FORCE_INLINE TCombineWrapper(const __m128i op1, const __m128i op2) { TQType<TOpOut>::As(Value) = combine(func(TQType<TOpIn>::As(op1)), @@ -634,7 +634,7 @@ using _mm_packus_epi16 = template <typename TOpOut, typename TOpIn, typename TFunc, TFunc* func, typename... TParams> struct TScalarOutWrapper : TBaseWrapper<TOpOut> { - Y_FORCE_INLINE + Y_FORCE_INLINE TScalarOutWrapper(const __m128i op, TParams... params) { TBaseWrapper<TOpOut>::Value = func(TQType<TOpIn>::As(op), params...); @@ -667,7 +667,7 @@ long long extract_epi64_arm(__m128i arg) { #define _mm_extract_epi64(op, imm) extract_epi64_arm<imm>(op) #define _mm_extract_ps(op, imm) _mm_extract_epi32(op, imm) -static Y_FORCE_INLINE +static Y_FORCE_INLINE __m128i _mm_mul_epu32(__m128i op1, __m128i op2) { __m128i result; uint32x4_t r1 = vuzp1q_u32(op1.AsUi32x4, op2.AsUi32x4); @@ -728,7 +728,7 @@ using _mm_set_ps1 = TWrapperSimpleF<float32x4_t, decltype(vdupq_n_f32), vdupq_n_f32, const float>; struct _mm_setzero_ps : TBaseWrapper<__m128> { - Y_FORCE_INLINE + Y_FORCE_INLINE _mm_setzero_ps() { TQType<float32x4_t>::As(Value) = vdupq_n_f32(0.); } @@ -759,7 +759,7 @@ Y_FORCE_INLINE void _mm_store_ps(float* ptr, const __m128& op) { } struct _mm_set_ps : TBaseWrapper<__m128> { - Y_FORCE_INLINE + Y_FORCE_INLINE _mm_set_ps(const float x3, const float x2, const float x1, const float x0) { float32x2_t d0 = {x0, x1}; @@ -803,7 +803,7 @@ using _mm_mul_pd = TWrapperDualF<float64x2_t, decltype(vmulq_f64), vmulq_f64, __ using _mm_div_pd = TWrapperDualF<float64x2_t, decltype(vdivq_f64), vdivq_f64, __m128d>; struct _mm_and_ps : TBaseWrapper<__m128> { - Y_FORCE_INLINE + Y_FORCE_INLINE _mm_and_ps(const __m128& op1, const __m128& op2) { TQType<uint64x2_t>::As(Value) = vandq_u64(TQType<uint64x2_t>::As(op1), @@ -842,7 +842,7 @@ Y_FORCE_INLINE __m128i _mm_castps_si128(__m128 op) { template <typename TOpOut, typename TOpIn, typename TFunc, TFunc* func, typename... TParams> struct TCvtS2FWrapperSingle : TBaseWrapper<__m128> { - Y_FORCE_INLINE + Y_FORCE_INLINE TCvtS2FWrapperSingle(const __m128i& op, TParams... params) { TQType<TOpOut>::As(Value) = func(TQType<TOpIn>::As(op), params...); @@ -856,7 +856,7 @@ using _mm_cvtepi32_ps = template <typename TOpOut, typename TOpIn, typename TFunc, TFunc* func, typename... TParams> struct TCvtF2SWrapperSingle : TBaseWrapper<__m128i> { - Y_FORCE_INLINE + Y_FORCE_INLINE TCvtF2SWrapperSingle(const __m128& op, TParams... params) { TQType<TOpOut>::As(Value) = func(TQType<TOpIn>::As(op), params...); @@ -887,7 +887,7 @@ _mm_movemask_ps(const __m128& op) { return vaddvq_u32(bits); } -Y_FORCE_INLINE i64 _mm_cvtsi128_si64(__m128i a) { +Y_FORCE_INLINE i64 _mm_cvtsi128_si64(__m128i a) { return vgetq_lane_s64(a.AsSi64x2, 0); } diff --git a/library/cpp/streams/zc_memory_input/zc_memory_input.h b/library/cpp/streams/zc_memory_input/zc_memory_input.h index 61a6686894..c939d8e426 100644 --- a/library/cpp/streams/zc_memory_input/zc_memory_input.h +++ b/library/cpp/streams/zc_memory_input/zc_memory_input.h @@ -21,7 +21,7 @@ public: } /// if there's 'size' data read it, otherwise just return false - Y_FORCE_INLINE bool ReadFixed(const char*& buf, size_t size) { + Y_FORCE_INLINE bool ReadFixed(const char*& buf, size_t size) { if (Avail() >= size) { buf = Buf(); Reset(Buf() + size, Avail() - size); @@ -42,7 +42,7 @@ public: } template <class T> - Y_FORCE_INLINE void ReadPOD(T& x) { + Y_FORCE_INLINE void ReadPOD(T& x) { x = LoadPOD<T>(); } }; diff --git a/library/cpp/testing/unittest/utmain.cpp b/library/cpp/testing/unittest/utmain.cpp index afac0afe09..305bc6b40f 100644 --- a/library/cpp/testing/unittest/utmain.cpp +++ b/library/cpp/testing/unittest/utmain.cpp @@ -55,7 +55,7 @@ class TNullTraceWriterProcessor: public ITestSuiteProcessor { class TTraceWriterProcessor: public ITestSuiteProcessor { public: - inline TTraceWriterProcessor(const char* traceFilePath, EOpenMode mode) + inline TTraceWriterProcessor(const char* traceFilePath, EOpenMode mode) : PrevTime(TInstant::Now()) { TraceFile = new TUnbufferedFileOutput(TFile(traceFilePath, mode | WrOnly | Seq)); |