[llvm-mca][x86] Add extend, carry-flag and CMP instructions to general x86_64 resourc...

llvm-svn: 337306

diff --git a/llvm/test/tools/llvm-mca/X86/Atom/resources-x86_64.s b/llvm/test/tools/llvm-mca/X86/Atom/resources-x86_64.s
index 4dbcc6d..f012700 100644 (file)
--- a/llvm/test/tools/llvm-mca/X86/Atom/resources-x86_64.s
+++ b/llvm/test/tools/llvm-mca/X86/Atom/resources-x86_64.s
@@ -172,7 +172,50 @@ btcq $7, (%rax)
 btrq $7, (%rax)
 btsq $7, (%rax)
 
+cbw
+cwde
+cdqe
+cwd
+cdq
+cqo
+
 clc
+cld
+cmc
+
+cmpb $7, %al
+cmpb $7, %dil
+cmpb $7, (%rax)
+cmpb %sil, %dil
+cmpb %sil, (%rax)
+cmpb (%rax), %dil
+
+cmpw $511, %ax
+cmpw $511, %di
+cmpw $511, (%rax)
+cmpw $7, %di
+cmpw $7, (%rax)
+cmpw %si, %di
+cmpw %si, (%rax)
+cmpw (%rax), %di
+
+cmpl $665536, %eax
+cmpl $665536, %edi
+cmpl $665536, (%rax)
+cmpl $7, %edi
+cmpl $7, (%rax)
+cmpl %esi, %edi
+cmpl %esi, (%rax)
+cmpl (%rax), %edi
+
+cmpq $665536, %rax
+cmpq $665536, %rdi
+cmpq $665536, (%rax)
+cmpq $7, %rdi
+cmpq $7, (%rax)
+cmpq %rsi, %rdi
+cmpq %rsi, (%rax)
+cmpq (%rax), %rdi
 
 decb %dil
 decb (%rax)
@@ -783,7 +826,45 @@ xorq (%rax), %rdi
 # CHECK-NEXT:  1      2     1.00    *      *            btcq   $7, (%rax)
 # CHECK-NEXT:  1      2     1.00    *      *            btrq   $7, (%rax)
 # CHECK-NEXT:  1      2     1.00    *      *            btsq   $7, (%rax)
+# CHECK-NEXT:  1      4     2.00                        cbtw
+# CHECK-NEXT:  1      4     2.00                        cwtl
+# CHECK-NEXT:  1      4     2.00                        cltq
+# CHECK-NEXT:  1      4     2.00                        cwtd
+# CHECK-NEXT:  1      4     2.00                        cltd
+# CHECK-NEXT:  1      4     2.00                        cqto
 # CHECK-NEXT:  1      1     0.50                  U     clc
+# CHECK-NEXT:  1      3     1.50                  U     cld
+# CHECK-NEXT:  1      1     0.50                  U     cmc
+# CHECK-NEXT:  1      1     0.50                        cmpb   $7, %al
+# CHECK-NEXT:  1      1     0.50                        cmpb   $7, %dil
+# CHECK-NEXT:  1      1     1.00    *                   cmpb   $7, (%rax)
+# CHECK-NEXT:  1      1     0.50                        cmpb   %sil, %dil
+# CHECK-NEXT:  1      1     1.00    *                   cmpb   %sil, (%rax)
+# CHECK-NEXT:  1      1     1.00    *                   cmpb   (%rax), %dil
+# CHECK-NEXT:  1      1     0.50                        cmpw   $511, %ax
+# CHECK-NEXT:  1      1     0.50                        cmpw   $511, %di
+# CHECK-NEXT:  1      1     1.00    *                   cmpw   $511, (%rax)
+# CHECK-NEXT:  1      1     0.50                        cmpw   $7, %di
+# CHECK-NEXT:  1      1     1.00    *                   cmpw   $7, (%rax)
+# CHECK-NEXT:  1      1     0.50                        cmpw   %si, %di
+# CHECK-NEXT:  1      1     1.00    *                   cmpw   %si, (%rax)
+# CHECK-NEXT:  1      1     1.00    *                   cmpw   (%rax), %di
+# CHECK-NEXT:  1      1     0.50                        cmpl   $665536, %eax
+# CHECK-NEXT:  1      1     0.50                        cmpl   $665536, %edi
+# CHECK-NEXT:  1      1     1.00    *                   cmpl   $665536, (%rax)
+# CHECK-NEXT:  1      1     0.50                        cmpl   $7, %edi
+# CHECK-NEXT:  1      1     1.00    *                   cmpl   $7, (%rax)
+# CHECK-NEXT:  1      1     0.50                        cmpl   %esi, %edi
+# CHECK-NEXT:  1      1     1.00    *                   cmpl   %esi, (%rax)
+# CHECK-NEXT:  1      1     1.00    *                   cmpl   (%rax), %edi
+# CHECK-NEXT:  1      1     0.50                        cmpq   $665536, %rax
+# CHECK-NEXT:  1      1     0.50                        cmpq   $665536, %rdi
+# CHECK-NEXT:  1      1     1.00    *                   cmpq   $665536, (%rax)
+# CHECK-NEXT:  1      1     0.50                        cmpq   $7, %rdi
+# CHECK-NEXT:  1      1     1.00    *                   cmpq   $7, (%rax)
+# CHECK-NEXT:  1      1     0.50                        cmpq   %rsi, %rdi
+# CHECK-NEXT:  1      1     1.00    *                   cmpq   %rsi, (%rax)
+# CHECK-NEXT:  1      1     1.00    *                   cmpq   (%rax), %rdi
 # CHECK-NEXT:  1      1     0.50                        decb   %dil
 # CHECK-NEXT:  1      1     1.00    *      *            decb   (%rax)
 # CHECK-NEXT:  1      1     0.50                        decw   %di
@@ -1194,7 +1275,7 @@ xorq (%rax), %rdi
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]
-# CHECK-NEXT: 1358.50 1061.50
+# CHECK-NEXT: 1395.00 1083.00
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    Instructions:
@@ -1350,7 +1431,45 @@ xorq (%rax), %rdi
 # CHECK-NEXT: 1.00   1.00   btcq       $7, (%rax)
 # CHECK-NEXT: 1.00   1.00   btrq       $7, (%rax)
 # CHECK-NEXT: 1.00   1.00   btsq       $7, (%rax)
+# CHECK-NEXT: 2.00   2.00   cbtw
+# CHECK-NEXT: 2.00   2.00   cwtl
+# CHECK-NEXT: 2.00   2.00   cltq
+# CHECK-NEXT: 2.00   2.00   cwtd
+# CHECK-NEXT: 2.00   2.00   cltd
+# CHECK-NEXT: 2.00   2.00   cqto
 # CHECK-NEXT: 0.50   0.50   clc
+# CHECK-NEXT: 1.50   1.50   cld
+# CHECK-NEXT: 0.50   0.50   cmc
+# CHECK-NEXT: 0.50   0.50   cmpb       $7, %al
+# CHECK-NEXT: 0.50   0.50   cmpb       $7, %dil
+# CHECK-NEXT: 1.00    -     cmpb       $7, (%rax)
+# CHECK-NEXT: 0.50   0.50   cmpb       %sil, %dil
+# CHECK-NEXT: 1.00    -     cmpb       %sil, (%rax)
+# CHECK-NEXT: 1.00    -     cmpb       (%rax), %dil
+# CHECK-NEXT: 0.50   0.50   cmpw       $511, %ax
+# CHECK-NEXT: 0.50   0.50   cmpw       $511, %di
+# CHECK-NEXT: 1.00    -     cmpw       $511, (%rax)
+# CHECK-NEXT: 0.50   0.50   cmpw       $7, %di
+# CHECK-NEXT: 1.00    -     cmpw       $7, (%rax)
+# CHECK-NEXT: 0.50   0.50   cmpw       %si, %di
+# CHECK-NEXT: 1.00    -     cmpw       %si, (%rax)
+# CHECK-NEXT: 1.00    -     cmpw       (%rax), %di
+# CHECK-NEXT: 0.50   0.50   cmpl       $665536, %eax
+# CHECK-NEXT: 0.50   0.50   cmpl       $665536, %edi
+# CHECK-NEXT: 1.00    -     cmpl       $665536, (%rax)
+# CHECK-NEXT: 0.50   0.50   cmpl       $7, %edi
+# CHECK-NEXT: 1.00    -     cmpl       $7, (%rax)
+# CHECK-NEXT: 0.50   0.50   cmpl       %esi, %edi
+# CHECK-NEXT: 1.00    -     cmpl       %esi, (%rax)
+# CHECK-NEXT: 1.00    -     cmpl       (%rax), %edi
+# CHECK-NEXT: 0.50   0.50   cmpq       $665536, %rax
+# CHECK-NEXT: 0.50   0.50   cmpq       $665536, %rdi
+# CHECK-NEXT: 1.00    -     cmpq       $665536, (%rax)
+# CHECK-NEXT: 0.50   0.50   cmpq       $7, %rdi
+# CHECK-NEXT: 1.00    -     cmpq       $7, (%rax)
+# CHECK-NEXT: 0.50   0.50   cmpq       %rsi, %rdi
+# CHECK-NEXT: 1.00    -     cmpq       %rsi, (%rax)
+# CHECK-NEXT: 1.00    -     cmpq       (%rax), %rdi
 # CHECK-NEXT: 0.50   0.50   decb       %dil
 # CHECK-NEXT: 1.00    -     decb       (%rax)
 # CHECK-NEXT: 0.50   0.50   decw       %di

