diff options
Diffstat (limited to 'llvm/test/CodeGen/X86')
-rw-r--r-- | llvm/test/CodeGen/X86/block-placement.ll | 10 | ||||
-rw-r--r-- | llvm/test/CodeGen/X86/cmov-into-branch.ll | 4 | ||||
-rw-r--r-- | llvm/test/CodeGen/X86/fma-intrinsics-phi-213-to-231.ll | 24 | ||||
-rw-r--r-- | llvm/test/CodeGen/X86/fp-une-cmp.ll | 4 | ||||
-rw-r--r-- | llvm/test/CodeGen/X86/pr11202.ll | 5 | ||||
-rw-r--r-- | llvm/test/CodeGen/X86/ragreedy-bug.ll | 22 | ||||
-rw-r--r-- | llvm/test/CodeGen/X86/sse1.ll | 28 | ||||
-rw-r--r-- | llvm/test/CodeGen/X86/tail-dup-repeat.ll | 53 | ||||
-rw-r--r-- | llvm/test/CodeGen/X86/update-terminator.mir | 22 |
9 files changed, 31 insertions, 141 deletions
diff --git a/llvm/test/CodeGen/X86/block-placement.ll b/llvm/test/CodeGen/X86/block-placement.ll index 39e29640724..b690316d531 100644 --- a/llvm/test/CodeGen/X86/block-placement.ll +++ b/llvm/test/CodeGen/X86/block-placement.ll @@ -177,12 +177,6 @@ exit: ret i32 %sum } -; Tail duplication during layout can entirely remove body0 by duplicating it -; into the entry block and into body1. This is a good thing but it isn't what -; this test is looking for. So to make the blocks longer so they don't get -; duplicated, we add some calls to dummy. -declare void @dummy() - define i32 @test_loop_rotate(i32 %i, i32* %a) { ; Check that we rotate conditional exits from the loop to the bottom of the ; loop, eliminating unconditional branches to the top. @@ -200,8 +194,6 @@ body0: %base = phi i32 [ 0, %entry ], [ %sum, %body1 ] %next = add i32 %iv, 1 %exitcond = icmp eq i32 %next, %i - call void @dummy() - call void @dummy() br i1 %exitcond, label %exit, label %body1 body1: @@ -953,7 +945,7 @@ define void @benchmark_heapsort(i32 %n, double* nocapture %ra) { ; First rotated loop top. ; CHECK: .p2align ; CHECK: %while.end -; %for.cond gets completely tail-duplicated away. +; CHECK: %for.cond ; CHECK: %if.then ; CHECK: %if.else ; CHECK: %if.end10 diff --git a/llvm/test/CodeGen/X86/cmov-into-branch.ll b/llvm/test/CodeGen/X86/cmov-into-branch.ll index 6e4762b2e79..c0c6fc4ac22 100644 --- a/llvm/test/CodeGen/X86/cmov-into-branch.ll +++ b/llvm/test/CodeGen/X86/cmov-into-branch.ll @@ -105,11 +105,9 @@ define i32 @weighted_select3(i32 %a, i32 %b) { ; CHECK-NEXT: testl %edi, %edi ; CHECK-NEXT: je [[LABEL_BB6:.*]] ; CHECK: movl %edi, %eax -; CHECK-NEXT: retq ; CHECK: [[LABEL_BB6]] ; CHECK-NEXT: movl %esi, %edi -; CHECK-NEXT: movl %edi, %eax -; CHECK-NEXT: retq +; CHECK-NEXT: jmp ; %cmp = icmp ne i32 %a, 0 %sel = select i1 %cmp, i32 %a, i32 %b, !prof !2 diff --git a/llvm/test/CodeGen/X86/fma-intrinsics-phi-213-to-231.ll b/llvm/test/CodeGen/X86/fma-intrinsics-phi-213-to-231.ll index 78e7471b886..8d0318bb93e 100644 --- a/llvm/test/CodeGen/X86/fma-intrinsics-phi-213-to-231.ll +++ b/llvm/test/CodeGen/X86/fma-intrinsics-phi-213-to-231.ll @@ -2,7 +2,7 @@ ; CHECK-LABEL: fmaddsubpd_loop_128: ; CHECK: vfmaddsub231pd %xmm1, %xmm0, %xmm2 -; CHECK: vmovapd %xmm2, %xmm0 +; CHECK: vmovaps %xmm2, %xmm0 ; CHECK-NEXT: retq define <2 x double> @fmaddsubpd_loop_128(i32 %iter, <2 x double> %a, <2 x double> %b, <2 x double> %c) { entry: @@ -28,7 +28,7 @@ for.end: ; CHECK-LABEL: fmsubaddpd_loop_128: ; CHECK: vfmsubadd231pd %xmm1, %xmm0, %xmm2 -; CHECK: vmovapd %xmm2, %xmm0 +; CHECK: vmovaps %xmm2, %xmm0 ; CHECK-NEXT: retq define <2 x double> @fmsubaddpd_loop_128(i32 %iter, <2 x double> %a, <2 x double> %b, <2 x double> %c) { entry: @@ -54,7 +54,7 @@ for.end: ; CHECK-LABEL: fmaddpd_loop_128: ; CHECK: vfmadd231pd %xmm1, %xmm0, %xmm2 -; CHECK: vmovapd %xmm2, %xmm0 +; CHECK: vmovaps %xmm2, %xmm0 ; CHECK-NEXT: retq define <2 x double> @fmaddpd_loop_128(i32 %iter, <2 x double> %a, <2 x double> %b, <2 x double> %c) { entry: @@ -80,7 +80,7 @@ for.end: ; CHECK-LABEL: fmsubpd_loop_128: ; CHECK: vfmsub231pd %xmm1, %xmm0, %xmm2 -; CHECK: vmovapd %xmm2, %xmm0 +; CHECK: vmovaps %xmm2, %xmm0 ; CHECK-NEXT: retq define <2 x double> @fmsubpd_loop_128(i32 %iter, <2 x double> %a, <2 x double> %b, <2 x double> %c) { entry: @@ -106,7 +106,7 @@ for.end: ; CHECK-LABEL: fnmaddpd_loop_128: ; CHECK: vfnmadd231pd %xmm1, %xmm0, %xmm2 -; CHECK: vmovapd %xmm2, %xmm0 +; CHECK: vmovaps %xmm2, %xmm0 ; CHECK-NEXT: retq define <2 x double> @fnmaddpd_loop_128(i32 %iter, <2 x double> %a, <2 x double> %b, <2 x double> %c) { entry: @@ -132,7 +132,7 @@ for.end: ; CHECK-LABEL: fnmsubpd_loop_128: ; CHECK: vfnmsub231pd %xmm1, %xmm0, %xmm2 -; CHECK: vmovapd %xmm2, %xmm0 +; CHECK: vmovaps %xmm2, %xmm0 ; CHECK-NEXT: retq define <2 x double> @fnmsubpd_loop_128(i32 %iter, <2 x double> %a, <2 x double> %b, <2 x double> %c) { entry: @@ -329,7 +329,7 @@ declare <4 x float> @llvm.x86.fma.vfnmsub.ps(<4 x float>, <4 x float>, <4 x floa ; CHECK-LABEL: fmaddsubpd_loop_256: ; CHECK: vfmaddsub231pd %ymm1, %ymm0, %ymm2 -; CHECK: vmovapd %ymm2, %ymm0 +; CHECK: vmovaps %ymm2, %ymm0 ; CHECK-NEXT: retq define <4 x double> @fmaddsubpd_loop_256(i32 %iter, <4 x double> %a, <4 x double> %b, <4 x double> %c) { entry: @@ -355,7 +355,7 @@ for.end: ; CHECK-LABEL: fmsubaddpd_loop_256: ; CHECK: vfmsubadd231pd %ymm1, %ymm0, %ymm2 -; CHECK: vmovapd %ymm2, %ymm0 +; CHECK: vmovaps %ymm2, %ymm0 ; CHECK-NEXT: retq define <4 x double> @fmsubaddpd_loop_256(i32 %iter, <4 x double> %a, <4 x double> %b, <4 x double> %c) { entry: @@ -381,7 +381,7 @@ for.end: ; CHECK-LABEL: fmaddpd_loop_256: ; CHECK: vfmadd231pd %ymm1, %ymm0, %ymm2 -; CHECK: vmovapd %ymm2, %ymm0 +; CHECK: vmovaps %ymm2, %ymm0 ; CHECK-NEXT: retq define <4 x double> @fmaddpd_loop_256(i32 %iter, <4 x double> %a, <4 x double> %b, <4 x double> %c) { entry: @@ -407,7 +407,7 @@ for.end: ; CHECK-LABEL: fmsubpd_loop_256: ; CHECK: vfmsub231pd %ymm1, %ymm0, %ymm2 -; CHECK: vmovapd %ymm2, %ymm0 +; CHECK: vmovaps %ymm2, %ymm0 ; CHECK-NEXT: retq define <4 x double> @fmsubpd_loop_256(i32 %iter, <4 x double> %a, <4 x double> %b, <4 x double> %c) { entry: @@ -433,7 +433,7 @@ for.end: ; CHECK-LABEL: fnmaddpd_loop_256: ; CHECK: vfnmadd231pd %ymm1, %ymm0, %ymm2 -; CHECK: vmovapd %ymm2, %ymm0 +; CHECK: vmovaps %ymm2, %ymm0 ; CHECK-NEXT: retq define <4 x double> @fnmaddpd_loop_256(i32 %iter, <4 x double> %a, <4 x double> %b, <4 x double> %c) { entry: @@ -459,7 +459,7 @@ for.end: ; CHECK-LABEL: fnmsubpd_loop_256: ; CHECK: vfnmsub231pd %ymm1, %ymm0, %ymm2 -; CHECK: vmovapd %ymm2, %ymm0 +; CHECK: vmovaps %ymm2, %ymm0 ; CHECK-NEXT: retq define <4 x double> @fnmsubpd_loop_256(i32 %iter, <4 x double> %a, <4 x double> %b, <4 x double> %c) { entry: diff --git a/llvm/test/CodeGen/X86/fp-une-cmp.ll b/llvm/test/CodeGen/X86/fp-une-cmp.ll index e3b2a04060b..653040053c2 100644 --- a/llvm/test/CodeGen/X86/fp-une-cmp.ll +++ b/llvm/test/CodeGen/X86/fp-une-cmp.ll @@ -56,11 +56,11 @@ define double @profile_metadata(double %x, double %y) { ; CHECK-NEXT: ucomisd %xmm1, %xmm0 ; CHECK-NEXT: jne .LBB1_1 ; CHECK-NEXT: jp .LBB1_1 -; CHECK-NEXT: # %bb2 +; CHECK-NEXT: .LBB1_2: # %bb2 ; CHECK-NEXT: retq ; CHECK-NEXT: .LBB1_1: # %bb1 ; CHECK-NEXT: addsd {{.*}}(%rip), %xmm0 -; CHECK-NEXT: retq +; CHECK-NEXT: jmp .LBB1_2 entry: %mul = fmul double %x, %y diff --git a/llvm/test/CodeGen/X86/pr11202.ll b/llvm/test/CodeGen/X86/pr11202.ll index cb1a749d91f..13070d1c600 100644 --- a/llvm/test/CodeGen/X86/pr11202.ll +++ b/llvm/test/CodeGen/X86/pr11202.ll @@ -15,8 +15,5 @@ l2: ; preds = %l1 br label %l1 } -; It is correct for either l1 or l2 to be removed. -; If l2 is removed, the message should be "Address of block that was removed by CodeGen" -; If l1 is removed, it should be "Block address taken." -; CHECK: .Ltmp0: # {{Address of block that was removed by CodeGen|Block address taken}} +; CHECK: .Ltmp0: # Address of block that was removed by CodeGen ; CHECK: .quad .Ltmp0 diff --git a/llvm/test/CodeGen/X86/ragreedy-bug.ll b/llvm/test/CodeGen/X86/ragreedy-bug.ll index bfeb041f89a..e8426317f13 100644 --- a/llvm/test/CodeGen/X86/ragreedy-bug.ll +++ b/llvm/test/CodeGen/X86/ragreedy-bug.ll @@ -3,34 +3,16 @@ ; This testing case is reduced from 197.parser prune_match function. ; We make sure register copies are not generated on isupper.exit blocks. -; isupper.exit and isupper.exit223 get tail-duplicated into all their -; predecessors. -; CHECK: cond.true.i.i +; CHECK: isupper.exit ; CHECK-NEXT: in Loop -; Mem-move -; CHECK-NEXT: movl -; CHECK-NEXT: andl ; CHECK-NEXT: testl ; CHECK-NEXT: jne -; CHECK: cond.true.i.i217 +; CHECK: isupper.exit ; CHECK-NEXT: in Loop -; Mem-move -; CHECK-NEXT: movl -; CHECK-NEXT: andl ; CHECK-NEXT: testl ; CHECK-NEXT: je -; CHECK: cond.false.i.i ; CHECK: maskrune -; CHECK-NEXT: movzbl -; CHECK-NEXT: movzbl -; CHECK-NEXT: testl -; CHECK-NEXT: je -; CHECK: cond.false.i.i219 ; CHECK: maskrune -; CHECK-NEXT: movzbl -; CHECK-NEXT: movzbl -; CHECK-NEXT: testl -; CHECK-NEXT: jne %struct.List_o_links_struct = type { i32, i32, i32, %struct.List_o_links_struct* } %struct.Connector_struct = type { i16, i16, i8, i8, %struct.Connector_struct*, i8* } diff --git a/llvm/test/CodeGen/X86/sse1.ll b/llvm/test/CodeGen/X86/sse1.ll index beedb1d2465..3ac6ea6e2b8 100644 --- a/llvm/test/CodeGen/X86/sse1.ll +++ b/llvm/test/CodeGen/X86/sse1.ll @@ -58,23 +58,21 @@ define <4 x float> @vselect(<4 x float>*%p, <4 x i32> %q) { ; X32-NEXT: je .LBB1_1 ; X32-NEXT: # BB#2: # %entry ; X32-NEXT: xorps %xmm1, %xmm1 -; X32-NEXT: cmpl $0, {{[0-9]+}}(%esp) -; X32-NEXT: jne .LBB1_5 -; X32-NEXT: jmp .LBB1_4 +; X32-NEXT: jmp .LBB1_3 ; X32-NEXT: .LBB1_1: ; X32-NEXT: movss {{.*#+}} xmm1 = mem[0],zero,zero,zero +; X32-NEXT: .LBB1_3: # %entry ; X32-NEXT: cmpl $0, {{[0-9]+}}(%esp) ; X32-NEXT: je .LBB1_4 -; X32-NEXT: .LBB1_5: # %entry +; X32-NEXT: # BB#5: # %entry ; X32-NEXT: xorps %xmm2, %xmm2 -; X32-NEXT: cmpl $0, {{[0-9]+}}(%esp) -; X32-NEXT: jne .LBB1_8 -; X32-NEXT: jmp .LBB1_7 +; X32-NEXT: jmp .LBB1_6 ; X32-NEXT: .LBB1_4: ; X32-NEXT: movss {{.*#+}} xmm2 = mem[0],zero,zero,zero +; X32-NEXT: .LBB1_6: # %entry ; X32-NEXT: cmpl $0, {{[0-9]+}}(%esp) ; X32-NEXT: je .LBB1_7 -; X32-NEXT: .LBB1_8: # %entry +; X32-NEXT: # BB#8: # %entry ; X32-NEXT: xorps %xmm3, %xmm3 ; X32-NEXT: jmp .LBB1_9 ; X32-NEXT: .LBB1_7: @@ -97,23 +95,21 @@ define <4 x float> @vselect(<4 x float>*%p, <4 x i32> %q) { ; X64-NEXT: je .LBB1_1 ; X64-NEXT: # BB#2: # %entry ; X64-NEXT: xorps %xmm1, %xmm1 -; X64-NEXT: testl %edx, %edx -; X64-NEXT: jne .LBB1_5 -; X64-NEXT: jmp .LBB1_4 +; X64-NEXT: jmp .LBB1_3 ; X64-NEXT: .LBB1_1: ; X64-NEXT: movss {{.*#+}} xmm1 = mem[0],zero,zero,zero +; X64-NEXT: .LBB1_3: # %entry ; X64-NEXT: testl %edx, %edx ; X64-NEXT: je .LBB1_4 -; X64-NEXT: .LBB1_5: # %entry +; X64-NEXT: # BB#5: # %entry ; X64-NEXT: xorps %xmm2, %xmm2 -; X64-NEXT: testl %r8d, %r8d -; X64-NEXT: jne .LBB1_8 -; X64-NEXT: jmp .LBB1_7 +; X64-NEXT: jmp .LBB1_6 ; X64-NEXT: .LBB1_4: ; X64-NEXT: movss {{.*#+}} xmm2 = mem[0],zero,zero,zero +; X64-NEXT: .LBB1_6: # %entry ; X64-NEXT: testl %r8d, %r8d ; X64-NEXT: je .LBB1_7 -; X64-NEXT: .LBB1_8: # %entry +; X64-NEXT: # BB#8: # %entry ; X64-NEXT: xorps %xmm3, %xmm3 ; X64-NEXT: jmp .LBB1_9 ; X64-NEXT: .LBB1_7: diff --git a/llvm/test/CodeGen/X86/tail-dup-repeat.ll b/llvm/test/CodeGen/X86/tail-dup-repeat.ll deleted file mode 100644 index 21b48e16efb..00000000000 --- a/llvm/test/CodeGen/X86/tail-dup-repeat.ll +++ /dev/null @@ -1,53 +0,0 @@ -; RUN: llc -O2 -tail-dup-placement-threshold=4 -o - %s | FileCheck %s -target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" -target triple = "x86_64-unknown-linux-gnu" - -; Function Attrs: uwtable -; When tail-duplicating during placement, we work backward from blocks with -; multiple successors. In this case, the block dup1 gets duplicated into dup2 -; and if.then64, and then the block dup2 gets duplicated into land.lhs.true -; and if.end70 -; CHECK-LABEL: repeated_tail_dup: -define void @repeated_tail_dup(i1 %a1, i1 %a2, i32* %a4, i32* %a5, i8* %a6) #0 align 2 { -entry: - br label %for.cond - -; CHECK: {{^}}.[[HEADER:LBB0_[1-9]]]: # %for.cond -for.cond: ; preds = %dup1, %entry - br i1 %a1, label %land.lhs.true, label %if.end56 - -land.lhs.true: ; preds = %for.cond - store i32 10, i32* %a4, align 8 - br label %dup2 - -if.end56: ; preds = %for.cond - br i1 %a2, label %if.then64, label %if.end70 - -if.then64: ; preds = %if.end56 - store i8 1, i8* %a6, align 1 - br label %dup1 - -; CHECK: # %if.end70 -; CHECK-NEXT: # in Loop: -; CHECK-NEXT: movl $12, (%rdx) -; CHECK-NEXT: movl $2, (%rcx) -; CHECK-NEXT: testl %eax, %eax -; CHECK-NEXT: je .[[HEADER]] -if.end70: ; preds = %if.end56 - store i32 12, i32* %a4, align 8 - br label %dup2 - -dup2: ; preds = %if.end70, %land.lhs.true - store i32 2, i32* %a5, align 4 - br label %dup1 - -dup1: ; preds = %dup2, %if.then64 - %val = load i32, i32* %a4, align 8 - %switch = icmp ult i32 undef, 1 - br i1 %switch, label %for.cond, label %for.end - -for.end: ; preds = %dup1 - ret void -} - -attributes #0 = { uwtable } diff --git a/llvm/test/CodeGen/X86/update-terminator.mir b/llvm/test/CodeGen/X86/update-terminator.mir index 2e8e85b4ef6..1e75c6af9eb 100644 --- a/llvm/test/CodeGen/X86/update-terminator.mir +++ b/llvm/test/CodeGen/X86/update-terminator.mir @@ -5,30 +5,17 @@ @a = external global i16 @b = external global i32 - declare void @dummy1() - declare void @dummy2() - declare void @dummy3() - ; Function Attrs: nounwind define void @f2() { br i1 undef, label %bb1, label %bb3 bb1: - call void @dummy1() - call void @dummy1() - call void @dummy1() br i1 undef, label %bb2, label %bb2 bb2: - call void @dummy2() - call void @dummy2() - call void @dummy2() br label %bb4 bb3: - call void @dummy3() - call void @dummy3() - call void @dummy3() br label %bb2 bb4: @@ -53,24 +40,15 @@ body: | bb.1: successors: %bb.2(100) - CALL64pcrel32 @dummy1, csr_64, implicit %rsp, implicit-def %rsp - CALL64pcrel32 @dummy1, csr_64, implicit %rsp, implicit-def %rsp - CALL64pcrel32 @dummy1, csr_64, implicit %rsp, implicit-def %rsp JNE_1 %bb.2, implicit %eflags bb.2: successors: %bb.4(100) - CALL64pcrel32 @dummy2, csr_64, implicit %rsp, implicit-def %rsp - CALL64pcrel32 @dummy2, csr_64, implicit %rsp, implicit-def %rsp - CALL64pcrel32 @dummy2, csr_64, implicit %rsp, implicit-def %rsp JMP_1 %bb.4 bb.3: successors: %bb.2(100) - CALL64pcrel32 @dummy3, csr_64, implicit %rsp, implicit-def %rsp - CALL64pcrel32 @dummy3, csr_64, implicit %rsp, implicit-def %rsp - CALL64pcrel32 @dummy3, csr_64, implicit %rsp, implicit-def %rsp JMP_1 %bb.2 bb.4: |