[llvm] df3b703 - [AArch64] Use llvm::countr_{zero,one} (NFC)

[Kazu Hirata via llvm-commits]

Author: Kazu Hirata
Date: 2023-02-11T17:53:01-08:00
New Revision: df3b703a4c172b522ed2117b2d6e6cb1026fee43

URL: https://github.com/llvm/llvm-project/commit/df3b703a4c172b522ed2117b2d6e6cb1026fee43
DIFF: https://github.com/llvm/llvm-project/commit/df3b703a4c172b522ed2117b2d6e6cb1026fee43.diff

LOG: [AArch64] Use llvm::countr_{zero,one} (NFC)

Added: 
    

Modified: 
    llvm/lib/Target/AArch64/AArch64ExpandImm.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/AArch64/AArch64ExpandImm.cpp b/llvm/lib/Target/AArch64/AArch64ExpandImm.cpp
index efaa5e9c4c339..e9a3eda77eb38 100644
--- a/llvm/lib/Target/AArch64/AArch64ExpandImm.cpp
+++ b/llvm/lib/Target/AArch64/AArch64ExpandImm.cpp
@@ -240,7 +240,7 @@ static bool trySequenceOfOnes(uint64_t UImm,
 }
 
 static uint64_t GetRunOfOnesStartingAt(uint64_t V, uint64_t StartPosition) {
-  uint64_t NumOnes = llvm::countTrailingOnes(V >> StartPosition);
+  uint64_t NumOnes = llvm::countr_one(V >> StartPosition);
 
   uint64_t UnshiftedOnes;
   if (NumOnes == 64) {
@@ -286,7 +286,7 @@ static uint64_t MaximallyReplicateSubImmediate(uint64_t V, uint64_t Subset) {
 static uint64_t maximalLogicalImmWithin(uint64_t RemainingBits,
                                         uint64_t OriginalBits) {
   // Find the first set bit.
-  uint32_t Position = llvm::countTrailingZeros(RemainingBits);
+  uint32_t Position = llvm::countr_zero(RemainingBits);
 
   // Get the first run of set bits.
   uint64_t FirstRun = GetRunOfOnesStartingAt(OriginalBits, Position);
@@ -304,7 +304,7 @@ decomposeIntoOrrOfLogicalImmediates(uint64_t UImm) {
     return std::nullopt;
 
   // Make sure we don't have a run of ones split around the rotation boundary.
-  uint32_t InitialTrailingOnes = llvm::countTrailingOnes(UImm);
+  uint32_t InitialTrailingOnes = llvm::countr_one(UImm);
   uint64_t RotatedBits = rotr(UImm, InitialTrailingOnes);
 
   // Find the largest logical immediate that fits within the full immediate.