diff --git a/llvm/test/tools/llvm-mca/X86/Broadwell/resources-x86_64.s b/llvm/test/tools/llvm-mca/X86/Broadwell/resources-x86_64.s
index 5e86508..26b951e 100644 (file)
--- a/llvm/test/tools/llvm-mca/X86/Broadwell/resources-x86_64.s
+++ b/llvm/test/tools/llvm-mca/X86/Broadwell/resources-x86_64.s
@@ -172,7 +172,50 @@ btcq $7, (%rax)
 btrq $7, (%rax)
 btsq $7, (%rax)
 
+cbw
+cwde
+cdqe
+cwd
+cdq
+cqo
+
 clc
+cld
+cmc
+
+cmpb $7, %al
+cmpb $7, %dil
+cmpb $7, (%rax)
+cmpb %sil, %dil
+cmpb %sil, (%rax)
+cmpb (%rax), %dil
+
+cmpw $511, %ax
+cmpw $511, %di
+cmpw $511, (%rax)
+cmpw $7, %di
+cmpw $7, (%rax)
+cmpw %si, %di
+cmpw %si, (%rax)
+cmpw (%rax), %di
+
+cmpl $665536, %eax
+cmpl $665536, %edi
+cmpl $665536, (%rax)
+cmpl $7, %edi
+cmpl $7, (%rax)
+cmpl %esi, %edi
+cmpl %esi, (%rax)
+cmpl (%rax), %edi
+
+cmpq $665536, %rax
+cmpq $665536, %rdi
+cmpq $665536, (%rax)
+cmpq $7, %rdi
+cmpq $7, (%rax)
+cmpq %rsi, %rdi
+cmpq %rsi, (%rax)
+cmpq (%rax), %rdi
 
 decb %dil
 decb (%rax)
@@ -783,7 +826,45 @@ xorq (%rax), %rdi
 # CHECK-NEXT:  4      6     1.00    *      *            btcq   $7, (%rax)
 # CHECK-NEXT:  4      6     1.00    *      *            btrq   $7, (%rax)
 # CHECK-NEXT:  4      6     1.00    *      *            btsq   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cbtw
+# CHECK-NEXT:  1      1     0.25                        cwtl
+# CHECK-NEXT:  1      1     0.25                        cltq
+# CHECK-NEXT:  2      2     0.50                        cwtd
+# CHECK-NEXT:  1      1     0.50                        cltd
+# CHECK-NEXT:  1      1     0.50                        cqto
 # CHECK-NEXT:  1      1     0.25                  U     clc
+# CHECK-NEXT:  3      3     1.00                  U     cld
+# CHECK-NEXT:  1      1     0.25                  U     cmc
+# CHECK-NEXT:  1      1     0.25                        cmpb   $7, %al
+# CHECK-NEXT:  1      1     0.25                        cmpb   $7, %dil
+# CHECK-NEXT:  2      6     0.50    *                   cmpb   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpb   %sil, %dil
+# CHECK-NEXT:  2      6     0.50    *                   cmpb   %sil, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpb   (%rax), %dil
+# CHECK-NEXT:  1      1     0.25                        cmpw   $511, %ax
+# CHECK-NEXT:  1      1     0.25                        cmpw   $511, %di
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   $511, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpw   $7, %di
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpw   %si, %di
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   %si, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   (%rax), %di
+# CHECK-NEXT:  1      1     0.25                        cmpl   $665536, %eax
+# CHECK-NEXT:  1      1     0.25                        cmpl   $665536, %edi
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   $665536, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpl   $7, %edi
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpl   %esi, %edi
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   %esi, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   (%rax), %edi
+# CHECK-NEXT:  1      1     0.25                        cmpq   $665536, %rax
+# CHECK-NEXT:  1      1     0.25                        cmpq   $665536, %rdi
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   $665536, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpq   $7, %rdi
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpq   %rsi, %rdi
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   %rsi, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   (%rax), %rdi
 # CHECK-NEXT:  1      1     0.25                        decb   %dil
 # CHECK-NEXT:  3      7     1.00    *      *            decb   (%rax)
 # CHECK-NEXT:  1      1     0.25                        decw   %di
@@ -1202,7 +1283,7 @@ xorq (%rax), %rdi
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]
-# CHECK-NEXT: 50.00   -     363.50 255.50 205.00 205.00 167.00 149.00 329.00 69.00
+# CHECK-NEXT: 50.00   -     374.25 264.75 212.50 212.50 167.00 158.25 340.75 69.00
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    Instructions:
@@ -1358,7 +1439,45 @@ xorq (%rax), %rdi
 # CHECK-NEXT:  -      -     0.50    -     0.83   0.83   1.00    -     0.50   0.33   btcq       $7, (%rax)
 # CHECK-NEXT:  -      -     0.50    -     0.83   0.83   1.00    -     0.50   0.33   btrq       $7, (%rax)
 # CHECK-NEXT:  -      -     0.50    -     0.83   0.83   1.00    -     0.50   0.33   btsq       $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cbtw
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cwtl
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cltq
+# CHECK-NEXT:  -      -     0.75   0.25    -      -      -     0.25   0.75    -     cwtd
+# CHECK-NEXT:  -      -     0.50    -      -      -      -      -     0.50    -     cltd
+# CHECK-NEXT:  -      -     0.50    -      -      -      -      -     0.50    -     cqto
 # CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     clc
