[X86][Skylake][KNL] Updating code gen regression test to use the KNL and SKYLAKE...

NFC.
Updating the code gen regression test bmi2-schedule.ll to use the KNL and SKYLAKE prefixes for the run commands that use the knl and Skylake mcpu options.
The fix is in preparation for a large patch of adding all SKL scheduling information.

Reviewers: delena, zvi, RKSimon
Revision: https://reviews.llvm.org/D37796

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@313138 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/CodeGen/X86/bmi2-schedule.ll b/test/CodeGen/X86/bmi2-schedule.ll
index fda72dc..22c8b15 100644 (file)
--- a/test/CodeGen/X86/bmi2-schedule.ll
+++ b/test/CodeGen/X86/bmi2-schedule.ll
@@ -3,7 +3,7 @@
 ; RUN: llc < %s -mtriple=x86_64-unknown-unknown -print-schedule -mcpu=haswell | FileCheck %s --check-prefix=CHECK --check-prefix=COMMON --check-prefix=HASWELL
 ; RUN: llc < %s -mtriple=x86_64-unknown-unknown -print-schedule -mcpu=skylake | FileCheck %s --check-prefix=CHECK --check-prefix=COMMON --check-prefix=SKYLAKE
 ; RUN: llc < %s -mtriple=x86_64-unknown-unknown -print-schedule -mcpu=knl     | FileCheck %s --check-prefix=CHECK --check-prefix=COMMON --check-prefix=KNL
