Skip to content

Commit

Permalink
[SelectionDAG] Correctly transform range metadata to AssertZExt
Browse files Browse the repository at this point in the history
We used the logBase2 of the high instead of the ceilLogBase2 resulting
in the wrong result for certain values.  For example, it resulted in an
i1 AssertZExt when the exclusive portion of the range was 3.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@291196 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
majnemer committed Jan 6, 2017
1 parent 71ae15e commit 5b3f19d
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
2 changes: 1 addition & 1 deletion lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7344,7 +7344,7 @@ SDValue SelectionDAGBuilder::lowerRangeToAssertZExt(SelectionDAG &DAG,
return Op;

Constant *Hi = cast<ConstantAsMetadata>(Range->getOperand(1))->getValue();
unsigned Bits = cast<ConstantInt>(Hi)->getValue().logBase2();
unsigned Bits = cast<ConstantInt>(Hi)->getValue().ceilLogBase2();

EVT SmallVT = EVT::getIntegerVT(*DAG.getContext(), Bits);

Expand Down
18 changes: 18 additions & 0 deletions test/CodeGen/NVPTX/tid-range.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
; RUN: llc < %s -march=nvptx64 | FileCheck %s
declare i32 @get_register()

define i1 @test1() {
entry:
%call = call i32 @llvm.nvvm.read.ptx.sreg.tid.x(), !range !0
%cmp = icmp eq i32 %call, 1
ret i1 %cmp
}

; CHECK-LABEL: test1(
; CHECK: setp.eq.s32 %p1, %r1, 1;
; CHECK: selp.u32 %[[R:.+]], 1, 0, %p1;
; CHECK: st.param.b32 [func_retval0+0], %[[R]];

declare i32 @llvm.nvvm.read.ptx.sreg.tid.x()

!0 = !{ i32 0, i32 3 }

0 comments on commit 5b3f19d

Please sign in to comment.