[SandboxVec][Interval][NFC] Rename From/To to Top/Bottom #112034
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The API was already using top()/bottom() but internally we were still using From/To. This patch fixes this. Top/Bottom seems a better choice because implies program order, whereas From/To does not.
|
@llvm/pr-subscribers-llvm-transforms Author: vporpo (vporpo) ChangesThe API was already using top()/bottom() but internally we were still using From/To. This patch fixes this. Top/Bottom seems a better choice because implies program order, whereas From/To does not. Full diff: https://github.com/llvm/llvm-project/pull/112034.diff 1 Files Affected:
diff --git a/llvm/include/llvm/Transforms/Vectorize/SandboxVectorizer/Interval.h b/llvm/include/llvm/Transforms/Vectorize/SandboxVectorizer/Interval.h
index 0777d9b043eb62..e2d0b82489ddc7 100644
--- a/llvm/include/llvm/Transforms/Vectorize/SandboxVectorizer/Interval.h
+++ b/llvm/include/llvm/Transforms/Vectorize/SandboxVectorizer/Interval.h
@@ -74,56 +74,56 @@ template <typename T, typename IntervalType> class IntervalIterator {
};
template <typename T> class Interval {
- T *From;
- T *To;
+ T *Top;
+ T *Bottom;
public:
- Interval() : From(nullptr), To(nullptr) {}
- Interval(T *From, T *To) : From(From), To(To) {
- assert((From == To || From->comesBefore(To)) &&
- "From should come before From!");
+ Interval() : Top(nullptr), Bottom(nullptr) {}
+ Interval(T *Top, T *Bottom) : Top(Top), Bottom(Bottom) {
+ assert((Top == Bottom || Top->comesBefore(Bottom)) &&
+ "Top should come before Bottom!");
}
Interval(ArrayRef<T *> Elems) {
assert(!Elems.empty() && "Expected non-empty Elems!");
- From = Elems[0];
- To = Elems[0];
+ Top = Elems[0];
+ Bottom = Elems[0];
for (auto *I : drop_begin(Elems)) {
- if (I->comesBefore(From))
- From = I;
- else if (To->comesBefore(I))
- To = I;
+ if (I->comesBefore(Top))
+ Top = I;
+ else if (Bottom->comesBefore(I))
+ Bottom = I;
}
}
bool empty() const {
- assert(((From == nullptr && To == nullptr) ||
- (From != nullptr && To != nullptr)) &&
+ assert(((Top == nullptr && Bottom == nullptr) ||
+ (Top != nullptr && Bottom != nullptr)) &&
"Either none or both should be null");
- return From == nullptr;
+ return Top == nullptr;
}
bool contains(T *I) const {
if (empty())
return false;
- return (From == I || From->comesBefore(I)) &&
- (I == To || I->comesBefore(To));
+ return (Top == I || Top->comesBefore(I)) &&
+ (I == Bottom || I->comesBefore(Bottom));
}
- T *top() const { return From; }
- T *bottom() const { return To; }
+ T *top() const { return Top; }
+ T *bottom() const { return Bottom; }
using iterator = IntervalIterator<T, Interval>;
- iterator begin() { return iterator(From, *this); }
+ iterator begin() { return iterator(Top, *this); }
iterator end() {
- return iterator(To != nullptr ? To->getNextNode() : nullptr, *this);
+ return iterator(Bottom != nullptr ? Bottom->getNextNode() : nullptr, *this);
}
iterator begin() const {
- return iterator(From, const_cast<Interval &>(*this));
+ return iterator(Top, const_cast<Interval &>(*this));
}
iterator end() const {
- return iterator(To != nullptr ? To->getNextNode() : nullptr,
+ return iterator(Bottom != nullptr ? Bottom->getNextNode() : nullptr,
const_cast<Interval &>(*this));
}
/// Equality.
bool operator==(const Interval &Other) const {
- return From == Other.From && To == Other.To;
+ return Top == Other.Top && Bottom == Other.Bottom;
}
/// Inequality.
bool operator!=(const Interval &Other) const { return !(*this == Other); }
@@ -139,7 +139,7 @@ template <typename T> class Interval {
return true;
if (empty())
return true;
- return Other.To->comesBefore(From) || To->comesBefore(Other.From);
+ return Other.Bottom->comesBefore(Top) || Bottom->comesBefore(Other.Top);
}
/// \Returns the intersection between this and \p Other.
// Example:
@@ -154,14 +154,14 @@ template <typename T> class Interval {
// 1. No overlap
// A---B this
// C--D Other
- if (To->comesBefore(Other.From) || Other.To->comesBefore(From))
+ if (Bottom->comesBefore(Other.Top) || Other.Bottom->comesBefore(Top))
return Interval();
// 2. Overlap.
// A---B this
// C--D Other
- auto NewFromI = From->comesBefore(Other.From) ? Other.From : From;
- auto NewToI = To->comesBefore(Other.To) ? To : Other.To;
- return Interval(NewFromI, NewToI);
+ auto NewTopI = Top->comesBefore(Other.Top) ? Other.Top : Top;
+ auto NewBottomI = Bottom->comesBefore(Other.Bottom) ? Bottom : Other.Bottom;
+ return Interval(NewTopI, NewBottomI);
}
/// Difference operation. This returns up to two intervals.
// Example:
@@ -178,11 +178,11 @@ template <typename T> class Interval {
Interval Intersection = intersection(Other);
SmallVector<Interval, 2> Result;
// Part 1, skip if empty.
- if (From != Intersection.From)
- Result.emplace_back(From, Intersection.From->getPrevNode());
+ if (Top != Intersection.Top)
+ Result.emplace_back(Top, Intersection.Top->getPrevNode());
// Part 2, skip if empty.
- if (Intersection.To != To)
- Result.emplace_back(Intersection.To->getNextNode(), To);
+ if (Intersection.Bottom != Bottom)
+ Result.emplace_back(Intersection.Bottom->getNextNode(), Bottom);
return Result;
}
/// \Returns the interval difference `this - Other`. This will crash in Debug
@@ -202,9 +202,9 @@ template <typename T> class Interval {
return Other;
if (Other.empty())
return *this;
- auto *NewFrom = From->comesBefore(Other.From) ? From : Other.From;
- auto *NewTo = To->comesBefore(Other.To) ? Other.To : To;
- return {NewFrom, NewTo};
+ auto *NewTop = Top->comesBefore(Other.Top) ? Top : Other.Top;
+ auto *NewBottom = Bottom->comesBefore(Other.Bottom) ? Other.Bottom : Bottom;
+ return {NewTop, NewBottom};
}
#ifndef NDEBUG
|
|
@llvm/pr-subscribers-vectorizers Author: vporpo (vporpo) ChangesThe API was already using top()/bottom() but internally we were still using From/To. This patch fixes this. Top/Bottom seems a better choice because implies program order, whereas From/To does not. Full diff: https://github.com/llvm/llvm-project/pull/112034.diff 1 Files Affected:
diff --git a/llvm/include/llvm/Transforms/Vectorize/SandboxVectorizer/Interval.h b/llvm/include/llvm/Transforms/Vectorize/SandboxVectorizer/Interval.h
index 0777d9b043eb62..e2d0b82489ddc7 100644
--- a/llvm/include/llvm/Transforms/Vectorize/SandboxVectorizer/Interval.h
+++ b/llvm/include/llvm/Transforms/Vectorize/SandboxVectorizer/Interval.h
@@ -74,56 +74,56 @@ template <typename T, typename IntervalType> class IntervalIterator {
};
template <typename T> class Interval {
- T *From;
- T *To;
+ T *Top;
+ T *Bottom;
public:
- Interval() : From(nullptr), To(nullptr) {}
- Interval(T *From, T *To) : From(From), To(To) {
- assert((From == To || From->comesBefore(To)) &&
- "From should come before From!");
+ Interval() : Top(nullptr), Bottom(nullptr) {}
+ Interval(T *Top, T *Bottom) : Top(Top), Bottom(Bottom) {
+ assert((Top == Bottom || Top->comesBefore(Bottom)) &&
+ "Top should come before Bottom!");
}
Interval(ArrayRef<T *> Elems) {
assert(!Elems.empty() && "Expected non-empty Elems!");
- From = Elems[0];
- To = Elems[0];
+ Top = Elems[0];
+ Bottom = Elems[0];
for (auto *I : drop_begin(Elems)) {
- if (I->comesBefore(From))
- From = I;
- else if (To->comesBefore(I))
- To = I;
+ if (I->comesBefore(Top))
+ Top = I;
+ else if (Bottom->comesBefore(I))
+ Bottom = I;
}
}
bool empty() const {
- assert(((From == nullptr && To == nullptr) ||
- (From != nullptr && To != nullptr)) &&
+ assert(((Top == nullptr && Bottom == nullptr) ||
+ (Top != nullptr && Bottom != nullptr)) &&
"Either none or both should be null");
- return From == nullptr;
+ return Top == nullptr;
}
bool contains(T *I) const {
if (empty())
return false;
- return (From == I || From->comesBefore(I)) &&
- (I == To || I->comesBefore(To));
+ return (Top == I || Top->comesBefore(I)) &&
+ (I == Bottom || I->comesBefore(Bottom));
}
- T *top() const { return From; }
- T *bottom() const { return To; }
+ T *top() const { return Top; }
+ T *bottom() const { return Bottom; }
using iterator = IntervalIterator<T, Interval>;
- iterator begin() { return iterator(From, *this); }
+ iterator begin() { return iterator(Top, *this); }
iterator end() {
- return iterator(To != nullptr ? To->getNextNode() : nullptr, *this);
+ return iterator(Bottom != nullptr ? Bottom->getNextNode() : nullptr, *this);
}
iterator begin() const {
- return iterator(From, const_cast<Interval &>(*this));
+ return iterator(Top, const_cast<Interval &>(*this));
}
iterator end() const {
- return iterator(To != nullptr ? To->getNextNode() : nullptr,
+ return iterator(Bottom != nullptr ? Bottom->getNextNode() : nullptr,
const_cast<Interval &>(*this));
}
/// Equality.
bool operator==(const Interval &Other) const {
- return From == Other.From && To == Other.To;
+ return Top == Other.Top && Bottom == Other.Bottom;
}
/// Inequality.
bool operator!=(const Interval &Other) const { return !(*this == Other); }
@@ -139,7 +139,7 @@ template <typename T> class Interval {
return true;
if (empty())
return true;
- return Other.To->comesBefore(From) || To->comesBefore(Other.From);
+ return Other.Bottom->comesBefore(Top) || Bottom->comesBefore(Other.Top);
}
/// \Returns the intersection between this and \p Other.
// Example:
@@ -154,14 +154,14 @@ template <typename T> class Interval {
// 1. No overlap
// A---B this
// C--D Other
- if (To->comesBefore(Other.From) || Other.To->comesBefore(From))
+ if (Bottom->comesBefore(Other.Top) || Other.Bottom->comesBefore(Top))
return Interval();
// 2. Overlap.
// A---B this
// C--D Other
- auto NewFromI = From->comesBefore(Other.From) ? Other.From : From;
- auto NewToI = To->comesBefore(Other.To) ? To : Other.To;
- return Interval(NewFromI, NewToI);
+ auto NewTopI = Top->comesBefore(Other.Top) ? Other.Top : Top;
+ auto NewBottomI = Bottom->comesBefore(Other.Bottom) ? Bottom : Other.Bottom;
+ return Interval(NewTopI, NewBottomI);
}
/// Difference operation. This returns up to two intervals.
// Example:
@@ -178,11 +178,11 @@ template <typename T> class Interval {
Interval Intersection = intersection(Other);
SmallVector<Interval, 2> Result;
// Part 1, skip if empty.
- if (From != Intersection.From)
- Result.emplace_back(From, Intersection.From->getPrevNode());
+ if (Top != Intersection.Top)
+ Result.emplace_back(Top, Intersection.Top->getPrevNode());
// Part 2, skip if empty.
- if (Intersection.To != To)
- Result.emplace_back(Intersection.To->getNextNode(), To);
+ if (Intersection.Bottom != Bottom)
+ Result.emplace_back(Intersection.Bottom->getNextNode(), Bottom);
return Result;
}
/// \Returns the interval difference `this - Other`. This will crash in Debug
@@ -202,9 +202,9 @@ template <typename T> class Interval {
return Other;
if (Other.empty())
return *this;
- auto *NewFrom = From->comesBefore(Other.From) ? From : Other.From;
- auto *NewTo = To->comesBefore(Other.To) ? Other.To : To;
- return {NewFrom, NewTo};
+ auto *NewTop = Top->comesBefore(Other.Top) ? Top : Other.Top;
+ auto *NewBottom = Bottom->comesBefore(Other.Bottom) ? Other.Bottom : Bottom;
+ return {NewTop, NewBottom};
}
#ifndef NDEBUG
|
|
A follow-up of #112026 |
tmsri
approved these changes
Oct 11, 2024
DanielCChen
pushed a commit
to DanielCChen/llvm-project
that referenced
this pull request
Oct 16, 2024
The API was already using top()/bottom() but internally we were still using From/To. This patch fixes this. Top/Bottom seems a better choice because implies program order, whereas From/To does not.
bricknerb
pushed a commit
to bricknerb/llvm-project
that referenced
this pull request
Oct 17, 2024
The API was already using top()/bottom() but internally we were still using From/To. This patch fixes this. Top/Bottom seems a better choice because implies program order, whereas From/To does not.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The API was already using top()/bottom() but internally we were still using From/To. This patch fixes this.
Top/Bottom seems a better choice because implies program order, whereas From/To does not.