Remove unused predicate and simplify lit test

Author: daniel-zabawa

llvm/lib/Target/X86/X86InstrPredicates.td

@@ -46,7 +46,6 @@ def NoEGPR       : Predicate<"!Subtarget->hasEGPR()">;
 def HasNDD       : Predicate<"Subtarget->hasNDD()">;
 def NoNDD        : Predicate<"!Subtarget->hasNDD()">;
 def HasZU        : Predicate<"Subtarget->hasZU()">;
-def NoZU         : Predicate<"!Subtarget->hasZU()">;
 def HasCF        : Predicate<"Subtarget->hasCF()">;
 def HasCMOV      : Predicate<"Subtarget->canUseCMOV()">;
 def NoCMOV       : Predicate<"!Subtarget->canUseCMOV()">;

llvm/test/CodeGen/X86/apx/imulzu.ll

@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
-; RUN: llc < %s -mtriple=x86_64-pc-linux-gnu -mattr=+zu | FileCheck %s --check-prefix=ZU
-; RUN: llc < %s -mtriple=x86_64-pc-linux-gnu | FileCheck %s --check-prefix=NOZU
+; RUN: llc < %s -mtriple=x86_64-pc-linux-gnu -mattr=+zu | FileCheck %s --check-prefixes=CHECK,ZU
+; RUN: llc < %s -mtriple=x86_64-pc-linux-gnu | FileCheck %s --check-prefixes=CHECK,NOZU
 
 ; Test generation of 16b imulzu when -mattr=+zu is specified.
 ; The mulzu_* tests check for basic generation, which is limited to cases where a
