summaryrefslogtreecommitdiffstats
path: root/llvm/test/CodeGen
diff options
context:
space:
mode:
authorJoerg Sonnenberger <joerg@bec.de>2016-11-28 18:56:54 +0000
committerJoerg Sonnenberger <joerg@bec.de>2016-11-28 18:56:54 +0000
commitcaaa82d90d8ca32d505ab388cef18abe4760b758 (patch)
treed50dd7d7e8fb53f349dbedf3d4cdb8fbbc6c2c67 /llvm/test/CodeGen
parent3aec10ca7e7e82d5adec66504e851e5a7eb270dc (diff)
downloadbcm5719-llvm-caaa82d90d8ca32d505ab388cef18abe4760b758.tar.gz
bcm5719-llvm-caaa82d90d8ca32d505ab388cef18abe4760b758.zip
Revert r287553: [CodeGenPrep] Skip merging empty case blocks
It results in assertions in lib/Analysis/BlockFrequencyInfoImpl.cpp line 670 ("Expected irreducible CFG"). llvm-svn: 288052
Diffstat (limited to 'llvm/test/CodeGen')
-rw-r--r--llvm/test/CodeGen/X86/phi-immediate-factoring.ll3
-rw-r--r--llvm/test/CodeGen/X86/ragreedy-hoist-spill.ll8
2 files changed, 5 insertions, 6 deletions
diff --git a/llvm/test/CodeGen/X86/phi-immediate-factoring.ll b/llvm/test/CodeGen/X86/phi-immediate-factoring.ll
index 8405ca436fd..05a0bf68657 100644
--- a/llvm/test/CodeGen/X86/phi-immediate-factoring.ll
+++ b/llvm/test/CodeGen/X86/phi-immediate-factoring.ll
@@ -1,6 +1,5 @@
; REQUIRES: asserts
-; RUN: llc < %s -disable-preheader-prot=true -march=x86 -stats 2>&1 | grep "Number of blocks eliminated" | grep 3
-; RUN: llc < %s -disable-preheader-prot=true -march=x86 -stats -cgp-freq-ratio-to-skip-merge=10 2>&1 | grep "Number of blocks eliminated" | grep 6
+; RUN: llc < %s -disable-preheader-prot=true -march=x86 -stats 2>&1 | grep "Number of blocks eliminated" | grep 6
; RUN: llc < %s -disable-preheader-prot=false -march=x86 -stats 2>&1 | grep "Number of blocks eliminated" | grep 3
; PR1296
diff --git a/llvm/test/CodeGen/X86/ragreedy-hoist-spill.ll b/llvm/test/CodeGen/X86/ragreedy-hoist-spill.ll
index 0178c9ec1c9..1d6b4f94731 100644
--- a/llvm/test/CodeGen/X86/ragreedy-hoist-spill.ll
+++ b/llvm/test/CodeGen/X86/ragreedy-hoist-spill.ll
@@ -177,14 +177,14 @@ for.cond357:
br label %for.cond357
sw.bb474:
- ; CHECK: sw.bb474
- ; spill is hoisted here. Although loop depth1 is even hotter than loop depth2, sw.bb474 is still cold.
- ; CHECK: movq %r{{.*}}, {{[0-9]+}}(%rsp)
- ; CHECK: land.rhs485
%cmp476 = icmp eq i8 undef, 0
br i1 %cmp476, label %if.end517, label %do.body479.preheader
do.body479.preheader:
+ ; CHECK: do.body479.preheader
+ ; spill is hoisted here. Although loop depth1 is even hotter than loop depth2, do.body479.preheader is cold.
+ ; CHECK: movq %r{{.*}}, {{[0-9]+}}(%rsp)
+ ; CHECK: land.rhs485
%cmp4833314 = icmp eq i8 undef, 0
br i1 %cmp4833314, label %if.end517, label %land.rhs485
OpenPOWER on IntegriCloud