+# CHECK-NEXT:  -      -     0.50   0.50    -      -      -     0.50   1.50    -     cld
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmc
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpb       $7, %al
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpb       $7, %dil
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpb       $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpb       %sil, %dil
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpb       %sil, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpb       (%rax), %dil
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpw       $511, %ax
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpw       $511, %di
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpw       $511, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpw       $7, %di
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpw       $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpw       %si, %di
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpw       %si, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpw       (%rax), %di
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpl       $665536, %eax
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpl       $665536, %edi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpl       $665536, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpl       $7, %edi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpl       $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpl       %esi, %edi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpl       %esi, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpl       (%rax), %edi
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpq       $665536, %rax
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpq       $665536, %rdi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpq       $665536, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpq       $7, %rdi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpq       $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpq       %rsi, %rdi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpq       %rsi, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpq       (%rax), %rdi
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     decb       %dil
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   decb       (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     decw       %di

diff --git a/llvm/test/tools/llvm-mca/X86/BtVer2/resources-x86_64.s b/llvm/test/tools/llvm-mca/X86/BtVer2/resources-x86_64.s
index 49df68d..fb0d758 100644 (file)
--- a/llvm/test/tools/llvm-mca/X86/BtVer2/resources-x86_64.s
+++ b/llvm/test/tools/llvm-mca/X86/BtVer2/resources-x86_64.s
@@ -172,7 +172,50 @@ btcq $7, (%rax)
 btrq $7, (%rax)
 btsq $7, (%rax)
 
+cbw
+cwde
+cdqe
+cwd
+cdq
+cqo
+
 clc
+cld
+cmc
+
+cmpb $7, %al
+cmpb $7, %dil
+cmpb $7, (%rax)
+cmpb %sil, %dil
+cmpb %sil, (%rax)
+cmpb (%rax), %dil
+
+cmpw $511, %ax
+cmpw $511, %di
+cmpw $511, (%rax)
+cmpw $7, %di
+cmpw $7, (%rax)
+cmpw %si, %di
+cmpw %si, (%rax)
+cmpw (%rax), %di
+
+cmpl $665536, %eax
+cmpl $665536, %edi
+cmpl $665536, (%rax)
+cmpl $7, %edi
+cmpl $7, (%rax)
+cmpl %esi, %edi
+cmpl %esi, (%rax)
+cmpl (%rax), %edi
+
+cmpq $665536, %rax
+cmpq $665536, %rdi
+cmpq $665536, (%rax)
+cmpq $7, %rdi
+cmpq $7, (%rax)
+cmpq %rsi, %rdi
+cmpq %rsi, (%rax)
+cmpq (%rax), %rdi
 
 decb %dil
 decb (%rax)
@@ -783,7 +826,45 @@ xorq (%rax), %rdi
 # CHECK-NEXT:  2      4     1.00    *      *            btcq   $7, (%rax)
 # CHECK-NEXT:  2      4     1.00    *      *            btrq   $7, (%rax)
 # CHECK-NEXT:  2      4     1.00    *      *            btsq   $7, (%rax)
+# CHECK-NEXT:  1      1     0.50                        cbtw
+# CHECK-NEXT:  1      1     0.50                        cwtl
+# CHECK-NEXT:  1      1     0.50                        cltq
+# CHECK-NEXT:  1      1     0.50                        cwtd
+# CHECK-NEXT:  1      1     0.50                        cltd
+# CHECK-NEXT:  1      1     0.50                        cqto
 # CHECK-NEXT:  1      1     0.50                  U     clc
+# CHECK-NEXT:  1      1     0.50                  U     cld
+# CHECK-NEXT:  1      1     0.50                  U     cmc
+# CHECK-NEXT:  1      1     0.50                        cmpb   $7, %al
+# CHECK-NEXT:  1      1     0.50                        cmpb   $7, %dil
+# CHECK-NEXT:  1      4     1.00    *                   cmpb   $7, (%rax)
+# CHECK-NEXT:  1      1     0.50                        cmpb   %sil, %dil
+# CHECK-NEXT:  1      4     1.00    *                   cmpb   %sil, (%rax)
+# CHECK-NEXT:  1      4     1.00    *                   cmpb   (%rax), %dil
+# CHECK-NEXT:  1      1     0.50                        cmpw   $511, %ax
+# CHECK-NEXT:  1      1     0.50                        cmpw   $511, %di
+# CHECK-NEXT:  1      4     1.00    *                   cmpw   $511, (%rax)
+# CHECK-NEXT:  1      1     0.50                        cmpw   $7, %di
+# CHECK-NEXT:  1      4     1.00    *                   cmpw   $7, (%rax)
+# CHECK-NEXT:  1      1     0.50                        cmpw   %si, %di
+# CHECK-NEXT:  1      4     1.00    *                   cmpw   %si, (%rax)
+# CHECK-NEXT:  1      4     1.00    *                   cmpw   (%rax), %di
+# CHECK-NEXT:  1      1     0.50                        cmpl   $665536, %eax
+# CHECK-NEXT:  1      1     0.50                        cmpl   $665536, %edi
+# CHECK-NEXT:  1      4     1.00    *                   cmpl   $665536, (%rax)
+# CHECK-NEXT:  1      1     0.50                        cmpl   $7, %edi
+# CHECK-NEXT:  1      4     1.00    *                   cmpl   $7, (%rax)
+# CHECK-NEXT:  1      1     0.50                        cmpl   %esi, %edi
+# CHECK-NEXT:  1      4     1.00    *                   cmpl   %esi, (%rax)
+# CHECK-NEXT:  1      4     1.00    *                   cmpl   (%rax), %edi
+# CHECK-NEXT:  1      1     0.50                        cmpq   $665536, %rax
+# CHECK-NEXT:  1      1     0.50                        cmpq   $665536, %rdi
+# CHECK-NEXT:  1      4     1.00    *                   cmpq   $665536, (%rax)
+# CHECK-NEXT:  1      1     0.50                        cmpq   $7, %rdi
+# CHECK-NEXT:  1      4     1.00    *                   cmpq   $7, (%rax)
+# CHECK-NEXT:  1      1     0.50                        cmpq   %rsi, %rdi
+# CHECK-NEXT:  1      4     1.00    *                   cmpq   %rsi, (%rax)
+# CHECK-NEXT:  1      4     1.00    *                   cmpq   (%rax), %rdi
 # CHECK-NEXT:  1      1     0.50                        decb   %dil
 # CHECK-NEXT:  2      5     1.00    *      *            decb   (%rax)
 # CHECK-NEXT:  1      1     0.50                        decw   %di
@@ -1206,7 +1287,7 @@ xorq (%rax), %rdi
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13]
-# CHECK-NEXT: 463.00 513.00 380.00  -      -      -      -     269.00 64.00  195.00  -      -      -      -
+# CHECK-NEXT: 482.00 532.00 380.00  -      -      -      -     284.00 64.00  195.00  -      -      -      -
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13]   Instructions:
@@ -1362,7 +1443,45 @@ xorq (%rax), %rdi
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -     1.00    -      -      -      -     btcq   $7, (%rax)
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -     1.00    -      -      -      -     btrq   $7, (%rax)
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -     1.00    -      -      -      -     btsq   $7, (%rax)
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cbtw
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cwtl
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cltq
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cwtd
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cltd
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cqto
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     clc
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cld
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cmc
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cmpb   $7, %al
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cmpb   $7, %dil
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -      -      -      -      -      -     cmpb   $7, (%rax)
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cmpb   %sil, %dil
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -      -      -      -      -      -     cmpb   %sil, (%rax)
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -      -      -      -      -      -     cmpb   (%rax), %dil
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cmpw   $511, %ax
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cmpw   $511, %di
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -      -      -      -      -      -     cmpw   $511, (%rax)
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cmpw   $7, %di
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -      -      -      -      -      -     cmpw   $7, (%rax)
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cmpw   %si, %di
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -      -      -      -      -      -     cmpw   %si, (%rax)
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -      -      -      -      -      -     cmpw   (%rax), %di
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cmpl   $665536, %eax
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cmpl   $665536, %edi
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -      -      -      -      -      -     cmpl   $665536, (%rax)
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cmpl   $7, %edi
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -      -      -      -      -      -     cmpl   $7, (%rax)
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cmpl   %esi, %edi
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -      -      -      -      -      -     cmpl   %esi, (%rax)
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -      -      -      -      -      -     cmpl   (%rax), %edi
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cmpq   $665536, %rax
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cmpq   $665536, %rdi
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -      -      -      -      -      -     cmpq   $665536, (%rax)
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cmpq   $7, %rdi
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -      -      -      -      -      -     cmpq   $7, (%rax)
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cmpq   %rsi, %rdi
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -      -      -      -      -      -     cmpq   %rsi, (%rax)
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -      -      -      -      -      -     cmpq   (%rax), %rdi
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     decb   %dil
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -     1.00    -      -      -      -     decb   (%rax)
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     decw   %di

diff --git a/llvm/test/tools/llvm-mca/X86/Generic/resources-x86_64.s b/llvm/test/tools/llvm-mca/X86/Generic/resources-x86_64.s
index 3ab7f91..2a58d90 100644 (file)
--- a/llvm/test/tools/llvm-mca/X86/Generic/resources-x86_64.s
+++ b/llvm/test/tools/llvm-mca/X86/Generic/resources-x86_64.s
@@ -172,7 +172,50 @@ btcq $7, (%rax)
 btrq $7, (%rax)
 btsq $7, (%rax)
 
+cbw
+cwde
+cdqe
+cwd
+cdq
+cqo
+
 clc
+cld
+cmc
+
+cmpb $7, %al
+cmpb $7, %dil
+cmpb $7, (%rax)
+cmpb %sil, %dil
+cmpb %sil, (%rax)
+cmpb (%rax), %dil
+
+cmpw $511, %ax
+cmpw $511, %di
+cmpw $511, (%rax)
+cmpw $7, %di
+cmpw $7, (%rax)
+cmpw %si, %di
+cmpw %si, (%rax)
+cmpw (%rax), %di
+
+cmpl $665536, %eax
+cmpl $665536, %edi
+cmpl $665536, (%rax)
+cmpl $7, %edi
+cmpl $7, (%rax)
+cmpl %esi, %edi
+cmpl %esi, (%rax)
+cmpl (%rax), %edi
+
+cmpq $665536, %rax
+cmpq $665536, %rdi
+cmpq $665536, (%rax)
+cmpq $7, %rdi
+cmpq $7, (%rax)
+cmpq %rsi, %rdi
+cmpq %rsi, (%rax)
+cmpq (%rax), %rdi
 
 decb %dil
 decb (%rax)
@@ -783,7 +826,45 @@ xorq (%rax), %rdi
 # CHECK-NEXT:  4      7     1.00    *      *            btcq   $7, (%rax)
 # CHECK-NEXT:  4      7     1.00    *      *            btrq   $7, (%rax)
 # CHECK-NEXT:  4      7     1.00    *      *            btsq   $7, (%rax)
+# CHECK-NEXT:  1      1     0.33                        cbtw
+# CHECK-NEXT:  1      1     0.33                        cwtl
+# CHECK-NEXT:  1      1     0.33                        cltq
+# CHECK-NEXT:  2      2     1.00                        cwtd
+# CHECK-NEXT:  1      1     0.50                        cltd
+# CHECK-NEXT:  1      1     0.50                        cqto
 # CHECK-NEXT:  1      1     0.25                  U     clc
+# CHECK-NEXT:  1      1     0.33                  U     cld
+# CHECK-NEXT:  1      1     0.33                  U     cmc
+# CHECK-NEXT:  1      1     0.33                        cmpb   $7, %al
+# CHECK-NEXT:  1      1     0.33                        cmpb   $7, %dil
+# CHECK-NEXT:  2      6     0.50    *                   cmpb   $7, (%rax)
+# CHECK-NEXT:  1      1     0.33                        cmpb   %sil, %dil
+# CHECK-NEXT:  2      6     0.50    *                   cmpb   %sil, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpb   (%rax), %dil
+# CHECK-NEXT:  1      1     0.33                        cmpw   $511, %ax
+# CHECK-NEXT:  1      1     0.33                        cmpw   $511, %di
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   $511, (%rax)
+# CHECK-NEXT:  1      1     0.33                        cmpw   $7, %di
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   $7, (%rax)
+# CHECK-NEXT:  1      1     0.33                        cmpw   %si, %di
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   %si, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   (%rax), %di
+# CHECK-NEXT:  1      1     0.33                        cmpl   $665536, %eax
+# CHECK-NEXT:  1      1     0.33                        cmpl   $665536, %edi
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   $665536, (%rax)
+# CHECK-NEXT:  1      1     0.33                        cmpl   $7, %edi
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   $7, (%rax)
+# CHECK-NEXT:  1      1     0.33                        cmpl   %esi, %edi
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   %esi, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   (%rax), %edi
+# CHECK-NEXT:  1      1     0.33                        cmpq   $665536, %rax
+# CHECK-NEXT:  1      1     0.33                        cmpq   $665536, %rdi
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   $665536, (%rax)
+# CHECK-NEXT:  1      1     0.33                        cmpq   $7, %rdi
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   $7, (%rax)
+# CHECK-NEXT:  1      1     0.33                        cmpq   %rsi, %rdi
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   %rsi, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   (%rax), %rdi
 # CHECK-NEXT:  1      1     0.33                        decb   %dil
 # CHECK-NEXT:  3      7     1.00    *      *            decb   (%rax)
 # CHECK-NEXT:  1      1     0.33                        decw   %di
@@ -1200,7 +1281,7 @@ xorq (%rax), %rdi
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6.0]  [6.1]
-# CHECK-NEXT: 160.00  -     347.83 155.33 210.00 339.83 241.00 241.00
+# CHECK-NEXT: 160.00  -     361.83 167.33 210.00 352.83 248.50 248.50
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6.0]  [6.1]  Instructions:
@@ -1356,7 +1437,45 @@ xorq (%rax), %rdi
 # CHECK-NEXT:  -      -     0.50    -     1.00   0.50   1.00   1.00   btcq     $7, (%rax)
 # CHECK-NEXT:  -      -     0.50    -     1.00   0.50   1.00   1.00   btrq     $7, (%rax)
 # CHECK-NEXT:  -      -     0.50    -     1.00   0.50   1.00   1.00   btsq     $7, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cbtw
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cwtl
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cltq
+# CHECK-NEXT:  -      -     1.33   0.33    -     0.33    -      -     cwtd
+# CHECK-NEXT:  -      -     0.50    -      -     0.50    -      -     cltd
+# CHECK-NEXT:  -      -     0.50    -      -     0.50    -      -     cqto
 # CHECK-NEXT:  -      -      -      -      -      -      -      -     clc
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cld
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmc
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpb     $7, %al
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpb     $7, %dil
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpb     $7, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpb     %sil, %dil
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpb     %sil, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpb     (%rax), %dil
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpw     $511, %ax
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpw     $511, %di
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpw     $511, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpw     $7, %di
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpw     $7, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpw     %si, %di
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpw     %si, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpw     (%rax), %di
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpl     $665536, %eax
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpl     $665536, %edi
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpl     $665536, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpl     $7, %edi
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpl     $7, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpl     %esi, %edi
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpl     %esi, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpl     (%rax), %edi
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpq     $665536, %rax
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpq     $665536, %rdi
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpq     $665536, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpq     $7, %rdi
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpq     $7, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpq     %rsi, %rdi
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpq     %rsi, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpq     (%rax), %rdi
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     decb     %dil
 # CHECK-NEXT:  -      -     0.33   0.33   1.00   0.33   1.00   1.00   decb     (%rax)
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     decw     %di

diff --git a/llvm/test/tools/llvm-mca/X86/Haswell/resources-x86_64.s b/llvm/test/tools/llvm-mca/X86/Haswell/resources-x86_64.s
index 90fcc21..c1663a1 100644 (file)
--- a/llvm/test/tools/llvm-mca/X86/Haswell/resources-x86_64.s
+++ b/llvm/test/tools/llvm-mca/X86/Haswell/resources-x86_64.s
@@ -172,7 +172,50 @@ btcq $7, (%rax)
 btrq $7, (%rax)
 btsq $7, (%rax)
 
+cbw
+cwde
+cdqe
+cwd
+cdq
+cqo
+
 clc
+cld
+cmc
+
+cmpb $7, %al
+cmpb $7, %dil
+cmpb $7, (%rax)
+cmpb %sil, %dil
+cmpb %sil, (%rax)
+cmpb (%rax), %dil
+
+cmpw $511, %ax
+cmpw $511, %di
+cmpw $511, (%rax)
+cmpw $7, %di
+cmpw $7, (%rax)
+cmpw %si, %di
+cmpw %si, (%rax)
+cmpw (%rax), %di
+
+cmpl $665536, %eax
+cmpl $665536, %edi
+cmpl $665536, (%rax)
+cmpl $7, %edi
+cmpl $7, (%rax)
+cmpl %esi, %edi
+cmpl %esi, (%rax)
+cmpl (%rax), %edi
+
+cmpq $665536, %rax
+cmpq $665536, %rdi
+cmpq $665536, (%rax)
+cmpq $7, %rdi
+cmpq $7, (%rax)
+cmpq %rsi, %rdi
+cmpq %rsi, (%rax)
+cmpq (%rax), %rdi
 
 decb %dil
 decb (%rax)
@@ -783,7 +826,45 @@ xorq (%rax), %rdi
 # CHECK-NEXT:  4      7     1.00    *      *            btcq   $7, (%rax)
 # CHECK-NEXT:  4      7     1.00    *      *            btrq   $7, (%rax)
 # CHECK-NEXT:  4      7     1.00    *      *            btsq   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cbtw
+# CHECK-NEXT:  1      1     0.25                        cwtl
+# CHECK-NEXT:  1      1     0.25                        cltq
+# CHECK-NEXT:  2      2     0.50                        cwtd
+# CHECK-NEXT:  1      1     0.50                        cltd
+# CHECK-NEXT:  1      1     0.50                        cqto
 # CHECK-NEXT:  1      1     0.25                  U     clc
+# CHECK-NEXT:  3      3     1.00                  U     cld
+# CHECK-NEXT:  1      1     0.25                  U     cmc
+# CHECK-NEXT:  1      1     0.25                        cmpb   $7, %al
+# CHECK-NEXT:  1      1     0.25                        cmpb   $7, %dil
+# CHECK-NEXT:  2      6     0.50    *                   cmpb   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpb   %sil, %dil
+# CHECK-NEXT:  2      6     0.50    *                   cmpb   %sil, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpb   (%rax), %dil
+# CHECK-NEXT:  1      1     0.25                        cmpw   $511, %ax
+# CHECK-NEXT:  1      1     0.25                        cmpw   $511, %di
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   $511, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpw   $7, %di
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpw   %si, %di
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   %si, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   (%rax), %di
+# CHECK-NEXT:  1      1     0.25                        cmpl   $665536, %eax
+# CHECK-NEXT:  1      1     0.25                        cmpl   $665536, %edi
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   $665536, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpl   $7, %edi
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpl   %esi, %edi
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   %esi, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   (%rax), %edi
+# CHECK-NEXT:  1      1     0.25                        cmpq   $665536, %rax
+# CHECK-NEXT:  1      1     0.25                        cmpq   $665536, %rdi
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   $665536, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpq   $7, %rdi
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpq   %rsi, %rdi
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   %rsi, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   (%rax), %rdi
 # CHECK-NEXT:  1      1     0.25                        decb   %dil
 # CHECK-NEXT:  3      7     1.00    *      *            decb   (%rax)
 # CHECK-NEXT:  1      1     0.25                        decw   %di
@@ -1202,7 +1283,7 @@ xorq (%rax), %rdi
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]
-# CHECK-NEXT: 80.00   -     414.50 276.50 196.00 196.00 158.00 172.00 409.00 66.00
+# CHECK-NEXT: 80.00   -     425.25 285.75 203.50 203.50 158.00 181.25 420.75 66.00
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    Instructions:
@@ -1358,7 +1439,45 @@ xorq (%rax), %rdi
 # CHECK-NEXT:  -      -     0.50    -     0.83   0.83   1.00    -     0.50   0.33   btcq       $7, (%rax)
 # CHECK-NEXT:  -      -     0.50    -     0.83   0.83   1.00    -     0.50   0.33   btrq       $7, (%rax)
 # CHECK-NEXT:  -      -     0.50    -     0.83   0.83   1.00    -     0.50   0.33   btsq       $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cbtw
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cwtl
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cltq
+# CHECK-NEXT:  -      -     0.75   0.25    -      -      -     0.25   0.75    -     cwtd
+# CHECK-NEXT:  -      -     0.50    -      -      -      -      -     0.50    -     cltd
+# CHECK-NEXT:  -      -     0.50    -      -      -      -      -     0.50    -     cqto
 # CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     clc
