[llvm] 4c1d248 - [MCA][X86] Fix duplicated cvtsi2ss/cvtsi2sd i32 + i64 folded tests
Simon Pilgrim via llvm-commits
llvm-commits at lists.llvm.org
Sun Dec 12 14:49:07 PST 2021
Author: Simon Pilgrim
Date: 2021-12-12T22:48:45Z
New Revision: 4c1d24839799f4f421335d20a271b78b138d822f
URL: https://github.com/llvm/llvm-project/commit/4c1d24839799f4f421335d20a271b78b138d822f
DIFF: https://github.com/llvm/llvm-project/commit/4c1d24839799f4f421335d20a271b78b138d822f.diff
LOG: [MCA][X86] Fix duplicated cvtsi2ss/cvtsi2sd i32 + i64 folded tests
Specify the integer width to ensure we're testing the correct instruction
Added:
Modified:
llvm/test/tools/llvm-mca/X86/Atom/resources-sse1.s
llvm/test/tools/llvm-mca/X86/Atom/resources-sse2.s
llvm/test/tools/llvm-mca/X86/Barcelona/resources-sse1.s
llvm/test/tools/llvm-mca/X86/Barcelona/resources-sse2.s
llvm/test/tools/llvm-mca/X86/BdVer2/resources-sse1.s
llvm/test/tools/llvm-mca/X86/BdVer2/resources-sse2.s
llvm/test/tools/llvm-mca/X86/Broadwell/resources-sse1.s
llvm/test/tools/llvm-mca/X86/Broadwell/resources-sse2.s
llvm/test/tools/llvm-mca/X86/BtVer2/resources-sse1.s
llvm/test/tools/llvm-mca/X86/BtVer2/resources-sse2.s
llvm/test/tools/llvm-mca/X86/Generic/resources-sse1.s
llvm/test/tools/llvm-mca/X86/Generic/resources-sse2.s
llvm/test/tools/llvm-mca/X86/Haswell/resources-sse1.s
llvm/test/tools/llvm-mca/X86/Haswell/resources-sse2.s
llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-sse1.s
llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-sse2.s
llvm/test/tools/llvm-mca/X86/SLM/resources-sse1.s
llvm/test/tools/llvm-mca/X86/SLM/resources-sse2.s
llvm/test/tools/llvm-mca/X86/SandyBridge/resources-sse1.s
llvm/test/tools/llvm-mca/X86/SandyBridge/resources-sse2.s
llvm/test/tools/llvm-mca/X86/SkylakeClient/resources-sse1.s
llvm/test/tools/llvm-mca/X86/SkylakeClient/resources-sse2.s
llvm/test/tools/llvm-mca/X86/SkylakeServer/resources-sse1.s
llvm/test/tools/llvm-mca/X86/SkylakeServer/resources-sse2.s
llvm/test/tools/llvm-mca/X86/Znver1/resources-sse1.s
llvm/test/tools/llvm-mca/X86/Znver1/resources-sse2.s
llvm/test/tools/llvm-mca/X86/Znver2/resources-sse1.s
llvm/test/tools/llvm-mca/X86/Znver2/resources-sse2.s
llvm/test/tools/llvm-mca/X86/Znver3/resources-sse1.s
llvm/test/tools/llvm-mca/X86/Znver3/resources-sse2.s
Removed:
################################################################################
diff --git a/llvm/test/tools/llvm-mca/X86/Atom/resources-sse1.s b/llvm/test/tools/llvm-mca/X86/Atom/resources-sse1.s
index a59deaee0a44c..97cee7d01bffe 100644
--- a/llvm/test/tools/llvm-mca/X86/Atom/resources-sse1.s
+++ b/llvm/test/tools/llvm-mca/X86/Atom/resources-sse1.s
@@ -30,8 +30,8 @@ cvtps2pi (%rax), %mm2
cvtsi2ss %ecx, %xmm2
cvtsi2ss %rcx, %xmm2
-cvtsi2ss (%rax), %xmm2
-cvtsi2ss (%rax), %xmm2
+cvtsi2ssl (%rax), %xmm2
+cvtsi2ssq (%rax), %xmm2
cvtss2si %xmm0, %ecx
cvtss2si %xmm0, %rcx
@@ -215,7 +215,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: 1 6 5.00 cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: 1 6 5.00 cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: 1 7 6.00 * cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: 1 7 6.00 * cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: 1 7 6.00 * cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: 1 8 7.00 cvtss2si %xmm0, %ecx
# CHECK-NEXT: 1 9 4.50 cvtss2si %xmm0, %rcx
# CHECK-NEXT: 1 9 6.00 * cvtss2si (%rax), %ecx
@@ -350,7 +350,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: 5.00 5.00 cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: 5.00 5.00 cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: 6.00 6.00 cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: 6.00 6.00 cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: 6.00 6.00 cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: 7.00 7.00 cvtss2si %xmm0, %ecx
# CHECK-NEXT: 4.50 4.50 cvtss2si %xmm0, %rcx
# CHECK-NEXT: 6.00 6.00 cvtss2si (%rax), %ecx
diff --git a/llvm/test/tools/llvm-mca/X86/Atom/resources-sse2.s b/llvm/test/tools/llvm-mca/X86/Atom/resources-sse2.s
index 977c94f77b841..a9d0c81c99d6a 100644
--- a/llvm/test/tools/llvm-mca/X86/Atom/resources-sse2.s
+++ b/llvm/test/tools/llvm-mca/X86/Atom/resources-sse2.s
@@ -58,8 +58,8 @@ cvtsd2ss (%rax), %xmm2
cvtsi2sd %ecx, %xmm2
cvtsi2sd %rcx, %xmm2
-cvtsi2sd (%rax), %xmm2
-cvtsi2sd (%rax), %xmm2
+cvtsi2sdl (%rax), %xmm2
+cvtsi2sdq (%rax), %xmm2
cvtss2sd %xmm0, %xmm2
cvtss2sd (%rax), %xmm2
@@ -447,7 +447,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: 1 6 5.00 cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: 1 6 5.00 cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: 1 7 6.00 * cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: 1 7 6.00 * cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: 1 7 6.00 * cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: 1 6 5.00 cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: 1 7 6.00 * cvtss2sd (%rax), %xmm2
# CHECK-NEXT: 1 7 6.00 cvttpd2dq %xmm0, %xmm2
@@ -725,7 +725,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: 5.00 5.00 cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: 5.00 5.00 cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: 6.00 6.00 cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: 6.00 6.00 cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: 6.00 6.00 cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: 5.00 5.00 cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: 6.00 6.00 cvtss2sd (%rax), %xmm2
# CHECK-NEXT: 6.00 6.00 cvttpd2dq %xmm0, %xmm2
diff --git a/llvm/test/tools/llvm-mca/X86/Barcelona/resources-sse1.s b/llvm/test/tools/llvm-mca/X86/Barcelona/resources-sse1.s
index 580b3608e8e7b..39a99e8a12408 100644
--- a/llvm/test/tools/llvm-mca/X86/Barcelona/resources-sse1.s
+++ b/llvm/test/tools/llvm-mca/X86/Barcelona/resources-sse1.s
@@ -30,8 +30,8 @@ cvtps2pi (%rax), %mm2
cvtsi2ss %ecx, %xmm2
cvtsi2ss %rcx, %xmm2
-cvtsi2ss (%rax), %xmm2
-cvtsi2ss (%rax), %xmm2
+cvtsi2ssl (%rax), %xmm2
+cvtsi2ssq (%rax), %xmm2
cvtss2si %xmm0, %ecx
cvtss2si %xmm0, %rcx
@@ -215,7 +215,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: 3 5 2.00 cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: 3 5 2.00 cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: 3 10 1.00 * cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: 3 10 1.00 * cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: 3 10 1.00 * cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: 2 5 1.00 cvtss2si %xmm0, %ecx
# CHECK-NEXT: 2 5 1.00 cvtss2si %xmm0, %rcx
# CHECK-NEXT: 3 9 1.00 * cvtss2si (%rax), %ecx
@@ -356,7 +356,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: - - - 1.00 - 2.00 - - cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: - - - 1.00 - 2.00 - - cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: - - - 1.00 - 1.00 0.50 0.50 cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: - - - 1.00 - 1.00 0.50 0.50 cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: - - - 1.00 - 1.00 0.50 0.50 cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: - - 1.00 1.00 - - - - cvtss2si %xmm0, %ecx
# CHECK-NEXT: - - 1.00 1.00 - - - - cvtss2si %xmm0, %rcx
# CHECK-NEXT: - - 1.00 1.00 - - 0.50 0.50 cvtss2si (%rax), %ecx
diff --git a/llvm/test/tools/llvm-mca/X86/Barcelona/resources-sse2.s b/llvm/test/tools/llvm-mca/X86/Barcelona/resources-sse2.s
index 4e720e42d7dc2..7a8d4b03a9356 100644
--- a/llvm/test/tools/llvm-mca/X86/Barcelona/resources-sse2.s
+++ b/llvm/test/tools/llvm-mca/X86/Barcelona/resources-sse2.s
@@ -58,8 +58,8 @@ cvtsd2ss (%rax), %xmm2
cvtsi2sd %ecx, %xmm2
cvtsi2sd %rcx, %xmm2
-cvtsi2sd (%rax), %xmm2
-cvtsi2sd (%rax), %xmm2
+cvtsi2sdl (%rax), %xmm2
+cvtsi2sdq (%rax), %xmm2
cvtss2sd %xmm0, %xmm2
cvtss2sd (%rax), %xmm2
@@ -447,7 +447,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: 2 4 1.00 cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: 2 4 1.00 cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: 2 9 1.00 * cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: 2 9 1.00 * cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: 2 9 1.00 * cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: 1 1 1.00 cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: 2 7 1.00 * cvtss2sd (%rax), %xmm2
# CHECK-NEXT: 2 4 1.00 cvttpd2dq %xmm0, %xmm2
@@ -731,7 +731,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: - - - 1.00 - 1.00 - - cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: - - - 1.00 - 1.00 - - cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: - - - 1.00 - - 0.50 0.50 cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: - - - 1.00 - - 0.50 0.50 cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: - - - 1.00 - - 0.50 0.50 cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: - - 1.00 - - - - - cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: - - 1.00 - - - 0.50 0.50 cvtss2sd (%rax), %xmm2
# CHECK-NEXT: - - - 1.00 - 1.00 - - cvttpd2dq %xmm0, %xmm2
diff --git a/llvm/test/tools/llvm-mca/X86/BdVer2/resources-sse1.s b/llvm/test/tools/llvm-mca/X86/BdVer2/resources-sse1.s
index daa097eb3a7cf..652cb5ec939b6 100644
--- a/llvm/test/tools/llvm-mca/X86/BdVer2/resources-sse1.s
+++ b/llvm/test/tools/llvm-mca/X86/BdVer2/resources-sse1.s
@@ -30,8 +30,8 @@ cvtps2pi (%rax), %mm2
cvtsi2ss %ecx, %xmm2
cvtsi2ss %rcx, %xmm2
-cvtsi2ss (%rax), %xmm2
-cvtsi2ss (%rax), %xmm2
+cvtsi2ssl (%rax), %xmm2
+cvtsi2ssq (%rax), %xmm2
cvtss2si %xmm0, %ecx
cvtss2si %xmm0, %rcx
@@ -215,7 +215,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: 2 14 1.00 cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: 2 14 1.00 cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: 2 9 1.50 * cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: 2 9 1.50 * cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: 2 9 1.50 * cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: 2 13 1.00 cvtss2si %xmm0, %ecx
# CHECK-NEXT: 2 13 1.00 cvtss2si %xmm0, %rcx
# CHECK-NEXT: 2 18 1.50 * cvtss2si (%rax), %ecx
@@ -371,7 +371,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: - - - - - - - 1.00 - - - - - 1.00 1.00 - - - - - - - - cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: - - - - - - - 1.00 - - - - - 1.00 1.00 - - - - - - - - cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: 1.50 1.50 - - - - - 1.00 - - - - - 1.00 1.00 - - - - 1.50 1.50 - - cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: 1.50 1.50 - - - - - 1.00 - - - - - 1.00 1.00 - - - - 1.50 1.50 - - cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: 1.50 1.50 - - - - - 1.00 - - - - - 1.00 1.00 - - - - 1.50 1.50 - - cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: - - - - - 1.00 - 1.00 0.50 0.50 - - - 1.00 1.00 - - - - - - - - cvtss2si %xmm0, %ecx
# CHECK-NEXT: - - - - - 1.00 - 1.00 0.50 0.50 - - - 1.00 1.00 - - - - - - - - cvtss2si %xmm0, %rcx
# CHECK-NEXT: 1.50 1.50 - - - 1.00 - 1.00 0.50 0.50 - - - 1.00 1.00 - - - - 1.50 1.50 - - cvtss2si (%rax), %ecx
diff --git a/llvm/test/tools/llvm-mca/X86/BdVer2/resources-sse2.s b/llvm/test/tools/llvm-mca/X86/BdVer2/resources-sse2.s
index e4983ca8598ff..391e39c855339 100644
--- a/llvm/test/tools/llvm-mca/X86/BdVer2/resources-sse2.s
+++ b/llvm/test/tools/llvm-mca/X86/BdVer2/resources-sse2.s
@@ -58,8 +58,8 @@ cvtsd2ss (%rax), %xmm2
cvtsi2sd %ecx, %xmm2
cvtsi2sd %rcx, %xmm2
-cvtsi2sd (%rax), %xmm2
-cvtsi2sd (%rax), %xmm2
+cvtsi2sdl (%rax), %xmm2
+cvtsi2sdq (%rax), %xmm2
cvtss2sd %xmm0, %xmm2
cvtss2sd (%rax), %xmm2
@@ -447,7 +447,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: 2 14 1.00 cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: 2 14 1.00 cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: 2 9 1.50 * cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: 2 9 1.50 * cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: 2 9 1.50 * cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: 1 4 2.00 cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: 1 9 2.00 * cvtss2sd (%rax), %xmm2
# CHECK-NEXT: 2 8 1.00 cvttpd2dq %xmm0, %xmm2
@@ -746,7 +746,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: - - - - - - - 1.00 - - - - - 1.00 1.00 - - - - - - - - cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: - - - - - - - 1.00 - - - - - 1.00 1.00 - - - - - - - - cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: 1.50 1.50 - - - - - 1.00 - - - - - 1.00 1.00 - - - - 1.50 1.50 - - cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: 1.50 1.50 - - - - - 1.00 - - - - - 1.00 1.00 - - - - 1.50 1.50 - - cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: 1.50 1.50 - - - - - 1.00 - - - - - 1.00 1.00 - - - - 1.50 1.50 - - cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: - - - - - - - 2.00 - - - - - 1.00 1.00 - - - - - - - - cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: 1.50 1.50 - - - - - 2.00 - - - - - 1.00 1.00 - - - - 1.50 1.50 - - cvtss2sd (%rax), %xmm2
# CHECK-NEXT: - - - - - - - 1.00 - - - - - 1.00 1.00 - - - - - - - - cvttpd2dq %xmm0, %xmm2
diff --git a/llvm/test/tools/llvm-mca/X86/Broadwell/resources-sse1.s b/llvm/test/tools/llvm-mca/X86/Broadwell/resources-sse1.s
index 317ec022c645b..81e765219b8a4 100644
--- a/llvm/test/tools/llvm-mca/X86/Broadwell/resources-sse1.s
+++ b/llvm/test/tools/llvm-mca/X86/Broadwell/resources-sse1.s
@@ -30,8 +30,8 @@ cvtps2pi (%rax), %mm2
cvtsi2ss %ecx, %xmm2
cvtsi2ss %rcx, %xmm2
-cvtsi2ss (%rax), %xmm2
-cvtsi2ss (%rax), %xmm2
+cvtsi2ssl (%rax), %xmm2
+cvtsi2ssq (%rax), %xmm2
cvtss2si %xmm0, %ecx
cvtss2si %xmm0, %rcx
@@ -215,7 +215,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: 2 4 1.00 cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: 3 5 2.00 cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: 2 9 1.00 * cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: 2 9 1.00 * cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: 2 9 1.00 * cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: 2 4 1.00 cvtss2si %xmm0, %ecx
# CHECK-NEXT: 2 4 1.00 cvtss2si %xmm0, %rcx
# CHECK-NEXT: 3 9 1.00 * cvtss2si (%rax), %ecx
@@ -358,7 +358,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: - - - 1.00 - - - 1.00 - - cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: - - - 1.00 - - - 2.00 - - cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: - - 1.00 1.00 - - - - - - cvtss2si %xmm0, %ecx
# CHECK-NEXT: - - 1.00 1.00 - - - - - - cvtss2si %xmm0, %rcx
# CHECK-NEXT: - - 1.00 1.00 0.50 0.50 - - - - cvtss2si (%rax), %ecx
diff --git a/llvm/test/tools/llvm-mca/X86/Broadwell/resources-sse2.s b/llvm/test/tools/llvm-mca/X86/Broadwell/resources-sse2.s
index 65306eef90bd3..5bed312b0fe1d 100644
--- a/llvm/test/tools/llvm-mca/X86/Broadwell/resources-sse2.s
+++ b/llvm/test/tools/llvm-mca/X86/Broadwell/resources-sse2.s
@@ -58,8 +58,8 @@ cvtsd2ss (%rax), %xmm2
cvtsi2sd %ecx, %xmm2
cvtsi2sd %rcx, %xmm2
-cvtsi2sd (%rax), %xmm2
-cvtsi2sd (%rax), %xmm2
+cvtsi2sdl (%rax), %xmm2
+cvtsi2sdq (%rax), %xmm2
cvtss2sd %xmm0, %xmm2
cvtss2sd (%rax), %xmm2
@@ -447,7 +447,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: 2 4 1.00 cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: 2 4 1.00 cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: 2 9 1.00 * cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: 2 9 1.00 * cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: 2 9 1.00 * cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: 2 2 1.00 cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: 2 6 1.00 * cvtss2sd (%rax), %xmm2
# CHECK-NEXT: 2 4 1.00 cvttpd2dq %xmm0, %xmm2
@@ -733,7 +733,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: - - - 1.00 - - - 1.00 - - cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: - - - 1.00 - - - 1.00 - - cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: - - 1.00 - - - - 1.00 - - cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: - - 1.00 - 0.50 0.50 - - - - cvtss2sd (%rax), %xmm2
# CHECK-NEXT: - - - 1.00 - - - 1.00 - - cvttpd2dq %xmm0, %xmm2
diff --git a/llvm/test/tools/llvm-mca/X86/BtVer2/resources-sse1.s b/llvm/test/tools/llvm-mca/X86/BtVer2/resources-sse1.s
index f51bac6a5dbf4..235816c706742 100644
--- a/llvm/test/tools/llvm-mca/X86/BtVer2/resources-sse1.s
+++ b/llvm/test/tools/llvm-mca/X86/BtVer2/resources-sse1.s
@@ -30,8 +30,8 @@ cvtps2pi (%rax), %mm2
cvtsi2ss %ecx, %xmm2
cvtsi2ss %rcx, %xmm2
-cvtsi2ss (%rax), %xmm2
-cvtsi2ss (%rax), %xmm2
+cvtsi2ssl (%rax), %xmm2
+cvtsi2ssq (%rax), %xmm2
cvtss2si %xmm0, %ecx
cvtss2si %xmm0, %rcx
@@ -215,7 +215,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: 2 10 1.00 cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: 2 10 1.00 cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: 1 9 1.00 * cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: 1 9 1.00 * cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: 1 9 1.00 * cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: 2 7 1.00 cvtss2si %xmm0, %ecx
# CHECK-NEXT: 2 7 1.00 cvtss2si %xmm0, %rcx
# CHECK-NEXT: 2 12 1.00 * cvtss2si (%rax), %ecx
@@ -362,7 +362,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: - - - - - - 1.00 - - - 1.00 - - - cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: - - - - - - 1.00 - - - 1.00 - - - cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: - - - - - - 1.00 1.00 - - 1.00 - - - cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: - - - - - - 1.00 1.00 - - 1.00 - - - cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: - - - - - - 1.00 1.00 - - 1.00 - - - cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: 1.00 - - 1.00 - 1.00 1.00 - - - 1.00 - - - cvtss2si %xmm0, %ecx
# CHECK-NEXT: 1.00 - - 1.00 - 1.00 1.00 - - - 1.00 - - - cvtss2si %xmm0, %rcx
# CHECK-NEXT: 1.00 - - 1.00 - 1.00 1.00 1.00 - - 1.00 - - - cvtss2si (%rax), %ecx
diff --git a/llvm/test/tools/llvm-mca/X86/BtVer2/resources-sse2.s b/llvm/test/tools/llvm-mca/X86/BtVer2/resources-sse2.s
index 63a29f9a70e43..99f63e194ec86 100644
--- a/llvm/test/tools/llvm-mca/X86/BtVer2/resources-sse2.s
+++ b/llvm/test/tools/llvm-mca/X86/BtVer2/resources-sse2.s
@@ -58,8 +58,8 @@ cvtsd2ss (%rax), %xmm2
cvtsi2sd %ecx, %xmm2
cvtsi2sd %rcx, %xmm2
-cvtsi2sd (%rax), %xmm2
-cvtsi2sd (%rax), %xmm2
+cvtsi2sdl (%rax), %xmm2
+cvtsi2sdq (%rax), %xmm2
cvtss2sd %xmm0, %xmm2
cvtss2sd (%rax), %xmm2
@@ -447,7 +447,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: 2 10 1.00 cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: 2 10 1.00 cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: 1 9 1.00 * cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: 1 9 1.00 * cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: 1 9 1.00 * cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: 2 7 2.00 cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: 2 12 2.00 * cvtss2sd (%rax), %xmm2
# CHECK-NEXT: 1 3 1.00 cvttpd2dq %xmm0, %xmm2
@@ -737,7 +737,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: - - - - - - 1.00 - - - 1.00 - - - cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: - - - - - - 1.00 - - - 1.00 - - - cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: - - - - - - 1.00 1.00 - - 1.00 - - - cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: - - - - - - 1.00 1.00 - - 1.00 - - - cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: - - - - - - 1.00 1.00 - - 1.00 - - - cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: - - - - - - 1.00 - - - 2.00 - - - cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: - - - - - - 1.00 1.00 - - 2.00 - - - cvtss2sd (%rax), %xmm2
# CHECK-NEXT: - - - - - - 1.00 - - - 1.00 - - - cvttpd2dq %xmm0, %xmm2
diff --git a/llvm/test/tools/llvm-mca/X86/Generic/resources-sse1.s b/llvm/test/tools/llvm-mca/X86/Generic/resources-sse1.s
index 580b3608e8e7b..39a99e8a12408 100644
--- a/llvm/test/tools/llvm-mca/X86/Generic/resources-sse1.s
+++ b/llvm/test/tools/llvm-mca/X86/Generic/resources-sse1.s
@@ -30,8 +30,8 @@ cvtps2pi (%rax), %mm2
cvtsi2ss %ecx, %xmm2
cvtsi2ss %rcx, %xmm2
-cvtsi2ss (%rax), %xmm2
-cvtsi2ss (%rax), %xmm2
+cvtsi2ssl (%rax), %xmm2
+cvtsi2ssq (%rax), %xmm2
cvtss2si %xmm0, %ecx
cvtss2si %xmm0, %rcx
@@ -215,7 +215,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: 3 5 2.00 cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: 3 5 2.00 cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: 3 10 1.00 * cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: 3 10 1.00 * cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: 3 10 1.00 * cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: 2 5 1.00 cvtss2si %xmm0, %ecx
# CHECK-NEXT: 2 5 1.00 cvtss2si %xmm0, %rcx
# CHECK-NEXT: 3 9 1.00 * cvtss2si (%rax), %ecx
@@ -356,7 +356,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: - - - 1.00 - 2.00 - - cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: - - - 1.00 - 2.00 - - cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: - - - 1.00 - 1.00 0.50 0.50 cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: - - - 1.00 - 1.00 0.50 0.50 cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: - - - 1.00 - 1.00 0.50 0.50 cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: - - 1.00 1.00 - - - - cvtss2si %xmm0, %ecx
# CHECK-NEXT: - - 1.00 1.00 - - - - cvtss2si %xmm0, %rcx
# CHECK-NEXT: - - 1.00 1.00 - - 0.50 0.50 cvtss2si (%rax), %ecx
diff --git a/llvm/test/tools/llvm-mca/X86/Generic/resources-sse2.s b/llvm/test/tools/llvm-mca/X86/Generic/resources-sse2.s
index 4e720e42d7dc2..7a8d4b03a9356 100644
--- a/llvm/test/tools/llvm-mca/X86/Generic/resources-sse2.s
+++ b/llvm/test/tools/llvm-mca/X86/Generic/resources-sse2.s
@@ -58,8 +58,8 @@ cvtsd2ss (%rax), %xmm2
cvtsi2sd %ecx, %xmm2
cvtsi2sd %rcx, %xmm2
-cvtsi2sd (%rax), %xmm2
-cvtsi2sd (%rax), %xmm2
+cvtsi2sdl (%rax), %xmm2
+cvtsi2sdq (%rax), %xmm2
cvtss2sd %xmm0, %xmm2
cvtss2sd (%rax), %xmm2
@@ -447,7 +447,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: 2 4 1.00 cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: 2 4 1.00 cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: 2 9 1.00 * cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: 2 9 1.00 * cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: 2 9 1.00 * cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: 1 1 1.00 cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: 2 7 1.00 * cvtss2sd (%rax), %xmm2
# CHECK-NEXT: 2 4 1.00 cvttpd2dq %xmm0, %xmm2
@@ -731,7 +731,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: - - - 1.00 - 1.00 - - cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: - - - 1.00 - 1.00 - - cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: - - - 1.00 - - 0.50 0.50 cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: - - - 1.00 - - 0.50 0.50 cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: - - - 1.00 - - 0.50 0.50 cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: - - 1.00 - - - - - cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: - - 1.00 - - - 0.50 0.50 cvtss2sd (%rax), %xmm2
# CHECK-NEXT: - - - 1.00 - 1.00 - - cvttpd2dq %xmm0, %xmm2
diff --git a/llvm/test/tools/llvm-mca/X86/Haswell/resources-sse1.s b/llvm/test/tools/llvm-mca/X86/Haswell/resources-sse1.s
index b64d23dd1ee60..17203584ea3fe 100644
--- a/llvm/test/tools/llvm-mca/X86/Haswell/resources-sse1.s
+++ b/llvm/test/tools/llvm-mca/X86/Haswell/resources-sse1.s
@@ -30,8 +30,8 @@ cvtps2pi (%rax), %mm2
cvtsi2ss %ecx, %xmm2
cvtsi2ss %rcx, %xmm2
-cvtsi2ss (%rax), %xmm2
-cvtsi2ss (%rax), %xmm2
+cvtsi2ssl (%rax), %xmm2
+cvtsi2ssq (%rax), %xmm2
cvtss2si %xmm0, %ecx
cvtss2si %xmm0, %rcx
@@ -215,7 +215,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: 2 4 1.00 cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: 3 5 2.00 cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: 2 9 1.00 * cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: 2 9 1.00 * cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: 2 9 1.00 * cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: 2 4 1.00 cvtss2si %xmm0, %ecx
# CHECK-NEXT: 2 4 1.00 cvtss2si %xmm0, %rcx
# CHECK-NEXT: 3 9 1.00 * cvtss2si (%rax), %ecx
@@ -358,7 +358,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: - - - 1.00 - - - 1.00 - - cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: - - - 1.00 - - - 2.00 - - cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: - - 1.00 1.00 - - - - - - cvtss2si %xmm0, %ecx
# CHECK-NEXT: - - 1.00 1.00 - - - - - - cvtss2si %xmm0, %rcx
# CHECK-NEXT: - - 1.00 1.00 0.50 0.50 - - - - cvtss2si (%rax), %ecx
diff --git a/llvm/test/tools/llvm-mca/X86/Haswell/resources-sse2.s b/llvm/test/tools/llvm-mca/X86/Haswell/resources-sse2.s
index 3961ca1823560..3813ef4707a80 100644
--- a/llvm/test/tools/llvm-mca/X86/Haswell/resources-sse2.s
+++ b/llvm/test/tools/llvm-mca/X86/Haswell/resources-sse2.s
@@ -58,8 +58,8 @@ cvtsd2ss (%rax), %xmm2
cvtsi2sd %ecx, %xmm2
cvtsi2sd %rcx, %xmm2
-cvtsi2sd (%rax), %xmm2
-cvtsi2sd (%rax), %xmm2
+cvtsi2sdl (%rax), %xmm2
+cvtsi2sdq (%rax), %xmm2
cvtss2sd %xmm0, %xmm2
cvtss2sd (%rax), %xmm2
@@ -447,7 +447,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: 2 4 1.00 cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: 2 4 1.00 cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: 2 9 1.00 * cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: 2 9 1.00 * cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: 2 9 1.00 * cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: 2 2 1.00 cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: 2 7 1.00 * cvtss2sd (%rax), %xmm2
# CHECK-NEXT: 2 4 1.00 cvttpd2dq %xmm0, %xmm2
@@ -733,7 +733,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: - - - 1.00 - - - 1.00 - - cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: - - - 1.00 - - - 1.00 - - cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: - - 1.00 - - - - 1.00 - - cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: - - 1.00 - 0.50 0.50 - - - - cvtss2sd (%rax), %xmm2
# CHECK-NEXT: - - - 1.00 - - - 1.00 - - cvttpd2dq %xmm0, %xmm2
diff --git a/llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-sse1.s b/llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-sse1.s
index 41b71c6afda85..b37b3cb2ad6ee 100644
--- a/llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-sse1.s
+++ b/llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-sse1.s
@@ -30,8 +30,8 @@ cvtps2pi (%rax), %mm2
cvtsi2ss %ecx, %xmm2
cvtsi2ss %rcx, %xmm2
-cvtsi2ss (%rax), %xmm2
-cvtsi2ss (%rax), %xmm2
+cvtsi2ssl (%rax), %xmm2
+cvtsi2ssq (%rax), %xmm2
cvtss2si %xmm0, %ecx
cvtss2si %xmm0, %rcx
@@ -215,7 +215,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: 2 5 1.00 cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: 3 6 2.00 cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: 2 9 1.00 * cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: 2 9 1.00 * cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: 2 9 1.00 * cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: 2 6 1.00 cvtss2si %xmm0, %ecx
# CHECK-NEXT: 3 7 1.00 cvtss2si %xmm0, %rcx
# CHECK-NEXT: 3 11 1.00 * cvtss2si (%rax), %ecx
@@ -360,7 +360,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: - - 0.33 0.33 - - - 1.33 - - - - cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: - - 0.33 0.33 - - - 2.33 - - - - cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - - - cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - - - cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - - - cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: - - 1.00 1.00 - - - - - - - - cvtss2si %xmm0, %ecx
# CHECK-NEXT: - - 1.33 0.33 - - - 1.33 - - - - cvtss2si %xmm0, %rcx
# CHECK-NEXT: - - 1.00 1.00 0.50 0.50 - - - - - - cvtss2si (%rax), %ecx
diff --git a/llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-sse2.s b/llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-sse2.s
index 0b36981e201d5..f3499dd58f08b 100644
--- a/llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-sse2.s
+++ b/llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-sse2.s
@@ -58,8 +58,8 @@ cvtsd2ss (%rax), %xmm2
cvtsi2sd %ecx, %xmm2
cvtsi2sd %rcx, %xmm2
-cvtsi2sd (%rax), %xmm2
-cvtsi2sd (%rax), %xmm2
+cvtsi2sdl (%rax), %xmm2
+cvtsi2sdq (%rax), %xmm2
cvtss2sd %xmm0, %xmm2
cvtss2sd (%rax), %xmm2
@@ -447,7 +447,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: 2 5 1.00 cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: 2 5 1.00 cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: 2 9 1.00 * cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: 2 9 1.00 * cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: 2 9 1.00 * cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: 2 5 1.00 cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: 2 10 0.50 * cvtss2sd (%rax), %xmm2
# CHECK-NEXT: 2 5 1.00 cvttpd2dq %xmm0, %xmm2
@@ -735,7 +735,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: - - 0.33 0.33 - - - 1.33 - - - - cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: - - 0.33 0.33 - - - 1.33 - - - - cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - - - cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - - - cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - - - cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: - - 0.33 0.33 - - - 1.33 - - - - cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: - - 0.33 0.33 0.50 0.50 - 0.33 - - - - cvtss2sd (%rax), %xmm2
# CHECK-NEXT: - - 0.33 0.33 - - - 1.33 - - - - cvttpd2dq %xmm0, %xmm2
diff --git a/llvm/test/tools/llvm-mca/X86/SLM/resources-sse1.s b/llvm/test/tools/llvm-mca/X86/SLM/resources-sse1.s
index 8c0023ef8d0fb..e7554b97a3f5f 100644
--- a/llvm/test/tools/llvm-mca/X86/SLM/resources-sse1.s
+++ b/llvm/test/tools/llvm-mca/X86/SLM/resources-sse1.s
@@ -30,8 +30,8 @@ cvtps2pi (%rax), %mm2
cvtsi2ss %ecx, %xmm2
cvtsi2ss %rcx, %xmm2
-cvtsi2ss (%rax), %xmm2
-cvtsi2ss (%rax), %xmm2
+cvtsi2ssl (%rax), %xmm2
+cvtsi2ssq (%rax), %xmm2
cvtss2si %xmm0, %ecx
cvtss2si %xmm0, %rcx
@@ -215,7 +215,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: 1 5 2.00 cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: 1 5 2.00 cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: 1 8 2.00 * cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: 1 8 2.00 * cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: 1 8 2.00 * cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: 1 5 1.00 cvtss2si %xmm0, %ecx
# CHECK-NEXT: 1 5 1.00 cvtss2si %xmm0, %rcx
# CHECK-NEXT: 1 8 1.00 * cvtss2si (%rax), %ecx
@@ -356,7 +356,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: - - - 2.00 - - - - cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: - - - 2.00 - - - - cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: - - - 2.00 - - - 1.00 cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: - - - 2.00 - - - 1.00 cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: - - - 2.00 - - - 1.00 cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: - - - 1.00 - - - - cvtss2si %xmm0, %ecx
# CHECK-NEXT: - - - 1.00 - - - - cvtss2si %xmm0, %rcx
# CHECK-NEXT: - - - 1.00 - - - 1.00 cvtss2si (%rax), %ecx
diff --git a/llvm/test/tools/llvm-mca/X86/SLM/resources-sse2.s b/llvm/test/tools/llvm-mca/X86/SLM/resources-sse2.s
index d1282864230b7..73e2da6a24548 100644
--- a/llvm/test/tools/llvm-mca/X86/SLM/resources-sse2.s
+++ b/llvm/test/tools/llvm-mca/X86/SLM/resources-sse2.s
@@ -58,8 +58,8 @@ cvtsd2ss (%rax), %xmm2
cvtsi2sd %ecx, %xmm2
cvtsi2sd %rcx, %xmm2
-cvtsi2sd (%rax), %xmm2
-cvtsi2sd (%rax), %xmm2
+cvtsi2sdl (%rax), %xmm2
+cvtsi2sdq (%rax), %xmm2
cvtss2sd %xmm0, %xmm2
cvtss2sd (%rax), %xmm2
@@ -447,7 +447,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: 1 5 2.00 cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: 1 5 2.00 cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: 1 8 2.00 * cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: 1 8 2.00 * cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: 1 8 2.00 * cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: 1 4 2.00 cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: 1 7 2.00 * cvtss2sd (%rax), %xmm2
# CHECK-NEXT: 1 5 2.00 cvttpd2dq %xmm0, %xmm2
@@ -731,7 +731,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: - - - 2.00 - - - - cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: - - - 2.00 - - - - cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: - - - 2.00 - - - 1.00 cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: - - - 2.00 - - - 1.00 cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: - - - 2.00 - - - 1.00 cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: - - - 2.00 - - - - cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: - - - 2.00 - - - 1.00 cvtss2sd (%rax), %xmm2
# CHECK-NEXT: - - - 2.00 - - - - cvttpd2dq %xmm0, %xmm2
diff --git a/llvm/test/tools/llvm-mca/X86/SandyBridge/resources-sse1.s b/llvm/test/tools/llvm-mca/X86/SandyBridge/resources-sse1.s
index 88217206ffaa5..28915f49790d9 100644
--- a/llvm/test/tools/llvm-mca/X86/SandyBridge/resources-sse1.s
+++ b/llvm/test/tools/llvm-mca/X86/SandyBridge/resources-sse1.s
@@ -30,8 +30,8 @@ cvtps2pi (%rax), %mm2
cvtsi2ss %ecx, %xmm2
cvtsi2ss %rcx, %xmm2
-cvtsi2ss (%rax), %xmm2
-cvtsi2ss (%rax), %xmm2
+cvtsi2ssl (%rax), %xmm2
+cvtsi2ssq (%rax), %xmm2
cvtss2si %xmm0, %ecx
cvtss2si %xmm0, %rcx
@@ -215,7 +215,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: 3 5 2.00 cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: 3 5 2.00 cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: 3 10 1.00 * cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: 3 10 1.00 * cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: 3 10 1.00 * cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: 2 5 1.00 cvtss2si %xmm0, %ecx
# CHECK-NEXT: 2 5 1.00 cvtss2si %xmm0, %rcx
# CHECK-NEXT: 3 9 1.00 * cvtss2si (%rax), %ecx
@@ -356,7 +356,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: - - - 1.00 - 2.00 - - cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: - - - 1.00 - 2.00 - - cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: - - - 1.00 - 1.00 0.50 0.50 cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: - - - 1.00 - 1.00 0.50 0.50 cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: - - - 1.00 - 1.00 0.50 0.50 cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: - - 1.00 1.00 - - - - cvtss2si %xmm0, %ecx
# CHECK-NEXT: - - 1.00 1.00 - - - - cvtss2si %xmm0, %rcx
# CHECK-NEXT: - - 1.00 1.00 - - 0.50 0.50 cvtss2si (%rax), %ecx
diff --git a/llvm/test/tools/llvm-mca/X86/SandyBridge/resources-sse2.s b/llvm/test/tools/llvm-mca/X86/SandyBridge/resources-sse2.s
index 0a1c25c0d66ff..2b6255c697fa1 100644
--- a/llvm/test/tools/llvm-mca/X86/SandyBridge/resources-sse2.s
+++ b/llvm/test/tools/llvm-mca/X86/SandyBridge/resources-sse2.s
@@ -58,8 +58,8 @@ cvtsd2ss (%rax), %xmm2
cvtsi2sd %ecx, %xmm2
cvtsi2sd %rcx, %xmm2
-cvtsi2sd (%rax), %xmm2
-cvtsi2sd (%rax), %xmm2
+cvtsi2sdl (%rax), %xmm2
+cvtsi2sdq (%rax), %xmm2
cvtss2sd %xmm0, %xmm2
cvtss2sd (%rax), %xmm2
@@ -447,7 +447,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: 2 4 1.00 cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: 2 4 1.00 cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: 2 9 1.00 * cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: 2 9 1.00 * cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: 2 9 1.00 * cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: 1 1 1.00 cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: 2 7 1.00 * cvtss2sd (%rax), %xmm2
# CHECK-NEXT: 2 4 1.00 cvttpd2dq %xmm0, %xmm2
@@ -731,7 +731,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: - - - 1.00 - 1.00 - - cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: - - - 1.00 - 1.00 - - cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: - - - 1.00 - - 0.50 0.50 cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: - - - 1.00 - - 0.50 0.50 cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: - - - 1.00 - - 0.50 0.50 cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: - - 1.00 - - - - - cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: - - 1.00 - - - 0.50 0.50 cvtss2sd (%rax), %xmm2
# CHECK-NEXT: - - - 1.00 - 1.00 - - cvttpd2dq %xmm0, %xmm2
diff --git a/llvm/test/tools/llvm-mca/X86/SkylakeClient/resources-sse1.s b/llvm/test/tools/llvm-mca/X86/SkylakeClient/resources-sse1.s
index d8e6f233d0cec..7f94e981c76ae 100644
--- a/llvm/test/tools/llvm-mca/X86/SkylakeClient/resources-sse1.s
+++ b/llvm/test/tools/llvm-mca/X86/SkylakeClient/resources-sse1.s
@@ -30,8 +30,8 @@ cvtps2pi (%rax), %mm2
cvtsi2ss %ecx, %xmm2
cvtsi2ss %rcx, %xmm2
-cvtsi2ss (%rax), %xmm2
-cvtsi2ss (%rax), %xmm2
+cvtsi2ssl (%rax), %xmm2
+cvtsi2ssq (%rax), %xmm2
cvtss2si %xmm0, %ecx
cvtss2si %xmm0, %rcx
@@ -215,7 +215,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: 2 5 1.00 cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: 3 6 2.00 cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: 2 9 1.00 * cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: 2 9 1.00 * cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: 2 9 1.00 * cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: 2 6 1.00 cvtss2si %xmm0, %ecx
# CHECK-NEXT: 2 6 1.00 cvtss2si %xmm0, %rcx
# CHECK-NEXT: 3 11 1.00 * cvtss2si (%rax), %ecx
@@ -358,7 +358,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: - - 0.33 0.33 - - - 1.33 - - cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: - - 0.50 0.50 - - - 2.00 - - cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: - - 1.50 0.50 - - - - - - cvtss2si %xmm0, %ecx
# CHECK-NEXT: - - 1.50 0.50 - - - - - - cvtss2si %xmm0, %rcx
# CHECK-NEXT: - - 1.50 0.50 0.50 0.50 - - - - cvtss2si (%rax), %ecx
diff --git a/llvm/test/tools/llvm-mca/X86/SkylakeClient/resources-sse2.s b/llvm/test/tools/llvm-mca/X86/SkylakeClient/resources-sse2.s
index 7b31b045bc101..32b53bc63ed03 100644
--- a/llvm/test/tools/llvm-mca/X86/SkylakeClient/resources-sse2.s
+++ b/llvm/test/tools/llvm-mca/X86/SkylakeClient/resources-sse2.s
@@ -58,8 +58,8 @@ cvtsd2ss (%rax), %xmm2
cvtsi2sd %ecx, %xmm2
cvtsi2sd %rcx, %xmm2
-cvtsi2sd (%rax), %xmm2
-cvtsi2sd (%rax), %xmm2
+cvtsi2sdl (%rax), %xmm2
+cvtsi2sdq (%rax), %xmm2
cvtss2sd %xmm0, %xmm2
cvtss2sd (%rax), %xmm2
@@ -447,7 +447,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: 2 5 1.00 cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: 2 5 1.00 cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: 2 9 1.00 * cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: 2 9 1.00 * cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: 2 9 1.00 * cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: 2 5 1.00 cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: 2 10 0.50 * cvtss2sd (%rax), %xmm2
# CHECK-NEXT: 2 5 1.00 cvttpd2dq %xmm0, %xmm2
@@ -733,7 +733,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: - - 0.33 0.33 - - - 1.33 - - cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: - - 0.33 0.33 - - - 1.33 - - cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: - - 0.33 0.33 - - - 1.33 - - cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: - - 0.50 0.50 0.50 0.50 - - - - cvtss2sd (%rax), %xmm2
# CHECK-NEXT: - - 0.33 0.33 - - - 1.33 - - cvttpd2dq %xmm0, %xmm2
diff --git a/llvm/test/tools/llvm-mca/X86/SkylakeServer/resources-sse1.s b/llvm/test/tools/llvm-mca/X86/SkylakeServer/resources-sse1.s
index b1d2c9640f12e..0a326792c1797 100644
--- a/llvm/test/tools/llvm-mca/X86/SkylakeServer/resources-sse1.s
+++ b/llvm/test/tools/llvm-mca/X86/SkylakeServer/resources-sse1.s
@@ -30,8 +30,8 @@ cvtps2pi (%rax), %mm2
cvtsi2ss %ecx, %xmm2
cvtsi2ss %rcx, %xmm2
-cvtsi2ss (%rax), %xmm2
-cvtsi2ss (%rax), %xmm2
+cvtsi2ssl (%rax), %xmm2
+cvtsi2ssq (%rax), %xmm2
cvtss2si %xmm0, %ecx
cvtss2si %xmm0, %rcx
@@ -215,7 +215,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: 2 5 1.00 cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: 3 6 2.00 cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: 2 9 1.00 * cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: 2 9 1.00 * cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: 2 9 1.00 * cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: 2 6 1.00 cvtss2si %xmm0, %ecx
# CHECK-NEXT: 3 7 1.00 cvtss2si %xmm0, %rcx
# CHECK-NEXT: 3 11 1.00 * cvtss2si (%rax), %ecx
@@ -358,7 +358,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: - - 0.33 0.33 - - - 1.33 - - cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: - - 0.33 0.33 - - - 2.33 - - cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: - - 1.00 1.00 - - - - - - cvtss2si %xmm0, %ecx
# CHECK-NEXT: - - 1.33 0.33 - - - 1.33 - - cvtss2si %xmm0, %rcx
# CHECK-NEXT: - - 1.00 1.00 0.50 0.50 - - - - cvtss2si (%rax), %ecx
diff --git a/llvm/test/tools/llvm-mca/X86/SkylakeServer/resources-sse2.s b/llvm/test/tools/llvm-mca/X86/SkylakeServer/resources-sse2.s
index 6a09e157a2ff2..f7ee4f9e2006a 100644
--- a/llvm/test/tools/llvm-mca/X86/SkylakeServer/resources-sse2.s
+++ b/llvm/test/tools/llvm-mca/X86/SkylakeServer/resources-sse2.s
@@ -58,8 +58,8 @@ cvtsd2ss (%rax), %xmm2
cvtsi2sd %ecx, %xmm2
cvtsi2sd %rcx, %xmm2
-cvtsi2sd (%rax), %xmm2
-cvtsi2sd (%rax), %xmm2
+cvtsi2sdl (%rax), %xmm2
+cvtsi2sdq (%rax), %xmm2
cvtss2sd %xmm0, %xmm2
cvtss2sd (%rax), %xmm2
@@ -447,7 +447,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: 2 5 1.00 cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: 2 5 1.00 cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: 2 9 1.00 * cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: 2 9 1.00 * cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: 2 9 1.00 * cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: 2 5 1.00 cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: 2 10 0.50 * cvtss2sd (%rax), %xmm2
# CHECK-NEXT: 2 5 1.00 cvttpd2dq %xmm0, %xmm2
@@ -733,7 +733,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: - - 0.33 0.33 - - - 1.33 - - cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: - - 0.33 0.33 - - - 1.33 - - cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: - - - 1.00 0.50 0.50 - - - - cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: - - 0.33 0.33 - - - 1.33 - - cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: - - 0.33 0.33 0.50 0.50 - 0.33 - - cvtss2sd (%rax), %xmm2
# CHECK-NEXT: - - 0.33 0.33 - - - 1.33 - - cvttpd2dq %xmm0, %xmm2
diff --git a/llvm/test/tools/llvm-mca/X86/Znver1/resources-sse1.s b/llvm/test/tools/llvm-mca/X86/Znver1/resources-sse1.s
index a0684cf20af82..3047e26d13644 100644
--- a/llvm/test/tools/llvm-mca/X86/Znver1/resources-sse1.s
+++ b/llvm/test/tools/llvm-mca/X86/Znver1/resources-sse1.s
@@ -30,8 +30,8 @@ cvtps2pi (%rax), %mm2
cvtsi2ss %ecx, %xmm2
cvtsi2ss %rcx, %xmm2
-cvtsi2ss (%rax), %xmm2
-cvtsi2ss (%rax), %xmm2
+cvtsi2ssl (%rax), %xmm2
+cvtsi2ssq (%rax), %xmm2
cvtss2si %xmm0, %ecx
cvtss2si %xmm0, %rcx
@@ -215,7 +215,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: 1 5 1.00 cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: 1 5 1.00 cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: 1 12 1.00 * cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: 1 12 1.00 * cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: 1 12 1.00 * cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: 1 5 1.00 cvtss2si %xmm0, %ecx
# CHECK-NEXT: 1 5 1.00 cvtss2si %xmm0, %rcx
# CHECK-NEXT: 2 12 1.00 * cvtss2si (%rax), %ecx
@@ -360,7 +360,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: - - - - - - - - - - 1.00 - cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: - - - - - - - - - - 1.00 - cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: 0.50 0.50 - - - - - - - - 1.00 - cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: 0.50 0.50 - - - - - - - - 1.00 - cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: 0.50 0.50 - - - - - - - - 1.00 - cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: - - - - - - - - 0.50 0.50 1.00 - cvtss2si %xmm0, %ecx
# CHECK-NEXT: - - - - - - - - 0.50 0.50 1.00 - cvtss2si %xmm0, %rcx
# CHECK-NEXT: 0.50 0.50 - - - - - - 0.50 0.50 1.00 - cvtss2si (%rax), %ecx
diff --git a/llvm/test/tools/llvm-mca/X86/Znver1/resources-sse2.s b/llvm/test/tools/llvm-mca/X86/Znver1/resources-sse2.s
index a16bede94f552..55e7229364158 100644
--- a/llvm/test/tools/llvm-mca/X86/Znver1/resources-sse2.s
+++ b/llvm/test/tools/llvm-mca/X86/Znver1/resources-sse2.s
@@ -58,8 +58,8 @@ cvtsd2ss (%rax), %xmm2
cvtsi2sd %ecx, %xmm2
cvtsi2sd %rcx, %xmm2
-cvtsi2sd (%rax), %xmm2
-cvtsi2sd (%rax), %xmm2
+cvtsi2sdl (%rax), %xmm2
+cvtsi2sdq (%rax), %xmm2
cvtss2sd %xmm0, %xmm2
cvtss2sd (%rax), %xmm2
@@ -447,7 +447,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: 1 5 1.00 cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: 1 5 1.00 cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: 1 12 1.00 * cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: 1 12 1.00 * cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: 1 12 1.00 * cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: 1 4 1.00 cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: 2 11 2.00 * cvtss2sd (%rax), %xmm2
# CHECK-NEXT: 1 5 1.00 cvttpd2dq %xmm0, %xmm2
@@ -735,7 +735,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: - - - - - - - 0.33 0.33 - 1.33 - cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: - - - - - - - 0.33 0.33 - 1.33 - cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: 0.50 0.50 - - - - - - - - 1.00 - cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: 0.50 0.50 - - - - - - - - 1.00 - cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: 0.50 0.50 - - - - - - - - 1.00 - cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: - - - - - - - - - - 1.00 - cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: 0.50 0.50 - - - - - - - - 2.00 - cvtss2sd (%rax), %xmm2
# CHECK-NEXT: - - - - - - - - 0.50 0.50 1.00 - cvttpd2dq %xmm0, %xmm2
diff --git a/llvm/test/tools/llvm-mca/X86/Znver2/resources-sse1.s b/llvm/test/tools/llvm-mca/X86/Znver2/resources-sse1.s
index 74b3c87e1ab91..7d9dcfbf249a6 100644
--- a/llvm/test/tools/llvm-mca/X86/Znver2/resources-sse1.s
+++ b/llvm/test/tools/llvm-mca/X86/Znver2/resources-sse1.s
@@ -30,8 +30,8 @@ cvtps2pi (%rax), %mm2
cvtsi2ss %ecx, %xmm2
cvtsi2ss %rcx, %xmm2
-cvtsi2ss (%rax), %xmm2
-cvtsi2ss (%rax), %xmm2
+cvtsi2ssl (%rax), %xmm2
+cvtsi2ssq (%rax), %xmm2
cvtss2si %xmm0, %ecx
cvtss2si %xmm0, %rcx
@@ -215,7 +215,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: 1 5 1.00 cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: 1 5 1.00 cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: 1 12 1.00 * cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: 1 12 1.00 * cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: 1 12 1.00 * cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: 1 3 1.00 cvtss2si %xmm0, %ecx
# CHECK-NEXT: 1 3 1.00 cvtss2si %xmm0, %rcx
# CHECK-NEXT: 2 10 1.00 * cvtss2si (%rax), %ecx
@@ -361,7 +361,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: - - - - - - - - - - - 1.00 - cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: - - - - - - - - - - - 1.00 - cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: 0.33 0.33 0.33 - - - - - - - - 1.00 - cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: 0.33 0.33 0.33 - - - - - - - - 1.00 - cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: 0.33 0.33 0.33 - - - - - - - - 1.00 - cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: - - - - - - - - - 0.50 0.50 1.00 - cvtss2si %xmm0, %ecx
# CHECK-NEXT: - - - - - - - - - 0.50 0.50 1.00 - cvtss2si %xmm0, %rcx
# CHECK-NEXT: 0.33 0.33 0.33 - - - - - - 0.50 0.50 1.00 - cvtss2si (%rax), %ecx
diff --git a/llvm/test/tools/llvm-mca/X86/Znver2/resources-sse2.s b/llvm/test/tools/llvm-mca/X86/Znver2/resources-sse2.s
index 8dc689b138f32..5bc3cdcc4a2ff 100644
--- a/llvm/test/tools/llvm-mca/X86/Znver2/resources-sse2.s
+++ b/llvm/test/tools/llvm-mca/X86/Znver2/resources-sse2.s
@@ -58,8 +58,8 @@ cvtsd2ss (%rax), %xmm2
cvtsi2sd %ecx, %xmm2
cvtsi2sd %rcx, %xmm2
-cvtsi2sd (%rax), %xmm2
-cvtsi2sd (%rax), %xmm2
+cvtsi2sdl (%rax), %xmm2
+cvtsi2sdq (%rax), %xmm2
cvtss2sd %xmm0, %xmm2
cvtss2sd (%rax), %xmm2
@@ -447,7 +447,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: 1 3 1.00 cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: 1 3 1.00 cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: 1 12 1.00 * cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: 1 12 1.00 * cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: 1 12 1.00 * cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: 1 3 1.00 cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: 2 10 2.00 * cvtss2sd (%rax), %xmm2
# CHECK-NEXT: 1 3 1.00 cvttpd2dq %xmm0, %xmm2
@@ -736,7 +736,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: - - - - - - - - 0.33 0.33 - 1.33 - cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: - - - - - - - - 0.33 0.33 - 1.33 - cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: 0.33 0.33 0.33 - - - - - - - - 1.00 - cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: 0.33 0.33 0.33 - - - - - - - - 1.00 - cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: 0.33 0.33 0.33 - - - - - - - - 1.00 - cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: - - - - - - - - - - - 1.00 - cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: 0.33 0.33 0.33 - - - - - - - - 2.00 - cvtss2sd (%rax), %xmm2
# CHECK-NEXT: - - - - - - - - - 0.50 0.50 1.00 - cvttpd2dq %xmm0, %xmm2
diff --git a/llvm/test/tools/llvm-mca/X86/Znver3/resources-sse1.s b/llvm/test/tools/llvm-mca/X86/Znver3/resources-sse1.s
index 4768a1639b896..9816b87df4620 100644
--- a/llvm/test/tools/llvm-mca/X86/Znver3/resources-sse1.s
+++ b/llvm/test/tools/llvm-mca/X86/Znver3/resources-sse1.s
@@ -30,8 +30,8 @@ cvtps2pi (%rax), %mm2
cvtsi2ss %ecx, %xmm2
cvtsi2ss %rcx, %xmm2
-cvtsi2ss (%rax), %xmm2
-cvtsi2ss (%rax), %xmm2
+cvtsi2ssl (%rax), %xmm2
+cvtsi2ssq (%rax), %xmm2
cvtss2si %xmm0, %ecx
cvtss2si %xmm0, %rcx
@@ -215,7 +215,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: 2 4 1.00 cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: 2 4 1.00 cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: 1 10 1.00 * cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: 1 10 1.00 * cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: 1 10 1.00 * cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: 2 2 1.00 cvtss2si %xmm0, %ecx
# CHECK-NEXT: 2 2 1.00 cvtss2si %xmm0, %rcx
# CHECK-NEXT: 2 9 1.00 * cvtss2si (%rax), %ecx
@@ -371,7 +371,7 @@ xorps (%rax), %xmm2
# CHECK-NEXT: - - - - - - - - - - 1.00 1.00 - - - - - - - - - - - cvtsi2ss %ecx, %xmm2
# CHECK-NEXT: - - - - - - - - - - 1.00 1.00 - - - - - - - - - - - cvtsi2ss %rcx, %xmm2
# CHECK-NEXT: - - - - - - - - - - 1.00 1.00 0.50 0.50 - 0.33 0.33 0.33 0.33 0.33 0.33 - - cvtsi2ssl (%rax), %xmm2
-# CHECK-NEXT: - - - - - - - - - - 1.00 1.00 0.50 0.50 - 0.33 0.33 0.33 0.33 0.33 0.33 - - cvtsi2ssl (%rax), %xmm2
+# CHECK-NEXT: - - - - - - - - - - 1.00 1.00 0.50 0.50 - 0.33 0.33 0.33 0.33 0.33 0.33 - - cvtsi2ssq (%rax), %xmm2
# CHECK-NEXT: - - - - - - - - - - 1.00 1.00 - - - - - - - - - - - cvtss2si %xmm0, %ecx
# CHECK-NEXT: - - - - - - - - - - 1.00 1.00 - - - - - - - - - - - cvtss2si %xmm0, %rcx
# CHECK-NEXT: - - - - - - - - - - 1.00 1.00 0.50 0.50 - 0.33 0.33 0.33 0.33 0.33 0.33 - - cvtss2si (%rax), %ecx
diff --git a/llvm/test/tools/llvm-mca/X86/Znver3/resources-sse2.s b/llvm/test/tools/llvm-mca/X86/Znver3/resources-sse2.s
index 9e31632b0ecc8..f69c535385af5 100644
--- a/llvm/test/tools/llvm-mca/X86/Znver3/resources-sse2.s
+++ b/llvm/test/tools/llvm-mca/X86/Znver3/resources-sse2.s
@@ -58,8 +58,8 @@ cvtsd2ss (%rax), %xmm2
cvtsi2sd %ecx, %xmm2
cvtsi2sd %rcx, %xmm2
-cvtsi2sd (%rax), %xmm2
-cvtsi2sd (%rax), %xmm2
+cvtsi2sdl (%rax), %xmm2
+cvtsi2sdq (%rax), %xmm2
cvtss2sd %xmm0, %xmm2
cvtss2sd (%rax), %xmm2
@@ -447,7 +447,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: 2 4 1.00 cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: 2 4 1.00 cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: 1 10 1.00 * cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: 1 10 1.00 * cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: 1 10 1.00 * cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: 1 3 0.50 cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: 1 10 0.50 * cvtss2sd (%rax), %xmm2
# CHECK-NEXT: 1 3 0.50 cvttpd2dq %xmm0, %xmm2
@@ -746,7 +746,7 @@ xorpd (%rax), %xmm2
# CHECK-NEXT: - - - - - - - - - - 1.00 1.00 - - - - - - - - - - - cvtsi2sd %ecx, %xmm2
# CHECK-NEXT: - - - - - - - - - - 1.00 1.00 - - - - - - - - - - - cvtsi2sd %rcx, %xmm2
# CHECK-NEXT: - - - - - - - - - - 1.00 1.00 0.50 0.50 - 0.33 0.33 0.33 0.33 0.33 0.33 - - cvtsi2sdl (%rax), %xmm2
-# CHECK-NEXT: - - - - - - - - - - 1.00 1.00 0.50 0.50 - 0.33 0.33 0.33 0.33 0.33 0.33 - - cvtsi2sdl (%rax), %xmm2
+# CHECK-NEXT: - - - - - - - - - - 1.00 1.00 0.50 0.50 - 0.33 0.33 0.33 0.33 0.33 0.33 - - cvtsi2sdq (%rax), %xmm2
# CHECK-NEXT: - - - - - - - - - - 0.50 0.50 - - - - - - - - - - - cvtss2sd %xmm0, %xmm2
# CHECK-NEXT: - - - - - - - - - - 0.50 0.50 0.50 0.50 - 0.33 0.33 0.33 0.33 0.33 0.33 - - cvtss2sd (%rax), %xmm2
# CHECK-NEXT: - - - - - - - - - - 0.50 0.50 - - - - - - - - - - - cvttpd2dq %xmm0, %xmm2
More information about the llvm-commits
mailing list