[X86] MCA tests for XCHG*, XADD* and CMPXCHG* instructions

[avt77]

Summary

Looking at D49861 Roman discovered that we don't have MCA tests for XCHG* instrs. This patch fixes this issue.

[lebedev.ri]

https://godbolt.org/g/xHjSKt

test/tools/llvm-mca/X86/Atom/resources-x86_64.s

676–677 ↗

(On Diff #157674)

http://felixcloutier.com/x86/XCHG.html suggests that memory operand can be on either side,
so this needs to be repeated with swapped order.

[avt77]

test/tools/llvm-mca/X86/Atom/resources-x86_64.s

676–677 ↗

(On Diff #157674)

In fact I checked it but decided not to include in the test because this test is not about syntax. But if you insist I'll extend the test. Is it enough to include the check in one test file only? I mean that I'd like to check this syntax construction for one cpu, OK? Or you'd like to see it inside all 10 files?

[lebedev.ri]

test/tools/llvm-mca/X86/Atom/resources-x86_64.s

676–677 ↗

(On Diff #157674)

In fact I checked it but decided not to include in the test because this test is not about syntax.

I agree. But the existing tests are doing exhaustive coverage - e.g. see sub, add.

Or you'd like to see it inside all 10 files?

All these generic files should be identical other than the CPU specified in run line.
One can argue that it is a bad design, to have to duplicate the tests for every CPU.
But this is what it is...

So yes, all of them, please.

[avt77]

I updated the tests accordingly to Roman's request.

[lebedev.ri]

Thank you for adding this test coverage.
It looks about right to me, but i don't have enough expirience with these MCA tests to accept this.

[RKSimon]

test/tools/llvm-mca/X86/Atom/resources-x86_64.s

674 ↗

(On Diff #157699)

I don't think only byte ops have special case AL instructions? It's just ax/eax/rax according to APMv3

676–677 ↗

(On Diff #157674)

Do they actually have different encodings? I just thought they were commutable in the assembly but would generate the same encoding - @craig.topper do you know?

[RKSimon]

Please can you add XADD tests as well

[RKSimon]

test/tools/llvm-mca/X86/Atom/resources-x86_64.s

230 ↗

(On Diff #157699)

Don't use AL/AX/EAX/RAX as explicit ops - they are implicitly referenced by in the instruction

233 ↗

(On Diff #157699)

cmpxchg8b/cmpxchg16b tests were added at rL338595 (in their own file) - please remove them from this patch

676–677 ↗

(On Diff #157674)

According to X86InstrInfo.td:

// xchg: We accept "xchgX <reg>, <mem>" and "xchgX <mem>, <reg>" as synonyms.
def : InstAlias<"xchg{b}\t{$mem, $val|$val, $mem}",
                (XCHG8rm  GR8 :$val, i8mem :$mem), 0>;
def : InstAlias<"xchg{w}\t{$mem, $val|$val, $mem}",
                (XCHG16rm GR16:$val, i16mem:$mem), 0>;
def : InstAlias<"xchg{l}\t{$mem, $val|$val, $mem}",
                (XCHG32rm GR32:$val, i32mem:$mem), 0>;
def : InstAlias<"xchg{q}\t{$mem, $val|$val, $mem}",
                (XCHG64rm GR64:$val, i64mem:$mem), 0>;

So we shouldn't need the commuted variants.

[craig.topper]

test/tools/llvm-mca/X86/Atom/resources-x86_64.s

676–677 ↗

(On Diff #157674)

Yeah its just a parser trick. The encoding is the same.

[avt77]

test/tools/llvm-mca/X86/Atom/resources-x86_64.s

230 ↗

(On Diff #157699)

It seems it deos not work:

<stdin>:225:1: error: too few operands for instruction
cmpxchgb %bl
^
<stdin>:226:10: error: invalid operand for instruction
cmpxchgb (%rbx)

^~~~~~

<stdin>:228:1: error: too few operands for instruction
cmpxchgw %bx
^
<stdin>:229:10: error: invalid operand for instruction
cmpxchgw (%rbx)

^~~~~~

<stdin>:231:1: error: too few operands for instruction
cmpxchgl %ebx
^
<stdin>:232:10: error: invalid operand for instruction
cmpxchgl (%ebx)

^~~~~~

<stdin>:234:1: error: too few operands for instruction
cmpxchgq %rbx
^
<stdin>:235:10: error: invalid operand for instruction
cmpxchgq (%rbx)

^~~~~~

[avt77]

The new tests were updated, xadd* tests were added.

[RKSimon]

test/tools/llvm-mca/X86/Atom/resources-x86_64.s

232 ↗

(On Diff #158721)

This triple is 64-bit - use 64-bit pointers (%rbx).

799 ↗

(On Diff #158721)

This triple is 64-bit - use 64-bit pointers (%rbx).

230 ↗

(On Diff #157699)

No, I mean the instruction implicitly uses the RAX register - use different registers to make the instruction more realistic.

APM V3:

Compares the value in the AL, AX, EAX, or RAX register with the value in a register or a memory location (first operand). If the two values are equal, the instruction copies the value in the second operand to the first operand and sets the ZF flag in the rFLAGS register to 1. Otherwise, it copies the value in the first operand to the AL, AX, EAX, or RAX register and clears the ZF flag to 0.

[avt77]

All last requirements were fixed.

[RKSimon]

LGTM - thanks

llvm/trunk/test/tools/llvm-mca/X86/Atom/resources-x86_64.s

 cmpq %rsi, (%rax)
 cmpq (%rax), %rdi
 
 cmpsb
 cmpsw
 cmpsl
 cmpsq
 
+cmpxchgb %cl, %bl
+cmpxchgb %cl, (%rbx)
+
+cmpxchgw %cx, %bx
+cmpxchgw %cx, (%rbx)
+
+cmpxchgl %ecx, %ebx
+cmpxchgl %ecx, (%rbx)
+
+cmpxchgq %rcx, %rbx
+cmpxchgq %rcx, (%rbx)
+
 cpuid
 
 decb %dil
 decb (%rax)
 decw %di
 decw (%rax)
 decl %edi
 decl (%rax)

 testq $665536, (%rax)
 testq $7, %rdi
 testq $7, (%rax)
 testq %rsi, %rdi
 testq %rsi, (%rax)
 
 ud2
 
+xaddb %bl, %cl
+xaddb %bl, (%rcx)
+
+xaddw %bx, %cx
+xaddw %ax, (%rbx)
+
+xaddl %ebx, %ecx
+xaddl %eax, (%rbx)
+
+xaddq %rbx, %rcx
+xaddq %rax, (%rbx)
+
+xchgb %bl, %cl
+xchgb %bl, (%rbx)
+
+xchgw %ax, %bx
+xchgw %bx, %cx
+xchgw %ax, (%rbx)
+
+xchgl %eax, %ebx
+xchgl %ebx, %ecx
+xchgl %eax, (%rbx)
+
+xchgq %rax, %rbx
+xchgq %rbx, %rcx
+xchgq %rax, (%rbx)
+
 xlatb
 
 xorb $7, %al
 xorb $7, %dil
 xorb $7, (%rax)
 xorb %sil, %dil
 xorb %sil, (%rax)
 xorb (%rax), %dil

 # 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      3     1.50                  U     cmpsb %es:(%rdi), (%rsi)
 # CHECK-NEXT:  1      3     1.50                  U     cmpsw %es:(%rdi), (%rsi)
 # CHECK-NEXT:  1      3     1.50                  U     cmpsl %es:(%rdi), (%rsi)
 # CHECK-NEXT:  1      3     1.50                  U     cmpsq %es:(%rdi), (%rsi)
+# CHECK-NEXT:  1      9     4.50                        cmpxchgb  %cl, %bl
+# CHECK-NEXT:  1      6     3.00    *      *            cmpxchgb  %cl, (%rbx)
+# CHECK-NEXT:  1      15    7.50                        cmpxchgw  %cx, %bx
+# CHECK-NEXT:  1      14    7.00    *      *            cmpxchgw  %cx, (%rbx)
+# CHECK-NEXT:  1      15    7.50                        cmpxchgl  %ecx, %ebx
+# CHECK-NEXT:  1      14    7.00    *      *            cmpxchgl  %ecx, (%rbx)
+# CHECK-NEXT:  1      15    7.50                        cmpxchgq  %rcx, %rbx
+# CHECK-NEXT:  1      14    7.00    *      *            cmpxchgq  %rcx, (%rbx)
 # CHECK-NEXT:  1      121   60.50                 U     cpuid
 # CHECK-NEXT:  1      1     0.50                        decb  %dil
 # CHECK-NEXT:  1      1     1.00    *      *            decb  (%rax)
 # CHECK-NEXT:  1      1     0.50                        decw  %di
 # CHECK-NEXT:  1      1     1.00    *      *            decw  (%rax)
 # CHECK-NEXT:  1      1     0.50                        decl  %edi
 # CHECK-NEXT:  1      1     1.00    *      *            decl  (%rax)
 # CHECK-NEXT:  1      1     0.50                        decq  %rdi

 # CHECK-NEXT:  1      1     0.50                        testq $665536, %rax
 # CHECK-NEXT:  1      1     0.50                        testq $665536, %rdi
 # CHECK-NEXT:  1      1     1.00    *                   testq $665536, (%rax)
 # CHECK-NEXT:  1      1     0.50                        testq $7, %rdi
 # CHECK-NEXT:  1      1     1.00    *                   testq $7, (%rax)
 # CHECK-NEXT:  1      1     0.50                        testq %rsi, %rdi
 # CHECK-NEXT:  1      1     1.00    *                   testq %rsi, (%rax)
 # CHECK-NEXT:  1      100   0.50    *             U     ud2
+# CHECK-NEXT:  1      2     1.00                        xaddb %bl, %cl
+# CHECK-NEXT:  1      3     1.50    *      *            xaddb %bl, (%rcx)
+# CHECK-NEXT:  1      2     1.00                        xaddw %bx, %cx
+# CHECK-NEXT:  1      3     1.50    *      *            xaddw %ax, (%rbx)
+# CHECK-NEXT:  1      2     1.00                        xaddl %ebx, %ecx
+# CHECK-NEXT:  1      3     1.50    *      *            xaddl %eax, (%rbx)
+# CHECK-NEXT:  1      2     1.00                        xaddq %rbx, %rcx
+# CHECK-NEXT:  1      3     1.50    *      *            xaddq %rax, (%rbx)
+# CHECK-NEXT:  1      2     1.00                        xchgb %bl, %cl
+# CHECK-NEXT:  1      3     1.50    *      *            xchgb %bl, (%rbx)
+# CHECK-NEXT:  1      2     1.00                        xchgw %bx, %ax
+# CHECK-NEXT:  1      2     1.00                        xchgw %bx, %cx
+# CHECK-NEXT:  1      3     1.50    *      *            xchgw %ax, (%rbx)
+# CHECK-NEXT:  1      2     1.00                        xchgl %ebx, %eax
+# CHECK-NEXT:  1      2     1.00                        xchgl %ebx, %ecx
+# CHECK-NEXT:  1      3     1.50    *      *            xchgl %eax, (%rbx)
+# CHECK-NEXT:  1      2     1.00                        xchgq %rbx, %rax
+# CHECK-NEXT:  1      2     1.00                        xchgq %rbx, %rcx
+# CHECK-NEXT:  1      3     1.50    *      *            xchgq %rax, (%rbx)
 # CHECK-NEXT:  1      6     3.00    *                   xlatb
 # CHECK-NEXT:  1      1     0.50                        xorb  $7, %al
 # CHECK-NEXT:  1      1     0.50                        xorb  $7, %dil
 # CHECK-NEXT:  1      1     1.00    *      *            xorb  $7, (%rax)
 # CHECK-NEXT:  1      1     0.50                        xorb  %sil, %dil
 # CHECK-NEXT:  1      1     1.00    *      *            xorb  %sil, (%rax)
 # CHECK-NEXT:  1      1     1.00    *                   xorb  (%rax), %dil
 # CHECK-NEXT:  1      1     0.50                        xorw  $511, %ax

 # CHECK-NEXT:  1      1     1.00    *                   xorq  (%rax), %rdi
 
 # CHECK:      Resources:
 # CHECK-NEXT: [0]   - AtomPort0
 # CHECK-NEXT: [1]   - AtomPort1
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]
-# CHECK-NEXT: 2318.00 1977.00
+# CHECK-NEXT: 2392.00 2051.00
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    Instructions:
 # CHECK-NEXT: 0.50   0.50   adcb  $7, %al
 # CHECK-NEXT: 0.50   0.50   adcb  $7, %dil
 # CHECK-NEXT: 1.00    -     adcb  $7, (%rax)
 # CHECK-NEXT: 0.50   0.50   adcb  %sil, %dil
 # CHECK-NEXT: 1.00    -     adcb  %sil, (%rax)

 # 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: 1.50   1.50   cmpsb %es:(%rdi), (%rsi)
 # CHECK-NEXT: 1.50   1.50   cmpsw %es:(%rdi), (%rsi)
 # CHECK-NEXT: 1.50   1.50   cmpsl %es:(%rdi), (%rsi)
 # CHECK-NEXT: 1.50   1.50   cmpsq %es:(%rdi), (%rsi)
+# CHECK-NEXT: 4.50   4.50   cmpxchgb  %cl, %bl
+# CHECK-NEXT: 3.00   3.00   cmpxchgb  %cl, (%rbx)
+# CHECK-NEXT: 7.50   7.50   cmpxchgw  %cx, %bx
+# CHECK-NEXT: 7.00   7.00   cmpxchgw  %cx, (%rbx)
+# CHECK-NEXT: 7.50   7.50   cmpxchgl  %ecx, %ebx
+# CHECK-NEXT: 7.00   7.00   cmpxchgl  %ecx, (%rbx)
+# CHECK-NEXT: 7.50   7.50   cmpxchgq  %rcx, %rbx
+# CHECK-NEXT: 7.00   7.00   cmpxchgq  %rcx, (%rbx)
 # CHECK-NEXT: 60.50  60.50  cpuid
 # CHECK-NEXT: 0.50   0.50   decb  %dil
 # CHECK-NEXT: 1.00    -     decb  (%rax)
 # CHECK-NEXT: 0.50   0.50   decw  %di
 # CHECK-NEXT: 1.00    -     decw  (%rax)
 # CHECK-NEXT: 0.50   0.50   decl  %edi
 # CHECK-NEXT: 1.00    -     decl  (%rax)
 # CHECK-NEXT: 0.50   0.50   decq  %rdi

 # CHECK-NEXT: 0.50   0.50   testq $665536, %rax
 # CHECK-NEXT: 0.50   0.50   testq $665536, %rdi
 # CHECK-NEXT: 1.00    -     testq $665536, (%rax)
 # CHECK-NEXT: 0.50   0.50   testq $7, %rdi
 # CHECK-NEXT: 1.00    -     testq $7, (%rax)
 # CHECK-NEXT: 0.50   0.50   testq %rsi, %rdi
 # CHECK-NEXT: 1.00    -     testq %rsi, (%rax)
 # CHECK-NEXT: 0.50   0.50   ud2
+# CHECK-NEXT: 1.00   1.00   xaddb %bl, %cl
+# CHECK-NEXT: 1.50   1.50   xaddb %bl, (%rcx)
+# CHECK-NEXT: 1.00   1.00   xaddw %bx, %cx
+# CHECK-NEXT: 1.50   1.50   xaddw %ax, (%rbx)
+# CHECK-NEXT: 1.00   1.00   xaddl %ebx, %ecx
+# CHECK-NEXT: 1.50   1.50   xaddl %eax, (%rbx)
+# CHECK-NEXT: 1.00   1.00   xaddq %rbx, %rcx
+# CHECK-NEXT: 1.50   1.50   xaddq %rax, (%rbx)
+# CHECK-NEXT: 1.00   1.00   xchgb %bl, %cl
+# CHECK-NEXT: 1.50   1.50   xchgb %bl, (%rbx)
+# CHECK-NEXT: 1.00   1.00   xchgw %bx, %ax
+# CHECK-NEXT: 1.00   1.00   xchgw %bx, %cx
+# CHECK-NEXT: 1.50   1.50   xchgw %ax, (%rbx)
+# CHECK-NEXT: 1.00   1.00   xchgl %ebx, %eax
+# CHECK-NEXT: 1.00   1.00   xchgl %ebx, %ecx
+# CHECK-NEXT: 1.50   1.50   xchgl %eax, (%rbx)
+# CHECK-NEXT: 1.00   1.00   xchgq %rbx, %rax
+# CHECK-NEXT: 1.00   1.00   xchgq %rbx, %rcx
+# CHECK-NEXT: 1.50   1.50   xchgq %rax, (%rbx)
 # CHECK-NEXT: 3.00   3.00   xlatb
 # CHECK-NEXT: 0.50   0.50   xorb  $7, %al
 # CHECK-NEXT: 0.50   0.50   xorb  $7, %dil
 # CHECK-NEXT: 1.00    -     xorb  $7, (%rax)
 # CHECK-NEXT: 0.50   0.50   xorb  %sil, %dil
 # CHECK-NEXT: 1.00    -     xorb  %sil, (%rax)
 # CHECK-NEXT: 1.00    -     xorb  (%rax), %dil
 # CHECK-NEXT: 0.50   0.50   xorw  $511, %ax

llvm/trunk/test/tools/llvm-mca/X86/Broadwell/resources-x86_64.s

 cmpq %rsi, (%rax)
 cmpq (%rax), %rdi
 
 cmpsb
 cmpsw
 cmpsl
 cmpsq
 
+cmpxchgb %cl, %bl
+cmpxchgb %cl, (%rbx)
+
+cmpxchgw %cx, %bx
+cmpxchgw %cx, (%rbx)
+
+cmpxchgl %ecx, %ebx
+cmpxchgl %ecx, (%rbx)
+
+cmpxchgq %rcx, %rbx
+cmpxchgq %rcx, (%rbx)
+
 cpuid
 
 decb %dil
 decb (%rax)
 decw %di
 decw (%rax)
 decl %edi
 decl (%rax)

 testq $665536, (%rax)
 testq $7, %rdi
 testq $7, (%rax)
 testq %rsi, %rdi
 testq %rsi, (%rax)
 
 ud2
 
+xaddb %bl, %cl
+xaddb %bl, (%rcx)
+
+xaddw %bx, %cx
+xaddw %ax, (%rbx)
+
+xaddl %ebx, %ecx
+xaddl %eax, (%rbx)
+
+xaddq %rbx, %rcx
+xaddq %rax, (%rbx)
+
+xchgb %bl, %cl
+xchgb %bl, (%rbx)
+
+xchgw %ax, %bx
+xchgw %bx, %cx
+xchgw %ax, (%rbx)
+
+xchgl %eax, %ebx
+xchgl %ebx, %ecx
+xchgl %eax, (%rbx)
+
+xchgq %rax, %rbx
+xchgq %rbx, %rcx
+xchgq %rax, (%rbx)
+
 xlatb
 
 xorb $7, %al
 xorb $7, %dil
 xorb $7, (%rax)
 xorb %sil, %dil
 xorb %sil, (%rax)
 xorb (%rax), %dil

 # 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      100   0.25                  U     cmpsb %es:(%rdi), (%rsi)
 # CHECK-NEXT:  1      100   0.25                  U     cmpsw %es:(%rdi), (%rsi)
 # CHECK-NEXT:  1      100   0.25                  U     cmpsl %es:(%rdi), (%rsi)
 # CHECK-NEXT:  1      100   0.25                  U     cmpsq %es:(%rdi), (%rsi)
+# CHECK-NEXT:  5      5     1.25                        cmpxchgb  %cl, %bl
+# CHECK-NEXT:  6      8     1.00    *      *            cmpxchgb  %cl, (%rbx)
+# CHECK-NEXT:  5      5     1.25                        cmpxchgw  %cx, %bx
+# CHECK-NEXT:  6      8     1.00    *      *            cmpxchgw  %cx, (%rbx)
+# CHECK-NEXT:  5      5     1.25                        cmpxchgl  %ecx, %ebx
+# CHECK-NEXT:  6      8     1.00    *      *            cmpxchgl  %ecx, (%rbx)
+# CHECK-NEXT:  5      5     1.25                        cmpxchgq  %rcx, %rbx
+# CHECK-NEXT:  6      8     1.00    *      *            cmpxchgq  %rcx, (%rbx)
 # CHECK-NEXT:  8      18    2.00                  U     cpuid
 # CHECK-NEXT:  1      1     0.25                        decb  %dil
 # CHECK-NEXT:  3      7     1.00    *      *            decb  (%rax)
 # CHECK-NEXT:  1      1     0.25                        decw  %di
 # CHECK-NEXT:  3      7     1.00    *      *            decw  (%rax)
 # CHECK-NEXT:  1      1     0.25                        decl  %edi
 # CHECK-NEXT:  3      7     1.00    *      *            decl  (%rax)
 # CHECK-NEXT:  1      1     0.25                        decq  %rdi

 # CHECK-NEXT:  1      1     0.25                        testq $665536, %rax
 # CHECK-NEXT:  1      1     0.25                        testq $665536, %rdi
 # CHECK-NEXT:  2      6     0.50    *                   testq $665536, (%rax)
 # CHECK-NEXT:  1      1     0.25                        testq $7, %rdi
 # CHECK-NEXT:  2      6     0.50    *                   testq $7, (%rax)
 # CHECK-NEXT:  1      1     0.25                        testq %rsi, %rdi
 # CHECK-NEXT:  2      6     0.50    *                   testq %rsi, (%rax)
 # CHECK-NEXT:  1      100   0.25    *             U     ud2
+# CHECK-NEXT:  3      2     0.75                        xaddb %bl, %cl
+# CHECK-NEXT:  5      7     1.00    *      *            xaddb %bl, (%rcx)
+# CHECK-NEXT:  3      2     0.75                        xaddw %bx, %cx
+# CHECK-NEXT:  5      7     1.00    *      *            xaddw %ax, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xaddl %ebx, %ecx
+# CHECK-NEXT:  5      7     1.00    *      *            xaddl %eax, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xaddq %rbx, %rcx
+# CHECK-NEXT:  5      7     1.00    *      *            xaddq %rax, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xchgb %bl, %cl
+# CHECK-NEXT:  6      8     1.00    *      *            xchgb %bl, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xchgw %bx, %ax
+# CHECK-NEXT:  3      2     0.75                        xchgw %bx, %cx
+# CHECK-NEXT:  6      8     1.00    *      *            xchgw %ax, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xchgl %ebx, %eax
+# CHECK-NEXT:  3      2     0.75                        xchgl %ebx, %ecx
+# CHECK-NEXT:  6      8     1.00    *      *            xchgl %eax, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xchgq %rbx, %rax
+# CHECK-NEXT:  3      2     0.75                        xchgq %rbx, %rcx
+# CHECK-NEXT:  6      8     1.00    *      *            xchgq %rax, (%rbx)
 # CHECK-NEXT:  1      5     0.50    *                   xlatb
 # CHECK-NEXT:  1      1     0.25                        xorb  $7, %al
 # CHECK-NEXT:  1      1     0.25                        xorb  $7, %dil
 # CHECK-NEXT:  3      7     1.00    *      *            xorb  $7, (%rax)
 # CHECK-NEXT:  1      1     0.25                        xorb  %sil, %dil
 # CHECK-NEXT:  3      7     1.00    *      *            xorb  %sil, (%rax)
 # CHECK-NEXT:  2      6     0.50    *                   xorb  (%rax), %dil
 # CHECK-NEXT:  1      1     0.25                        xorw  $511, %ax

 # CHECK-NEXT: [5]   - BWPort3
 # CHECK-NEXT: [6]   - BWPort4
 # CHECK-NEXT: [7]   - BWPort5
 # CHECK-NEXT: [8]   - BWPort6
 # CHECK-NEXT: [9]   - BWPort7
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]
-# CHECK-NEXT: 50.00   -     469.00 317.50 252.17 252.17 190.00 227.00 501.50 78.67
+# CHECK-NEXT: 50.00   -     494.25 334.75 262.17 262.17 202.00 244.25 526.75 82.67
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    Instructions:
 # CHECK-NEXT:  -      -     0.75   0.25    -      -      -     0.25   0.75    -     adcb  $7, %al
 # CHECK-NEXT:  -      -     0.75   0.25    -      -      -     0.25   0.75    -     adcb  $7, %dil
 # CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   adcb  $7, (%rax)
 # CHECK-NEXT:  -      -     0.50    -      -      -      -      -     0.50    -     adcb  %sil, %dil
 # CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   adcb  %sil, (%rax)

 # 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    -     cmpsb %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpsw %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpsl %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpsq %es:(%rdi), (%rsi)
+# CHECK-NEXT:  -      -     1.75   0.75    -      -      -     0.75   1.75    -     cmpxchgb  %cl, %bl
+# CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   cmpxchgb  %cl, (%rbx)
+# CHECK-NEXT:  -      -     1.75   0.75    -      -      -     0.75   1.75    -     cmpxchgw  %cx, %bx
+# CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   cmpxchgw  %cx, (%rbx)
+# CHECK-NEXT:  -      -     1.75   0.75    -      -      -     0.75   1.75    -     cmpxchgl  %ecx, %ebx
+# CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   cmpxchgl  %ecx, (%rbx)
+# CHECK-NEXT:  -      -     1.75   0.75    -      -      -     0.75   1.75    -     cmpxchgq  %rcx, %rbx
+# CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   cmpxchgq  %rcx, (%rbx)
 # CHECK-NEXT:  -      -     1.75   1.25    -      -      -     2.25   2.75    -     cpuid
 # 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
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   decw  (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     decl  %edi
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   decl  (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     decq  %rdi

 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     testq $665536, %rax
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     testq $665536, %rdi
 # CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     testq $665536, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     testq $7, %rdi
 # CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     testq $7, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     testq %rsi, %rdi
 # CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     testq %rsi, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     ud2
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xaddb %bl, %cl
+# CHECK-NEXT:  -      -     0.50   0.50   0.83   0.83   1.00   0.50   0.50   0.33   xaddb %bl, (%rcx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xaddw %bx, %cx
+# CHECK-NEXT:  -      -     0.50   0.50   0.83   0.83   1.00   0.50   0.50   0.33   xaddw %ax, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xaddl %ebx, %ecx
+# CHECK-NEXT:  -      -     0.50   0.50   0.83   0.83   1.00   0.50   0.50   0.33   xaddl %eax, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xaddq %rbx, %rcx
+# CHECK-NEXT:  -      -     0.50   0.50   0.83   0.83   1.00   0.50   0.50   0.33   xaddq %rax, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgb %bl, %cl
+# CHECK-NEXT:  -      -     0.75   0.75   0.83   0.83   1.00   0.75   0.75   0.33   xchgb %bl, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgw %bx, %ax
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgw %bx, %cx
+# CHECK-NEXT:  -      -     0.75   0.75   0.83   0.83   1.00   0.75   0.75   0.33   xchgw %ax, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgl %ebx, %eax
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgl %ebx, %ecx
+# CHECK-NEXT:  -      -     0.75   0.75   0.83   0.83   1.00   0.75   0.75   0.33   xchgl %eax, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgq %rbx, %rax
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgq %rbx, %rcx
+# CHECK-NEXT:  -      -     0.75   0.75   0.83   0.83   1.00   0.75   0.75   0.33   xchgq %rax, (%rbx)
 # CHECK-NEXT:  -      -      -      -     0.50   0.50    -      -      -      -     xlatb
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     xorb  $7, %al
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     xorb  $7, %dil
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   xorb  $7, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     xorb  %sil, %dil
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   xorb  %sil, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     xorb  (%rax), %dil
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     xorw  $511, %ax

llvm/trunk/test/tools/llvm-mca/X86/BtVer2/resources-x86_64.s

 cmpq %rsi, (%rax)
 cmpq (%rax), %rdi
 
 cmpsb
 cmpsw
 cmpsl
 cmpsq
 
+cmpxchgb %cl, %bl
+cmpxchgb %cl, (%rbx)
+
+cmpxchgw %cx, %bx
+cmpxchgw %cx, (%rbx)
+
+cmpxchgl %ecx, %ebx
+cmpxchgl %ecx, (%rbx)
+
+cmpxchgq %rcx, %rbx
+cmpxchgq %rcx, (%rbx)
+
 cpuid
 
 decb %dil
 decb (%rax)
 decw %di
 decw (%rax)
 decl %edi
 decl (%rax)

 testq $665536, (%rax)
 testq $7, %rdi
 testq $7, (%rax)
 testq %rsi, %rdi
 testq %rsi, (%rax)
 
 ud2
 
+xaddb %bl, %cl
+xaddb %bl, (%rcx)
+
+xaddw %bx, %cx
+xaddw %ax, (%rbx)
+
+xaddl %ebx, %ecx
+xaddl %eax, (%rbx)
+
+xaddq %rbx, %rcx
+xaddq %rax, (%rbx)
+
+xchgb %bl, %cl
+xchgb %bl, (%rbx)
+
+xchgw %ax, %bx
+xchgw %bx, %cx
+xchgw %ax, (%rbx)
+
+xchgl %eax, %ebx
+xchgl %ebx, %ecx
+xchgl %eax, (%rbx)
+
+xchgq %rax, %rbx
+xchgq %rbx, %rcx
+xchgq %rax, (%rbx)
+
 xlatb
 
 xorb $7, %al
 xorb $7, %dil
 xorb $7, (%rax)
 xorb %sil, %dil
 xorb %sil, (%rax)
 xorb (%rax), %dil

 # 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      100   0.50                  U     cmpsb %es:(%rdi), (%rsi)
 # CHECK-NEXT:  1      100   0.50                  U     cmpsw %es:(%rdi), (%rsi)
 # CHECK-NEXT:  1      100   0.50                  U     cmpsl %es:(%rdi), (%rsi)
 # CHECK-NEXT:  1      100   0.50                  U     cmpsq %es:(%rdi), (%rsi)
+# CHECK-NEXT:  1      1     0.50                        cmpxchgb  %cl, %bl
+# CHECK-NEXT:  2      4     1.00    *      *            cmpxchgb  %cl, (%rbx)
+# CHECK-NEXT:  1      1     0.50                        cmpxchgw  %cx, %bx
+# CHECK-NEXT:  2      4     1.00    *      *            cmpxchgw  %cx, (%rbx)
+# CHECK-NEXT:  1      1     0.50                        cmpxchgl  %ecx, %ebx
+# CHECK-NEXT:  2      4     1.00    *      *            cmpxchgl  %ecx, (%rbx)
+# CHECK-NEXT:  1      1     0.50                        cmpxchgq  %rcx, %rbx
+# CHECK-NEXT:  2      4     1.00    *      *            cmpxchgq  %rcx, (%rbx)
 # CHECK-NEXT:  1      100   0.50                  U     cpuid
 # CHECK-NEXT:  1      1     0.50                        decb  %dil
 # CHECK-NEXT:  2      5     1.00    *      *            decb  (%rax)
 # CHECK-NEXT:  1      1     0.50                        decw  %di
 # CHECK-NEXT:  2      5     1.00    *      *            decw  (%rax)
 # CHECK-NEXT:  1      1     0.50                        decl  %edi
 # CHECK-NEXT:  2      5     1.00    *      *            decl  (%rax)
 # CHECK-NEXT:  1      1     0.50                        decq  %rdi

 # CHECK-NEXT:  1      1     0.50                        testq $665536, %rax
 # CHECK-NEXT:  1      1     0.50                        testq $665536, %rdi
 # CHECK-NEXT:  1      4     1.00    *                   testq $665536, (%rax)
 # CHECK-NEXT:  1      1     0.50                        testq $7, %rdi
 # CHECK-NEXT:  1      4     1.00    *                   testq $7, (%rax)
 # CHECK-NEXT:  1      1     0.50                        testq %rsi, %rdi
 # CHECK-NEXT:  1      4     1.00    *                   testq %rsi, (%rax)
 # CHECK-NEXT:  1      100   0.50    *             U     ud2
+# CHECK-NEXT:  1      1     0.50                        xaddb %bl, %cl
+# CHECK-NEXT:  2      4     1.00    *      *            xaddb %bl, (%rcx)
+# CHECK-NEXT:  1      1     0.50                        xaddw %bx, %cx
+# CHECK-NEXT:  2      4     1.00    *      *            xaddw %ax, (%rbx)
+# CHECK-NEXT:  1      1     0.50                        xaddl %ebx, %ecx
+# CHECK-NEXT:  2      4     1.00    *      *            xaddl %eax, (%rbx)
+# CHECK-NEXT:  1      1     0.50                        xaddq %rbx, %rcx
+# CHECK-NEXT:  2      4     1.00    *      *            xaddq %rax, (%rbx)
+# CHECK-NEXT:  1      1     0.50                        xchgb %bl, %cl
+# CHECK-NEXT:  2      4     1.00    *      *            xchgb %bl, (%rbx)
+# CHECK-NEXT:  1      1     0.50                        xchgw %bx, %ax
+# CHECK-NEXT:  1      1     0.50                        xchgw %bx, %cx
+# CHECK-NEXT:  2      4     1.00    *      *            xchgw %ax, (%rbx)
+# CHECK-NEXT:  1      1     0.50                        xchgl %ebx, %eax
+# CHECK-NEXT:  1      1     0.50                        xchgl %ebx, %ecx
+# CHECK-NEXT:  2      4     1.00    *      *            xchgl %eax, (%rbx)
+# CHECK-NEXT:  1      1     0.50                        xchgq %rbx, %rax
+# CHECK-NEXT:  1      1     0.50                        xchgq %rbx, %rcx
+# CHECK-NEXT:  2      4     1.00    *      *            xchgq %rax, (%rbx)
 # CHECK-NEXT:  1      5     1.00    *                   xlatb
 # CHECK-NEXT:  1      1     0.50                        xorb  $7, %al
 # CHECK-NEXT:  1      1     0.50                        xorb  $7, %dil
 # CHECK-NEXT:  2      5     1.00    *      *            xorb  $7, (%rax)
 # CHECK-NEXT:  1      1     0.50                        xorb  %sil, %dil
 # CHECK-NEXT:  2      5     1.00    *      *            xorb  %sil, (%rax)
 # CHECK-NEXT:  1      4     1.00    *                   xorb  (%rax), %dil
 # CHECK-NEXT:  1      1     0.50                        xorw  $511, %ax

 # CHECK-NEXT: [9]   - JSAGU
 # CHECK-NEXT: [10]  - JSTC
 # CHECK-NEXT: [11]  - JVALU0
 # CHECK-NEXT: [12]  - JVALU1
 # CHECK-NEXT: [13]  - JVIMUL
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13]
-# CHECK-NEXT: 544.00 594.00 380.00  -      -      -      -     307.00 64.00  211.00  -      -      -      -
+# CHECK-NEXT: 557.50 607.50 380.00  -      -      -      -     319.00 64.00  223.00  -      -      -      -
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13]   Instructions:
 # CHECK-NEXT: 1.00   1.00    -      -      -      -      -      -      -      -      -      -      -      -     adcb  $7, %al
 # CHECK-NEXT: 1.00   1.00    -      -      -      -      -      -      -      -      -      -      -      -     adcb  $7, %dil
 # CHECK-NEXT: 1.00   1.00    -      -      -      -      -     1.00    -     1.00    -      -      -      -     adcb  $7, (%rax)
 # CHECK-NEXT: 1.00   1.00    -      -      -      -      -      -      -      -      -      -      -      -     adcb  %sil, %dil
 # CHECK-NEXT: 1.00   1.00    -      -      -      -      -     1.00    -     1.00    -      -      -      -     adcb  %sil, (%rax)

 # 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    -      -      -      -      -      -      -      -      -      -      -      -     cmpsb %es:(%rdi), (%rsi)
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cmpsw %es:(%rdi), (%rsi)
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cmpsl %es:(%rdi), (%rsi)
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cmpsq %es:(%rdi), (%rsi)
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cmpxchgb  %cl, %bl
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -     1.00    -      -      -      -     cmpxchgb  %cl, (%rbx)
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cmpxchgw  %cx, %bx
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -     1.00    -      -      -      -     cmpxchgw  %cx, (%rbx)
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cmpxchgl  %ecx, %ebx
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -     1.00    -      -      -      -     cmpxchgl  %ecx, (%rbx)
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cmpxchgq  %rcx, %rbx
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -     1.00    -      -      -      -     cmpxchgq  %rcx, (%rbx)
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     cpuid
 # 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
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -     1.00    -      -      -      -     decw  (%rax)
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     decl  %edi
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -     1.00    -      -      -      -     decl  (%rax)
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     decq  %rdi

 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     testq $665536, %rax
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     testq $665536, %rdi
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -      -      -      -      -      -     testq $665536, (%rax)
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     testq $7, %rdi
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -      -      -      -      -      -     testq $7, (%rax)
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     testq %rsi, %rdi
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -      -      -      -      -      -     testq %rsi, (%rax)
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     ud2
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     xaddb %bl, %cl
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -     1.00    -      -      -      -     xaddb %bl, (%rcx)
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     xaddw %bx, %cx
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -     1.00    -      -      -      -     xaddw %ax, (%rbx)
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     xaddl %ebx, %ecx
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -     1.00    -      -      -      -     xaddl %eax, (%rbx)
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     xaddq %rbx, %rcx
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -     1.00    -      -      -      -     xaddq %rax, (%rbx)
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     xchgb %bl, %cl
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -     1.00    -      -      -      -     xchgb %bl, (%rbx)
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     xchgw %bx, %ax
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     xchgw %bx, %cx
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -     1.00    -      -      -      -     xchgw %ax, (%rbx)
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     xchgl %ebx, %eax
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     xchgl %ebx, %ecx
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -     1.00    -      -      -      -     xchgl %eax, (%rbx)
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     xchgq %rbx, %rax
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     xchgq %rbx, %rcx
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -     1.00    -      -      -      -     xchgq %rax, (%rbx)
 # CHECK-NEXT:  -      -      -      -      -      -      -     1.00    -      -      -      -      -      -     xlatb
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     xorb  $7, %al
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     xorb  $7, %dil
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -     1.00    -      -      -      -     xorb  $7, (%rax)
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     xorb  %sil, %dil
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -     1.00    -      -      -      -     xorb  %sil, (%rax)
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -     1.00    -      -      -      -      -      -     xorb  (%rax), %dil
 # CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -     xorw  $511, %ax

llvm/trunk/test/tools/llvm-mca/X86/Generic/resources-x86_64.s

 cmpq %rsi, (%rax)
 cmpq (%rax), %rdi
 
 cmpsb
 cmpsw
 cmpsl
 cmpsq
 
+cmpxchgb %cl, %bl
+cmpxchgb %cl, (%rbx)
+
+cmpxchgw %cx, %bx
+cmpxchgw %cx, (%rbx)
+
+cmpxchgl %ecx, %ebx
+cmpxchgl %ecx, (%rbx)
+
+cmpxchgq %rcx, %rbx
+cmpxchgq %rcx, (%rbx)
+
 cpuid
 
 decb %dil
 decb (%rax)
 decw %di
 decw (%rax)
 decl %edi
 decl (%rax)

 testq $665536, (%rax)
 testq $7, %rdi
 testq $7, (%rax)
 testq %rsi, %rdi
 testq %rsi, (%rax)
 
 ud2
 
+xaddb %bl, %cl
+xaddb %bl, (%rcx)
+
+xaddw %bx, %cx
+xaddw %ax, (%rbx)
+
+xaddl %ebx, %ecx
+xaddl %eax, (%rbx)
+
+xaddq %rbx, %rcx
+xaddq %rax, (%rbx)
+
+xchgb %bl, %cl
+xchgb %bl, (%rbx)
+
+xchgw %ax, %bx
+xchgw %bx, %cx
+xchgw %ax, (%rbx)
+
+xchgl %eax, %ebx
+xchgl %ebx, %ecx
+xchgl %eax, (%rbx)
+
+xchgq %rax, %rbx
+xchgq %rbx, %rcx
+xchgq %rax, (%rbx)
+
 xlatb
 
 xorb $7, %al
 xorb $7, %dil
 xorb $7, (%rax)
 xorb %sil, %dil
 xorb %sil, (%rax)
 xorb (%rax), %dil

 # 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:  5      8     1.00                  U     cmpsb %es:(%rdi), (%rsi)
 # CHECK-NEXT:  5      8     1.00                  U     cmpsw %es:(%rdi), (%rsi)
 # CHECK-NEXT:  5      8     1.00                  U     cmpsl %es:(%rdi), (%rsi)
 # CHECK-NEXT:  5      8     1.00                  U     cmpsq %es:(%rdi), (%rsi)
+# CHECK-NEXT:  4      5     1.33                        cmpxchgb  %cl, %bl
+# CHECK-NEXT:  4      8     1.00    *      *            cmpxchgb  %cl, (%rbx)
+# CHECK-NEXT:  4      5     1.33                        cmpxchgw  %cx, %bx
+# CHECK-NEXT:  4      8     1.00    *      *            cmpxchgw  %cx, (%rbx)
+# CHECK-NEXT:  4      5     1.33                        cmpxchgl  %ecx, %ebx
+# CHECK-NEXT:  4      8     1.00    *      *            cmpxchgl  %ecx, (%rbx)
+# CHECK-NEXT:  4      5     1.33                        cmpxchgq  %rcx, %rbx
+# CHECK-NEXT:  4      8     1.00    *      *            cmpxchgq  %rcx, (%rbx)
 # CHECK-NEXT:  1      100   0.33                  U     cpuid
 # CHECK-NEXT:  1      1     0.33                        decb  %dil
 # CHECK-NEXT:  3      7     1.00    *      *            decb  (%rax)
 # CHECK-NEXT:  1      1     0.33                        decw  %di
 # CHECK-NEXT:  3      7     1.00    *      *            decw  (%rax)
 # CHECK-NEXT:  1      1     0.33                        decl  %edi
 # CHECK-NEXT:  3      7     1.00    *      *            decl  (%rax)
 # CHECK-NEXT:  1      1     0.33                        decq  %rdi

 # CHECK-NEXT:  1      1     0.33                        testq $665536, %rax
 # CHECK-NEXT:  1      1     0.33                        testq $665536, %rdi
 # CHECK-NEXT:  2      6     0.50    *                   testq $665536, (%rax)
 # CHECK-NEXT:  1      1     0.33                        testq $7, %rdi
 # CHECK-NEXT:  2      6     0.50    *                   testq $7, (%rax)
 # CHECK-NEXT:  1      1     0.33                        testq %rsi, %rdi
 # CHECK-NEXT:  2      6     0.50    *                   testq %rsi, (%rax)
 # CHECK-NEXT:  1      100   0.33    *             U     ud2
+# CHECK-NEXT:  3      2     1.00                        xaddb %bl, %cl
+# CHECK-NEXT:  5      8     1.00    *      *            xaddb %bl, (%rcx)
+# CHECK-NEXT:  3      2     1.00                        xaddw %bx, %cx
+# CHECK-NEXT:  5      8     1.00    *      *            xaddw %ax, (%rbx)
+# CHECK-NEXT:  3      2     1.00                        xaddl %ebx, %ecx
+# CHECK-NEXT:  5      8     1.00    *      *            xaddl %eax, (%rbx)
+# CHECK-NEXT:  3      2     1.00                        xaddq %rbx, %rcx
+# CHECK-NEXT:  5      8     1.00    *      *            xaddq %rax, (%rbx)
+# CHECK-NEXT:  3      2     1.00                        xchgb %bl, %cl
+# CHECK-NEXT:  3      6     1.00    *      *            xchgb %bl, (%rbx)
+# CHECK-NEXT:  3      2     1.00                        xchgw %bx, %ax
+# CHECK-NEXT:  3      2     1.00                        xchgw %bx, %cx
+# CHECK-NEXT:  3      6     1.00    *      *            xchgw %ax, (%rbx)
+# CHECK-NEXT:  3      2     1.00                        xchgl %ebx, %eax
+# CHECK-NEXT:  3      2     1.00                        xchgl %ebx, %ecx
+# CHECK-NEXT:  3      6     1.00    *      *            xchgl %eax, (%rbx)
+# CHECK-NEXT:  3      2     1.00                        xchgq %rbx, %rax
+# CHECK-NEXT:  3      2     1.00                        xchgq %rbx, %rcx
+# CHECK-NEXT:  3      6     1.00    *      *            xchgq %rax, (%rbx)
 # CHECK-NEXT:  1      5     0.50    *                   xlatb
 # CHECK-NEXT:  1      1     0.33                        xorb  $7, %al
 # CHECK-NEXT:  1      1     0.33                        xorb  $7, %dil
 # CHECK-NEXT:  3      7     1.00    *      *            xorb  $7, (%rax)
 # CHECK-NEXT:  1      1     0.33                        xorb  %sil, %dil
 # CHECK-NEXT:  3      7     1.00    *      *            xorb  %sil, (%rax)
 # CHECK-NEXT:  2      6     0.50    *                   xorb  (%rax), %dil
 # CHECK-NEXT:  1      1     0.33                        xorw  $511, %ax

 # CHECK-NEXT: [3]   - SBPort1
 # CHECK-NEXT: [4]   - SBPort4
 # CHECK-NEXT: [5]   - SBPort5
 # CHECK-NEXT: [6.0] - SBPort23
 # CHECK-NEXT: [6.1] - SBPort23
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6.0]  [6.1]
-# CHECK-NEXT: 160.00  -     413.50 201.00 234.00 405.50 280.00 280.00
+# CHECK-NEXT: 160.00  -     438.50 224.00 242.00 430.50 290.00 290.00
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6.0]  [6.1]  Instructions:
 # CHECK-NEXT:  -      -     0.83   0.33    -     0.83    -      -     adcb  $7, %al
 # CHECK-NEXT:  -      -     0.83   0.33    -     0.83    -      -     adcb  $7, %dil
 # CHECK-NEXT:  -      -     1.00   1.00   1.00   1.00   1.00   1.00   adcb  $7, (%rax)
 # CHECK-NEXT:  -      -     0.83   0.33    -     0.83    -      -     adcb  %sil, %dil
 # CHECK-NEXT:  -      -     1.33   0.33   1.00   1.33   1.00   1.00   adcb  %sil, (%rax)

 # 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:  -      -     1.00   1.00    -     1.00   1.00   1.00   cmpsb %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -     1.00   1.00    -     1.00   1.00   1.00   cmpsw %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -     1.00   1.00    -     1.00   1.00   1.00   cmpsl %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -     1.00   1.00    -     1.00   1.00   1.00   cmpsq %es:(%rdi), (%rsi)
+# CHECK-NEXT:  -      -     1.50   1.00    -     1.50    -      -     cmpxchgb  %cl, %bl
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00   0.50   0.50   cmpxchgb  %cl, (%rbx)
+# CHECK-NEXT:  -      -     1.50   1.00    -     1.50    -      -     cmpxchgw  %cx, %bx
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00   0.50   0.50   cmpxchgw  %cx, (%rbx)
+# CHECK-NEXT:  -      -     1.50   1.00    -     1.50    -      -     cmpxchgl  %ecx, %ebx
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00   0.50   0.50   cmpxchgl  %ecx, (%rbx)
+# CHECK-NEXT:  -      -     1.50   1.00    -     1.50    -      -     cmpxchgq  %rcx, %rbx
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00   0.50   0.50   cmpxchgq  %rcx, (%rbx)
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cpuid
 # 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
 # CHECK-NEXT:  -      -     0.33   0.33   1.00   0.33   1.00   1.00   decw  (%rax)
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     decl  %edi
 # CHECK-NEXT:  -      -     0.33   0.33   1.00   0.33   1.00   1.00   decl  (%rax)
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     decq  %rdi

 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     testq $665536, %rax
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     testq $665536, %rdi
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   testq $665536, (%rax)
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     testq $7, %rdi
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   testq $7, (%rax)
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     testq %rsi, %rdi
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   testq %rsi, (%rax)
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     ud2
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00    -      -     xaddb %bl, %cl
+# CHECK-NEXT:  -      -     0.67   0.67   1.00   0.67   1.00   1.00   xaddb %bl, (%rcx)
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00    -      -     xaddw %bx, %cx
+# CHECK-NEXT:  -      -     0.67   0.67   1.00   0.67   1.00   1.00   xaddw %ax, (%rbx)
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00    -      -     xaddl %ebx, %ecx
+# CHECK-NEXT:  -      -     0.67   0.67   1.00   0.67   1.00   1.00   xaddl %eax, (%rbx)
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00    -      -     xaddq %rbx, %rcx
+# CHECK-NEXT:  -      -     0.67   0.67   1.00   0.67   1.00   1.00   xaddq %rax, (%rbx)
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00    -      -     xchgb %bl, %cl
+# CHECK-NEXT:  -      -     0.33   0.33   1.00   0.33   1.00   1.00   xchgb %bl, (%rbx)
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00    -      -     xchgw %bx, %ax
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00    -      -     xchgw %bx, %cx
+# CHECK-NEXT:  -      -     0.33   0.33   1.00   0.33   1.00   1.00   xchgw %ax, (%rbx)
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00    -      -     xchgl %ebx, %eax
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00    -      -     xchgl %ebx, %ecx
+# CHECK-NEXT:  -      -     0.33   0.33   1.00   0.33   1.00   1.00   xchgl %eax, (%rbx)
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00    -      -     xchgq %rbx, %rax
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00    -      -     xchgq %rbx, %rcx
+# CHECK-NEXT:  -      -     0.33   0.33   1.00   0.33   1.00   1.00   xchgq %rax, (%rbx)
 # CHECK-NEXT:  -      -      -      -      -      -     0.50   0.50   xlatb
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     xorb  $7, %al
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     xorb  $7, %dil
 # CHECK-NEXT:  -      -     0.33   0.33   1.00   0.33   1.00   1.00   xorb  $7, (%rax)
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     xorb  %sil, %dil
 # CHECK-NEXT:  -      -     0.33   0.33   1.00   0.33   1.00   1.00   xorb  %sil, (%rax)
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   xorb  (%rax), %dil
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     xorw  $511, %ax

llvm/trunk/test/tools/llvm-mca/X86/Haswell/resources-x86_64.s

 cmpq %rsi, (%rax)
 cmpq (%rax), %rdi
 
 cmpsb
 cmpsw
 cmpsl
 cmpsq
 
+cmpxchgb %cl, %bl
+cmpxchgb %cl, (%rbx)
+
+cmpxchgw %cx, %bx
+cmpxchgw %cx, (%rbx)
+
+cmpxchgl %ecx, %ebx
+cmpxchgl %ecx, (%rbx)
+
+cmpxchgq %rcx, %rbx
+cmpxchgq %rcx, (%rbx)
+
 cpuid
 
 decb %dil
 decb (%rax)
 decw %di
 decw (%rax)
 decl %edi
 decl (%rax)

 testq $665536, (%rax)
 testq $7, %rdi
 testq $7, (%rax)
 testq %rsi, %rdi
 testq %rsi, (%rax)
 
 ud2
 
+xaddb %bl, %cl
+xaddb %bl, (%rcx)
+
+xaddw %bx, %cx
+xaddw %ax, (%rbx)
+
+xaddl %ebx, %ecx
+xaddl %eax, (%rbx)
+
+xaddq %rbx, %rcx
+xaddq %rax, (%rbx)
+
+xchgb %bl, %cl
+xchgb %bl, (%rbx)
+
+xchgw %ax, %bx
+xchgw %bx, %cx
+xchgw %ax, (%rbx)
+
+xchgl %eax, %ebx
+xchgl %ebx, %ecx
+xchgl %eax, (%rbx)
+
+xchgq %rax, %rbx
+xchgq %rbx, %rcx
+xchgq %rax, (%rbx)
+
 xlatb
 
 xorb $7, %al
 xorb $7, %dil
 xorb $7, (%rax)
 xorb %sil, %dil
 xorb %sil, (%rax)
 xorb (%rax), %dil

 # 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:  5      4     1.00                  U     cmpsb %es:(%rdi), (%rsi)
 # CHECK-NEXT:  5      4     1.00                  U     cmpsw %es:(%rdi), (%rsi)
 # CHECK-NEXT:  5      4     1.00                  U     cmpsl %es:(%rdi), (%rsi)
 # CHECK-NEXT:  5      4     1.00                  U     cmpsq %es:(%rdi), (%rsi)
+# CHECK-NEXT:  5      5     1.25                        cmpxchgb  %cl, %bl
+# CHECK-NEXT:  6      9     1.00    *      *            cmpxchgb  %cl, (%rbx)
+# CHECK-NEXT:  5      5     1.25                        cmpxchgw  %cx, %bx
+# CHECK-NEXT:  6      9     1.00    *      *            cmpxchgw  %cx, (%rbx)
+# CHECK-NEXT:  5      5     1.25                        cmpxchgl  %ecx, %ebx
+# CHECK-NEXT:  6      9     1.00    *      *            cmpxchgl  %ecx, (%rbx)
+# CHECK-NEXT:  5      5     1.25                        cmpxchgq  %rcx, %rbx
+# CHECK-NEXT:  6      9     1.00    *      *            cmpxchgq  %rcx, (%rbx)
 # CHECK-NEXT:  8      18    2.00                  U     cpuid
 # CHECK-NEXT:  1      1     0.25                        decb  %dil
 # CHECK-NEXT:  3      7     1.00    *      *            decb  (%rax)
 # CHECK-NEXT:  1      1     0.25                        decw  %di
 # CHECK-NEXT:  3      7     1.00    *      *            decw  (%rax)
 # CHECK-NEXT:  1      1     0.25                        decl  %edi
 # CHECK-NEXT:  3      7     1.00    *      *            decl  (%rax)
 # CHECK-NEXT:  1      1     0.25                        decq  %rdi

 # CHECK-NEXT:  1      1     0.25                        testq $665536, %rax
 # CHECK-NEXT:  1      1     0.25                        testq $665536, %rdi
 # CHECK-NEXT:  2      6     0.50    *                   testq $665536, (%rax)
 # CHECK-NEXT:  1      1     0.25                        testq $7, %rdi
 # CHECK-NEXT:  2      6     0.50    *                   testq $7, (%rax)
 # CHECK-NEXT:  1      1     0.25                        testq %rsi, %rdi
 # CHECK-NEXT:  2      6     0.50    *                   testq %rsi, (%rax)
 # CHECK-NEXT:  1      100   0.25    *             U     ud2
+# CHECK-NEXT:  3      2     0.75                        xaddb %bl, %cl
+# CHECK-NEXT:  5      8     1.00    *      *            xaddb %bl, (%rcx)
+# CHECK-NEXT:  3      2     0.75                        xaddw %bx, %cx
+# CHECK-NEXT:  5      8     1.00    *      *            xaddw %ax, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xaddl %ebx, %ecx
+# CHECK-NEXT:  5      8     1.00    *      *            xaddl %eax, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xaddq %rbx, %rcx
+# CHECK-NEXT:  5      8     1.00    *      *            xaddq %rax, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xchgb %bl, %cl
+# CHECK-NEXT:  6      9     1.00    *      *            xchgb %bl, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xchgw %bx, %ax
+# CHECK-NEXT:  3      2     0.75                        xchgw %bx, %cx
+# CHECK-NEXT:  6      9     1.00    *      *            xchgw %ax, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xchgl %ebx, %eax
+# CHECK-NEXT:  3      2     0.75                        xchgl %ebx, %ecx
+# CHECK-NEXT:  6      9     1.00    *      *            xchgl %eax, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xchgq %rbx, %rax
+# CHECK-NEXT:  3      2     0.75                        xchgq %rbx, %rcx
+# CHECK-NEXT:  6      9     1.00    *      *            xchgq %rax, (%rbx)
 # CHECK-NEXT:  3      7     0.75    *                   xlatb
 # CHECK-NEXT:  1      1     0.25                        xorb  $7, %al
 # CHECK-NEXT:  1      1     0.25                        xorb  $7, %dil
 # CHECK-NEXT:  3      7     1.00    *      *            xorb  $7, (%rax)
 # CHECK-NEXT:  1      1     0.25                        xorb  %sil, %dil
 # CHECK-NEXT:  3      7     1.00    *      *            xorb  %sil, (%rax)
 # CHECK-NEXT:  2      6     0.50    *                   xorb  (%rax), %dil
 # CHECK-NEXT:  1      1     0.25                        xorw  $511, %ax

 # CHECK-NEXT: [5]   - HWPort3
 # CHECK-NEXT: [6]   - HWPort4
 # CHECK-NEXT: [7]   - HWPort5
 # CHECK-NEXT: [8]   - HWPort6
 # CHECK-NEXT: [9]   - HWPort7
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]
-# CHECK-NEXT: 80.00   -     523.50 342.00 252.67 252.67 185.00 253.50 585.00 75.67
+# CHECK-NEXT: 80.00   -     548.75 359.25 262.67 262.67 197.00 270.75 610.25 79.67
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    Instructions:
 # CHECK-NEXT:  -      -     0.75   0.25    -      -      -     0.25   0.75    -     adcb  $7, %al
 # CHECK-NEXT:  -      -     0.75   0.25    -      -      -     0.25   0.75    -     adcb  $7, %dil
 # CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   adcb  $7, (%rax)
 # CHECK-NEXT:  -      -     0.75   0.25    -      -      -     0.25   0.75    -     adcb  %sil, %dil
 # CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   adcb  %sil, (%rax)

 # 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.75   0.75   1.00   1.00    -     0.75   0.75    -     cmpsb %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -     0.75   0.75   1.00   1.00    -     0.75   0.75    -     cmpsw %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -     0.75   0.75   1.00   1.00    -     0.75   0.75    -     cmpsl %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -     0.75   0.75   1.00   1.00    -     0.75   0.75    -     cmpsq %es:(%rdi), (%rsi)
+# CHECK-NEXT:  -      -     1.75   0.75    -      -      -     0.75   1.75    -     cmpxchgb  %cl, %bl
+# CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   cmpxchgb  %cl, (%rbx)
+# CHECK-NEXT:  -      -     1.75   0.75    -      -      -     0.75   1.75    -     cmpxchgw  %cx, %bx
+# CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   cmpxchgw  %cx, (%rbx)
+# CHECK-NEXT:  -      -     1.75   0.75    -      -      -     0.75   1.75    -     cmpxchgl  %ecx, %ebx
+# CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   cmpxchgl  %ecx, (%rbx)
+# CHECK-NEXT:  -      -     1.75   0.75    -      -      -     0.75   1.75    -     cmpxchgq  %rcx, %rbx
+# CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   cmpxchgq  %rcx, (%rbx)
 # CHECK-NEXT:  -      -     1.75   1.25    -      -      -     2.25   2.75    -     cpuid
 # 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
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   decw  (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     decl  %edi
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   decl  (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     decq  %rdi

 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     testq $665536, %rax
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     testq $665536, %rdi
 # CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     testq $665536, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     testq $7, %rdi
 # CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     testq $7, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     testq %rsi, %rdi
 # CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     testq %rsi, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     ud2
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xaddb %bl, %cl
+# CHECK-NEXT:  -      -     0.50   0.50   0.83   0.83   1.00   0.50   0.50   0.33   xaddb %bl, (%rcx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xaddw %bx, %cx
+# CHECK-NEXT:  -      -     0.50   0.50   0.83   0.83   1.00   0.50   0.50   0.33   xaddw %ax, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xaddl %ebx, %ecx
+# CHECK-NEXT:  -      -     0.50   0.50   0.83   0.83   1.00   0.50   0.50   0.33   xaddl %eax, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xaddq %rbx, %rcx
+# CHECK-NEXT:  -      -     0.50   0.50   0.83   0.83   1.00   0.50   0.50   0.33   xaddq %rax, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgb %bl, %cl
+# CHECK-NEXT:  -      -     0.75   0.75   0.83   0.83   1.00   0.75   0.75   0.33   xchgb %bl, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgw %bx, %ax
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgw %bx, %cx
+# CHECK-NEXT:  -      -     0.75   0.75   0.83   0.83   1.00   0.75   0.75   0.33   xchgw %ax, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgl %ebx, %eax
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgl %ebx, %ecx
+# CHECK-NEXT:  -      -     0.75   0.75   0.83   0.83   1.00   0.75   0.75   0.33   xchgl %eax, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgq %rbx, %rax
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgq %rbx, %rcx
+# CHECK-NEXT:  -      -     0.75   0.75   0.83   0.83   1.00   0.75   0.75   0.33   xchgq %rax, (%rbx)
 # CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -     xlatb
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     xorb  $7, %al
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     xorb  $7, %dil
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   xorb  $7, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     xorb  %sil, %dil
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   xorb  %sil, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     xorb  (%rax), %dil
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     xorw  $511, %ax

llvm/trunk/test/tools/llvm-mca/X86/SLM/resources-x86_64.s

 cmpq %rsi, (%rax)
 cmpq (%rax), %rdi
 
 cmpsb
 cmpsw
 cmpsl
 cmpsq
 
+cmpxchgb %cl, %bl
+cmpxchgb %cl, (%rbx)
+
+cmpxchgw %cx, %bx
+cmpxchgw %cx, (%rbx)
+
+cmpxchgl %ecx, %ebx
+cmpxchgl %ecx, (%rbx)
+
+cmpxchgq %rcx, %rbx
+cmpxchgq %rcx, (%rbx)
+
 cpuid
 
 decb %dil
 decb (%rax)
 decw %di
 decw (%rax)
 decl %edi
 decl (%rax)

 testq $665536, (%rax)
 testq $7, %rdi
 testq $7, (%rax)
 testq %rsi, %rdi
 testq %rsi, (%rax)
 
 ud2
 
+xaddb %bl, %cl
+xaddb %bl, (%rcx)
+
+xaddw %bx, %cx
+xaddw %ax, (%rbx)
+
+xaddl %ebx, %ecx
+xaddl %eax, (%rbx)
+
+xaddq %rbx, %rcx
+xaddq %rax, (%rbx)
+
+xchgb %bl, %cl
+xchgb %bl, (%rbx)
+
+xchgw %ax, %bx
+xchgw %bx, %cx
+xchgw %ax, (%rbx)
+
+xchgl %eax, %ebx
+xchgl %ebx, %ecx
+xchgl %eax, (%rbx)
+
+xchgq %rax, %rbx
+xchgq %rbx, %rcx
+xchgq %rax, (%rbx)
+
 xlatb
 
 xorb $7, %al
 xorb $7, %dil
 xorb $7, (%rax)
 xorb %sil, %dil
 xorb %sil, (%rax)
 xorb (%rax), %dil

 # 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      100   1.00                  U     cmpsb %es:(%rdi), (%rsi)
 # CHECK-NEXT:  1      100   1.00                  U     cmpsw %es:(%rdi), (%rsi)
 # CHECK-NEXT:  1      100   1.00                  U     cmpsl %es:(%rdi), (%rsi)
 # CHECK-NEXT:  1      100   1.00                  U     cmpsq %es:(%rdi), (%rsi)
+# CHECK-NEXT:  1      1     0.50                        cmpxchgb  %cl, %bl
+# CHECK-NEXT:  2      4     2.00    *      *            cmpxchgb  %cl, (%rbx)
+# CHECK-NEXT:  1      1     0.50                        cmpxchgw  %cx, %bx
+# CHECK-NEXT:  2      4     2.00    *      *            cmpxchgw  %cx, (%rbx)
+# CHECK-NEXT:  1      1     0.50                        cmpxchgl  %ecx, %ebx
+# CHECK-NEXT:  2      4     2.00    *      *            cmpxchgl  %ecx, (%rbx)
+# CHECK-NEXT:  1      1     0.50                        cmpxchgq  %rcx, %rbx
+# CHECK-NEXT:  2      4     2.00    *      *            cmpxchgq  %rcx, (%rbx)
 # CHECK-NEXT:  1      100   1.00                  U     cpuid
 # CHECK-NEXT:  1      1     0.50                        decb  %dil
 # CHECK-NEXT:  2      5     2.00    *      *            decb  (%rax)
 # CHECK-NEXT:  1      1     0.50                        decw  %di
 # CHECK-NEXT:  2      5     2.00    *      *            decw  (%rax)
 # CHECK-NEXT:  1      1     0.50                        decl  %edi
 # CHECK-NEXT:  2      5     2.00    *      *            decl  (%rax)
 # CHECK-NEXT:  1      1     0.50                        decq  %rdi

 # CHECK-NEXT:  1      1     0.50                        testq $665536, %rax
 # CHECK-NEXT:  1      1     0.50                        testq $665536, %rdi
 # CHECK-NEXT:  1      4     1.00    *                   testq $665536, (%rax)
 # CHECK-NEXT:  1      1     0.50                        testq $7, %rdi
 # CHECK-NEXT:  1      4     1.00    *                   testq $7, (%rax)
 # CHECK-NEXT:  1      1     0.50                        testq %rsi, %rdi
 # CHECK-NEXT:  1      4     1.00    *                   testq %rsi, (%rax)
 # CHECK-NEXT:  1      100   1.00    *             U     ud2
+# CHECK-NEXT:  1      1     0.50                        xaddb %bl, %cl
+# CHECK-NEXT:  2      4     2.00    *      *            xaddb %bl, (%rcx)
+# CHECK-NEXT:  1      1     0.50                        xaddw %bx, %cx
+# CHECK-NEXT:  2      4     2.00    *      *            xaddw %ax, (%rbx)
+# CHECK-NEXT:  1      1     0.50                        xaddl %ebx, %ecx
+# CHECK-NEXT:  2      4     2.00    *      *            xaddl %eax, (%rbx)
+# CHECK-NEXT:  1      1     0.50                        xaddq %rbx, %rcx
+# CHECK-NEXT:  2      4     2.00    *      *            xaddq %rax, (%rbx)
+# CHECK-NEXT:  1      1     0.50                        xchgb %bl, %cl
+# CHECK-NEXT:  2      4     2.00    *      *            xchgb %bl, (%rbx)
+# CHECK-NEXT:  1      1     0.50                        xchgw %bx, %ax
+# CHECK-NEXT:  1      1     0.50                        xchgw %bx, %cx
+# CHECK-NEXT:  2      4     2.00    *      *            xchgw %ax, (%rbx)
+# CHECK-NEXT:  1      1     0.50                        xchgl %ebx, %eax
+# CHECK-NEXT:  1      1     0.50                        xchgl %ebx, %ecx
+# CHECK-NEXT:  2      4     2.00    *      *            xchgl %eax, (%rbx)
+# CHECK-NEXT:  1      1     0.50                        xchgq %rbx, %rax
+# CHECK-NEXT:  1      1     0.50                        xchgq %rbx, %rcx
+# CHECK-NEXT:  2      4     2.00    *      *            xchgq %rax, (%rbx)
 # CHECK-NEXT:  1      3     1.00    *                   xlatb
 # CHECK-NEXT:  1      1     0.50                        xorb  $7, %al
 # CHECK-NEXT:  1      1     0.50                        xorb  $7, %dil
 # CHECK-NEXT:  2      5     2.00    *      *            xorb  $7, (%rax)
 # CHECK-NEXT:  1      1     0.50                        xorb  %sil, %dil
 # CHECK-NEXT:  2      5     2.00    *      *            xorb  %sil, (%rax)
 # CHECK-NEXT:  1      4     1.00    *                   xorb  (%rax), %dil
 # CHECK-NEXT:  1      1     0.50                        xorw  $511, %ax

 # CHECK-NEXT: [3]   - SLM_FPC_RSV0
 # CHECK-NEXT: [4]   - SLM_FPC_RSV1
 # CHECK-NEXT: [5]   - SLM_IEC_RSV0
 # CHECK-NEXT: [6]   - SLM_IEC_RSV1
 # CHECK-NEXT: [7]   - SLM_MEC_RSV
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]
-# CHECK-NEXT: 400.00  -      -     41.00   -     582.00 424.00 530.00
+# CHECK-NEXT: 400.00  -      -     41.00   -     595.50 437.50 554.00
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    Instructions:
 # CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     adcb  $7, %al
 # CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     adcb  $7, %dil
 # CHECK-NEXT:  -      -      -      -      -     1.00   1.00   2.00   adcb  $7, (%rax)
 # CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     adcb  %sil, %dil
 # CHECK-NEXT:  -      -      -      -      -     1.00   1.00   2.00   adcb  %sil, (%rax)

 # 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:  -      -      -     1.00    -      -      -      -     cmpsb %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -      -     1.00    -      -      -      -     cmpsw %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -      -     1.00    -      -      -      -     cmpsl %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -      -     1.00    -      -      -      -     cmpsq %es:(%rdi), (%rsi)
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cmpxchgb  %cl, %bl
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   2.00   cmpxchgb  %cl, (%rbx)
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cmpxchgw  %cx, %bx
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   2.00   cmpxchgw  %cx, (%rbx)
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cmpxchgl  %ecx, %ebx
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   2.00   cmpxchgl  %ecx, (%rbx)
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     cmpxchgq  %rcx, %rbx
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   2.00   cmpxchgq  %rcx, (%rbx)
 # CHECK-NEXT:  -      -      -     1.00    -      -      -      -     cpuid
 # 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
 # CHECK-NEXT:  -      -      -      -      -     1.00   1.00   2.00   decw  (%rax)
 # CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     decl  %edi
 # CHECK-NEXT:  -      -      -      -      -     1.00   1.00   2.00   decl  (%rax)
 # CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     decq  %rdi

 # CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     testq $665536, %rax
 # CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     testq $665536, %rdi
 # CHECK-NEXT:  -      -      -      -      -     0.50   0.50   1.00   testq $665536, (%rax)
 # CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     testq $7, %rdi
 # CHECK-NEXT:  -      -      -      -      -     0.50   0.50   1.00   testq $7, (%rax)
 # CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     testq %rsi, %rdi
 # CHECK-NEXT:  -      -      -      -      -     0.50   0.50   1.00   testq %rsi, (%rax)
 # CHECK-NEXT:  -      -      -     1.00    -      -      -      -     ud2
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     xaddb %bl, %cl
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   2.00   xaddb %bl, (%rcx)
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     xaddw %bx, %cx
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   2.00   xaddw %ax, (%rbx)
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     xaddl %ebx, %ecx
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   2.00   xaddl %eax, (%rbx)
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     xaddq %rbx, %rcx
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   2.00   xaddq %rax, (%rbx)
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     xchgb %bl, %cl
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   2.00   xchgb %bl, (%rbx)
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     xchgw %bx, %ax
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     xchgw %bx, %cx
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   2.00   xchgw %ax, (%rbx)
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     xchgl %ebx, %eax
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     xchgl %ebx, %ecx
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   2.00   xchgl %eax, (%rbx)
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     xchgq %rbx, %rax
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     xchgq %rbx, %rcx
+# CHECK-NEXT:  -      -      -      -      -     0.50   0.50   2.00   xchgq %rax, (%rbx)
 # CHECK-NEXT:  -      -      -      -      -      -      -     1.00   xlatb
 # CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     xorb  $7, %al
 # CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     xorb  $7, %dil
 # CHECK-NEXT:  -      -      -      -      -     1.00   1.00   2.00   xorb  $7, (%rax)
 # CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     xorb  %sil, %dil
 # CHECK-NEXT:  -      -      -      -      -     1.00   1.00   2.00   xorb  %sil, (%rax)
 # CHECK-NEXT:  -      -      -      -      -     0.50   0.50   1.00   xorb  (%rax), %dil
 # CHECK-NEXT:  -      -      -      -      -     0.50   0.50    -     xorw  $511, %ax

llvm/trunk/test/tools/llvm-mca/X86/SandyBridge/resources-x86_64.s

 cmpq %rsi, (%rax)
 cmpq (%rax), %rdi
 
 cmpsb
 cmpsw
 cmpsl
 cmpsq
 
+cmpxchgb %cl, %bl
+cmpxchgb %cl, (%rbx)
+
+cmpxchgw %cx, %bx
+cmpxchgw %cx, (%rbx)
+
+cmpxchgl %ecx, %ebx
+cmpxchgl %ecx, (%rbx)
+
+cmpxchgq %rcx, %rbx
+cmpxchgq %rcx, (%rbx)
+
 cpuid
 
 decb %dil
 decb (%rax)
 decw %di
 decw (%rax)
 decl %edi
 decl (%rax)

 testq $665536, (%rax)
 testq $7, %rdi
 testq $7, (%rax)
 testq %rsi, %rdi
 testq %rsi, (%rax)
 
 ud2
 
+xaddb %bl, %cl
+xaddb %bl, (%rcx)
+
+xaddw %bx, %cx
+xaddw %ax, (%rbx)
+
+xaddl %ebx, %ecx
+xaddl %eax, (%rbx)
+
+xaddq %rbx, %rcx
+xaddq %rax, (%rbx)
+
+xchgb %bl, %cl
+xchgb %bl, (%rbx)
+
+xchgw %ax, %bx
+xchgw %bx, %cx
+xchgw %ax, (%rbx)
+
+xchgl %eax, %ebx
+xchgl %ebx, %ecx
+xchgl %eax, (%rbx)
+
+xchgq %rax, %rbx
+xchgq %rbx, %rcx
+xchgq %rax, (%rbx)
+
 xlatb
 
 xorb $7, %al
 xorb $7, %dil
 xorb $7, (%rax)
 xorb %sil, %dil
 xorb %sil, (%rax)
 xorb (%rax), %dil

 # 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:  5      8     1.00                  U     cmpsb %es:(%rdi), (%rsi)
 # CHECK-NEXT:  5      8     1.00                  U     cmpsw %es:(%rdi), (%rsi)
 # CHECK-NEXT:  5      8     1.00                  U     cmpsl %es:(%rdi), (%rsi)
 # CHECK-NEXT:  5      8     1.00                  U     cmpsq %es:(%rdi), (%rsi)
+# CHECK-NEXT:  4      5     1.33                        cmpxchgb  %cl, %bl
+# CHECK-NEXT:  4      8     1.00    *      *            cmpxchgb  %cl, (%rbx)
+# CHECK-NEXT:  4      5     1.33                        cmpxchgw  %cx, %bx
+# CHECK-NEXT:  4      8     1.00    *      *            cmpxchgw  %cx, (%rbx)
+# CHECK-NEXT:  4      5     1.33                        cmpxchgl  %ecx, %ebx
+# CHECK-NEXT:  4      8     1.00    *      *            cmpxchgl  %ecx, (%rbx)
+# CHECK-NEXT:  4      5     1.33                        cmpxchgq  %rcx, %rbx
+# CHECK-NEXT:  4      8     1.00    *      *            cmpxchgq  %rcx, (%rbx)
 # CHECK-NEXT:  1      100   0.33                  U     cpuid
 # CHECK-NEXT:  1      1     0.33                        decb  %dil
 # CHECK-NEXT:  3      7     1.00    *      *            decb  (%rax)
 # CHECK-NEXT:  1      1     0.33                        decw  %di
 # CHECK-NEXT:  3      7     1.00    *      *            decw  (%rax)
 # CHECK-NEXT:  1      1     0.33                        decl  %edi
 # CHECK-NEXT:  3      7     1.00    *      *            decl  (%rax)
 # CHECK-NEXT:  1      1     0.33                        decq  %rdi

 # CHECK-NEXT:  1      1     0.33                        testq $665536, %rax
 # CHECK-NEXT:  1      1     0.33                        testq $665536, %rdi
 # CHECK-NEXT:  2      6     0.50    *                   testq $665536, (%rax)
 # CHECK-NEXT:  1      1     0.33                        testq $7, %rdi
 # CHECK-NEXT:  2      6     0.50    *                   testq $7, (%rax)
 # CHECK-NEXT:  1      1     0.33                        testq %rsi, %rdi
 # CHECK-NEXT:  2      6     0.50    *                   testq %rsi, (%rax)
 # CHECK-NEXT:  1      100   0.33    *             U     ud2
+# CHECK-NEXT:  3      2     1.00                        xaddb %bl, %cl
+# CHECK-NEXT:  5      8     1.00    *      *            xaddb %bl, (%rcx)
+# CHECK-NEXT:  3      2     1.00                        xaddw %bx, %cx
+# CHECK-NEXT:  5      8     1.00    *      *            xaddw %ax, (%rbx)
+# CHECK-NEXT:  3      2     1.00                        xaddl %ebx, %ecx
+# CHECK-NEXT:  5      8     1.00    *      *            xaddl %eax, (%rbx)
+# CHECK-NEXT:  3      2     1.00                        xaddq %rbx, %rcx
+# CHECK-NEXT:  5      8     1.00    *      *            xaddq %rax, (%rbx)
+# CHECK-NEXT:  3      2     1.00                        xchgb %bl, %cl
+# CHECK-NEXT:  3      6     1.00    *      *            xchgb %bl, (%rbx)
+# CHECK-NEXT:  3      2     1.00                        xchgw %bx, %ax
+# CHECK-NEXT:  3      2     1.00                        xchgw %bx, %cx
+# CHECK-NEXT:  3      6     1.00    *      *            xchgw %ax, (%rbx)
+# CHECK-NEXT:  3      2     1.00                        xchgl %ebx, %eax
+# CHECK-NEXT:  3      2     1.00                        xchgl %ebx, %ecx
+# CHECK-NEXT:  3      6     1.00    *      *            xchgl %eax, (%rbx)
+# CHECK-NEXT:  3      2     1.00                        xchgq %rbx, %rax
+# CHECK-NEXT:  3      2     1.00                        xchgq %rbx, %rcx
+# CHECK-NEXT:  3      6     1.00    *      *            xchgq %rax, (%rbx)
 # CHECK-NEXT:  1      5     0.50    *                   xlatb
 # CHECK-NEXT:  1      1     0.33                        xorb  $7, %al
 # CHECK-NEXT:  1      1     0.33                        xorb  $7, %dil
 # CHECK-NEXT:  3      7     1.00    *      *            xorb  $7, (%rax)
 # CHECK-NEXT:  1      1     0.33                        xorb  %sil, %dil
 # CHECK-NEXT:  3      7     1.00    *      *            xorb  %sil, (%rax)
 # CHECK-NEXT:  2      6     0.50    *                   xorb  (%rax), %dil
 # CHECK-NEXT:  1      1     0.33                        xorw  $511, %ax

 # CHECK-NEXT: [3]   - SBPort1
 # CHECK-NEXT: [4]   - SBPort4
 # CHECK-NEXT: [5]   - SBPort5
 # CHECK-NEXT: [6.0] - SBPort23
 # CHECK-NEXT: [6.1] - SBPort23
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6.0]  [6.1]
-# CHECK-NEXT: 160.00  -     413.50 201.00 234.00 405.50 280.00 280.00
+# CHECK-NEXT: 160.00  -     438.50 224.00 242.00 430.50 290.00 290.00
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6.0]  [6.1]  Instructions:
 # CHECK-NEXT:  -      -     0.83   0.33    -     0.83    -      -     adcb  $7, %al
 # CHECK-NEXT:  -      -     0.83   0.33    -     0.83    -      -     adcb  $7, %dil
 # CHECK-NEXT:  -      -     1.00   1.00   1.00   1.00   1.00   1.00   adcb  $7, (%rax)
 # CHECK-NEXT:  -      -     0.83   0.33    -     0.83    -      -     adcb  %sil, %dil
 # CHECK-NEXT:  -      -     1.33   0.33   1.00   1.33   1.00   1.00   adcb  %sil, (%rax)

 # 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:  -      -     1.00   1.00    -     1.00   1.00   1.00   cmpsb %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -     1.00   1.00    -     1.00   1.00   1.00   cmpsw %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -     1.00   1.00    -     1.00   1.00   1.00   cmpsl %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -     1.00   1.00    -     1.00   1.00   1.00   cmpsq %es:(%rdi), (%rsi)
+# CHECK-NEXT:  -      -     1.50   1.00    -     1.50    -      -     cmpxchgb  %cl, %bl
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00   0.50   0.50   cmpxchgb  %cl, (%rbx)
+# CHECK-NEXT:  -      -     1.50   1.00    -     1.50    -      -     cmpxchgw  %cx, %bx
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00   0.50   0.50   cmpxchgw  %cx, (%rbx)
+# CHECK-NEXT:  -      -     1.50   1.00    -     1.50    -      -     cmpxchgl  %ecx, %ebx
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00   0.50   0.50   cmpxchgl  %ecx, (%rbx)
+# CHECK-NEXT:  -      -     1.50   1.00    -     1.50    -      -     cmpxchgq  %rcx, %rbx
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00   0.50   0.50   cmpxchgq  %rcx, (%rbx)
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     cpuid
 # 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
 # CHECK-NEXT:  -      -     0.33   0.33   1.00   0.33   1.00   1.00   decw  (%rax)
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     decl  %edi
 # CHECK-NEXT:  -      -     0.33   0.33   1.00   0.33   1.00   1.00   decl  (%rax)
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     decq  %rdi

 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     testq $665536, %rax
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     testq $665536, %rdi
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   testq $665536, (%rax)
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     testq $7, %rdi
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   testq $7, (%rax)
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     testq %rsi, %rdi
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   testq %rsi, (%rax)
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     ud2
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00    -      -     xaddb %bl, %cl
+# CHECK-NEXT:  -      -     0.67   0.67   1.00   0.67   1.00   1.00   xaddb %bl, (%rcx)
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00    -      -     xaddw %bx, %cx
+# CHECK-NEXT:  -      -     0.67   0.67   1.00   0.67   1.00   1.00   xaddw %ax, (%rbx)
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00    -      -     xaddl %ebx, %ecx
+# CHECK-NEXT:  -      -     0.67   0.67   1.00   0.67   1.00   1.00   xaddl %eax, (%rbx)
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00    -      -     xaddq %rbx, %rcx
+# CHECK-NEXT:  -      -     0.67   0.67   1.00   0.67   1.00   1.00   xaddq %rax, (%rbx)
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00    -      -     xchgb %bl, %cl
+# CHECK-NEXT:  -      -     0.33   0.33   1.00   0.33   1.00   1.00   xchgb %bl, (%rbx)
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00    -      -     xchgw %bx, %ax
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00    -      -     xchgw %bx, %cx
+# CHECK-NEXT:  -      -     0.33   0.33   1.00   0.33   1.00   1.00   xchgw %ax, (%rbx)
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00    -      -     xchgl %ebx, %eax
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00    -      -     xchgl %ebx, %ecx
+# CHECK-NEXT:  -      -     0.33   0.33   1.00   0.33   1.00   1.00   xchgl %eax, (%rbx)
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00    -      -     xchgq %rbx, %rax
+# CHECK-NEXT:  -      -     1.00   1.00    -     1.00    -      -     xchgq %rbx, %rcx
+# CHECK-NEXT:  -      -     0.33   0.33   1.00   0.33   1.00   1.00   xchgq %rax, (%rbx)
 # CHECK-NEXT:  -      -      -      -      -      -     0.50   0.50   xlatb
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     xorb  $7, %al
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     xorb  $7, %dil
 # CHECK-NEXT:  -      -     0.33   0.33   1.00   0.33   1.00   1.00   xorb  $7, (%rax)
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     xorb  %sil, %dil
 # CHECK-NEXT:  -      -     0.33   0.33   1.00   0.33   1.00   1.00   xorb  %sil, (%rax)
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33   0.50   0.50   xorb  (%rax), %dil
 # CHECK-NEXT:  -      -     0.33   0.33    -     0.33    -      -     xorw  $511, %ax

llvm/trunk/test/tools/llvm-mca/X86/SkylakeClient/resources-x86_64.s

 cmpq %rsi, (%rax)
 cmpq (%rax), %rdi
 
 cmpsb
 cmpsw
 cmpsl
 cmpsq
 
+cmpxchgb %cl, %bl
+cmpxchgb %cl, (%rbx)
+
+cmpxchgw %cx, %bx
+cmpxchgw %cx, (%rbx)
+
+cmpxchgl %ecx, %ebx
+cmpxchgl %ecx, (%rbx)
+
+cmpxchgq %rcx, %rbx
+cmpxchgq %rcx, (%rbx)
+
 cpuid
 
 decb %dil
 decb (%rax)
 decw %di
 decw (%rax)
 decl %edi
 decl (%rax)

 testq $665536, (%rax)
 testq $7, %rdi
 testq $7, (%rax)
 testq %rsi, %rdi
 testq %rsi, (%rax)
 
 ud2
 
+xaddb %bl, %cl
+xaddb %bl, (%rcx)
+
+xaddw %bx, %cx
+xaddw %ax, (%rbx)
+
+xaddl %ebx, %ecx
+xaddl %eax, (%rbx)
+
+xaddq %rbx, %rcx
+xaddq %rax, (%rbx)
+
+xchgb %bl, %cl
+xchgb %bl, (%rbx)
+
+xchgw %ax, %bx
+xchgw %bx, %cx
+xchgw %ax, (%rbx)
+
+xchgl %eax, %ebx
+xchgl %ebx, %ecx
+xchgl %eax, (%rbx)
+
+xchgq %rax, %rbx
+xchgq %rbx, %rcx
+xchgq %rax, (%rbx)
+
 xlatb
 
 xorb $7, %al
 xorb $7, %dil
 xorb $7, (%rax)
 xorb %sil, %dil
 xorb %sil, (%rax)
 xorb (%rax), %dil

 # 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      100   0.25                  U     cmpsb %es:(%rdi), (%rsi)
 # CHECK-NEXT:  1      100   0.25                  U     cmpsw %es:(%rdi), (%rsi)
 # CHECK-NEXT:  1      100   0.25                  U     cmpsl %es:(%rdi), (%rsi)
 # CHECK-NEXT:  1      100   0.25                  U     cmpsq %es:(%rdi), (%rsi)
+# CHECK-NEXT:  5      5     1.25                        cmpxchgb  %cl, %bl
+# CHECK-NEXT:  6      8     1.00    *      *            cmpxchgb  %cl, (%rbx)
+# CHECK-NEXT:  5      5     1.25                        cmpxchgw  %cx, %bx
+# CHECK-NEXT:  6      8     1.00    *      *            cmpxchgw  %cx, (%rbx)
+# CHECK-NEXT:  5      5     1.25                        cmpxchgl  %ecx, %ebx
+# CHECK-NEXT:  6      8     1.00    *      *            cmpxchgl  %ecx, (%rbx)
+# CHECK-NEXT:  5      5     1.25                        cmpxchgq  %rcx, %rbx
+# CHECK-NEXT:  6      8     1.00    *      *            cmpxchgq  %rcx, (%rbx)
 # CHECK-NEXT:  8      18    2.00                  U     cpuid
 # CHECK-NEXT:  1      1     0.25                        decb  %dil
 # CHECK-NEXT:  3      7     1.00    *      *            decb  (%rax)
 # CHECK-NEXT:  1      1     0.25                        decw  %di
 # CHECK-NEXT:  3      7     1.00    *      *            decw  (%rax)
 # CHECK-NEXT:  1      1     0.25                        decl  %edi
 # CHECK-NEXT:  3      7     1.00    *      *            decl  (%rax)
 # CHECK-NEXT:  1      1     0.25                        decq  %rdi

 # CHECK-NEXT:  1      1     0.25                        testq $665536, %rax
 # CHECK-NEXT:  1      1     0.25                        testq $665536, %rdi
 # CHECK-NEXT:  2      6     0.50    *                   testq $665536, (%rax)
 # CHECK-NEXT:  1      1     0.25                        testq $7, %rdi
 # CHECK-NEXT:  2      6     0.50    *                   testq $7, (%rax)
 # CHECK-NEXT:  1      1     0.25                        testq %rsi, %rdi
 # CHECK-NEXT:  2      6     0.50    *                   testq %rsi, (%rax)
 # CHECK-NEXT:  1      100   0.25    *             U     ud2
+# CHECK-NEXT:  3      2     0.75                        xaddb %bl, %cl
+# CHECK-NEXT:  5      7     1.00    *      *            xaddb %bl, (%rcx)
+# CHECK-NEXT:  3      2     0.75                        xaddw %bx, %cx
+# CHECK-NEXT:  5      7     1.00    *      *            xaddw %ax, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xaddl %ebx, %ecx
+# CHECK-NEXT:  5      7     1.00    *      *            xaddl %eax, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xaddq %rbx, %rcx
+# CHECK-NEXT:  5      7     1.00    *      *            xaddq %rax, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xchgb %bl, %cl
+# CHECK-NEXT:  8      10    1.25    *      *            xchgb %bl, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xchgw %bx, %ax
+# CHECK-NEXT:  3      2     0.75                        xchgw %bx, %cx
+# CHECK-NEXT:  8      10    1.25    *      *            xchgw %ax, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xchgl %ebx, %eax
+# CHECK-NEXT:  3      2     0.75                        xchgl %ebx, %ecx
+# CHECK-NEXT:  8      10    1.25    *      *            xchgl %eax, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xchgq %rbx, %rax
+# CHECK-NEXT:  3      2     0.75                        xchgq %rbx, %rcx
+# CHECK-NEXT:  8      10    1.25    *      *            xchgq %rax, (%rbx)
 # CHECK-NEXT:  1      5     0.50    *                   xlatb
 # CHECK-NEXT:  1      1     0.25                        xorb  $7, %al
 # CHECK-NEXT:  1      1     0.25                        xorb  $7, %dil
 # CHECK-NEXT:  3      7     1.00    *      *            xorb  $7, (%rax)
 # CHECK-NEXT:  1      1     0.25                        xorb  %sil, %dil
 # CHECK-NEXT:  3      7     1.00    *      *            xorb  %sil, (%rax)
 # CHECK-NEXT:  2      6     0.50    *                   xorb  (%rax), %dil
 # CHECK-NEXT:  1      1     0.25                        xorw  $511, %ax

 # CHECK-NEXT: [5]   - SKLPort3
 # CHECK-NEXT: [6]   - SKLPort4
 # CHECK-NEXT: [7]   - SKLPort5
 # CHECK-NEXT: [8]   - SKLPort6
 # CHECK-NEXT: [9]   - SKLPort7
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]
-# CHECK-NEXT: 60.00   -     537.25 297.25 252.17 252.17 190.00 261.75 588.75 78.67
+# CHECK-NEXT: 60.00   -     564.50 314.50 262.17 262.17 202.00 279.00 620.00 82.67
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    Instructions:
 # CHECK-NEXT:  -      -     0.75   0.25    -      -      -     0.25   0.75    -     adcb  $7, %al
 # CHECK-NEXT:  -      -     0.75   0.25    -      -      -     0.25   0.75    -     adcb  $7, %dil
 # CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   adcb  $7, (%rax)
 # CHECK-NEXT:  -      -     0.50    -      -      -      -      -     0.50    -     adcb  %sil, %dil
 # CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   adcb  %sil, (%rax)

 # 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    -     cmpsb %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpsw %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpsl %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpsq %es:(%rdi), (%rsi)
+# CHECK-NEXT:  -      -     1.75   0.75    -      -      -     0.75   1.75    -     cmpxchgb  %cl, %bl
+# CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   cmpxchgb  %cl, (%rbx)
+# CHECK-NEXT:  -      -     1.75   0.75    -      -      -     0.75   1.75    -     cmpxchgw  %cx, %bx
+# CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   cmpxchgw  %cx, (%rbx)
+# CHECK-NEXT:  -      -     1.75   0.75    -      -      -     0.75   1.75    -     cmpxchgl  %ecx, %ebx
+# CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   cmpxchgl  %ecx, (%rbx)
+# CHECK-NEXT:  -      -     1.75   0.75    -      -      -     0.75   1.75    -     cmpxchgq  %rcx, %rbx
+# CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   cmpxchgq  %rcx, (%rbx)
 # CHECK-NEXT:  -      -     1.75   1.25    -      -      -     2.25   2.75    -     cpuid
 # 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
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   decw  (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     decl  %edi
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   decl  (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     decq  %rdi

 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     testq $665536, %rax
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     testq $665536, %rdi
 # CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     testq $665536, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     testq $7, %rdi
 # CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     testq $7, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     testq %rsi, %rdi
 # CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     testq %rsi, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     ud2
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xaddb %bl, %cl
+# CHECK-NEXT:  -      -     0.50   0.50   0.83   0.83   1.00   0.50   0.50   0.33   xaddb %bl, (%rcx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xaddw %bx, %cx
+# CHECK-NEXT:  -      -     0.50   0.50   0.83   0.83   1.00   0.50   0.50   0.33   xaddw %ax, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xaddl %ebx, %ecx
+# CHECK-NEXT:  -      -     0.50   0.50   0.83   0.83   1.00   0.50   0.50   0.33   xaddl %eax, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xaddq %rbx, %rcx
+# CHECK-NEXT:  -      -     0.50   0.50   0.83   0.83   1.00   0.50   0.50   0.33   xaddq %rax, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgb %bl, %cl
+# CHECK-NEXT:  -      -     1.25   0.75   0.83   0.83   1.00   0.75   2.25   0.33   xchgb %bl, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgw %bx, %ax
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgw %bx, %cx
+# CHECK-NEXT:  -      -     1.25   0.75   0.83   0.83   1.00   0.75   2.25   0.33   xchgw %ax, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgl %ebx, %eax
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgl %ebx, %ecx
+# CHECK-NEXT:  -      -     1.25   0.75   0.83   0.83   1.00   0.75   2.25   0.33   xchgl %eax, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgq %rbx, %rax
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgq %rbx, %rcx
+# CHECK-NEXT:  -      -     1.25   0.75   0.83   0.83   1.00   0.75   2.25   0.33   xchgq %rax, (%rbx)
 # CHECK-NEXT:  -      -      -      -     0.50   0.50    -      -      -      -     xlatb
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     xorb  $7, %al
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     xorb  $7, %dil
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   xorb  $7, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     xorb  %sil, %dil
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   xorb  %sil, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     xorb  (%rax), %dil
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     xorw  $511, %ax

llvm/trunk/test/tools/llvm-mca/X86/SkylakeServer/resources-x86_64.s

 cmpq %rsi, (%rax)
 cmpq (%rax), %rdi
 
 cmpsb
 cmpsw
 cmpsl
 cmpsq
 
+cmpxchgb %cl, %bl
+cmpxchgb %cl, (%rbx)
+
+cmpxchgw %cx, %bx
+cmpxchgw %cx, (%rbx)
+
+cmpxchgl %ecx, %ebx
+cmpxchgl %ecx, (%rbx)
+
+cmpxchgq %rcx, %rbx
+cmpxchgq %rcx, (%rbx)
+
 cpuid
 
 decb %dil
 decb (%rax)
 decw %di
 decw (%rax)
 decl %edi
 decl (%rax)

 testq $665536, (%rax)
 testq $7, %rdi
 testq $7, (%rax)
 testq %rsi, %rdi
 testq %rsi, (%rax)
 
 ud2
 
+xaddb %bl, %cl
+xaddb %bl, (%rcx)
+
+xaddw %bx, %cx
+xaddw %ax, (%rbx)
+
+xaddl %ebx, %ecx
+xaddl %eax, (%rbx)
+
+xaddq %rbx, %rcx
+xaddq %rax, (%rbx)
+
+xchgb %bl, %cl
+xchgb %bl, (%rbx)
+
+xchgw %ax, %bx
+xchgw %bx, %cx
+xchgw %ax, (%rbx)
+
+xchgl %eax, %ebx
+xchgl %ebx, %ecx
+xchgl %eax, (%rbx)
+
+xchgq %rax, %rbx
+xchgq %rbx, %rcx
+xchgq %rax, (%rbx)
+
 xlatb
 
 xorb $7, %al
 xorb $7, %dil
 xorb $7, (%rax)
 xorb %sil, %dil
 xorb %sil, (%rax)
 xorb (%rax), %dil

 # 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      100   0.25                  U     cmpsb %es:(%rdi), (%rsi)
 # CHECK-NEXT:  1      100   0.25                  U     cmpsw %es:(%rdi), (%rsi)
 # CHECK-NEXT:  1      100   0.25                  U     cmpsl %es:(%rdi), (%rsi)
 # CHECK-NEXT:  1      100   0.25                  U     cmpsq %es:(%rdi), (%rsi)
+# CHECK-NEXT:  5      5     1.25                        cmpxchgb  %cl, %bl
+# CHECK-NEXT:  6      8     1.00    *      *            cmpxchgb  %cl, (%rbx)
+# CHECK-NEXT:  5      5     1.25                        cmpxchgw  %cx, %bx
+# CHECK-NEXT:  6      8     1.00    *      *            cmpxchgw  %cx, (%rbx)
+# CHECK-NEXT:  5      5     1.25                        cmpxchgl  %ecx, %ebx
+# CHECK-NEXT:  6      8     1.00    *      *            cmpxchgl  %ecx, (%rbx)
+# CHECK-NEXT:  5      5     1.25                        cmpxchgq  %rcx, %rbx
+# CHECK-NEXT:  6      8     1.00    *      *            cmpxchgq  %rcx, (%rbx)
 # CHECK-NEXT:  8      18    2.00                  U     cpuid
 # CHECK-NEXT:  1      1     0.25                        decb  %dil
 # CHECK-NEXT:  3      7     1.00    *      *            decb  (%rax)
 # CHECK-NEXT:  1      1     0.25                        decw  %di
 # CHECK-NEXT:  3      7     1.00    *      *            decw  (%rax)
 # CHECK-NEXT:  1      1     0.25                        decl  %edi
 # CHECK-NEXT:  3      7     1.00    *      *            decl  (%rax)
 # CHECK-NEXT:  1      1     0.25                        decq  %rdi

 # CHECK-NEXT:  1      1     0.25                        testq $665536, %rax
 # CHECK-NEXT:  1      1     0.25                        testq $665536, %rdi
 # CHECK-NEXT:  2      6     0.50    *                   testq $665536, (%rax)
 # CHECK-NEXT:  1      1     0.25                        testq $7, %rdi
 # CHECK-NEXT:  2      6     0.50    *                   testq $7, (%rax)
 # CHECK-NEXT:  1      1     0.25                        testq %rsi, %rdi
 # CHECK-NEXT:  2      6     0.50    *                   testq %rsi, (%rax)
 # CHECK-NEXT:  1      100   0.25    *             U     ud2
+# CHECK-NEXT:  3      2     0.75                        xaddb %bl, %cl
+# CHECK-NEXT:  5      7     1.00    *      *            xaddb %bl, (%rcx)
+# CHECK-NEXT:  3      2     0.75                        xaddw %bx, %cx
+# CHECK-NEXT:  5      7     1.00    *      *            xaddw %ax, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xaddl %ebx, %ecx
+# CHECK-NEXT:  5      7     1.00    *      *            xaddl %eax, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xaddq %rbx, %rcx
+# CHECK-NEXT:  5      7     1.00    *      *            xaddq %rax, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xchgb %bl, %cl
+# CHECK-NEXT:  8      10    1.25    *      *            xchgb %bl, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xchgw %bx, %ax
+# CHECK-NEXT:  3      2     0.75                        xchgw %bx, %cx
+# CHECK-NEXT:  8      10    1.25    *      *            xchgw %ax, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xchgl %ebx, %eax
+# CHECK-NEXT:  3      2     0.75                        xchgl %ebx, %ecx
+# CHECK-NEXT:  8      10    1.25    *      *            xchgl %eax, (%rbx)
+# CHECK-NEXT:  3      2     0.75                        xchgq %rbx, %rax
+# CHECK-NEXT:  3      2     0.75                        xchgq %rbx, %rcx
+# CHECK-NEXT:  8      10    1.25    *      *            xchgq %rax, (%rbx)
 # CHECK-NEXT:  1      5     0.50    *                   xlatb
 # CHECK-NEXT:  1      1     0.25                        xorb  $7, %al
 # CHECK-NEXT:  1      1     0.25                        xorb  $7, %dil
 # CHECK-NEXT:  3      7     1.00    *      *            xorb  $7, (%rax)
 # CHECK-NEXT:  1      1     0.25                        xorb  %sil, %dil
 # CHECK-NEXT:  3      7     1.00    *      *            xorb  %sil, (%rax)
 # CHECK-NEXT:  2      6     0.50    *                   xorb  (%rax), %dil
 # CHECK-NEXT:  1      1     0.25                        xorw  $511, %ax

 # CHECK-NEXT: [5]   - SKXPort3
 # CHECK-NEXT: [6]   - SKXPort4
 # CHECK-NEXT: [7]   - SKXPort5
 # CHECK-NEXT: [8]   - SKXPort6
 # CHECK-NEXT: [9]   - SKXPort7
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]
-# CHECK-NEXT: 60.00   -     537.50 297.50 252.17 252.17 190.00 262.00 589.00 78.67
+# CHECK-NEXT: 60.00   -     564.75 314.75 262.17 262.17 202.00 279.25 620.25 82.67
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    Instructions:
 # CHECK-NEXT:  -      -     0.75   0.25    -      -      -     0.25   0.75    -     adcb  $7, %al
 # CHECK-NEXT:  -      -     0.75   0.25    -      -      -     0.25   0.75    -     adcb  $7, %dil
 # CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   adcb  $7, (%rax)
 # CHECK-NEXT:  -      -     0.50    -      -      -      -      -     0.50    -     adcb  %sil, %dil
 # CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   adcb  %sil, (%rax)

 # 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    -     cmpsb %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpsw %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpsl %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     cmpsq %es:(%rdi), (%rsi)
+# CHECK-NEXT:  -      -     1.75   0.75    -      -      -     0.75   1.75    -     cmpxchgb  %cl, %bl
+# CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   cmpxchgb  %cl, (%rbx)
+# CHECK-NEXT:  -      -     1.75   0.75    -      -      -     0.75   1.75    -     cmpxchgw  %cx, %bx
+# CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   cmpxchgw  %cx, (%rbx)
+# CHECK-NEXT:  -      -     1.75   0.75    -      -      -     0.75   1.75    -     cmpxchgl  %ecx, %ebx
+# CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   cmpxchgl  %ecx, (%rbx)
+# CHECK-NEXT:  -      -     1.75   0.75    -      -      -     0.75   1.75    -     cmpxchgq  %rcx, %rbx
+# CHECK-NEXT:  -      -     1.25   0.25   0.83   0.83   1.00   0.25   1.25   0.33   cmpxchgq  %rcx, (%rbx)
 # CHECK-NEXT:  -      -     1.75   1.25    -      -      -     2.25   2.75    -     cpuid
 # 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
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   decw  (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     decl  %edi
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   decl  (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     decq  %rdi

 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     testq $665536, %rax
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     testq $665536, %rdi
 # CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     testq $665536, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     testq $7, %rdi
 # CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     testq $7, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     testq %rsi, %rdi
 # CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     testq %rsi, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     ud2
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xaddb %bl, %cl
+# CHECK-NEXT:  -      -     0.50   0.50   0.83   0.83   1.00   0.50   0.50   0.33   xaddb %bl, (%rcx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xaddw %bx, %cx
+# CHECK-NEXT:  -      -     0.50   0.50   0.83   0.83   1.00   0.50   0.50   0.33   xaddw %ax, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xaddl %ebx, %ecx
+# CHECK-NEXT:  -      -     0.50   0.50   0.83   0.83   1.00   0.50   0.50   0.33   xaddl %eax, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xaddq %rbx, %rcx
+# CHECK-NEXT:  -      -     0.50   0.50   0.83   0.83   1.00   0.50   0.50   0.33   xaddq %rax, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgb %bl, %cl
+# CHECK-NEXT:  -      -     1.25   0.75   0.83   0.83   1.00   0.75   2.25   0.33   xchgb %bl, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgw %bx, %ax
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgw %bx, %cx
+# CHECK-NEXT:  -      -     1.25   0.75   0.83   0.83   1.00   0.75   2.25   0.33   xchgw %ax, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgl %ebx, %eax
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgl %ebx, %ecx
+# CHECK-NEXT:  -      -     1.25   0.75   0.83   0.83   1.00   0.75   2.25   0.33   xchgl %eax, (%rbx)
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgq %rbx, %rax
+# CHECK-NEXT:  -      -     0.75   0.75    -      -      -     0.75   0.75    -     xchgq %rbx, %rcx
+# CHECK-NEXT:  -      -     1.25   0.75   0.83   0.83   1.00   0.75   2.25   0.33   xchgq %rax, (%rbx)
 # CHECK-NEXT:  -      -      -      -     0.50   0.50    -      -      -      -     xlatb
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     xorb  $7, %al
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     xorb  $7, %dil
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   xorb  $7, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     xorb  %sil, %dil
 # CHECK-NEXT:  -      -     0.25   0.25   0.83   0.83   1.00   0.25   0.25   0.33   xorb  %sil, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25   0.50   0.50    -     0.25   0.25    -     xorb  (%rax), %dil
 # CHECK-NEXT:  -      -     0.25   0.25    -      -      -     0.25   0.25    -     xorw  $511, %ax

llvm/trunk/test/tools/llvm-mca/X86/Znver1/resources-x86_64.s

 cmpq %rsi, (%rax)
 cmpq (%rax), %rdi
 
 cmpsb
 cmpsw
 cmpsl
 cmpsq
 
+cmpxchgb %cl, %bl
+cmpxchgb %cl, (%rbx)
+
+cmpxchgw %cx, %bx
+cmpxchgw %cx, (%rbx)
+
+cmpxchgl %ecx, %ebx
+cmpxchgl %ecx, (%rbx)
+
+cmpxchgq %rcx, %rbx
+cmpxchgq %rcx, (%rbx)
+
 cpuid
 
 decb %dil
 decb (%rax)
 decw %di
 decw (%rax)
 decl %edi
 decl (%rax)

 testq $665536, (%rax)
 testq $7, %rdi
 testq $7, (%rax)
 testq %rsi, %rdi
 testq %rsi, (%rax)
 
 ud2
 
+xaddb %bl, %cl
+xaddb %bl, (%rcx)
+
+xaddw %bx, %cx
+xaddw %ax, (%rbx)
+
+xaddl %ebx, %ecx
+xaddl %eax, (%rbx)
+
+xaddq %rbx, %rcx
+xaddq %rax, (%rbx)
+
+xchgb %bl, %cl
+xchgb %bl, (%rbx)
+
+xchgw %ax, %bx
+xchgw %bx, %cx
+xchgw %ax, (%rbx)
+
+xchgl %eax, %ebx
+xchgl %ebx, %ecx
+xchgl %eax, (%rbx)
+
+xchgq %rax, %rbx
+xchgq %rbx, %rcx
+xchgq %rax, (%rbx)
+
 xlatb
 
 xorb $7, %al
 xorb $7, %dil
 xorb $7, (%rax)
 xorb %sil, %dil
 xorb %sil, (%rax)
 xorb (%rax), %dil

 # 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      100   0.25                  U     cmpsb %es:(%rdi), (%rsi)
 # CHECK-NEXT:  1      100   0.25                  U     cmpsw %es:(%rdi), (%rsi)
 # CHECK-NEXT:  1      100   0.25                  U     cmpsl %es:(%rdi), (%rsi)
 # CHECK-NEXT:  1      100   0.25                  U     cmpsq %es:(%rdi), (%rsi)
+# CHECK-NEXT:  1      1     0.25                        cmpxchgb  %cl, %bl
+# CHECK-NEXT:  5      8     0.50    *      *            cmpxchgb  %cl, (%rbx)
+# CHECK-NEXT:  1      1     0.25                        cmpxchgw  %cx, %bx
+# CHECK-NEXT:  5      8     0.50    *      *            cmpxchgw  %cx, (%rbx)
+# CHECK-NEXT:  1      1     0.25                        cmpxchgl  %ecx, %ebx
+# CHECK-NEXT:  5      8     0.50    *      *            cmpxchgl  %ecx, (%rbx)
+# CHECK-NEXT:  1      1     0.25                        cmpxchgq  %rcx, %rbx
+# CHECK-NEXT:  5      8     0.50    *      *            cmpxchgq  %rcx, (%rbx)
 # CHECK-NEXT:  1      100   0.25                  U     cpuid
 # CHECK-NEXT:  1      1     0.25                        decb  %dil
 # CHECK-NEXT:  2      5     0.50    *      *            decb  (%rax)
 # CHECK-NEXT:  1      1     0.25                        decw  %di
 # CHECK-NEXT:  2      5     0.50    *      *            decw  (%rax)
 # CHECK-NEXT:  1      1     0.25                        decl  %edi
 # CHECK-NEXT:  2      5     0.50    *      *            decl  (%rax)
 # CHECK-NEXT:  1      1     0.25                        decq  %rdi

 # CHECK-NEXT:  1      1     0.25                        testq $665536, %rax
 # CHECK-NEXT:  1      1     0.25                        testq $665536, %rdi
 # CHECK-NEXT:  2      5     0.50    *                   testq $665536, (%rax)
 # CHECK-NEXT:  1      1     0.25                        testq $7, %rdi
 # CHECK-NEXT:  2      5     0.50    *                   testq $7, (%rax)
 # CHECK-NEXT:  1      1     0.25                        testq %rsi, %rdi
 # CHECK-NEXT:  2      5     0.50    *                   testq %rsi, (%rax)
 # CHECK-NEXT:  1      100   0.25    *             U     ud2
+# CHECK-NEXT:  1      1     0.25                        xaddb %bl, %cl
+# CHECK-NEXT:  1      100   0.25    *      *            xaddb %bl, (%rcx)
+# CHECK-NEXT:  1      1     0.25                        xaddw %bx, %cx
+# CHECK-NEXT:  1      100   0.25    *      *            xaddw %ax, (%rbx)
+# CHECK-NEXT:  1      1     0.25                        xaddl %ebx, %ecx
+# CHECK-NEXT:  1      100   0.25    *      *            xaddl %eax, (%rbx)
+# CHECK-NEXT:  1      1     0.25                        xaddq %rbx, %rcx
+# CHECK-NEXT:  1      100   0.25    *      *            xaddq %rax, (%rbx)
+# CHECK-NEXT:  2      1     0.50                        xchgb %bl, %cl
+# CHECK-NEXT:  2      5     0.50    *      *            xchgb %bl, (%rbx)
+# CHECK-NEXT:  2      1     0.50                        xchgw %bx, %ax
+# CHECK-NEXT:  2      1     0.50                        xchgw %bx, %cx
+# CHECK-NEXT:  2      5     0.50    *      *            xchgw %ax, (%rbx)
+# CHECK-NEXT:  2      1     0.50                        xchgl %ebx, %eax
+# CHECK-NEXT:  2      1     0.50                        xchgl %ebx, %ecx
+# CHECK-NEXT:  2      5     0.50    *      *            xchgl %eax, (%rbx)
+# CHECK-NEXT:  2      1     0.50                        xchgq %rbx, %rax
+# CHECK-NEXT:  2      1     0.50                        xchgq %rbx, %rcx
+# CHECK-NEXT:  2      5     0.50    *      *            xchgq %rax, (%rbx)
 # CHECK-NEXT:  1      100   0.25    *                   xlatb
 # CHECK-NEXT:  1      1     0.25                        xorb  $7, %al
 # CHECK-NEXT:  1      1     0.25                        xorb  $7, %dil
 # CHECK-NEXT:  2      5     0.50    *      *            xorb  $7, (%rax)
 # CHECK-NEXT:  1      1     0.25                        xorb  %sil, %dil
 # CHECK-NEXT:  2      5     0.50    *      *            xorb  %sil, (%rax)
 # CHECK-NEXT:  2      5     0.50    *                   xorb  (%rax), %dil
 # CHECK-NEXT:  1      1     0.25                        xorw  $511, %ax

 # CHECK-NEXT: [7]   - ZnFPU0
 # CHECK-NEXT: [8]   - ZnFPU1
 # CHECK-NEXT: [9]   - ZnFPU2
 # CHECK-NEXT: [10]  - ZnFPU3
 # CHECK-NEXT: [11]  - ZnMultiplier
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]
-# CHECK-NEXT: 161.00 161.00 146.00 180.00 162.00 146.00 392.00  -      -      -      -     34.00
+# CHECK-NEXT: 165.00 165.00 153.50 187.50 169.50 153.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:
 # CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     adcb  $7, %al
 # CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     adcb  $7, %dil
 # CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     adcb  $7, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     adcb  %sil, %dil
 # CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     adcb  %sil, (%rax)

 # 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:  -      -      -      -      -      -      -      -      -      -      -      -     cmpsb %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -     cmpsw %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -     cmpsl %es:(%rdi), (%rsi)
 # CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -     cmpsq %es:(%rdi), (%rsi)
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpxchgb  %cl, %bl
+# CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpxchgb  %cl, (%rbx)
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpxchgw  %cx, %bx
+# CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpxchgw  %cx, (%rbx)
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpxchgl  %ecx, %ebx
+# CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpxchgl  %ecx, (%rbx)
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpxchgq  %rcx, %rbx
+# CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     cmpxchgq  %rcx, (%rbx)
 # CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -     cpuid
 # 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
 # CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     decw  (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     decl  %edi
 # CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     decl  (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     decq  %rdi

 # CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     testq $665536, %rax
 # CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     testq $665536, %rdi
 # CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     testq $665536, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     testq $7, %rdi
 # CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     testq $7, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     testq %rsi, %rdi
 # CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     testq %rsi, (%rax)
 # CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -     ud2
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     xaddb %bl, %cl
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -     xaddb %bl, (%rcx)
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     xaddw %bx, %cx
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -     xaddw %ax, (%rbx)
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     xaddl %ebx, %ecx
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -     xaddl %eax, (%rbx)
+# CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     xaddq %rbx, %rcx
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -     xaddq %rax, (%rbx)
+# CHECK-NEXT:  -      -     0.50   0.50   0.50   0.50    -      -      -      -      -      -     xchgb %bl, %cl
+# CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     xchgb %bl, (%rbx)
+# CHECK-NEXT:  -      -     0.50   0.50   0.50   0.50    -      -      -      -      -      -     xchgw %bx, %ax
+# CHECK-NEXT:  -      -     0.50   0.50   0.50   0.50    -      -      -      -      -      -     xchgw %bx, %cx
+# CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     xchgw %ax, (%rbx)
+# CHECK-NEXT:  -      -     0.50   0.50   0.50   0.50    -      -      -      -      -      -     xchgl %ebx, %eax
+# CHECK-NEXT:  -      -     0.50   0.50   0.50   0.50    -      -      -      -      -      -     xchgl %ebx, %ecx
+# CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     xchgl %eax, (%rbx)
+# CHECK-NEXT:  -      -     0.50   0.50   0.50   0.50    -      -      -      -      -      -     xchgq %rbx, %rax
+# CHECK-NEXT:  -      -     0.50   0.50   0.50   0.50    -      -      -      -      -      -     xchgq %rbx, %rcx
+# CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     xchgq %rax, (%rbx)
 # CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -     xlatb
 # CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     xorb  $7, %al
 # CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     xorb  $7, %dil
 # CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     xorb  $7, (%rax)
 # CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     xorb  %sil, %dil
 # CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     xorb  %sil, (%rax)
 # CHECK-NEXT: 0.50   0.50   0.25   0.25   0.25   0.25    -      -      -      -      -      -     xorb  (%rax), %dil
 # CHECK-NEXT:  -      -     0.25   0.25   0.25   0.25    -      -      -      -      -      -     xorw  $511, %ax