+# CHECK-NEXT:  -      -     0.50   0.50    -      -      -     0.50   1.50    -     cld
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmc
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpb       $7, %al
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpb       $7, %dil
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpb       $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpb       %sil, %dil
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpb       %sil, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpb       (%rax), %dil
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpw       $511, %ax
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpw       $511, %di
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpw       $511, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpw       $7, %di
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpw       $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpw       %si, %di
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpw       %si, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpw       (%rax), %di
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpl       $665536, %eax
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpl       $665536, %edi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpl       $665536, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpl       $7, %edi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpl       $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpl       %esi, %edi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpl       %esi, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpl       (%rax), %edi
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpq       $665536, %rax
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpq       $665536, %rdi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpq       $665536, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpq       $7, %rdi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpq       $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpq       %rsi, %rdi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpq       %rsi, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpq       (%rax), %rdi
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     decb       %dil
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   decb       (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     decw       %di

diff --git a/llvm/test/tools/llvm-mca/X86/SLM/resources-x86_64.s b/llvm/test/tools/llvm-mca/X86/SLM/resources-x86_64.s
index 2c3694f..689a5c8 100644 (file)
--- a/llvm/test/tools/llvm-mca/X86/SLM/resources-x86_64.s
+++ b/llvm/test/tools/llvm-mca/X86/SLM/resources-x86_64.s
@@ -172,7 +172,50 @@ btcq $7, (%rax)
 btrq $7, (%rax)
 btsq $7, (%rax)
 
+cbw
+cwde
+cdqe
+cwd
+cdq
+cqo
+
 clc
+cld
+cmc
+
+cmpb $7, %al
+cmpb $7, %dil
+cmpb $7, (%rax)
+cmpb %sil, %dil
+cmpb %sil, (%rax)
+cmpb (%rax), %dil
+
+cmpw $511, %ax
+cmpw $511, %di
+cmpw $511, (%rax)
+cmpw $7, %di
+cmpw $7, (%rax)
+cmpw %si, %di
+cmpw %si, (%rax)
+cmpw (%rax), %di
+
+cmpl $665536, %eax
+cmpl $665536, %edi
+cmpl $665536, (%rax)
+cmpl $7, %edi
+cmpl $7, (%rax)
+cmpl %esi, %edi
+cmpl %esi, (%rax)
+cmpl (%rax), %edi
+
+cmpq $665536, %rax
+cmpq $665536, %rdi
+cmpq $665536, (%rax)
+cmpq $7, %rdi
+cmpq $7, (%rax)
+cmpq %rsi, %rdi
+cmpq %rsi, (%rax)
+cmpq (%rax), %rdi
 
 decb %dil
 decb (%rax)
@@ -783,7 +826,45 @@ xorq (%rax), %rdi
 # CHECK-NEXT:  2      4     2.00    *      *            btcq   $7, (%rax)
 # CHECK-NEXT:  2      4     2.00    *      *            btrq   $7, (%rax)
 # CHECK-NEXT:  2      4     2.00    *      *            btsq   $7, (%rax)
+# CHECK-NEXT:  1      1     0.50                        cbtw
+# CHECK-NEXT:  1      1     0.50                        cwtl
+# CHECK-NEXT:  1      1     0.50                        cltq
+# CHECK-NEXT:  1      1     0.50                        cwtd
+# CHECK-NEXT:  1      1     0.50                        cltd
+# CHECK-NEXT:  1      1     0.50                        cqto
 # CHECK-NEXT:  1      1     0.50                  U     clc
+# CHECK-NEXT:  1      1     0.50                  U     cld
+# CHECK-NEXT:  1      1     0.50                  U     cmc
+# CHECK-NEXT:  1      1     0.50                        cmpb   $7, %al
+# CHECK-NEXT:  1      1     0.50                        cmpb   $7, %dil
+# CHECK-NEXT:  1      4     1.00    *                   cmpb   $7, (%rax)
+# CHECK-NEXT:  1      1     0.50                        cmpb   %sil, %dil
+# CHECK-NEXT:  1      4     1.00    *                   cmpb   %sil, (%rax)
+# CHECK-NEXT:  1      4     1.00    *                   cmpb   (%rax), %dil
+# CHECK-NEXT:  1      1     0.50                        cmpw   $511, %ax
+# CHECK-NEXT:  1      1     0.50                        cmpw   $511, %di
+# CHECK-NEXT:  1      4     1.00    *                   cmpw   $511, (%rax)
+# CHECK-NEXT:  1      1     0.50                        cmpw   $7, %di
+# CHECK-NEXT:  1      4     1.00    *                   cmpw   $7, (%rax)
+# CHECK-NEXT:  1      1     0.50                        cmpw   %si, %di
+# CHECK-NEXT:  1      4     1.00    *                   cmpw   %si, (%rax)
+# CHECK-NEXT:  1      4     1.00    *                   cmpw   (%rax), %di
+# CHECK-NEXT:  1      1     0.50                        cmpl   $665536, %eax
+# CHECK-NEXT:  1      1     0.50                        cmpl   $665536, %edi
+# CHECK-NEXT:  1      4     1.00    *                   cmpl   $665536, (%rax)
+# CHECK-NEXT:  1      1     0.50                        cmpl   $7, %edi
+# CHECK-NEXT:  1      4     1.00    *                   cmpl   $7, (%rax)
+# CHECK-NEXT:  1      1     0.50                        cmpl   %esi, %edi
+# CHECK-NEXT:  1      4     1.00    *                   cmpl   %esi, (%rax)
+# CHECK-NEXT:  1      4     1.00    *                   cmpl   (%rax), %edi
+# CHECK-NEXT:  1      1     0.50                        cmpq   $665536, %rax
+# CHECK-NEXT:  1      1     0.50                        cmpq   $665536, %rdi
+# CHECK-NEXT:  1      4     1.00    *                   cmpq   $665536, (%rax)
+# CHECK-NEXT:  1      1     0.50                        cmpq   $7, %rdi
+# CHECK-NEXT:  1      4     1.00    *                   cmpq   $7, (%rax)
+# CHECK-NEXT:  1      1     0.50                        cmpq   %rsi, %rdi
+# CHECK-NEXT:  1      4     1.00    *                   cmpq   %rsi, (%rax)
+# CHECK-NEXT:  1      4     1.00    *                   cmpq   (%rax), %rdi
 # CHECK-NEXT:  1      1     0.50                        decb   %dil
 # CHECK-NEXT:  2      5     2.00    *      *            decb   (%rax)
 # CHECK-NEXT:  1      1     0.50                        decw   %di
@@ -1200,7 +1281,7 @@ xorq (%rax), %rdi
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]
-# CHECK-NEXT: 400.00  -      -      -      -     514.00 356.00 476.00
+# CHECK-NEXT: 400.00  -      -      -      -     533.00 375.00 491.00
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    Instructions:
@@ -1356,7 +1437,45 @@ xorq (%rax), %rdi
 # CHECK-NEXT:  -      -      -      -      -     0.50   0.50   2.00   btcq     $7, (%rax)
 # CHECK-NEXT:  -      -      -      -      -     0.50   0.50   2.00   btrq     $7, (%rax)
 # CHECK-NEXT:  -      -      -      -      -     0.50   0.50   2.00   btsq     $7, (%rax)
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cbtw
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cwtl
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cltq
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cwtd
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cltd
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cqto
 # CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     clc
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cld
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cmc
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cmpb     $7, %al
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cmpb     $7, %dil
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   1.00   cmpb     $7, (%rax)
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cmpb     %sil, %dil
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   1.00   cmpb     %sil, (%rax)
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   1.00   cmpb     (%rax), %dil
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cmpw     $511, %ax
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cmpw     $511, %di
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   1.00   cmpw     $511, (%rax)
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cmpw     $7, %di
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   1.00   cmpw     $7, (%rax)
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cmpw     %si, %di
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   1.00   cmpw     %si, (%rax)
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   1.00   cmpw     (%rax), %di
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cmpl     $665536, %eax
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cmpl     $665536, %edi
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   1.00   cmpl     $665536, (%rax)
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cmpl     $7, %edi
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   1.00   cmpl     $7, (%rax)
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cmpl     %esi, %edi
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   1.00   cmpl     %esi, (%rax)
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   1.00   cmpl     (%rax), %edi
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cmpq     $665536, %rax
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cmpq     $665536, %rdi
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   1.00   cmpq     $665536, (%rax)
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cmpq     $7, %rdi
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   1.00   cmpq     $7, (%rax)
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cmpq     %rsi, %rdi
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   1.00   cmpq     %rsi, (%rax)
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   1.00   cmpq     (%rax), %rdi
 # CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     decb     %dil
 # CHECK-NEXT:  -      -      -      -      -     1.00   1.00   2.00   decb     (%rax)
 # CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     decw     %di