-; RUN: llc < %s -mtriple=x86_64-unknown-unknown -print-schedule -mcpu=znver1  | FileCheck %s --check-prefix=CHECK --check-prefix=COMMON --check-prefix=ZNVER1
+; RUN: llc < %s -mtriple=x86_64-unknown-unknown -print-schedule -mcpu=znver1  | FileCheck %s --check-prefix=CHECK --check-prefix=ZNVER1
 
 define i32 @test_bzhi_i32(i32 %a0, i32 %a1, i32 *%a2) {
 ; GENERIC-LABEL: test_bzhi_i32:
@@ -13,26 +13,12 @@ define i32 @test_bzhi_i32(i32 %a0, i32 %a1, i32 *%a2) {
 ; GENERIC-NEXT:    addl %ecx, %eax # sched: [1:0.33]
 ; GENERIC-NEXT:    retq # sched: [1:1.00]
 ;
-; HASWELL-LABEL: test_bzhi_i32:
-; HASWELL:       # BB#0:
-; HASWELL-NEXT:    bzhil %edi, (%rdx), %ecx # sched: [1:0.50]
-; HASWELL-NEXT:    bzhil %edi, %esi, %eax # sched: [1:0.50]
-; HASWELL-NEXT:    addl %ecx, %eax # sched: [1:0.25]
-; HASWELL-NEXT:    retq # sched: [2:1.00]
-;
-; SKYLAKE-LABEL: test_bzhi_i32:
-; SKYLAKE:       # BB#0:
-; SKYLAKE-NEXT:    bzhil %edi, (%rdx), %ecx # sched: [1:0.50]
-; SKYLAKE-NEXT:    bzhil %edi, %esi, %eax # sched: [1:0.50]
-; SKYLAKE-NEXT:    addl %ecx, %eax # sched: [1:0.25]
-; SKYLAKE-NEXT:    retq # sched: [2:1.00]
-;
-; KNL-LABEL: test_bzhi_i32:
-; KNL:       # BB#0:
-; KNL-NEXT:    bzhil %edi, (%rdx), %ecx # sched: [1:0.50]
-; KNL-NEXT:    bzhil %edi, %esi, %eax # sched: [1:0.50]
-; KNL-NEXT:    addl %ecx, %eax # sched: [1:0.25]
-; KNL-NEXT:    retq # sched: [2:1.00]
+; COMMON-LABEL: test_bzhi_i32:
+; COMMON:       # BB#0:
+; COMMON-NEXT:    bzhil %edi, (%rdx), %ecx # sched: [1:0.50]
+; COMMON-NEXT:    bzhil %edi, %esi, %eax # sched: [1:0.50]
+; COMMON-NEXT:    addl %ecx, %eax # sched: [1:0.25]
+; COMMON-NEXT:    retq # sched: [2:1.00]
 ;
 ; ZNVER1-LABEL: test_bzhi_i32:
 ; ZNVER1:       # BB#0:
@@ -56,26 +42,12 @@ define i64 @test_bzhi_i64(i64 %a0, i64 %a1, i64 *%a2) {
 ; GENERIC-NEXT:    addq %rcx, %rax # sched: [1:0.33]
 ; GENERIC-NEXT:    retq # sched: [1:1.00]
 ;
-; HASWELL-LABEL: test_bzhi_i64:
-; HASWELL:       # BB#0:
-; HASWELL-NEXT:    bzhiq %rdi, (%rdx), %rcx # sched: [1:0.50]
-; HASWELL-NEXT:    bzhiq %rdi, %rsi, %rax # sched: [1:0.50]
-; HASWELL-NEXT:    addq %rcx, %rax # sched: [1:0.25]
-; HASWELL-NEXT:    retq # sched: [2:1.00]
-;
-; SKYLAKE-LABEL: test_bzhi_i64:
-; SKYLAKE:       # BB#0:
-; SKYLAKE-NEXT:    bzhiq %rdi, (%rdx), %rcx # sched: [1:0.50]
-; SKYLAKE-NEXT:    bzhiq %rdi, %rsi, %rax # sched: [1:0.50]
-; SKYLAKE-NEXT:    addq %rcx, %rax # sched: [1:0.25]
-; SKYLAKE-NEXT:    retq # sched: [2:1.00]
-;
-; KNL-LABEL: test_bzhi_i64:
-; KNL:       # BB#0:
-; KNL-NEXT:    bzhiq %rdi, (%rdx), %rcx # sched: [1:0.50]
-; KNL-NEXT:    bzhiq %rdi, %rsi, %rax # sched: [1:0.50]
-; KNL-NEXT:    addq %rcx, %rax # sched: [1:0.25]
-; KNL-NEXT:    retq # sched: [2:1.00]
+; COMMON-LABEL: test_bzhi_i64:
+; COMMON:       # BB#0:
+; COMMON-NEXT:    bzhiq %rdi, (%rdx), %rcx # sched: [1:0.50]
+; COMMON-NEXT:    bzhiq %rdi, %rsi, %rax # sched: [1:0.50]
+; COMMON-NEXT:    addq %rcx, %rax # sched: [1:0.25]
+; COMMON-NEXT:    retq # sched: [2:1.00]
 ;
 ; ZNVER1-LABEL: test_bzhi_i64:
 ; ZNVER1:       # BB#0:
@@ -103,32 +75,14 @@ define i64 @test_mulx_i64(i64 %a0, i64 %a1, i64 *%a2) {
 ; GENERIC-NEXT:    orq %rcx, %rax # sched: [1:0.33]
 ; GENERIC-NEXT:    retq # sched: [1:1.00]
 ;
-; HASWELL-LABEL: test_mulx_i64:
-; HASWELL:       # BB#0:
-; HASWELL-NEXT:    movq %rdx, %rax # sched: [1:0.25]
-; HASWELL-NEXT:    movq %rdi, %rdx # sched: [1:0.25]
-; HASWELL-NEXT:    mulxq %rsi, %rsi, %rcx # sched: [4:1.00]
-; HASWELL-NEXT:    mulxq (%rax), %rdx, %rax # sched: [4:1.00]
-; HASWELL-NEXT:    orq %rcx, %rax # sched: [1:0.25]
-; HASWELL-NEXT:    retq # sched: [2:1.00]
-;
-; SKYLAKE-LABEL: test_mulx_i64:
-; SKYLAKE:       # BB#0:
-; SKYLAKE-NEXT:    movq %rdx, %rax # sched: [1:0.25]
-; SKYLAKE-NEXT:    movq %rdi, %rdx # sched: [1:0.25]
-; SKYLAKE-NEXT:    mulxq %rsi, %rsi, %rcx # sched: [4:1.00]
-; SKYLAKE-NEXT:    mulxq (%rax), %rdx, %rax # sched: [4:1.00]
-; SKYLAKE-NEXT:    orq %rcx, %rax # sched: [1:0.25]
-; SKYLAKE-NEXT:    retq # sched: [2:1.00]
-;
-; KNL-LABEL: test_mulx_i64:
-; KNL:       # BB#0:
-; KNL-NEXT:    movq %rdx, %rax # sched: [1:0.25]
-; KNL-NEXT:    movq %rdi, %rdx # sched: [1:0.25]
-; KNL-NEXT:    mulxq %rsi, %rsi, %rcx # sched: [4:1.00]
-; KNL-NEXT:    mulxq (%rax), %rdx, %rax # sched: [4:1.00]
-; KNL-NEXT:    orq %rcx, %rax # sched: [1:0.25]
-; KNL-NEXT:    retq # sched: [2:1.00]
+; COMMON-LABEL: test_mulx_i64:
+; COMMON:       # BB#0:
+; COMMON-NEXT:    movq %rdx, %rax # sched: [1:0.25]
+; COMMON-NEXT:    movq %rdi, %rdx # sched: [1:0.25]
+; COMMON-NEXT:    mulxq %rsi, %rsi, %rcx # sched: [4:1.00]
+; COMMON-NEXT:    mulxq (%rax), %rdx, %rax # sched: [4:1.00]
+; COMMON-NEXT:    orq %rcx, %rax # sched: [1:0.25]
+; COMMON-NEXT:    retq # sched: [2:1.00]
 ;
 ; ZNVER1-LABEL: test_mulx_i64:
 ; ZNVER1:       # BB#0:
@@ -160,26 +114,12 @@ define i32 @test_pdep_i32(i32 %a0, i32 %a1, i32 *%a2) {
 ; GENERIC-NEXT:    addl %ecx, %eax # sched: [1:0.33]
 ; GENERIC-NEXT:    retq # sched: [1:1.00]
 ;
-; HASWELL-LABEL: test_pdep_i32:
-; HASWELL:       # BB#0:
-; HASWELL-NEXT:    pdepl (%rdx), %edi, %ecx # sched: [3:1.00]
-; HASWELL-NEXT:    pdepl %esi, %edi, %eax # sched: [3:1.00]
-; HASWELL-NEXT:    addl %ecx, %eax # sched: [1:0.25]
-; HASWELL-NEXT:    retq # sched: [2:1.00]
-;
-; SKYLAKE-LABEL: test_pdep_i32:
-; SKYLAKE:       # BB#0:
-; SKYLAKE-NEXT:    pdepl (%rdx), %edi, %ecx # sched: [3:1.00]
-; SKYLAKE-NEXT:    pdepl %esi, %edi, %eax # sched: [3:1.00]
-; SKYLAKE-NEXT:    addl %ecx, %eax # sched: [1:0.25]
-; SKYLAKE-NEXT:    retq # sched: [2:1.00]
-;
-; KNL-LABEL: test_pdep_i32:
-; KNL:       # BB#0:
-; KNL-NEXT:    pdepl (%rdx), %edi, %ecx # sched: [3:1.00]
-; KNL-NEXT:    pdepl %esi, %edi, %eax # sched: [3:1.00]
-; KNL-NEXT:    addl %ecx, %eax # sched: [1:0.25]
-; KNL-NEXT:    retq # sched: [2:1.00]
+; COMMON-LABEL: test_pdep_i32:
+; COMMON:       # BB#0:
+; COMMON-NEXT:    pdepl (%rdx), %edi, %ecx # sched: [3:1.00]
+; COMMON-NEXT:    pdepl %esi, %edi, %eax # sched: [3:1.00]
+; COMMON-NEXT:    addl %ecx, %eax # sched: [1:0.25]
+; COMMON-NEXT:    retq # sched: [2:1.00]
 ;
 ; ZNVER1-LABEL: test_pdep_i32:
 ; ZNVER1:       # BB#0:
@@ -203,26 +143,12 @@ define i64 @test_pdep_i64(i64 %a0, i64 %a1, i64 *%a2) {
 ; GENERIC-NEXT:    addq %rcx, %rax # sched: [1:0.33]
 ; GENERIC-NEXT:    retq # sched: [1:1.00]
 ;
-; HASWELL-LABEL: test_pdep_i64:
-; HASWELL:       # BB#0:
-; HASWELL-NEXT:    pdepq (%rdx), %rdi, %rcx # sched: [3:1.00]
-; HASWELL-NEXT:    pdepq %rsi, %rdi, %rax # sched: [3:1.00]
-; HASWELL-NEXT:    addq %rcx, %rax # sched: [1:0.25]
-; HASWELL-NEXT:    retq # sched: [2:1.00]
-;
-; SKYLAKE-LABEL: test_pdep_i64:
-; SKYLAKE:       # BB#0:
-; SKYLAKE-NEXT:    pdepq (%rdx), %rdi, %rcx # sched: [3:1.00]
-; SKYLAKE-NEXT:    pdepq %rsi, %rdi, %rax # sched: [3:1.00]
-; SKYLAKE-NEXT:    addq %rcx, %rax # sched: [1:0.25]
-; SKYLAKE-NEXT:    retq # sched: [2:1.00]
-;
-; KNL-LABEL: test_pdep_i64:
-; KNL:       # BB#0:
-; KNL-NEXT:    pdepq (%rdx), %rdi, %rcx # sched: [3:1.00]
-; KNL-NEXT:    pdepq %rsi, %rdi, %rax # sched: [3:1.00]
-; KNL-NEXT:    addq %rcx, %rax # sched: [1:0.25]
-; KNL-NEXT:    retq # sched: [2:1.00]
+; COMMON-LABEL: test_pdep_i64:
+; COMMON:       # BB#0:
+; COMMON-NEXT:    pdepq (%rdx), %rdi, %rcx # sched: [3:1.00]
+; COMMON-NEXT:    pdepq %rsi, %rdi, %rax # sched: [3:1.00]
+; COMMON-NEXT:    addq %rcx, %rax # sched: [1:0.25]
+; COMMON-NEXT:    retq # sched: [2:1.00]
 ;
 ; ZNVER1-LABEL: test_pdep_i64:
 ; ZNVER1:       # BB#0:
@@ -246,26 +172,12 @@ define i32 @test_pext_i32(i32 %a0, i32 %a1, i32 *%a2) {
 ; GENERIC-NEXT:    addl %ecx, %eax # sched: [1:0.33]
 ; GENERIC-NEXT:    retq # sched: [1:1.00]
 ;
-; HASWELL-LABEL: test_pext_i32:
-; HASWELL:       # BB#0:
-; HASWELL-NEXT:    pextl (%rdx), %edi, %ecx # sched: [3:1.00]
-; HASWELL-NEXT:    pextl %esi, %edi, %eax # sched: [3:1.00]
-; HASWELL-NEXT:    addl %ecx, %eax # sched: [1:0.25]
-; HASWELL-NEXT:    retq # sched: [2:1.00]
-;
-; SKYLAKE-LABEL: test_pext_i32:
-; SKYLAKE:       # BB#0:
-; SKYLAKE-NEXT:    pextl (%rdx), %edi, %ecx # sched: [3:1.00]
-; SKYLAKE-NEXT:    pextl %esi, %edi, %eax # sched: [3:1.00]
-; SKYLAKE-NEXT:    addl %ecx, %eax # sched: [1:0.25]
-; SKYLAKE-NEXT:    retq # sched: [2:1.00]
-;
-; KNL-LABEL: test_pext_i32:
-; KNL:       # BB#0:
-; KNL-NEXT:    pextl (%rdx), %edi, %ecx # sched: [3:1.00]
-; KNL-NEXT:    pextl %esi, %edi, %eax # sched: [3:1.00]
-; KNL-NEXT:    addl %ecx, %eax # sched: [1:0.25]
-; KNL-NEXT:    retq # sched: [2:1.00]
+; COMMON-LABEL: test_pext_i32:
+; COMMON:       # BB#0:
+; COMMON-NEXT:    pextl (%rdx), %edi, %ecx # sched: [3:1.00]
+; COMMON-NEXT:    pextl %esi, %edi, %eax # sched: [3:1.00]
+; COMMON-NEXT:    addl %ecx, %eax # sched: [1:0.25]
+; COMMON-NEXT:    retq # sched: [2:1.00]
 ;
 ; ZNVER1-LABEL: test_pext_i32:
 ; ZNVER1:       # BB#0:
@@ -289,26 +201,12 @@ define i64 @test_pext_i64(i64 %a0, i64 %a1, i64 *%a2) {
 ; GENERIC-NEXT:    addq %rcx, %rax # sched: [1:0.33]
 ; GENERIC-NEXT:    retq # sched: [1:1.00]
 ;
-; HASWELL-LABEL: test_pext_i64:
-; HASWELL:       # BB#0:
-; HASWELL-NEXT:    pextq (%rdx), %rdi, %rcx # sched: [3:1.00]
-; HASWELL-NEXT:    pextq %rsi, %rdi, %rax # sched: [3:1.00]
-; HASWELL-NEXT:    addq %rcx, %rax # sched: [1:0.25]
-; HASWELL-NEXT:    retq # sched: [2:1.00]
-;
-; SKYLAKE-LABEL: test_pext_i64:
-; SKYLAKE:       # BB#0:
-; SKYLAKE-NEXT:    pextq (%rdx), %rdi, %rcx # sched: [3:1.00]
-; SKYLAKE-NEXT:    pextq %rsi, %rdi, %rax # sched: [3:1.00]
-; SKYLAKE-NEXT:    addq %rcx, %rax # sched: [1:0.25]
-; SKYLAKE-NEXT:    retq # sched: [2:1.00]
-;
-; KNL-LABEL: test_pext_i64:
-; KNL:       # BB#0:
-; KNL-NEXT:    pextq (%rdx), %rdi, %rcx # sched: [3:1.00]
-; KNL-NEXT:    pextq %rsi, %rdi, %rax # sched: [3:1.00]
-; KNL-NEXT:    addq %rcx, %rax # sched: [1:0.25]
-; KNL-NEXT:    retq # sched: [2:1.00]
+; COMMON-LABEL: test_pext_i64:
+; COMMON:       # BB#0:
+; COMMON-NEXT:    pextq (%rdx), %rdi, %rcx # sched: [3:1.00]
+; COMMON-NEXT:    pextq %rsi, %rdi, %rax # sched: [3:1.00]
+; COMMON-NEXT:    addq %rcx, %rax # sched: [1:0.25]
+; COMMON-NEXT:    retq # sched: [2:1.00]
 ;
 ; ZNVER1-LABEL: test_pext_i64:
 ; ZNVER1:       # BB#0:
@@ -332,26 +230,12 @@ define i32 @test_rorx_i32(i32 %a0, i32 %a1, i32 *%a2) {
 ; GENERIC-NEXT:    addl %ecx, %eax # sched: [1:0.33]
 ; GENERIC-NEXT:    retq # sched: [1:1.00]
 ;
-; HASWELL-LABEL: test_rorx_i32:
-; HASWELL:       # BB#0:
-; HASWELL-NEXT:    rorxl $5, %edi, %ecx # sched: [1:0.50]
-; HASWELL-NEXT:    rorxl $5, (%rdx), %eax # sched: [1:0.50]
-; HASWELL-NEXT:    addl %ecx, %eax # sched: [1:0.25]
-; HASWELL-NEXT:    retq # sched: [2:1.00]
-;
-; SKYLAKE-LABEL: test_rorx_i32:
-; SKYLAKE:       # BB#0:
-; SKYLAKE-NEXT:    rorxl $5, %edi, %ecx # sched: [1:0.50]
-; SKYLAKE-NEXT:    rorxl $5, (%rdx), %eax # sched: [1:0.50]
-; SKYLAKE-NEXT:    addl %ecx, %eax # sched: [1:0.25]
-; SKYLAKE-NEXT:    retq # sched: [2:1.00]
-;
-; KNL-LABEL: test_rorx_i32:
-; KNL:       # BB#0:
-; KNL-NEXT:    rorxl $5, %edi, %ecx # sched: [1:0.50]
-; KNL-NEXT:    rorxl $5, (%rdx), %eax # sched: [1:0.50]
-; KNL-NEXT:    addl %ecx, %eax # sched: [1:0.25]
-; KNL-NEXT:    retq # sched: [2:1.00]
+; COMMON-LABEL: test_rorx_i32:
+; COMMON:       # BB#0:
+; COMMON-NEXT:    rorxl $5, %edi, %ecx # sched: [1:0.50]
+; COMMON-NEXT:    rorxl $5, (%rdx), %eax # sched: [1:0.50]
+; COMMON-NEXT:    addl %ecx, %eax # sched: [1:0.25]
+; COMMON-NEXT:    retq # sched: [2:1.00]
 ;
 ; ZNVER1-LABEL: test_rorx_i32:
 ; ZNVER1:       # BB#0:
@@ -378,26 +262,12 @@ define i64 @test_rorx_i64(i64 %a0, i64 %a1, i64 *%a2) {
 ; GENERIC-NEXT:    addq %rcx, %rax # sched: [1:0.33]
 ; GENERIC-NEXT:    retq # sched: [1:1.00]
 ;
-; HASWELL-LABEL: test_rorx_i64:
-; HASWELL:       # BB#0:
-; HASWELL-NEXT:    rorxq $5, %rdi, %rcx # sched: [1:0.50]
-; HASWELL-NEXT:    rorxq $5, (%rdx), %rax # sched: [1:0.50]
-; HASWELL-NEXT:    addq %rcx, %rax # sched: [1:0.25]
-; HASWELL-NEXT:    retq # sched: [2:1.00]
-;
-; SKYLAKE-LABEL: test_rorx_i64:
-; SKYLAKE:       # BB#0:
-; SKYLAKE-NEXT:    rorxq $5, %rdi, %rcx # sched: [1:0.50]
-; SKYLAKE-NEXT:    rorxq $5, (%rdx), %rax # sched: [1:0.50]
-; SKYLAKE-NEXT:    addq %rcx, %rax # sched: [1:0.25]
-; SKYLAKE-NEXT:    retq # sched: [2:1.00]
-;
-; KNL-LABEL: test_rorx_i64:
-; KNL:       # BB#0:
-; KNL-NEXT:    rorxq $5, %rdi, %rcx # sched: [1:0.50]
-; KNL-NEXT:    rorxq $5, (%rdx), %rax # sched: [1:0.50]
-; KNL-NEXT:    addq %rcx, %rax # sched: [1:0.25]
-; KNL-NEXT:    retq # sched: [2:1.00]
+; COMMON-LABEL: test_rorx_i64:
+; COMMON:       # BB#0:
+; COMMON-NEXT:    rorxq $5, %rdi, %rcx # sched: [1:0.50]
+; COMMON-NEXT:    rorxq $5, (%rdx), %rax # sched: [1:0.50]
+; COMMON-NEXT:    addq %rcx, %rax # sched: [1:0.25]
+; COMMON-NEXT:    retq # sched: [2:1.00]
 ;
 ; ZNVER1-LABEL: test_rorx_i64:
 ; ZNVER1:       # BB#0:
@@ -424,26 +294,12 @@ define i32 @test_sarx_i32(i32 %a0, i32 %a1, i32 *%a2) {
 ; GENERIC-NEXT:    addl %ecx, %eax # sched: [1:0.33]
 ; GENERIC-NEXT:    retq # sched: [1:1.00]
 ;
-; HASWELL-LABEL: test_sarx_i32:
-; HASWELL:       # BB#0:
-; HASWELL-NEXT:    sarxl %esi, %edi, %ecx # sched: [1:0.50]
-; HASWELL-NEXT:    sarxl %esi, (%rdx), %eax # sched: [1:0.50]
-; HASWELL-NEXT:    addl %ecx, %eax # sched: [1:0.25]
-; HASWELL-NEXT:    retq # sched: [2:1.00]
-;
-; SKYLAKE-LABEL: test_sarx_i32:
-; SKYLAKE:       # BB#0:
-; SKYLAKE-NEXT:    sarxl %esi, %edi, %ecx # sched: [1:0.50]
-; SKYLAKE-NEXT:    sarxl %esi, (%rdx), %eax # sched: [1:0.50]
-; SKYLAKE-NEXT:    addl %ecx, %eax # sched: [1:0.25]
-; SKYLAKE-NEXT:    retq # sched: [2:1.00]
-;
-; KNL-LABEL: test_sarx_i32:
-; KNL:       # BB#0:
-; KNL-NEXT:    sarxl %esi, %edi, %ecx # sched: [1:0.50]
-; KNL-NEXT:    sarxl %esi, (%rdx), %eax # sched: [1:0.50]
-; KNL-NEXT:    addl %ecx, %eax # sched: [1:0.25]
-; KNL-NEXT:    retq # sched: [2:1.00]
+; COMMON-LABEL: test_sarx_i32:
+; COMMON:       # BB#0:
+; COMMON-NEXT:    sarxl %esi, %edi, %ecx # sched: [1:0.50]
+; COMMON-NEXT:    sarxl %esi, (%rdx), %eax # sched: [1:0.50]
+; COMMON-NEXT:    addl %ecx, %eax # sched: [1:0.25]
+; COMMON-NEXT:    retq # sched: [2:1.00]
 ;
 ; ZNVER1-LABEL: test_sarx_i32:
 ; ZNVER1:       # BB#0:
@@ -466,26 +322,12 @@ define i64 @test_sarx_i64(i64 %a0, i64 %a1, i64 *%a2) {
 ; GENERIC-NEXT:    addq %rcx, %rax # sched: [1:0.33]
 ; GENERIC-NEXT:    retq # sched: [1:1.00]
 ;
-; HASWELL-LABEL: test_sarx_i64:
-; HASWELL:       # BB#0:
-; HASWELL-NEXT:    sarxq %rsi, %rdi, %rcx # sched: [1:0.50]
-; HASWELL-NEXT:    sarxq %rsi, (%rdx), %rax # sched: [1:0.50]
-; HASWELL-NEXT:    addq %rcx, %rax # sched: [1:0.25]
-; HASWELL-NEXT:    retq # sched: [2:1.00]
-;
-; SKYLAKE-LABEL: test_sarx_i64:
-; SKYLAKE:       # BB#0:
-; SKYLAKE-NEXT:    sarxq %rsi, %rdi, %rcx # sched: [1:0.50]
-; SKYLAKE-NEXT:    sarxq %rsi, (%rdx), %rax # sched: [1:0.50]
-; SKYLAKE-NEXT:    addq %rcx, %rax # sched: [1:0.25]
-; SKYLAKE-NEXT:    retq # sched: [2:1.00]
-;
-; KNL-LABEL: test_sarx_i64:
-; KNL:       # BB#0:
-; KNL-NEXT:    sarxq %rsi, %rdi, %rcx # sched: [1:0.50]
-; KNL-NEXT:    sarxq %rsi, (%rdx), %rax # sched: [1:0.50]
-; KNL-NEXT:    addq %rcx, %rax # sched: [1:0.25]
-; KNL-NEXT:    retq # sched: [2:1.00]
+; COMMON-LABEL: test_sarx_i64:
+; COMMON:       # BB#0:
+; COMMON-NEXT:    sarxq %rsi, %rdi, %rcx # sched: [1:0.50]
+; COMMON-NEXT:    sarxq %rsi, (%rdx), %rax # sched: [1:0.50]
+; COMMON-NEXT:    addq %rcx, %rax # sched: [1:0.25]
+; COMMON-NEXT:    retq # sched: [2:1.00]
 ;
 ; ZNVER1-LABEL: test_sarx_i64:
 ; ZNVER1:       # BB#0:
@@ -508,26 +350,12 @@ define i32 @test_shlx_i32(i32 %a0, i32 %a1, i32 *%a2) {
 ; GENERIC-NEXT:    addl %ecx, %eax # sched: [1:0.33]
 ; GENERIC-NEXT:    retq # sched: [1:1.00]
 ;
-; HASWELL-LABEL: test_shlx_i32:
-; HASWELL:       # BB#0:
-; HASWELL-NEXT:    shlxl %esi, %edi, %ecx # sched: [1:0.50]
-; HASWELL-NEXT:    shlxl %esi, (%rdx), %eax # sched: [1:0.50]
-; HASWELL-NEXT:    addl %ecx, %eax # sched: [1:0.25]
-; HASWELL-NEXT:    retq # sched: [2:1.00]
-;
-; SKYLAKE-LABEL: test_shlx_i32:
-; SKYLAKE:       # BB#0:
-; SKYLAKE-NEXT:    shlxl %esi, %edi, %ecx # sched: [1:0.50]
-; SKYLAKE-NEXT:    shlxl %esi, (%rdx), %eax # sched: [1:0.50]
-; SKYLAKE-NEXT:    addl %ecx, %eax # sched: [1:0.25]
-; SKYLAKE-NEXT:    retq # sched: [2:1.00]
-;
-; KNL-LABEL: test_shlx_i32:
-; KNL:       # BB#0:
-; KNL-NEXT:    shlxl %esi, %edi, %ecx # sched: [1:0.50]
-; KNL-NEXT:    shlxl %esi, (%rdx), %eax # sched: [1:0.50]
-; KNL-NEXT:    addl %ecx, %eax # sched: [1:0.25]
-; KNL-NEXT:    retq # sched: [2:1.00]
+; COMMON-LABEL: test_shlx_i32:
+; COMMON:       # BB#0:
+; COMMON-NEXT:    shlxl %esi, %edi, %ecx # sched: [1:0.50]
+; COMMON-NEXT:    shlxl %esi, (%rdx), %eax # sched: [1:0.50]
+; COMMON-NEXT:    addl %ecx, %eax # sched: [1:0.25]
+; COMMON-NEXT:    retq # sched: [2:1.00]
 ;
 ; ZNVER1-LABEL: test_shlx_i32:
 ; ZNVER1:       # BB#0:
@@ -550,26 +378,12 @@ define i64 @test_shlx_i64(i64 %a0, i64 %a1, i64 *%a2) {
 ; GENERIC-NEXT:    addq %rcx, %rax # sched: [1:0.33]
 ; GENERIC-NEXT:    retq # sched: [1:1.00]
 ;
-; HASWELL-LABEL: test_shlx_i64:
-; HASWELL:       # BB#0:
-; HASWELL-NEXT:    shlxq %rsi, %rdi, %rcx # sched: [1:0.50]
-; HASWELL-NEXT:    shlxq %rsi, (%rdx), %rax # sched: [1:0.50]
-; HASWELL-NEXT:    addq %rcx, %rax # sched: [1:0.25]
-; HASWELL-NEXT:    retq # sched: [2:1.00]
-;
-; SKYLAKE-LABEL: test_shlx_i64:
-; SKYLAKE:       # BB#0:
-; SKYLAKE-NEXT:    shlxq %rsi, %rdi, %rcx # sched: [1:0.50]
-; SKYLAKE-NEXT:    shlxq %rsi, (%rdx), %rax # sched: [1:0.50]
-; SKYLAKE-NEXT:    addq %rcx, %rax # sched: [1:0.25]
-; SKYLAKE-NEXT:    retq # sched: [2:1.00]
-;
-; KNL-LABEL: test_shlx_i64:
-; KNL:       # BB#0:
-; KNL-NEXT:    shlxq %rsi, %rdi, %rcx # sched: [1:0.50]
-; KNL-NEXT:    shlxq %rsi, (%rdx), %rax # sched: [1:0.50]
-; KNL-NEXT:    addq %rcx, %rax # sched: [1:0.25]
-; KNL-NEXT:    retq # sched: [2:1.00]
+; COMMON-LABEL: test_shlx_i64:
+; COMMON:       # BB#0:
+; COMMON-NEXT:    shlxq %rsi, %rdi, %rcx # sched: [1:0.50]
+; COMMON-NEXT:    shlxq %rsi, (%rdx), %rax # sched: [1:0.50]
+; COMMON-NEXT:    addq %rcx, %rax # sched: [1:0.25]
+; COMMON-NEXT:    retq # sched: [2:1.00]
 ;
 ; ZNVER1-LABEL: test_shlx_i64:
 ; ZNVER1:       # BB#0:
@@ -592,26 +406,12 @@ define i32 @test_shrx_i32(i32 %a0, i32 %a1, i32 *%a2) {
 ; GENERIC-NEXT:    addl %ecx, %eax # sched: [1:0.33]
 ; GENERIC-NEXT:    retq # sched: [1:1.00]
 ;
-; HASWELL-LABEL: test_shrx_i32:
-; HASWELL:       # BB#0:
-; HASWELL-NEXT:    shrxl %esi, %edi, %ecx # sched: [1:0.50]
-; HASWELL-NEXT:    shrxl %esi, (%rdx), %eax # sched: [1:0.50]
-; HASWELL-NEXT:    addl %ecx, %eax # sched: [1:0.25]
-; HASWELL-NEXT:    retq # sched: [2:1.00]
-;
-; SKYLAKE-LABEL: test_shrx_i32:
-; SKYLAKE:       # BB#0:
-; SKYLAKE-NEXT:    shrxl %esi, %edi, %ecx # sched: [1:0.50]
-; SKYLAKE-NEXT:    shrxl %esi, (%rdx), %eax # sched: [1:0.50]
-; SKYLAKE-NEXT:    addl %ecx, %eax # sched: [1:0.25]
-; SKYLAKE-NEXT:    retq # sched: [2:1.00]
-;
-; KNL-LABEL: test_shrx_i32:
-; KNL:       # BB#0:
-; KNL-NEXT:    shrxl %esi, %edi, %ecx # sched: [1:0.50]
-; KNL-NEXT:    shrxl %esi, (%rdx), %eax # sched: [1:0.50]
-; KNL-NEXT:    addl %ecx, %eax # sched: [1:0.25]
-; KNL-NEXT:    retq # sched: [2:1.00]
+; COMMON-LABEL: test_shrx_i32:
+; COMMON:       # BB#0:
+; COMMON-NEXT:    shrxl %esi, %edi, %ecx # sched: [1:0.50]
+; COMMON-NEXT:    shrxl %esi, (%rdx), %eax # sched: [1:0.50]
+; COMMON-NEXT:    addl %ecx, %eax # sched: [1:0.25]
+; COMMON-NEXT:    retq # sched: [2:1.00]
 ;
 ; ZNVER1-LABEL: test_shrx_i32:
 ; ZNVER1:       # BB#0:
@@ -634,26 +434,12 @@ define i64 @test_shrx_i64(i64 %a0, i64 %a1, i64 *%a2) {
 ; GENERIC-NEXT:    addq %rcx, %rax # sched: [1:0.33]
 ; GENERIC-NEXT:    retq # sched: [1:1.00]
 ;
-; HASWELL-LABEL: test_shrx_i64:
-; HASWELL:       # BB#0:
-; HASWELL-NEXT:    shrxq %rsi, %rdi, %rcx # sched: [1:0.50]
-; HASWELL-NEXT:    shrxq %rsi, (%rdx), %rax # sched: [1:0.50]
-; HASWELL-NEXT:    addq %rcx, %rax # sched: [1:0.25]
-; HASWELL-NEXT:    retq # sched: [2:1.00]
-;
-; SKYLAKE-LABEL: test_shrx_i64:
-; SKYLAKE:       # BB#0:
-; SKYLAKE-NEXT:    shrxq %rsi, %rdi, %rcx # sched: [1:0.50]
-; SKYLAKE-NEXT:    shrxq %rsi, (%rdx), %rax # sched: [1:0.50]
-; SKYLAKE-NEXT:    addq %rcx, %rax # sched: [1:0.25]
-; SKYLAKE-NEXT:    retq # sched: [2:1.00]
-;
-; KNL-LABEL: test_shrx_i64:
-; KNL:       # BB#0:
-; KNL-NEXT:    shrxq %rsi, %rdi, %rcx # sched: [1:0.50]
-; KNL-NEXT:    shrxq %rsi, (%rdx), %rax # sched: [1:0.50]
-; KNL-NEXT:    addq %rcx, %rax # sched: [1:0.25]
-; KNL-NEXT:    retq # sched: [2:1.00]
+; COMMON-LABEL: test_shrx_i64:
+; COMMON:       # BB#0:
+; COMMON-NEXT:    shrxq %rsi, %rdi, %rcx # sched: [1:0.50]
+; COMMON-NEXT:    shrxq %rsi, (%rdx), %rax # sched: [1:0.50]
+; COMMON-NEXT:    addq %rcx, %rax # sched: [1:0.25]
+; COMMON-NEXT:    retq # sched: [2:1.00]
 ;
 ; ZNVER1-LABEL: test_shrx_i64:
 ; ZNVER1:       # BB#0: