[X86][Btver2] BLSI/BLSMSK/BLSR instructions take 2uops not 1 (same as TZCNT)

llvm-svn: 343227

diff --git a/llvm/lib/Target/X86/X86ScheduleBtVer2.td b/llvm/lib/Target/X86/X86ScheduleBtVer2.td
index 450b18fc5830c76f426f705f64e8061f7d5a4d3f..83ba18f9b4a1411791605915fd3953b263ece230 100644 (file)
--- a/llvm/lib/Target/X86/X86ScheduleBtVer2.td
+++ b/llvm/lib/Target/X86/X86ScheduleBtVer2.td
@@ -214,7 +214,7 @@ defm : JWriteResIntPair<WriteTZCNT,          [JALU01], 2, [2], 2>;
 
 // BMI1 BEXTR/BLS, BMI2 BZHI
 defm : JWriteResIntPair<WriteBEXTR, [JALU01], 1>;
-defm : JWriteResIntPair<WriteBLS,   [JALU01], 2, [2]>;
+defm : JWriteResIntPair<WriteBLS,   [JALU01], 2, [2], 2>;
 defm : X86WriteResPairUnsupported<WriteBZHI>;
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/llvm/test/tools/llvm-mca/X86/BtVer2/resources-bmi1.s b/llvm/test/tools/llvm-mca/X86/BtVer2/resources-bmi1.s
index 54db08b810cade311764217ba01455d6c69b97cb..f2ea5ea89a1cc1812ae211352dee54f738bb810b 100644 (file)
--- a/llvm/test/tools/llvm-mca/X86/BtVer2/resources-bmi1.s
+++ b/llvm/test/tools/llvm-mca/X86/BtVer2/resources-bmi1.s
@@ -54,18 +54,18 @@ tzcnt       (%rax), %rcx
 # CHECK-NEXT:  1      4     1.00    *                   bextrl %eax, (%rbx), %ecx
 # CHECK-NEXT:  1      1     0.50                        bextrq %rax, %rbx, %rcx
 # CHECK-NEXT:  1      4     1.00    *                   bextrq %rax, (%rbx), %rcx
-# CHECK-NEXT:  1      2     1.00                        blsil  %eax, %ecx
-# CHECK-NEXT:  1      5     1.00    *                   blsil  (%rax), %ecx
-# CHECK-NEXT:  1      2     1.00                        blsiq  %rax, %rcx
-# CHECK-NEXT:  1      5     1.00    *                   blsiq  (%rax), %rcx
-# CHECK-NEXT:  1      2     1.00                        blsmskl        %eax, %ecx
-# CHECK-NEXT:  1      5     1.00    *                   blsmskl        (%rax), %ecx
-# CHECK-NEXT:  1      2     1.00                        blsmskq        %rax, %rcx
-# CHECK-NEXT:  1      5     1.00    *                   blsmskq        (%rax), %rcx
-# CHECK-NEXT:  1      2     1.00                        blsrl  %eax, %ecx
-# CHECK-NEXT:  1      5     1.00    *                   blsrl  (%rax), %ecx
-# CHECK-NEXT:  1      2     1.00                        blsrq  %rax, %rcx
-# CHECK-NEXT:  1      5     1.00    *                   blsrq  (%rax), %rcx
+# CHECK-NEXT:  2      2     1.00                        blsil  %eax, %ecx
+# CHECK-NEXT:  2      5     1.00    *                   blsil  (%rax), %ecx
+# CHECK-NEXT:  2      2     1.00                        blsiq  %rax, %rcx
+# CHECK-NEXT:  2      5     1.00    *                   blsiq  (%rax), %rcx
+# CHECK-NEXT:  2      2     1.00                        blsmskl        %eax, %ecx
+# CHECK-NEXT:  2      5     1.00    *                   blsmskl        (%rax), %ecx
+# CHECK-NEXT:  2      2     1.00                        blsmskq        %rax, %rcx
+# CHECK-NEXT:  2      5     1.00    *                   blsmskq        (%rax), %rcx
+# CHECK-NEXT:  2      2     1.00                        blsrl  %eax, %ecx
+# CHECK-NEXT:  2      5     1.00    *                   blsrl  (%rax), %ecx
+# CHECK-NEXT:  2      2     1.00                        blsrq  %rax, %rcx
+# CHECK-NEXT:  2      5     1.00    *                   blsrq  (%rax), %rcx
 # CHECK-NEXT:  2      2     1.00                        tzcntl %eax, %ecx
 # CHECK-NEXT:  2      5     1.00    *                   tzcntl (%rax), %ecx
 # CHECK-NEXT:  2      2     1.00                        tzcntq %rax, %rcx