diff --git a/llvm/test/tools/llvm-mca/X86/SandyBridge/resources-x86_64.s b/llvm/test/tools/llvm-mca/X86/SandyBridge/resources-x86_64.s
index 35e7299..316614d 100644 (file)
--- a/llvm/test/tools/llvm-mca/X86/SandyBridge/resources-x86_64.s
+++ b/llvm/test/tools/llvm-mca/X86/SandyBridge/resources-x86_64.s
@@ -172,7 +172,50 @@ btcq $7, (%rax)
 btrq $7, (%rax)
 btsq $7, (%rax)
 
+cbw
+cwde
+cdqe
+cwd
+cdq
+cqo
+
 clc
+cld
+cmc
+
+cmpb $7, %al
+cmpb $7, %dil
+cmpb $7, (%rax)
+cmpb %sil, %dil
+cmpb %sil, (%rax)
+cmpb (%rax), %dil
+
+cmpw $511, %ax
+cmpw $511, %di
+cmpw $511, (%rax)
+cmpw $7, %di
+cmpw $7, (%rax)
+cmpw %si, %di
+cmpw %si, (%rax)
+cmpw (%rax), %di
+
+cmpl $665536, %eax
+cmpl $665536, %edi
+cmpl $665536, (%rax)
+cmpl $7, %edi
+cmpl $7, (%rax)
+cmpl %esi, %edi
+cmpl %esi, (%rax)
+cmpl (%rax), %edi
+
+cmpq $665536, %rax
+cmpq $665536, %rdi
+cmpq $665536, (%rax)
+cmpq $7, %rdi
+cmpq $7, (%rax)
+cmpq %rsi, %rdi
+cmpq %rsi, (%rax)
+cmpq (%rax), %rdi
 
 decb %dil
 decb (%rax)
@@ -783,7 +826,45 @@ xorq (%rax), %rdi
 # CHECK-NEXT:  4      7     1.00    *      *            btcq   $7, (%rax)
 # CHECK-NEXT:  4      7     1.00    *      *            btrq   $7, (%rax)
 # CHECK-NEXT:  4      7     1.00    *      *            btsq   $7, (%rax)
+# CHECK-NEXT:  1      1     0.33                        cbtw
+# CHECK-NEXT:  1      1     0.33                        cwtl
+# CHECK-NEXT:  1      1     0.33                        cltq
+# CHECK-NEXT:  2      2     1.00                        cwtd
+# CHECK-NEXT:  1      1     0.50                        cltd
+# CHECK-NEXT:  1      1     0.50                        cqto
 # CHECK-NEXT:  1      1     0.25                  U     clc
+# CHECK-NEXT:  1      1     0.33                  U     cld
+# CHECK-NEXT:  1      1     0.33                  U     cmc
+# CHECK-NEXT:  1      1     0.33                        cmpb   $7, %al
+# CHECK-NEXT:  1      1     0.33                        cmpb   $7, %dil
+# CHECK-NEXT:  2      6     0.50    *                   cmpb   $7, (%rax)
+# CHECK-NEXT:  1      1     0.33                        cmpb   %sil, %dil
+# CHECK-NEXT:  2      6     0.50    *                   cmpb   %sil, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpb   (%rax), %dil
+# CHECK-NEXT:  1      1     0.33                        cmpw   $511, %ax
+# CHECK-NEXT:  1      1     0.33                        cmpw   $511, %di
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   $511, (%rax)
+# CHECK-NEXT:  1      1     0.33                        cmpw   $7, %di
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   $7, (%rax)
+# CHECK-NEXT:  1      1     0.33                        cmpw   %si, %di
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   %si, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   (%rax), %di
+# CHECK-NEXT:  1      1     0.33                        cmpl   $665536, %eax
+# CHECK-NEXT:  1      1     0.33                        cmpl   $665536, %edi
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   $665536, (%rax)
+# CHECK-NEXT:  1      1     0.33                        cmpl   $7, %edi
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   $7, (%rax)
+# CHECK-NEXT:  1      1     0.33                        cmpl   %esi, %edi
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   %esi, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   (%rax), %edi
+# CHECK-NEXT:  1      1     0.33                        cmpq   $665536, %rax
+# CHECK-NEXT:  1      1     0.33                        cmpq   $665536, %rdi
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   $665536, (%rax)
+# CHECK-NEXT:  1      1     0.33                        cmpq   $7, %rdi
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   $7, (%rax)
+# CHECK-NEXT:  1      1     0.33                        cmpq   %rsi, %rdi
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   %rsi, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   (%rax), %rdi
 # CHECK-NEXT:  1      1     0.33                        decb   %dil
 # CHECK-NEXT:  3      7     1.00    *      *            decb   (%rax)
 # CHECK-NEXT:  1      1     0.33                        decw   %di
@@ -1200,7 +1281,7 @@ xorq (%rax), %rdi
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6.0]  [6.1]
-# CHECK-NEXT: 160.00  -     347.83 155.33 210.00 339.83 241.00 241.00
+# CHECK-NEXT: 160.00  -     361.83 167.33 210.00 352.83 248.50 248.50
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6.0]  [6.1]  Instructions:
@@ -1356,7 +1437,45 @@ xorq (%rax), %rdi
 # CHECK-NEXT:  -      -     0.50    -     1.00   0.50   1.00   1.00   btcq     $7, (%rax)
 # CHECK-NEXT:  -      -     0.50    -     1.00   0.50   1.00   1.00   btrq     $7, (%rax)
 # CHECK-NEXT:  -      -     0.50    -     1.00   0.50   1.00   1.00   btsq     $7, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cbtw
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cwtl
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cltq
+# CHECK-NEXT:  -      -     1.33   0.33    -     0.33    -      -     cwtd
+# CHECK-NEXT:  -      -     0.50    -      -     0.50    -      -     cltd
+# CHECK-NEXT:  -      -     0.50    -      -     0.50    -      -     cqto
 # CHECK-NEXT:  -      -      -      -      -      -      -      -     clc
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cld
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmc
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpb     $7, %al
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpb     $7, %dil
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpb     $7, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpb     %sil, %dil
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpb     %sil, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpb     (%rax), %dil
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpw     $511, %ax
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpw     $511, %di
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpw     $511, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpw     $7, %di
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpw     $7, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpw     %si, %di
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpw     %si, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpw     (%rax), %di
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpl     $665536, %eax
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpl     $665536, %edi
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpl     $665536, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpl     $7, %edi
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpl     $7, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpl     %esi, %edi
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpl     %esi, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpl     (%rax), %edi
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpq     $665536, %rax
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpq     $665536, %rdi
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpq     $665536, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpq     $7, %rdi
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpq     $7, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cmpq     %rsi, %rdi
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpq     %rsi, (%rax)
+# CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   cmpq     (%rax), %rdi
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     decb     %dil
 # CHECK-NEXT:  -      -     0.33   0.33   1.00   0.33   1.00   1.00   decb     (%rax)
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     decw     %di

diff --git a/llvm/test/tools/llvm-mca/X86/SkylakeClient/resources-x86_64.s b/llvm/test/tools/llvm-mca/X86/SkylakeClient/resources-x86_64.s
index 6fd745a..548b255 100644 (file)
--- a/llvm/test/tools/llvm-mca/X86/SkylakeClient/resources-x86_64.s
+++ b/llvm/test/tools/llvm-mca/X86/SkylakeClient/resources-x86_64.s
@@ -172,7 +172,50 @@ btcq $7, (%rax)
 btrq $7, (%rax)
 btsq $7, (%rax)
 
+cbw
+cwde
+cdqe
+cwd
+cdq
+cqo
+
 clc
+cld
+cmc
+
+cmpb $7, %al
+cmpb $7, %dil
+cmpb $7, (%rax)
+cmpb %sil, %dil
+cmpb %sil, (%rax)
+cmpb (%rax), %dil
+
+cmpw $511, %ax
+cmpw $511, %di
+cmpw $511, (%rax)
+cmpw $7, %di
+cmpw $7, (%rax)
+cmpw %si, %di
+cmpw %si, (%rax)
+cmpw (%rax), %di
+
+cmpl $665536, %eax
+cmpl $665536, %edi
+cmpl $665536, (%rax)
+cmpl $7, %edi
+cmpl $7, (%rax)
+cmpl %esi, %edi
+cmpl %esi, (%rax)
+cmpl (%rax), %edi
+
+cmpq $665536, %rax
+cmpq $665536, %rdi
+cmpq $665536, (%rax)
+cmpq $7, %rdi
+cmpq $7, (%rax)
+cmpq %rsi, %rdi
+cmpq %rsi, (%rax)
+cmpq (%rax), %rdi
 
 decb %dil
 decb (%rax)
