Use llvm::count{lr}_{zero,one} (NFC)

Author: kazutakahirata

clang-tools-extra/clangd/SourceCode.cpp

@@ -72,7 +72,7 @@ static bool iterateCodepoints(llvm::StringRef U8, const Callback &CB) {
       continue;
     }
     // This convenient property of UTF-8 holds for all non-ASCII characters.
-    size_t UTF8Length = llvm::countLeadingOnes(C);
+    size_t UTF8Length = llvm::countl_one(C);
     // 0xxx is ASCII, handled above. 10xxx is a trailing byte, invalid here.
     // 11111xxx is not valid UTF-8 at all, maybe some ISO-8859-*.
     if (LLVM_UNLIKELY(UTF8Length < 2 || UTF8Length > 4)) {

clang/include/clang/Basic/TargetBuiltins.h

@@ -243,10 +243,10 @@ namespace clang {
     };
 
     SVETypeFlags(uint64_t F) : Flags(F) {
-      EltTypeShift = llvm::countTrailingZeros(EltTypeMask);
-      MemEltTypeShift = llvm::countTrailingZeros(MemEltTypeMask);
-      MergeTypeShift = llvm::countTrailingZeros(MergeTypeMask);
-      SplatOperandMaskShift = llvm::countTrailingZeros(SplatOperandMask);
+      EltTypeShift = llvm::countr_zero(EltTypeMask);
+      MemEltTypeShift = llvm::countr_zero(MemEltTypeMask);
+      MergeTypeShift = llvm::countr_zero(MergeTypeMask);
+      SplatOperandMaskShift = llvm::countr_zero(SplatOperandMask);
     }
 
     EltType getEltType() const {

clang/include/clang/CodeGen/CGFunctionInfo.h

@@ -742,7 +742,7 @@ class CGFunctionInfo final
   /// Set the maximum vector width in the arguments.
   void setMaxVectorWidth(unsigned Width) {
     assert(llvm::isPowerOf2_32(Width) && "Expected power of 2 vector");
-    MaxVectorWidth = llvm::countTrailingZeros(Width) + 1;
+    MaxVectorWidth = llvm::countr_zero(Width) + 1;
   }
 
   void Profile(llvm::FoldingSetNodeID &ID) {

clang/lib/AST/Interp/Integral.h

@@ -127,9 +127,7 @@ template <unsigned Bits, bool Signed> class Integral final {
     return Compare(V, RHS.V);
   }
 
-  unsigned countLeadingZeros() const {
-    return llvm::countLeadingZeros<ReprT>(V);
-  }
+  unsigned countLeadingZeros() const { return llvm::countl_zero<ReprT>(V); }
 
   Integral truncate(unsigned TruncBits) const {
     if (TruncBits >= Bits)

clang/lib/Basic/SourceManager.cpp

@@ -1302,8 +1302,7 @@ LineOffsetMapping LineOffsetMapping::get(llvm::MemoryBufferRef Buffer,
       // in [\n, \r + 1 [
 
       // Scan for the next newline - it's very likely there's one.
-      unsigned N =
-          llvm::countTrailingZeros(Mask) - 7; // -7 because 0x80 is the marker
+      unsigned N = llvm::countr_zero(Mask) - 7; // -7 because 0x80 is the marker
       Word >>= N;
       Buf += N / 8 + 1;
       unsigned char Byte = Word;

clang/lib/Lex/Lexer.cpp

@@ -2785,7 +2785,7 @@ bool Lexer::SkipBlockComment(Token &Result, const char *CurPtr,
           // Adjust the pointer to point directly after the first slash. It's
           // not necessary to set C here, it will be overwritten at the end of
           // the outer loop.
-          CurPtr += llvm::countTrailingZeros<unsigned>(cmp) + 1;
+          CurPtr += llvm::countr_zero<unsigned>(cmp) + 1;
           goto FoundSlash;
         }
         CurPtr += 16;

clang/lib/StaticAnalyzer/Checkers/PaddingChecker.cpp

@@ -273,7 +273,7 @@ class PaddingChecker : public Checker<check::ASTDecl<TranslationUnitDecl>> {
     SmallVector<const FieldDecl *, 20> OptimalFieldsOrder;
     while (!Fields.empty()) {
       unsigned TrailingZeros =
-          llvm::countTrailingZeros((unsigned long long)NewOffset.getQuantity());
+          llvm::countr_zero((unsigned long long)NewOffset.getQuantity());
       // If NewOffset is zero, then countTrailingZeros will be 64. Shifting
       // 64 will overflow our unsigned long long. Shifting 63 will turn
       // our long long (and CharUnits internal type) negative. So shift 62.

clang/utils/TableGen/SveEmitter.cpp

@@ -298,7 +298,7 @@ class SVEEmitter {
     auto It = FlagTypes.find(MaskName);
     if (It != FlagTypes.end()) {
       uint64_t Mask = It->getValue();
-      unsigned Shift = llvm::countTrailingZeros(Mask);
+      unsigned Shift = llvm::countr_zero(Mask);
       return (V << Shift) & Mask;
     }
     llvm_unreachable("Unsupported flag");

lld/ELF/Arch/ARM.cpp

@@ -432,7 +432,7 @@ static std::pair<uint32_t, uint32_t> getRemAndLZForGroup(unsigned group,
                                                          uint32_t val) {
   uint32_t rem, lz;
   do {
-    lz = llvm::countLeadingZeros(val) & ~1;
+    lz = llvm::countl_zero(val) & ~1;
     rem = val;
     if (lz == 32) // implies rem == 0
       break;

lld/ELF/InputFiles.cpp

@@ -1317,7 +1317,7 @@ static uint64_t getAlignment(ArrayRef<typename ELFT::Shdr> sections,
                              const typename ELFT::Sym &sym) {
   uint64_t ret = UINT64_MAX;
   if (sym.st_value)
-    ret = 1ULL << countTrailingZeros((uint64_t)sym.st_value);
+    ret = 1ULL << llvm::countr_zero((uint64_t)sym.st_value);
   if (0 < sym.st_shndx && sym.st_shndx < sections.size())
     ret = std::min<uint64_t>(ret, sections[sym.st_shndx].sh_addralign);
   return (ret > UINT32_MAX) ? 0 : ret;

lld/ELF/SyntheticSections.cpp

@@ -2782,7 +2782,7 @@ createSymbols(
   // A sharded map to uniquify symbols by name.
   auto map =
       std::make_unique<DenseMap<CachedHashStringRef, size_t>[]>(numShards);
-  size_t shift = 32 - countTrailingZeros(numShards);
+  size_t shift = 32 - llvm::countr_zero(numShards);
 
   // Instantiate GdbSymbols while uniqufying them by name.
   auto symbols = std::make_unique<SmallVector<GdbSymbol, 0>[]>(numShards);

lld/ELF/SyntheticSections.h

@@ -970,7 +970,7 @@ class MergeNoTailSection final : public MergeSyntheticSection {
   // hash collisions.
   size_t getShardId(uint32_t hash) {
     assert((hash >> 31) == 0);
-    return hash >> (31 - llvm::countTrailingZeros(numShards));
+    return hash >> (31 - llvm::countr_zero(numShards));
   }
 
   // Section size

lld/ELF/Writer.cpp

@@ -1111,7 +1111,7 @@ template <class ELFT> void Writer<ELFT>::setReservedSymbolSections() {
 static int getRankProximity(OutputSection *a, SectionCommand *b) {
   auto *osd = dyn_cast<OutputDesc>(b);
   return (osd && osd->osec.hasInputSections)
-             ? countLeadingZeros(a->sortRank ^ osd->osec.sortRank)
+             ? llvm::countl_zero(a->sortRank ^ osd->osec.sortRank)
              : -1;
 }
 

lld/MachO/SyntheticSections.cpp

@@ -1641,7 +1641,7 @@ void CStringSection::finalizeContents() {
       // See comment above DeduplicatedCStringSection for how alignment is
       // handled.
       uint32_t pieceAlign = 1
-                            << countTrailingZeros(isec->align | piece.inSecOff);
+                            << llvm::countr_zero(isec->align | piece.inSecOff);
       offset = alignTo(offset, pieceAlign);
       piece.outSecOff = offset;
       isec->isFinal = true;
@@ -1698,7 +1698,7 @@ void DeduplicatedCStringSection::finalizeContents() {
         continue;
       auto s = isec->getCachedHashStringRef(i);
       assert(isec->align != 0);
-      uint8_t trailingZeros = countTrailingZeros(isec->align | piece.inSecOff);
+      uint8_t trailingZeros = llvm::countr_zero(isec->align | piece.inSecOff);
       auto it = stringOffsetMap.insert(
           std::make_pair(s, StringOffset(trailingZeros)));
       if (!it.second && it.first->second.trailingZeros < trailingZeros)

lld/MachO/UnwindInfoSection.cpp

@@ -405,7 +405,7 @@ void UnwindInfoSectionImpl::encodePersonalities() {
       personalityIndex = personalities.size();
     }
     cu.encoding |=
-        personalityIndex << countTrailingZeros(
+        personalityIndex << llvm::countr_zero(
             static_cast<compact_unwind_encoding_t>(UNWIND_PERSONALITY_MASK));
   }
   if (personalities.size() > 3)

lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp

@@ -605,7 +605,7 @@ static std::optional<RegisterInfo> GetARMDWARFRegisterInfo(unsigned reg_num) {
 // Valid return values are {1, 2, 3, 4}, with 0 signifying an error condition.
 static uint32_t CountITSize(uint32_t ITMask) {
   // First count the trailing zeros of the IT mask.
-  uint32_t TZ = llvm::countTrailingZeros(ITMask);
+  uint32_t TZ = llvm::countr_zero(ITMask);
   if (TZ > 3) {
     return 0;
   }

lldb/source/Symbol/CompactUnwindInfo.cpp

@@ -155,7 +155,7 @@ FLAGS_ANONYMOUS_ENUM(){
 #endif
 
 #define EXTRACT_BITS(value, mask)                                              \
-  ((value >> llvm::countTrailingZeros(static_cast<uint32_t>(mask))) &          \
+  ((value >> llvm::countr_zero(static_cast<uint32_t>(mask))) &                 \
    (((1 << llvm::popcount(static_cast<uint32_t>(mask)))) - 1))
 
 // constructor

llvm/include/llvm/ADT/APInt.h

@@ -1552,7 +1552,7 @@ class [[nodiscard]] APInt {
   unsigned countLeadingZeros() const {
     if (isSingleWord()) {
       unsigned unusedBits = APINT_BITS_PER_WORD - BitWidth;
-      return llvm::countLeadingZeros(U.VAL) - unusedBits;
+      return llvm::countl_zero(U.VAL) - unusedBits;
     }
     return countLeadingZerosSlowCase();
   }
@@ -1569,7 +1569,7 @@ class [[nodiscard]] APInt {
     if (isSingleWord()) {
       if (LLVM_UNLIKELY(BitWidth == 0))
         return 0;
-      return llvm::countLeadingOnes(U.VAL << (APINT_BITS_PER_WORD - BitWidth));
+      return llvm::countl_one(U.VAL << (APINT_BITS_PER_WORD - BitWidth));
     }
     return countLeadingOnesSlowCase();
   }
@@ -1590,7 +1590,7 @@ class [[nodiscard]] APInt {
   /// zeros from the least significant bit to the first one bit.
   unsigned countTrailingZeros() const {
     if (isSingleWord()) {
-      unsigned TrailingZeros = llvm::countTrailingZeros(U.VAL);
+      unsigned TrailingZeros = llvm::countr_zero(U.VAL);
       return (TrailingZeros > BitWidth ? BitWidth : TrailingZeros);
     }
     return countTrailingZerosSlowCase();
@@ -1606,7 +1606,7 @@ class [[nodiscard]] APInt {
   /// of ones from the least significant bit to the first zero bit.
   unsigned countTrailingOnes() const {
     if (isSingleWord())
-      return llvm::countTrailingOnes(U.VAL);
+      return llvm::countr_one(U.VAL);
     return countTrailingOnesSlowCase();
   }
 

llvm/include/llvm/ADT/BitVector.h

@@ -213,7 +213,7 @@ class BitVector {
         Copy &= maskTrailingOnes<BitWord>(LastBit + 1);
       }
       if (Copy != 0)
-        return i * BITWORD_SIZE + countTrailingZeros(Copy);
+        return i * BITWORD_SIZE + llvm::countr_zero(Copy);
     }
     return -1;
   }
@@ -243,7 +243,7 @@ class BitVector {
       }
 
       if (Copy != 0)
-        return (CurrentWord + 1) * BITWORD_SIZE - countLeadingZeros(Copy) - 1;
+        return (CurrentWord + 1) * BITWORD_SIZE - llvm::countl_zero(Copy) - 1;
     }
 
     return -1;
@@ -281,7 +281,7 @@ class BitVector {
 
       if (Copy != ~BitWord(0)) {
         unsigned Result =
-            (CurrentWord + 1) * BITWORD_SIZE - countLeadingOnes(Copy) - 1;
+            (CurrentWord + 1) * BITWORD_SIZE - llvm::countl_one(Copy) - 1;
         return Result < Size ? Result : -1;
       }
     }
@@ -763,7 +763,7 @@ class BitVector {
   }
 
   int next_unset_in_word(int WordIndex, BitWord Word) const {
-    unsigned Result = WordIndex * BITWORD_SIZE + countTrailingOnes(Word);
+    unsigned Result = WordIndex * BITWORD_SIZE + llvm::countr_one(Word);
     return Result < size() ? Result : -1;
   }
 

llvm/include/llvm/ADT/SmallBitVector.h

@@ -232,7 +232,7 @@ class SmallBitVector {
       uintptr_t Bits = getSmallBits();
       if (Bits == 0)
         return -1;
-      return countTrailingZeros(Bits);
+      return llvm::countr_zero(Bits);
     }
     return getPointer()->find_first();
   }
@@ -242,7 +242,7 @@ class SmallBitVector {
       uintptr_t Bits = getSmallBits();
       if (Bits == 0)
         return -1;
-      return NumBaseBits - countLeadingZeros(Bits) - 1;
+      return NumBaseBits - llvm::countl_zero(Bits) - 1;
     }
     return getPointer()->find_last();
   }
@@ -254,7 +254,7 @@ class SmallBitVector {
         return -1;
 
       uintptr_t Bits = getSmallBits();
-      return countTrailingOnes(Bits);
+      return llvm::countr_one(Bits);
     }
     return getPointer()->find_first_unset();
   }
@@ -267,7 +267,7 @@ class SmallBitVector {
       uintptr_t Bits = getSmallBits();
       // Set unused bits.
       Bits |= ~uintptr_t(0) << getSmallSize();
-      return NumBaseBits - countLeadingOnes(Bits) - 1;
+      return NumBaseBits - llvm::countl_one(Bits) - 1;
     }
     return getPointer()->find_last_unset();
   }
@@ -281,7 +281,7 @@ class SmallBitVector {
       Bits &= ~uintptr_t(0) << (Prev + 1);
       if (Bits == 0 || Prev + 1 >= getSmallSize())
         return -1;
-      return countTrailingZeros(Bits);
+      return llvm::countr_zero(Bits);
     }
     return getPointer()->find_next(Prev);
   }
@@ -298,7 +298,7 @@ class SmallBitVector {
 
       if (Bits == ~uintptr_t(0) || Prev + 1 >= getSmallSize())
         return -1;
-      return countTrailingOnes(Bits);
+      return llvm::countr_one(Bits);
     }
     return getPointer()->find_next_unset(Prev);
   }
@@ -316,7 +316,7 @@ class SmallBitVector {
       if (Bits == 0)
         return -1;
 
-      return NumBaseBits - countLeadingZeros(Bits) - 1;
+      return NumBaseBits - llvm::countl_zero(Bits) - 1;
     }
     return getPointer()->find_prev(PriorTo);
   }

llvm/include/llvm/ADT/SparseBitVector.h

@@ -128,7 +128,7 @@ template <unsigned ElementSize = 128> struct SparseBitVectorElement {
   int find_first() const {
     for (unsigned i = 0; i < BITWORDS_PER_ELEMENT; ++i)
       if (Bits[i] != 0)
-        return i * BITWORD_SIZE + countTrailingZeros(Bits[i]);
+        return i * BITWORD_SIZE + llvm::countr_zero(Bits[i]);
     llvm_unreachable("Illegal empty element");
   }
 
@@ -138,7 +138,7 @@ template <unsigned ElementSize = 128> struct SparseBitVectorElement {
       unsigned Idx = BITWORDS_PER_ELEMENT - I - 1;
       if (Bits[Idx] != 0)
         return Idx * BITWORD_SIZE + BITWORD_SIZE -
-               countLeadingZeros(Bits[Idx]) - 1;
+               llvm::countl_zero(Bits[Idx]) - 1;
     }
     llvm_unreachable("Illegal empty element");
   }
@@ -159,12 +159,12 @@ template <unsigned ElementSize = 128> struct SparseBitVectorElement {
     Copy &= ~0UL << BitPos;
 
     if (Copy != 0)
-      return WordPos * BITWORD_SIZE + countTrailingZeros(Copy);
+      return WordPos * BITWORD_SIZE + llvm::countr_zero(Copy);
 
     // Check subsequent words.
     for (unsigned i = WordPos+1; i < BITWORDS_PER_ELEMENT; ++i)
       if (Bits[i] != 0)
-        return i * BITWORD_SIZE + countTrailingZeros(Bits[i]);
+        return i * BITWORD_SIZE + llvm::countr_zero(Bits[i]);
     return -1;
   }
 

llvm/include/llvm/CodeGen/ExecutionDomainFix.h

@@ -102,7 +102,7 @@ struct DomainValue {
 
   /// First domain available.
   unsigned getFirstDomain() const {
-    return countTrailingZeros(AvailableDomains);
+    return llvm::countr_zero(AvailableDomains);
   }
 
   /// Clear this DomainValue and point to next which has all its data.

llvm/include/llvm/CodeGen/TargetRegisterInfo.h

@@ -1255,7 +1255,7 @@ class BitMaskClassIterator {
     // Otherwise look for the first bit set from the right
     // (representation of the class ID is big endian).
     // See getSubClassMask for more details on the representation.
-    unsigned Offset = countTrailingZeros(CurrentChunk);
+    unsigned Offset = llvm::countr_zero(CurrentChunk);
     // Add the Offset to the adjusted base number of this chunk: Idx.
     // This is the ID of the register class.
     ID = Idx + Offset;

llvm/include/llvm/ExecutionEngine/JITLink/JITLink.h

@@ -163,7 +163,7 @@ class Block : public Addressable {
     assert(AlignmentOffset <= MaxAlignmentOffset &&
            "Alignment offset exceeds maximum");
     ContentMutable = false;
-    P2Align = Alignment ? countTrailingZeros(Alignment) : 0;
+    P2Align = Alignment ? llvm::countr_zero(Alignment) : 0;
     this->AlignmentOffset = AlignmentOffset;
   }
 
@@ -180,7 +180,7 @@ class Block : public Addressable {
     assert(AlignmentOffset <= MaxAlignmentOffset &&
            "Alignment offset exceeds maximum");
     ContentMutable = false;
-    P2Align = Alignment ? countTrailingZeros(Alignment) : 0;
+    P2Align = Alignment ? llvm::countr_zero(Alignment) : 0;
     this->AlignmentOffset = AlignmentOffset;
   }
 
@@ -199,7 +199,7 @@ class Block : public Addressable {
     assert(AlignmentOffset <= MaxAlignmentOffset &&
            "Alignment offset exceeds maximum");
     ContentMutable = true;
-    P2Align = Alignment ? countTrailingZeros(Alignment) : 0;
+    P2Align = Alignment ? llvm::countr_zero(Alignment) : 0;
     this->AlignmentOffset = AlignmentOffset;
   }
 
@@ -289,7 +289,7 @@ class Block : public Addressable {
   /// Set the alignment for this content.
   void setAlignment(uint64_t Alignment) {
     assert(isPowerOf2_64(Alignment) && "Alignment must be a power of two");
-    P2Align = Alignment ? countTrailingZeros(Alignment) : 0;
+    P2Align = Alignment ? llvm::countr_zero(Alignment) : 0;
   }
 
   /// Get the alignment offset for this content.