From ceff222dea8266f7edeee65e5d1fdf62adc1d120 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Fri, 25 Jan 2013 05:40:09 +0000 Subject: Switch this code away from Value::isUsedInBasicBlock. That code either loops over instructions in the basic block or the use-def list of the value, neither of which are really efficient when repeatedly querying about values in the same basic block. What's more, we already know that the CondBB is small, and so we can do a much more efficient test by counting the uses in CondBB, and seeing if those account for all of the uses. Finally, we shouldn't blanket fail on any such instruction, instead we should conservatively assume that those instructions are part of the cost. Note that this actually fixes a bug in the pass because isUsedInBasicBlock has a really terrible bug in it. I'll fix that in my next commit, but the fix for it would make this code suddenly take the compile time hit I thought it already was taking, so I wanted to go ahead and migrate this code to a faster & better pattern. The bug in isUsedInBasicBlock was also causing other tests to test the wrong thing entirely: for example we weren't actually disabling speculation for floating point operations as intended (and tested), but the test passed because we failed to speculate them due to the isUsedInBasicBlock failure. llvm-svn: 173417 --- .../test/Transforms/SimplifyCFG/SpeculativeExec.ll | 63 ++++++++++++++++++++++ 1 file changed, 63 insertions(+) (limited to 'llvm/test') diff --git a/llvm/test/Transforms/SimplifyCFG/SpeculativeExec.ll b/llvm/test/Transforms/SimplifyCFG/SpeculativeExec.ll index bcef8480405..b60e5dc56f7 100644 --- a/llvm/test/Transforms/SimplifyCFG/SpeculativeExec.ll +++ b/llvm/test/Transforms/SimplifyCFG/SpeculativeExec.ll @@ -137,3 +137,66 @@ end: ret i16 %x } +define i16 @test6(i1* %dummy, i64 %a, i64 %b) { +; Test that we speculate no-op instructions when those instructions are in the +; predecessor but could potentially be sunk. +; CHECK: @test6 + +entry: + %cond1 = load volatile i1* %dummy + %a.conv = trunc i64 %a to i16 + %b.conv = trunc i64 %b to i16 + br i1 %cond1, label %if, label %end + +if: + %cond2 = load volatile i1* %dummy + %cond3 = load volatile i1* %dummy + %cond4 = load volatile i1* %dummy + %cmp = icmp ult i16 %a.conv, %b.conv + %a.conv2 = trunc i64 %a to i32 + %b.conv2 = trunc i64 %b to i32 + br i1 %cond2, label %then, label %end + +then: + %sub = sub i32 %a.conv2, %b.conv2 + %sub.conv = trunc i32 %sub to i16 + br label %end + +end: + %x = phi i16 [ %a.conv, %entry ], [ %b.conv, %if ], [ %sub.conv, %then ] +; CHECK-NOT: phi +; CHECK: select i1 + + ret i16 %x +} + +define i16 @test7(i1* %dummy, i16 %a, i16 %b, i32 %x) { +; Test that we don't speculate when there are instructions that could +; potentially sink into the conditional block. +; CHECK: @test7 + +entry: + %cond1 = load volatile i1* %dummy + br i1 %cond1, label %if, label %end + +if: + %cond2 = load volatile i1* %dummy + %a.conv = sext i16 %a to i32 + %b.conv = sext i16 %b to i32 + %cmp = icmp ult i32 %a.conv, %b.conv + %a.conv2 = add i32 %a.conv, %x + br i1 %cond2, label %then, label %end + +then: + %sub = sub i32 %a.conv2, %b.conv + %sub.conv = trunc i32 %sub to i16 + br label %end + +end: + %y = phi i16 [ %a, %entry ], [ %b, %if ], [ %sub.conv, %then ] +; CHECK-NOT: select +; CHECK: phi i16 + + ret i16 %y +} + -- cgit v1.2.3