@@ -783,7 +826,45 @@ xorq (%rax), %rdi
 # CHECK-NEXT:  4      6     1.00    *      *            btcq   $7, (%rax)
 # CHECK-NEXT:  4      6     1.00    *      *            btrq   $7, (%rax)
 # CHECK-NEXT:  4      6     1.00    *      *            btsq   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cbtw
+# CHECK-NEXT:  1      1     0.25                        cwtl
+# CHECK-NEXT:  1      1     0.25                        cltq
+# CHECK-NEXT:  2      2     0.50                        cwtd
+# CHECK-NEXT:  1      1     0.50                        cltd
+# CHECK-NEXT:  1      1     0.50                        cqto
 # CHECK-NEXT:  1      1     0.17                  U     clc
+# CHECK-NEXT:  3      3     1.00                  U     cld
+# CHECK-NEXT:  1      1     0.25                  U     cmc
+# CHECK-NEXT:  1      1     0.25                        cmpb   $7, %al
+# CHECK-NEXT:  1      1     0.25                        cmpb   $7, %dil
+# CHECK-NEXT:  2      6     0.50    *                   cmpb   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpb   %sil, %dil
+# CHECK-NEXT:  2      6     0.50    *                   cmpb   %sil, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpb   (%rax), %dil
+# CHECK-NEXT:  1      1     0.25                        cmpw   $511, %ax
+# CHECK-NEXT:  1      1     0.25                        cmpw   $511, %di
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   $511, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpw   $7, %di
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpw   %si, %di
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   %si, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   (%rax), %di
+# CHECK-NEXT:  1      1     0.25                        cmpl   $665536, %eax
+# CHECK-NEXT:  1      1     0.25                        cmpl   $665536, %edi
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   $665536, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpl   $7, %edi
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpl   %esi, %edi
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   %esi, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   (%rax), %edi
+# CHECK-NEXT:  1      1     0.25                        cmpq   $665536, %rax
+# CHECK-NEXT:  1      1     0.25                        cmpq   $665536, %rdi
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   $665536, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpq   $7, %rdi
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpq   %rsi, %rdi
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   %rsi, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   (%rax), %rdi
 # CHECK-NEXT:  1      1     0.25                        decb   %dil
 # CHECK-NEXT:  3      7     1.00    *      *            decb   (%rax)
 # CHECK-NEXT:  1      1     0.25                        decw   %di
@@ -1202,7 +1283,7 @@ xorq (%rax), %rdi
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]
-# CHECK-NEXT: 60.00   -     431.00 236.50 205.00 205.00 167.00 185.00 415.50 69.00
+# CHECK-NEXT: 60.00   -     441.75 245.75 212.50 212.50 167.00 194.25 427.25 69.00
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    Instructions:
@@ -1358,7 +1439,45 @@ xorq (%rax), %rdi
 # CHECK-NEXT:  -      -     0.50    -     0.83   0.83   1.00    -     0.50   0.33   btcq       $7, (%rax)
 # CHECK-NEXT:  -      -     0.50    -     0.83   0.83   1.00    -     0.50   0.33   btrq       $7, (%rax)
 # CHECK-NEXT:  -      -     0.50    -     0.83   0.83   1.00    -     0.50   0.33   btsq       $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cbtw
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cwtl
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cltq
+# CHECK-NEXT:  -      -     0.75   0.25    -      -      -     0.25   0.75    -     cwtd
+# CHECK-NEXT:  -      -     0.50    -      -      -      -      -     0.50    -     cltd
+# CHECK-NEXT:  -      -     0.50    -      -      -      -      -     0.50    -     cqto
 # CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     clc
+# CHECK-NEXT:  -      -     0.50   0.50    -      -      -     0.50   1.50    -     cld
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmc
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpb       $7, %al
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpb       $7, %dil
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpb       $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpb       %sil, %dil
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpb       %sil, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpb       (%rax), %dil
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpw       $511, %ax
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpw       $511, %di
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpw       $511, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpw       $7, %di
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpw       $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpw       %si, %di
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpw       %si, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpw       (%rax), %di
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpl       $665536, %eax
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpl       $665536, %edi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpl       $665536, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpl       $7, %edi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpl       $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpl       %esi, %edi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpl       %esi, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpl       (%rax), %edi
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpq       $665536, %rax
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpq       $665536, %rdi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpq       $665536, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpq       $7, %rdi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpq       $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpq       %rsi, %rdi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpq       %rsi, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpq       (%rax), %rdi
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     decb       %dil
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   decb       (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     decw       %di

diff --git a/llvm/test/tools/llvm-mca/X86/SkylakeServer/resources-x86_64.s b/llvm/test/tools/llvm-mca/X86/SkylakeServer/resources-x86_64.s
index 9c22e2e..b61b665 100644 (file)
--- a/llvm/test/tools/llvm-mca/X86/SkylakeServer/resources-x86_64.s
+++ b/llvm/test/tools/llvm-mca/X86/SkylakeServer/resources-x86_64.s
@@ -172,7 +172,50 @@ btcq $7, (%rax)
 btrq $7, (%rax)
 btsq $7, (%rax)
 
+cbw
+cwde
+cdqe
+cwd
+cdq
+cqo
+
 clc
+cld
+cmc
+
+cmpb $7, %al
+cmpb $7, %dil
+cmpb $7, (%rax)
+cmpb %sil, %dil
+cmpb %sil, (%rax)
+cmpb (%rax), %dil
+
+cmpw $511, %ax
+cmpw $511, %di
+cmpw $511, (%rax)
+cmpw $7, %di
+cmpw $7, (%rax)
+cmpw %si, %di
+cmpw %si, (%rax)
+cmpw (%rax), %di
+
+cmpl $665536, %eax
+cmpl $665536, %edi
+cmpl $665536, (%rax)
+cmpl $7, %edi
+cmpl $7, (%rax)
+cmpl %esi, %edi
+cmpl %esi, (%rax)
+cmpl (%rax), %edi
+
+cmpq $665536, %rax
+cmpq $665536, %rdi
+cmpq $665536, (%rax)
+cmpq $7, %rdi
+cmpq $7, (%rax)
+cmpq %rsi, %rdi
+cmpq %rsi, (%rax)
+cmpq (%rax), %rdi
 
 decb %dil
 decb (%rax)
@@ -783,7 +826,45 @@ xorq (%rax), %rdi
 # CHECK-NEXT:  4      6     1.00    *      *            btcq   $7, (%rax)
 # CHECK-NEXT:  4      6     1.00    *      *            btrq   $7, (%rax)
 # CHECK-NEXT:  4      6     1.00    *      *            btsq   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cbtw
+# CHECK-NEXT:  1      1     0.25                        cwtl
+# CHECK-NEXT:  1      1     0.25                        cltq
+# CHECK-NEXT:  2      2     0.50                        cwtd
+# CHECK-NEXT:  1      1     0.50                        cltd
+# CHECK-NEXT:  1      1     0.50                        cqto
 # CHECK-NEXT:  1      1     0.17                  U     clc
+# CHECK-NEXT:  3      3     1.00                  U     cld
+# CHECK-NEXT:  1      1     0.25                  U     cmc
+# CHECK-NEXT:  1      1     0.25                        cmpb   $7, %al
+# CHECK-NEXT:  1      1     0.25                        cmpb   $7, %dil
+# CHECK-NEXT:  2      6     0.50    *                   cmpb   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpb   %sil, %dil
+# CHECK-NEXT:  2      6     0.50    *                   cmpb   %sil, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpb   (%rax), %dil
+# CHECK-NEXT:  1      1     0.25                        cmpw   $511, %ax
+# CHECK-NEXT:  1      1     0.25                        cmpw   $511, %di
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   $511, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpw   $7, %di
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpw   %si, %di
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   %si, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpw   (%rax), %di
+# CHECK-NEXT:  1      1     0.25                        cmpl   $665536, %eax
+# CHECK-NEXT:  1      1     0.25                        cmpl   $665536, %edi
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   $665536, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpl   $7, %edi
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpl   %esi, %edi
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   %esi, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpl   (%rax), %edi
+# CHECK-NEXT:  1      1     0.25                        cmpq   $665536, %rax
+# CHECK-NEXT:  1      1     0.25                        cmpq   $665536, %rdi
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   $665536, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpq   $7, %rdi
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpq   %rsi, %rdi
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   %rsi, (%rax)
+# CHECK-NEXT:  2      6     0.50    *                   cmpq   (%rax), %rdi
 # CHECK-NEXT:  1      1     0.25                        decb   %dil
 # CHECK-NEXT:  3      7     1.00    *      *            decb   (%rax)
 # CHECK-NEXT:  1      1     0.25                        decw   %di
@@ -1202,7 +1283,7 @@ xorq (%rax), %rdi
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]
-# CHECK-NEXT: 60.00   -     431.25 236.75 205.00 205.00 167.00 185.25 415.75 69.00
+# CHECK-NEXT: 60.00   -     442.00 246.00 212.50 212.50 167.00 194.50 427.50 69.00
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    Instructions:
@@ -1358,7 +1439,45 @@ xorq (%rax), %rdi
 # CHECK-NEXT:  -      -     0.50    -     0.83   0.83   1.00    -     0.50   0.33   btcq       $7, (%rax)
 # CHECK-NEXT:  -      -     0.50    -     0.83   0.83   1.00    -     0.50   0.33   btrq       $7, (%rax)
 # CHECK-NEXT:  -      -     0.50    -     0.83   0.83   1.00    -     0.50   0.33   btsq       $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cbtw
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cwtl
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cltq
+# CHECK-NEXT:  -      -     0.75   0.25    -      -      -     0.25   0.75    -     cwtd
+# CHECK-NEXT:  -      -     0.50    -      -      -      -      -     0.50    -     cltd
+# CHECK-NEXT:  -      -     0.50    -      -      -      -      -     0.50    -     cqto
 # CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     clc
