Skip to content

Commit

Permalink
[Metadata] Try to merge the first and last ranges. (llvm#101860)
Browse files Browse the repository at this point in the history
Fixes llvm#101859.

If we have at least 2 ranges, we have to try to merge the last and first
ones to handle the wrap range.

(cherry picked from commit 4377656)
  • Loading branch information
DianQK authored and tru committed Aug 5, 2024
1 parent b047c24 commit 1069d16
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 2 deletions.
5 changes: 3 additions & 2 deletions llvm/lib/IR/Metadata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1318,10 +1318,11 @@ MDNode *MDNode::getMostGenericRange(MDNode *A, MDNode *B) {
++BI;
}

// If we have more than 2 ranges (4 endpoints) we have to try to merge
// We haven't handled wrap in the previous merge,
// if we have at least 2 ranges (4 endpoints) we have to try to merge
// the last and first ones.
unsigned Size = EndPoints.size();
if (Size > 4) {
if (Size > 2) {
ConstantInt *FB = EndPoints[0];
ConstantInt *FE = EndPoints[1];
if (tryMergeRange(EndPoints, FB, FE)) {
Expand Down
20 changes: 20 additions & 0 deletions llvm/test/Transforms/GVN/merge-range.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
; RUN: opt -passes=gvn -S < %s | FileCheck %s

define i8 @foo(ptr %arg, i8 %arg1) {
; CHECK-LABEL: define i8 @foo(
; CHECK-SAME: ptr [[ARG:%.*]], i8 [[ARG1:%.*]]) {
; CHECK-NEXT: [[BB:.*:]]
; CHECK-NEXT: [[I:%.*]] = load i8, ptr [[ARG]], align 1, !range [[RNG0:![0-9]+]]
; CHECK-NEXT: [[I3:%.*]] = add i8 [[I]], [[I]]
; CHECK-NEXT: ret i8 [[I3]]
;
bb:
%i = load i8, ptr %arg, align 1, !range !{i8 127, i8 -20}
%i2 = load i8, ptr %arg, align 1, !range !{i8 -27, i8 -24, i8 -20, i8 -17}
%i3 = add i8 %i, %i2
ret i8 %i3
}
;.
; CHECK: [[RNG0]] = !{i8 127, i8 -17}
;.

0 comments on commit 1069d16

Please sign in to comment.