Index: llvm/lib/Target/AArch64/AArch64TargetTransformInfo.cpp
===================================================================
--- llvm/lib/Target/AArch64/AArch64TargetTransformInfo.cpp
+++ llvm/lib/Target/AArch64/AArch64TargetTransformInfo.cpp
@@ -275,6 +275,23 @@
     }
     return Cost;
   }
+  case Intrinsic::ctpop: {
+    // CTPOP costs should match the codegen from
+    // llvm/test/CodeGen/AArch64/arm64-vpopcnt.ll
+    static const CostTblEntry CtpopCostTbl[] = {
+        {ISD::CTPOP, MVT::i64, 4},   {ISD::CTPOP, MVT::v2i64, 4},
+        {ISD::CTPOP, MVT::i32, 3},   {ISD::CTPOP, MVT::v2i32, 3},
+        {ISD::CTPOP, MVT::v4i32, 3}, {ISD::CTPOP, MVT::i16, 2},
+        {ISD::CTPOP, MVT::v2i16, 2}, {ISD::CTPOP, MVT::v4i16, 2},
+        {ISD::CTPOP, MVT::v8i16, 2}, {ISD::CTPOP, MVT::i8, 1},
+        {ISD::CTPOP, MVT::v2i8, 1},  {ISD::CTPOP, MVT::v4i8, 1},
+        {ISD::CTPOP, MVT::v8i8, 1},  {ISD::CTPOP, MVT::v16i8, 1},
+    };
+    MVT MTy = MVT::getVT(RetTy, true);
+    if (const auto *Entry = CostTableLookup(CtpopCostTbl, ISD::CTPOP, MTy))
+      return Entry->Cost;
+    break;
+  }
   default:
     break;
   }