@@ -89,37 +89,24 @@ define i64 @mulzu_16_64_mem(ptr %P) {
 ; cases should match.
 
 define void @mulzu_16_store(i16 %A, ptr %R) {
-; ZU-LABEL: mulzu_16_store:
-; ZU:       # %bb.0:
-; ZU-NEXT:    imull $1234, %edi, %eax # imm = 0x4D2
-; ZU-NEXT:    movw %ax, (%rsi)
-; ZU-NEXT:    retq
-;
-; NOZU-LABEL: mulzu_16_store:
-; NOZU:       # %bb.0:
-; NOZU-NEXT:    imull $1234, %edi, %eax # imm = 0x4D2
-; NOZU-NEXT:    movw %ax, (%rsi)
-; NOZU-NEXT:    retq
+; CHECK-LABEL: mulzu_16_store:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    imull $1234, %edi, %eax # imm = 0x4D2
+; CHECK-NEXT:    movw %ax, (%rsi)
+; CHECK-NEXT:    retq
     %gep = getelementptr i16, ptr %R, i64 0
     %mul = mul i16 %A, 1234
     store i16 %mul, ptr %gep
     ret void
 }
 
 define i32 @mulzu_16_store_32(i16 %A, ptr %R) {
-; ZU-LABEL: mulzu_16_store_32:
-; ZU:       # %bb.0:
-; ZU-NEXT:    imull $1234, %edi, %eax # imm = 0x4D2
-; ZU-NEXT:    movw %ax, (%rsi)
-; ZU-NEXT:    movzwl %ax, %eax
-; ZU-NEXT:    retq
-;
-; NOZU-LABEL: mulzu_16_store_32:
-; NOZU:       # %bb.0:
-; NOZU-NEXT:    imull $1234, %edi, %eax # imm = 0x4D2
-; NOZU-NEXT:    movw %ax, (%rsi)
-; NOZU-NEXT:    movzwl %ax, %eax
-; NOZU-NEXT:    retq
+; CHECK-LABEL: mulzu_16_store_32:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    imull $1234, %edi, %eax # imm = 0x4D2
+; CHECK-NEXT:    movw %ax, (%rsi)
+; CHECK-NEXT:    movzwl %ax, %eax
+; CHECK-NEXT:    retq
     %gep = getelementptr i16, ptr %R, i64 0
     %mul = mul i16 %A, 1234
     store i16 %mul, ptr %gep
@@ -128,19 +115,12 @@ define i32 @mulzu_16_store_32(i16 %A, ptr %R) {
 }
 
 define i64 @mulzu_16_store_64(i16 %A, ptr %R) {
-; ZU-LABEL: mulzu_16_store_64:
-; ZU:       # %bb.0:
-; ZU-NEXT:    imull $1234, %edi, %eax # imm = 0x4D2
-; ZU-NEXT:    movw %ax, (%rsi)
-; ZU-NEXT:    movzwl %ax, %eax
-; ZU-NEXT:    retq
-;
-; NOZU-LABEL: mulzu_16_store_64:
-; NOZU:       # %bb.0:
-; NOZU-NEXT:    imull $1234, %edi, %eax # imm = 0x4D2
-; NOZU-NEXT:    movw %ax, (%rsi)
-; NOZU-NEXT:    movzwl %ax, %eax
-; NOZU-NEXT:    retq
+; CHECK-LABEL: mulzu_16_store_64:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    imull $1234, %edi, %eax # imm = 0x4D2
+; CHECK-NEXT:    movw %ax, (%rsi)
+; CHECK-NEXT:    movzwl %ax, %eax
+; CHECK-NEXT:    retq
     %gep = getelementptr i16, ptr %R, i64 0
     %mul = mul i16 %A, 1234
     store i16 %mul, ptr %gep
@@ -149,34 +129,22 @@ define i64 @mulzu_16_store_64(i16 %A, ptr %R) {
 }
 
 define i32 @mulzu_sext_16_32(i16 %A) {
-; ZU-LABEL: mulzu_sext_16_32:
-; ZU:       # %bb.0:
-; ZU-NEXT:    imull $1234, %edi, %eax # imm = 0x4D2
-; ZU-NEXT:    cwtl
-; ZU-NEXT:    retq
-;
-; NOZU-LABEL: mulzu_sext_16_32:
-; NOZU:       # %bb.0:
-; NOZU-NEXT:    imull $1234, %edi, %eax # imm = 0x4D2
-; NOZU-NEXT:    cwtl
-; NOZU-NEXT:    retq
+; CHECK-LABEL: mulzu_sext_16_32:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    imull $1234, %edi, %eax # imm = 0x4D2
+; CHECK-NEXT:    cwtl
+; CHECK-NEXT:    retq
     %mul = mul i16 %A, 1234
     %r = sext i16 %mul to i32
     ret i32 %r
 }
 
 define i64 @mulzu_sext_16_64(i16 %A) {
-; ZU-LABEL: mulzu_sext_16_64:
-; ZU:       # %bb.0:
-; ZU-NEXT:    imull $1234, %edi, %eax # imm = 0x4D2
-; ZU-NEXT:    movswq %ax, %rax
-; ZU-NEXT:    retq
-;
-; NOZU-LABEL: mulzu_sext_16_64:
-; NOZU:       # %bb.0:
-; NOZU-NEXT:    imull $1234, %edi, %eax # imm = 0x4D2
-; NOZU-NEXT:    movswq %ax, %rax
-; NOZU-NEXT:    retq
+; CHECK-LABEL: mulzu_sext_16_64:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    imull $1234, %edi, %eax # imm = 0x4D2
+; CHECK-NEXT:    movswq %ax, %rax
+; CHECK-NEXT:    retq
     %mul = mul i16 %A, 1234
     %r = sext i16 %mul to i64
     ret i64 %r
@@ -188,112 +156,71 @@ define i64 @mulzu_sext_16_64(i16 %A) {
 
 define i16 @mul4_16(i16 %A) {
 ;
-; ZU-LABEL: mul4_16:
-; ZU:       # %bb.0:
-; ZU-NEXT:    # kill: def $edi killed $edi def $rdi
-; ZU-NEXT:    leal (,%rdi,4), %eax
-; ZU-NEXT:    # kill: def $ax killed $ax killed $eax
-; ZU-NEXT:    retq
-;
-; NOZU-LABEL: mul4_16:
-; NOZU:       # %bb.0:
-; NOZU-NEXT:    # kill: def $edi killed $edi def $rdi
-; NOZU-NEXT:    leal (,%rdi,4), %eax
-; NOZU-NEXT:    # kill: def $ax killed $ax killed $eax
-; NOZU-NEXT:    retq
+; CHECK-LABEL: mul4_16:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    # kill: def $edi killed $edi def $rdi
+; CHECK-NEXT:    leal (,%rdi,4), %eax
+; CHECK-NEXT:    # kill: def $ax killed $ax killed $eax
+; CHECK-NEXT:    retq
     %mul = mul i16 %A, 4
     ret i16 %mul
 }
 
 define i16 @mul4096_16(i16 %A) {
 ;
-; ZU-LABEL: mul4096_16:
-; ZU:       # %bb.0:
-; ZU-NEXT:    movl %edi, %eax
-; ZU-NEXT:    shll $12, %eax
-; ZU-NEXT:    # kill: def $ax killed $ax killed $eax
-; ZU-NEXT:    retq
-;
-; NOZU-LABEL: mul4096_16:
-; NOZU:       # %bb.0:
-; NOZU-NEXT:    movl %edi, %eax
-; NOZU-NEXT:    shll $12, %eax
-; NOZU-NEXT:    # kill: def $ax killed $ax killed $eax
-; NOZU-NEXT:    retq
+; CHECK-LABEL: mul4096_16:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    movl %edi, %eax
+; CHECK-NEXT:    shll $12, %eax
+; CHECK-NEXT:    # kill: def $ax killed $ax killed $eax
+; CHECK-NEXT:    retq
     %mul = mul i16 %A, 4096
     ret i16 %mul
 }
 
 define i16 @mulmin4096_16(i16 %A) {
 ;
-; ZU-LABEL: mulmin4096_16:
-; ZU:       # %bb.0:
-; ZU-NEXT:    movl %edi, %eax
-; ZU-NEXT:    shll $12, %eax
-; ZU-NEXT:    negl %eax
-; ZU-NEXT:    # kill: def $ax killed $ax killed $eax
-; ZU-NEXT:    retq
-;
-; NOZU-LABEL: mulmin4096_16:
-; NOZU:       # %bb.0:
-; NOZU-NEXT:    movl %edi, %eax
-; NOZU-NEXT:    shll $12, %eax
-; NOZU-NEXT:    negl %eax
-; NOZU-NEXT:    # kill: def $ax killed $ax killed $eax
-; NOZU-NEXT:    retq
+; CHECK-LABEL: mulmin4096_16:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    movl %edi, %eax
+; CHECK-NEXT:    shll $12, %eax
+; CHECK-NEXT:    negl %eax
+; CHECK-NEXT:    # kill: def $ax killed $ax killed $eax
+; CHECK-NEXT:    retq
     %mul = mul i16 %A, -4096
     ret i16 %mul
 }
 
 define i16 @mul4_16_minsize(i16 %A) minsize {
 ;
-; ZU-LABEL: mul4_16_minsize:
-; ZU:       # %bb.0:
-; ZU-NEXT:    # kill: def $edi killed $edi def $rdi
-; ZU-NEXT:    leal (,%rdi,4), %eax
-; ZU-NEXT:    # kill: def $ax killed $ax killed $eax
-; ZU-NEXT:    retq
-;
-; NOZU-LABEL: mul4_16_minsize:
-; NOZU:       # %bb.0:
-; NOZU-NEXT:    # kill: def $edi killed $edi def $rdi
-; NOZU-NEXT:    leal (,%rdi,4), %eax
-; NOZU-NEXT:    # kill: def $ax killed $ax killed $eax
-; NOZU-NEXT:    retq
+; CHECK-LABEL: mul4_16_minsize:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    # kill: def $edi killed $edi def $rdi
+; CHECK-NEXT:    leal (,%rdi,4), %eax
+; CHECK-NEXT:    # kill: def $ax killed $ax killed $eax
+; CHECK-NEXT:    retq
     %mul = mul i16 %A, 4
     ret i16 %mul
 }
 
 define i16 @mul0_16(i16 %A) {
 ;
-; ZU-LABEL: mul0_16:
-; ZU:       # %bb.0:
-; ZU-NEXT:    xorl %eax, %eax
-; ZU-NEXT:    retq
-;
-; NOZU-LABEL: mul0_16:
-; NOZU:       # %bb.0:
-; NOZU-NEXT:    xorl %eax, %eax
-; NOZU-NEXT:    retq
+; CHECK-LABEL: mul0_16:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    xorl %eax, %eax
+; CHECK-NEXT:    retq
     %mul = mul i16 %A, 0
     ret i16 %mul
 }
 
 define i16 @mul4294967295_16(i16 %A) {
 ;
-; ZU-LABEL: mul4294967295_16:
-; ZU:       # %bb.0:
-; ZU-NEXT:    movl %edi, %eax
-; ZU-NEXT:    negl %eax
-; ZU-NEXT:    # kill: def $ax killed $ax killed $eax
-; ZU-NEXT:    retq
-;
-; NOZU-LABEL: mul4294967295_16:
-; NOZU:       # %bb.0:
-; NOZU-NEXT:    movl %edi, %eax
-; NOZU-NEXT:    negl %eax
-; NOZU-NEXT:    # kill: def $ax killed $ax killed $eax
-; NOZU-NEXT:    retq
+; CHECK-LABEL: mul4294967295_16:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    movl %edi, %eax
+; CHECK-NEXT:    negl %eax
+; CHECK-NEXT:    # kill: def $ax killed $ax killed $eax
+; CHECK-NEXT:    retq
     %mul = mul i16 %A, 4294967295
     ret i16 %mul
 }