+# CHECK-NEXT:  -      -     0.50   0.50    -      -      -     0.50   1.50    -     cld
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmc
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpb       $7, %al
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpb       $7, %dil
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpb       $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpb       %sil, %dil
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpb       %sil, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpb       (%rax), %dil
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpw       $511, %ax
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpw       $511, %di
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpw       $511, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpw       $7, %di
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpw       $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpw       %si, %di
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpw       %si, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpw       (%rax), %di
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpl       $665536, %eax
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpl       $665536, %edi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpl       $665536, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpl       $7, %edi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpl       $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpl       %esi, %edi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpl       %esi, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpl       (%rax), %edi
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpq       $665536, %rax
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpq       $665536, %rdi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpq       $665536, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpq       $7, %rdi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpq       $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpq       %rsi, %rdi
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpq       %rsi, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     cmpq       (%rax), %rdi
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     decb       %dil
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   decb       (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     decw       %di

diff --git a/llvm/test/tools/llvm-mca/X86/Znver1/resources-x86_64.s b/llvm/test/tools/llvm-mca/X86/Znver1/resources-x86_64.s
index 0189ad2..5b6a173 100644 (file)
--- a/llvm/test/tools/llvm-mca/X86/Znver1/resources-x86_64.s
+++ b/llvm/test/tools/llvm-mca/X86/Znver1/resources-x86_64.s
@@ -172,7 +172,50 @@ btcq $7, (%rax)
 btrq $7, (%rax)
 btsq $7, (%rax)
 
+cbw
+cwde
+cdqe
+cwd
+cdq
+cqo
+
 clc
+cld
+cmc
+
+cmpb $7, %al
+cmpb $7, %dil
+cmpb $7, (%rax)
+cmpb %sil, %dil
+cmpb %sil, (%rax)
+cmpb (%rax), %dil
+
+cmpw $511, %ax
+cmpw $511, %di
+cmpw $511, (%rax)
+cmpw $7, %di
+cmpw $7, (%rax)
+cmpw %si, %di
+cmpw %si, (%rax)
+cmpw (%rax), %di
+
+cmpl $665536, %eax
+cmpl $665536, %edi
+cmpl $665536, (%rax)
+cmpl $7, %edi
+cmpl $7, (%rax)
+cmpl %esi, %edi
+cmpl %esi, (%rax)
+cmpl (%rax), %edi
+
+cmpq $665536, %rax
+cmpq $665536, %rdi
+cmpq $665536, (%rax)
+cmpq $7, %rdi
+cmpq $7, (%rax)
+cmpq %rsi, %rdi
+cmpq %rsi, (%rax)
+cmpq (%rax), %rdi
 
 decb %dil
 decb (%rax)
@@ -783,7 +826,45 @@ xorq (%rax), %rdi
 # CHECK-NEXT:  2      6     0.50    *      *            btcq   $7, (%rax)
 # CHECK-NEXT:  2      6     0.50    *      *            btrq   $7, (%rax)
 # CHECK-NEXT:  2      6     0.50    *      *            btsq   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cbtw
+# CHECK-NEXT:  1      1     0.25                        cwtl
+# CHECK-NEXT:  1      1     0.25                        cltq
+# CHECK-NEXT:  1      1     0.25                        cwtd
+# CHECK-NEXT:  1      1     0.25                        cltd
+# CHECK-NEXT:  1      1     0.25                        cqto
 # CHECK-NEXT:  1      1     0.25                  U     clc
+# CHECK-NEXT:  1      1     0.25                  U     cld
+# CHECK-NEXT:  1      1     0.25                  U     cmc
+# CHECK-NEXT:  1      1     0.25                        cmpb   $7, %al
+# CHECK-NEXT:  1      1     0.25                        cmpb   $7, %dil
+# CHECK-NEXT:  2      5     0.50    *                   cmpb   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpb   %sil, %dil
+# CHECK-NEXT:  2      5     0.50    *                   cmpb   %sil, (%rax)
+# CHECK-NEXT:  2      5     0.50    *                   cmpb   (%rax), %dil
+# CHECK-NEXT:  1      1     0.25                        cmpw   $511, %ax
+# CHECK-NEXT:  1      1     0.25                        cmpw   $511, %di
+# CHECK-NEXT:  2      5     0.50    *                   cmpw   $511, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpw   $7, %di
+# CHECK-NEXT:  2      5     0.50    *                   cmpw   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpw   %si, %di
+# CHECK-NEXT:  2      5     0.50    *                   cmpw   %si, (%rax)
+# CHECK-NEXT:  2      5     0.50    *                   cmpw   (%rax), %di
+# CHECK-NEXT:  1      1     0.25                        cmpl   $665536, %eax
+# CHECK-NEXT:  1      1     0.25                        cmpl   $665536, %edi
+# CHECK-NEXT:  2      5     0.50    *                   cmpl   $665536, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpl   $7, %edi
+# CHECK-NEXT:  2      5     0.50    *                   cmpl   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpl   %esi, %edi
+# CHECK-NEXT:  2      5     0.50    *                   cmpl   %esi, (%rax)
+# CHECK-NEXT:  2      5     0.50    *                   cmpl   (%rax), %edi
+# CHECK-NEXT:  1      1     0.25                        cmpq   $665536, %rax
+# CHECK-NEXT:  1      1     0.25                        cmpq   $665536, %rdi
+# CHECK-NEXT:  2      5     0.50    *                   cmpq   $665536, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpq   $7, %rdi
+# CHECK-NEXT:  2      5     0.50    *                   cmpq   $7, (%rax)
+# CHECK-NEXT:  1      1     0.25                        cmpq   %rsi, %rdi
+# CHECK-NEXT:  2      5     0.50    *                   cmpq   %rsi, (%rax)
+# CHECK-NEXT:  2      5     0.50    *                   cmpq   (%rax), %rdi
 # CHECK-NEXT:  1      1     0.25                        decb   %dil
 # CHECK-NEXT:  2      5     0.50    *      *            decb   (%rax)
 # CHECK-NEXT:  1      1     0.25                        decw   %di
@@ -1204,7 +1285,7 @@ xorq (%rax), %rdi
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]
-# CHECK-NEXT: 134.50 134.50 117.00 151.00 133.00 117.00 392.00  -      -      -      -     34.00
+# CHECK-NEXT: 142.00 142.00 126.50 160.50 142.50 126.50 392.00  -      -      -      -     34.00
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   Instructions:
@@ -1360,7 +1441,45 @@ xorq (%rax), %rdi
 # CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     btcq $7, (%rax)
 # CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     btrq $7, (%rax)
 # CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     btsq $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cbtw
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cwtl
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cltq
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cwtd
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cltd
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cqto
 # CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     clc
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cld
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmc
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpb $7, %al
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpb $7, %dil
+# CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpb $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpb %sil, %dil
+# CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpb %sil, (%rax)
+# CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpb (%rax), %dil
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpw $511, %ax
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpw $511, %di
+# CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpw $511, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpw $7, %di
+# CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpw $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpw %si, %di
+# CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpw %si, (%rax)
+# CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpw (%rax), %di
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpl $665536, %eax
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpl $665536, %edi
+# CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpl $665536, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpl $7, %edi
+# CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpl $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpl %esi, %edi
+# CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpl %esi, (%rax)
+# CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpl (%rax), %edi
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpq $665536, %rax
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpq $665536, %rdi
+# CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpq $665536, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpq $7, %rdi
+# CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpq $7, (%rax)
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpq %rsi, %rdi
+# CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpq %rsi, (%rax)
+# CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpq (%rax), %rdi
 # CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     decb %dil
 # CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     decb (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     decw %di