Index: llvm/test/Analysis/CostModel/AArch64/ctpop.ll
===================================================================
--- llvm/test/Analysis/CostModel/AArch64/ctpop.ll
+++ llvm/test/Analysis/CostModel/AArch64/ctpop.ll
@@ -4,9 +4,8 @@
 ; Verify the cost of scalar ctpop instructions.
 
 define i64 @test_ctpop_i64(i64 %a) {
-;
 ; CHECK-LABEL: 'test_ctpop_i64'
-; CHECK-NEXT:  Cost Model: Found an estimated cost of 2 for instruction: %ctpop = call i64 @llvm.ctpop.i64(i64 %a)
+; CHECK-NEXT:  Cost Model: Found an estimated cost of 4 for instruction: %ctpop = call i64 @llvm.ctpop.i64(i64 %a)
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 0 for instruction: ret i64 %ctpop
 ;
   %ctpop = call i64 @llvm.ctpop.i64(i64 %a)
@@ -14,9 +13,8 @@
 }
 
 define i32 @test_ctpop_i32(i32 %a) {
-;
 ; CHECK-LABEL: 'test_ctpop_i32'
-; CHECK-NEXT:  Cost Model: Found an estimated cost of 2 for instruction: %ctpop = call i32 @llvm.ctpop.i32(i32 %a)
+; CHECK-NEXT:  Cost Model: Found an estimated cost of 3 for instruction: %ctpop = call i32 @llvm.ctpop.i32(i32 %a)
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 0 for instruction: ret i32 %ctpop
 ;
   %ctpop = call i32 @llvm.ctpop.i32(i32 %a)
@@ -24,7 +22,6 @@
 }
 
 define i16 @test_ctpop_i16(i16 %a) {
-;
 ; CHECK-LABEL: 'test_ctpop_i16'
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 2 for instruction: %ctpop = call i16 @llvm.ctpop.i16(i16 %a)
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 0 for instruction: ret i16 %ctpop
@@ -34,9 +31,8 @@
 }
 
 define i8 @test_ctpop_i8(i8 %a) {
-;
 ; CHECK-LABEL: 'test_ctpop_i8'
-; CHECK-NEXT:  Cost Model: Found an estimated cost of 2 for instruction: %ctpop = call i8 @llvm.ctpop.i8(i8 %a)
+; CHECK-NEXT:  Cost Model: Found an estimated cost of 1 for instruction: %ctpop = call i8 @llvm.ctpop.i8(i8 %a)
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 0 for instruction: ret i8 %ctpop
 ;
   %ctpop = call i8 @llvm.ctpop.i8(i8 %a)
@@ -51,9 +47,8 @@
 ; Verify the cost of vector ctpop instructions.
 
 define <2 x i64> @test_ctpop_v2i64(<2 x i64> %a) {
-;
 ; CHECK-LABEL: 'test_ctpop_v2i64'
-; CHECK-NEXT:  Cost Model: Found an estimated cost of 2 for instruction: %ctpop = call <2 x i64> @llvm.ctpop.v2i64(<2 x i64> %a)
+; CHECK-NEXT:  Cost Model: Found an estimated cost of 4 for instruction: %ctpop = call <2 x i64> @llvm.ctpop.v2i64(<2 x i64> %a)
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 0 for instruction: ret <2 x i64> %ctpop
 ;
   %ctpop = call <2 x i64> @llvm.ctpop.v2i64(<2 x i64> %a)
@@ -61,9 +56,8 @@
 }
 
 define <2 x i32> @test_ctpop_v2i32(<2 x i32> %a) {
-;
 ; CHECK-LABEL: 'test_ctpop_v2i32'
-; CHECK-NEXT:  Cost Model: Found an estimated cost of 2 for instruction: %ctpop = call <2 x i32> @llvm.ctpop.v2i32(<2 x i32> %a)
+; CHECK-NEXT:  Cost Model: Found an estimated cost of 3 for instruction: %ctpop = call <2 x i32> @llvm.ctpop.v2i32(<2 x i32> %a)
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 0 for instruction: ret <2 x i32> %ctpop
 ;
   %ctpop = call <2 x i32> @llvm.ctpop.v2i32(<2 x i32> %a)
@@ -71,9 +65,8 @@
 }
 
 define <4 x i32> @test_ctpop_v4i32(<4 x i32> %a) {
-;
 ; CHECK-LABEL: 'test_ctpop_v4i32'
-; CHECK-NEXT:  Cost Model: Found an estimated cost of 2 for instruction: %ctpop = call <4 x i32> @llvm.ctpop.v4i32(<4 x i32> %a)
+; CHECK-NEXT:  Cost Model: Found an estimated cost of 3 for instruction: %ctpop = call <4 x i32> @llvm.ctpop.v4i32(<4 x i32> %a)
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 0 for instruction: ret <4 x i32> %ctpop
 ;
   %ctpop = call <4 x i32> @llvm.ctpop.v4i32(<4 x i32> %a)
@@ -81,7 +74,6 @@
 }
 
 define <2 x i16> @test_ctpop_v2i16(<2 x i16> %a) {
-;
 ; CHECK-LABEL: 'test_ctpop_v2i16'
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 2 for instruction: %ctpop = call <2 x i16> @llvm.ctpop.v2i16(<2 x i16> %a)
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 0 for instruction: ret <2 x i16> %ctpop
@@ -91,7 +83,6 @@
 }
 
 define <4 x i16> @test_ctpop_v4i16(<4 x i16> %a) {
-;
 ; CHECK-LABEL: 'test_ctpop_v4i16'
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 2 for instruction: %ctpop = call <4 x i16> @llvm.ctpop.v4i16(<4 x i16> %a)
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 0 for instruction: ret <4 x i16> %ctpop
@@ -101,7 +92,6 @@
 }
 
 define <8 x i16> @test_ctpop_v8i16(<8 x i16> %a) {
-;
 ; CHECK-LABEL: 'test_ctpop_v8i16'
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 2 for instruction: %ctpop = call <8 x i16> @llvm.ctpop.v8i16(<8 x i16> %a)
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 0 for instruction: ret <8 x i16> %ctpop
@@ -111,9 +101,8 @@
 }
 
 define <2 x i8> @test_ctpop_v2i8(<2 x i8> %a) {
-;
 ; CHECK-LABEL: 'test_ctpop_v2i8'
-; CHECK-NEXT:  Cost Model: Found an estimated cost of 2 for instruction: %ctpop = call <2 x i8> @llvm.ctpop.v2i8(<2 x i8> %a)
+; CHECK-NEXT:  Cost Model: Found an estimated cost of 1 for instruction: %ctpop = call <2 x i8> @llvm.ctpop.v2i8(<2 x i8> %a)
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 0 for instruction: ret <2 x i8> %ctpop
 ;
   %ctpop = call <2 x i8> @llvm.ctpop.v2i8(<2 x i8> %a)
@@ -121,9 +110,8 @@
 }
 
 define <4 x i8> @test_ctpop_v4i8(<4 x i8> %a) {
-;
 ; CHECK-LABEL: 'test_ctpop_v4i8'
-; CHECK-NEXT:  Cost Model: Found an estimated cost of 2 for instruction: %ctpop = call <4 x i8> @llvm.ctpop.v4i8(<4 x i8> %a)
+; CHECK-NEXT:  Cost Model: Found an estimated cost of 1 for instruction: %ctpop = call <4 x i8> @llvm.ctpop.v4i8(<4 x i8> %a)
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 0 for instruction: ret <4 x i8> %ctpop
 ;
   %ctpop = call <4 x i8> @llvm.ctpop.v4i8(<4 x i8> %a)
@@ -131,7 +119,6 @@
 }
 
 define <8 x i8> @test_ctpop_v8i8(<8 x i8> %a) {
-;
 ; CHECK-LABEL: 'test_ctpop_v8i8'
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 1 for instruction: %ctpop = call <8 x i8> @llvm.ctpop.v8i8(<8 x i8> %a)
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 0 for instruction: ret <8 x i8> %ctpop
@@ -141,7 +128,6 @@
 }
 
 define <16 x i8> @test_ctpop_v16i8(<16 x i8> %a) {
-;
 ; CHECK-LABEL: 'test_ctpop_v16i8'
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 1 for instruction: %ctpop = call <16 x i8> @llvm.ctpop.v16i8(<16 x i8> %a)
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 0 for instruction: ret <16 x i8> %ctpop
@@ -151,7 +137,6 @@
 }
 
 define <4 x i64> @test_ctpop_v4i64(<4 x i64> %a) {
-;
 ; CHECK-LABEL: 'test_ctpop_v4i64'
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 4 for instruction: %ctpop = call <4 x i64> @llvm.ctpop.v4i64(<4 x i64> %a)
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 0 for instruction: ret <4 x i64> %ctpop
@@ -161,7 +146,6 @@
 }
 
 define <8 x i32> @test_ctpop_v8i32(<8 x i32> %a) {
-;
 ; CHECK-LABEL: 'test_ctpop_v8i32'
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 4 for instruction: %ctpop = call <8 x i32> @llvm.ctpop.v8i32(<8 x i32> %a)
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 0 for instruction: ret <8 x i32> %ctpop
@@ -171,7 +155,6 @@
 }
 
 define <16 x i16> @test_ctpop_v16i16(<16 x i16> %a) {
-;
 ; CHECK-LABEL: 'test_ctpop_v16i16'
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 4 for instruction: %ctpop = call <16 x i16> @llvm.ctpop.v16i16(<16 x i16> %a)
 ; CHECK-NEXT:  Cost Model: Found an estimated cost of 0 for instruction: ret <16 x i16> %ctpop