[Arith][TIR] IntSetAnalyzer, delay intersection of IntSet until use#12821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tkonolige merged 1 commit into from
Sep 19, 2022
Merged

[Arith][TIR] IntSetAnalyzer, delay intersection of IntSet until use #12821

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 52 additions & 74 deletions src/arith/int_set.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -362,8 +362,13 @@ using namespace tir;
// We might use better set analysis in the future to replace the intervalset.
class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {
public:
IntervalSetEvaluator(Analyzer* analyzer, const Map<Var, IntSet>& dom_map, bool eval_vec = false)
: analyzer_(analyzer), dom_map_(dom_map), eval_vec_(eval_vec) {}
IntervalSetEvaluator(Analyzer* analyzer, const Map<Var, IntSet>& dom_map,
const std::vector<std::pair<Var, IntSet>>* dom_constraints = nullptr,
bool eval_vec = false)
: analyzer_(analyzer),
dom_map_(dom_map),
dom_constraints_(dom_constraints),
eval_vec_(eval_vec) {}

IntervalSet Eval(const PrimExpr& val) { return this->VisitExpr(val); }
// evaluate and relax the set
Expand All@@ -383,18 +388,40 @@ class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {

IntervalSet VisitExpr_(const VarNode* op) final {
Var var = GetRef<Var>(op);

Array<IntSet> values;
if (dom_constraints_) {
for (const auto& constraint : *dom_constraints_) {
if (var.same_as(constraint.first)) {
values.push_back(constraint.second);
}
}
}

auto it = dom_map_.find(var);
if (it != dom_map_.end()) {
IntervalSet res = ToIntervalSet((*it).second);
if (res->min_value.same_as(var) && res->max_value.same_as(var)) {
return res;
}
// recursively evaluate mapped result
// in case the domain contains variables to be relaxed.
return Eval(res);
} else {
values.push_back((*it).second);
}

if (values.empty()) {
return IntervalSet::SinglePoint(var);
}

IntSet intersection = [&]() {
if (values.size() == 1) {
return values.front();
} else {
return Intersect(values);
}
}();

IntervalSet res = ToIntervalSet(intersection);
if (res->min_value.same_as(var) && res->max_value.same_as(var)) {
return res;
}
// recursively evaluate mapped result
// in case the domain contains variables to be relaxed.
return Eval(res);
}

IntervalSet VisitExpr_(const AddNode* op) final { return VisitBinaryExpr_<Add>(op); }
Expand DownExpand Up@@ -517,6 +544,7 @@ class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {
// analyzer
Analyzer* analyzer_;
const Map<Var, IntSet>& dom_map_;
const std::vector<std::pair<Var, IntSet>>* dom_constraints_;
bool eval_vec_{false};
};

Expand All@@ -529,7 +557,7 @@ class IntSetAnalyzer::Impl {
}

IntSet Eval(const PrimExpr& expr) const {
return IntervalSetEvaluator(analyzer_, GetCurrentBounds(), true).Eval(expr);
return IntervalSetEvaluator(analyzer_, dom_map_, &dom_constraints_, true).Eval(expr);
}

void Bind(const Var& var, const Range& range, bool allow_override) {
Expand All@@ -541,10 +569,6 @@ class IntSetAnalyzer::Impl {
std::function<void()> EnterConstraint(const PrimExpr& constraint);

private:
// Get the current variable bounds, including both global bounds and
// scope-dependent bounds.
Map<Var, IntSet> GetCurrentBounds() const;

// Utility function to split a boolean condition into the domain
// bounds implied by that condition.
static std::vector<std::pair<Var, IntSet>> DetectBoundInfo(const PrimExpr& cond);
Expand All@@ -556,9 +580,11 @@ class IntSetAnalyzer::Impl {
// ranges)
Map<Var, IntSet> dom_map_;

// Map of variables to implicit scope-dependent bounds (e.g. inside
// the body of an if-statement)
Map<Var, IntSet> constraints_;
// List of implicit scope-dependent bounds (e.g. inside the body of
// an if-statement). Maintained as a list of constraints, rather
// than as a `Map<Var,IntSet>`, to avoid computing an Intersection
// until required.
std::vector<std::pair<Var, IntSet>> dom_constraints_;
};

IntSetAnalyzer::IntSetAnalyzer(Analyzer* parent) : impl_(new Impl(parent)) {}
Expand DownExpand Up@@ -603,29 +629,6 @@ void IntSetAnalyzer::Impl::Bind(const Var& var, const PrimExpr& expr, bool can_o
Update(var, Eval(expr), can_override);
}

Map<Var, IntSet> IntSetAnalyzer::Impl::GetCurrentBounds() const {
// If either constraints_ or dom_map_ is empty, return the other to
// avoid constructing a new map.
if (constraints_.empty()) {
return dom_map_;
} else if (dom_map_.empty()) {
return constraints_;
}

// If neither is empty, construct a merged domain map with
// information from both sources.
Map<Var, IntSet> merged = dom_map_;
for (const auto& pair : constraints_) {
auto it = merged.find(pair.first);
if (it == merged.end()) {
merged.Set(pair.first, pair.second);
} else {
merged.Set(pair.first, Intersect({pair.second, (*it).second}));
}
}
return merged;
}

std::vector<std::pair<Var, IntSet>> IntSetAnalyzer::Impl::DetectBoundInfo(
const PrimExpr& constraint) {
PVar<Var> x;
Expand DownExpand Up@@ -665,41 +668,16 @@ std::function<void()> IntSetAnalyzer::EnterConstraint(const PrimExpr& constraint
}

std::function<void()> IntSetAnalyzer::Impl::EnterConstraint(const PrimExpr& constraint) {
Map<Var, IntSet> cached_values;

auto bounds = DetectBoundInfo(constraint);

if (bounds.size() == 0) return nullptr;

// Collect the current values of each var that is changes by this
// constraint.
for (const auto& pair : bounds) {
auto it = constraints_.find(pair.first);
if (it == constraints_.end()) {
cached_values.Set(pair.first, IntSet());
} else {
cached_values.Set(pair.first, (*it).second);
}
}

// Update all constraints
for (const auto& pair : bounds) {
auto it = constraints_.find(pair.first);
if (it == constraints_.end()) {
constraints_.Set(pair.first, pair.second);
} else {
constraints_.Set(pair.first, Intersect({pair.second, (*it).second}));
}
}

auto frecover = [cached_values, this]() {
for (const auto& it : cached_values) {
if (it.second.defined()) {
constraints_.Set(it.first, it.second);
} else {
constraints_.erase(it.first);
}
}
size_t old_size = dom_constraints_.size();
dom_constraints_.insert(dom_constraints_.end(), bounds.begin(), bounds.end());
size_t new_size = dom_constraints_.size();
auto frecover = [old_size, new_size, this]() {
ICHECK_EQ(dom_constraints_.size(), new_size);
dom_constraints_.resize(old_size);
};
return frecover;
}
Expand DownExpand Up@@ -960,13 +938,13 @@ Map<Var, IntSet> ConvertDomMap(const std::unordered_map<const VarNode*, IntSet>&

IntSet EvalSet(PrimExpr e, const Map<Var, IntSet>& dom_map) {
Analyzer ana;
return IntervalSetEvaluator(&ana, dom_map, false).Eval(e);
return IntervalSetEvaluator(&ana, dom_map, {}, false).Eval(e);
}

IntSet IntSet::Vector(PrimExpr x) {
Analyzer ana;
Map<Var, IntSet> dmap;
return IntervalSetEvaluator(&ana, dmap, true).Eval(x);
return IntervalSetEvaluator(&ana, dmap, {}, true).Eval(x);
}

IntSet EvalSet(PrimExpr e, const Map<IterVar, IntSet>& dom_map) {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[Arith][TIR] IntSetAnalyzer, delay intersection of IntSet until use#12821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tkonolige
merged 1 commit into

from

Sep 19, 2022
 Merged


[Arith][TIR] IntSetAnalyzer, delay intersection of IntSet until use
#12821
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


126 changes: 52 additions & 74 deletions
src/arith/int_set.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -362,8 +362,13 @@ using namespace tir;
// We might use better set analysis in the future to replace the intervalset.
class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {
 public:
 IntervalSetEvaluator(Analyzer* analyzer, const Map<Var, IntSet>& dom_map, bool eval_vec = false)
 : analyzer_(analyzer), dom_map_(dom_map), eval_vec_(eval_vec) {}
 IntervalSetEvaluator(Analyzer* analyzer, const Map<Var, IntSet>& dom_map,
 const std::vector<std::pair<Var, IntSet>>* dom_constraints = nullptr,
 bool eval_vec = false)
 : analyzer_(analyzer),
 dom_map_(dom_map),
 dom_constraints_(dom_constraints),
 eval_vec_(eval_vec) {}

 IntervalSet Eval(const PrimExpr& val) { return this->VisitExpr(val); }
 // evaluate and relax the set
Expand All@@ -383,18 +388,40 @@ class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {

 IntervalSet VisitExpr_(const VarNode* op) final {
 Var var = GetRef<Var>(op);

 Array<IntSet> values;
 if (dom_constraints_) {
 for (const auto& constraint : *dom_constraints_) {
 if (var.same_as(constraint.first)) {
 values.push_back(constraint.second);
 }
 }
 }

 auto it = dom_map_.find(var);
 if (it != dom_map_.end()) {
 IntervalSet res = ToIntervalSet((*it).second);
 if (res->min_value.same_as(var) && res->max_value.same_as(var)) {
 return res;
 }
 // recursively evaluate mapped result
 // in case the domain contains variables to be relaxed.
 return Eval(res);
 } else {
 values.push_back((*it).second);
 }

 if (values.empty()) {
 return IntervalSet::SinglePoint(var);
 }

 IntSet intersection = [&]() {
 if (values.size() == 1) {
 return values.front();
 } else {
 return Intersect(values);
 }
 }();

 IntervalSet res = ToIntervalSet(intersection);
 if (res->min_value.same_as(var) && res->max_value.same_as(var)) {
 return res;
 }
 // recursively evaluate mapped result
 // in case the domain contains variables to be relaxed.
 return Eval(res);
 }

 IntervalSet VisitExpr_(const AddNode* op) final { return VisitBinaryExpr_<Add>(op); }
Expand DownExpand Up@@ -517,6 +544,7 @@ class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {
 // analyzer
 Analyzer* analyzer_;
 const Map<Var, IntSet>& dom_map_;
 const std::vector<std::pair<Var, IntSet>>* dom_constraints_;
 bool eval_vec_{false};
};

Expand All@@ -529,7 +557,7 @@ class IntSetAnalyzer::Impl {
 }

 IntSet Eval(const PrimExpr& expr) const {
 return IntervalSetEvaluator(analyzer_, GetCurrentBounds(), true).Eval(expr);
 return IntervalSetEvaluator(analyzer_, dom_map_, &dom_constraints_, true).Eval(expr);
 }

 void Bind(const Var& var, const Range& range, bool allow_override) {
Expand All@@ -541,10 +569,6 @@ class IntSetAnalyzer::Impl {
 std::function<void()> EnterConstraint(const PrimExpr& constraint);

 private:
 // Get the current variable bounds, including both global bounds and
 // scope-dependent bounds.
 Map<Var, IntSet> GetCurrentBounds() const;

 // Utility function to split a boolean condition into the domain
 // bounds implied by that condition.
 static std::vector<std::pair<Var, IntSet>> DetectBoundInfo(const PrimExpr& cond);
Expand All@@ -556,9 +580,11 @@ class IntSetAnalyzer::Impl {
 // ranges)
 Map<Var, IntSet> dom_map_;

 // Map of variables to implicit scope-dependent bounds (e.g. inside
 // the body of an if-statement)
 Map<Var, IntSet> constraints_;
 // List of implicit scope-dependent bounds (e.g. inside the body of
 // an if-statement). Maintained as a list of constraints, rather
 // than as a `Map<Var,IntSet>`, to avoid computing an Intersection
 // until required.
 std::vector<std::pair<Var, IntSet>> dom_constraints_;
};

IntSetAnalyzer::IntSetAnalyzer(Analyzer* parent) : impl_(new Impl(parent)) {}
Expand DownExpand Up@@ -603,29 +629,6 @@ void IntSetAnalyzer::Impl::Bind(const Var& var, const PrimExpr& expr, bool can_o
 Update(var, Eval(expr), can_override);
}

Map<Var, IntSet> IntSetAnalyzer::Impl::GetCurrentBounds() const {
 // If either constraints_ or dom_map_ is empty, return the other to
 // avoid constructing a new map.
 if (constraints_.empty()) {
 return dom_map_;
 } else if (dom_map_.empty()) {
 return constraints_;
 }

 // If neither is empty, construct a merged domain map with
 // information from both sources.
 Map<Var, IntSet> merged = dom_map_;
 for (const auto& pair : constraints_) {
 auto it = merged.find(pair.first);
 if (it == merged.end()) {
 merged.Set(pair.first, pair.second);
 } else {
 merged.Set(pair.first, Intersect({pair.second, (*it).second}));
 }
 }
 return merged;
}

std::vector<std::pair<Var, IntSet>> IntSetAnalyzer::Impl::DetectBoundInfo(
 const PrimExpr& constraint) {
 PVar<Var> x;
Expand DownExpand Up@@ -665,41 +668,16 @@ std::function<void()> IntSetAnalyzer::EnterConstraint(const PrimExpr& constraint
}

std::function<void()> IntSetAnalyzer::Impl::EnterConstraint(const PrimExpr& constraint) {
 Map<Var, IntSet> cached_values;

 auto bounds = DetectBoundInfo(constraint);

 if (bounds.size() == 0) return nullptr;

 // Collect the current values of each var that is changes by this
 // constraint.
 for (const auto& pair : bounds) {
 auto it = constraints_.find(pair.first);
 if (it == constraints_.end()) {
 cached_values.Set(pair.first, IntSet());
 } else {
 cached_values.Set(pair.first, (*it).second);
 }
 }

 // Update all constraints
 for (const auto& pair : bounds) {
 auto it = constraints_.find(pair.first);
 if (it == constraints_.end()) {
 constraints_.Set(pair.first, pair.second);
 } else {
 constraints_.Set(pair.first, Intersect({pair.second, (*it).second}));
 }
 }

 auto frecover = [cached_values, this]() {
 for (const auto& it : cached_values) {
 if (it.second.defined()) {
 constraints_.Set(it.first, it.second);
 } else {
 constraints_.erase(it.first);
 }
 }
 size_t old_size = dom_constraints_.size();
 dom_constraints_.insert(dom_constraints_.end(), bounds.begin(), bounds.end());
 size_t new_size = dom_constraints_.size();
 auto frecover = [old_size, new_size, this]() {
 ICHECK_EQ(dom_constraints_.size(), new_size);
 dom_constraints_.resize(old_size);
 };
 return frecover;
}
Expand DownExpand Up@@ -960,13 +938,13 @@ Map<Var, IntSet> ConvertDomMap(const std::unordered_map<const VarNode*, IntSet>&

IntSet EvalSet(PrimExpr e, const Map<Var, IntSet>& dom_map) {
 Analyzer ana;
 return IntervalSetEvaluator(&ana, dom_map, false).Eval(e);
 return IntervalSetEvaluator(&ana, dom_map, {}, false).Eval(e);
}

IntSet IntSet::Vector(PrimExpr x) {
 Analyzer ana;
 Map<Var, IntSet> dmap;
 return IntervalSetEvaluator(&ana, dmap, true).Eval(x);
 return IntervalSetEvaluator(&ana, dmap, {}, true).Eval(x);
}

IntSet EvalSet(PrimExpr e, const Map<IterVar, IntSet>& dom_map) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Arith][TIR] IntSetAnalyzer, delay intersection of IntSet until use#12821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tkonolige
merged 1 commit into

from

Sep 19, 2022
 Merged


[Arith][TIR] IntSetAnalyzer, delay intersection of IntSet until use
#12821
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


126 changes: 52 additions & 74 deletions
src/arith/int_set.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -362,8 +362,13 @@ using namespace tir;
// We might use better set analysis in the future to replace the intervalset.
class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {
 public:
 IntervalSetEvaluator(Analyzer* analyzer, const Map<Var, IntSet>& dom_map, bool eval_vec = false)
 : analyzer_(analyzer), dom_map_(dom_map), eval_vec_(eval_vec) {}
 IntervalSetEvaluator(Analyzer* analyzer, const Map<Var, IntSet>& dom_map,
 const std::vector<std::pair<Var, IntSet>>* dom_constraints = nullptr,
 bool eval_vec = false)
 : analyzer_(analyzer),
 dom_map_(dom_map),
 dom_constraints_(dom_constraints),
 eval_vec_(eval_vec) {}

 IntervalSet Eval(const PrimExpr& val) { return this->VisitExpr(val); }
 // evaluate and relax the set
Expand All@@ -383,18 +388,40 @@ class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {

 IntervalSet VisitExpr_(const VarNode* op) final {
 Var var = GetRef<Var>(op);

 Array<IntSet> values;
 if (dom_constraints_) {
 for (const auto& constraint : *dom_constraints_) {
 if (var.same_as(constraint.first)) {
 values.push_back(constraint.second);
 }
 }
 }

 auto it = dom_map_.find(var);
 if (it != dom_map_.end()) {
 IntervalSet res = ToIntervalSet((*it).second);
 if (res->min_value.same_as(var) && res->max_value.same_as(var)) {
 return res;
 }
 // recursively evaluate mapped result
 // in case the domain contains variables to be relaxed.
 return Eval(res);
 } else {
 values.push_back((*it).second);
 }

 if (values.empty()) {
 return IntervalSet::SinglePoint(var);
 }

 IntSet intersection = [&]() {
 if (values.size() == 1) {
 return values.front();
 } else {
 return Intersect(values);
 }
 }();

 IntervalSet res = ToIntervalSet(intersection);
 if (res->min_value.same_as(var) && res->max_value.same_as(var)) {
 return res;
 }
 // recursively evaluate mapped result
 // in case the domain contains variables to be relaxed.
 return Eval(res);
 }

 IntervalSet VisitExpr_(const AddNode* op) final { return VisitBinaryExpr_<Add>(op); }
Expand DownExpand Up@@ -517,6 +544,7 @@ class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {
 // analyzer
 Analyzer* analyzer_;
 const Map<Var, IntSet>& dom_map_;
 const std::vector<std::pair<Var, IntSet>>* dom_constraints_;
 bool eval_vec_{false};
};

Expand All@@ -529,7 +557,7 @@ class IntSetAnalyzer::Impl {
 }

 IntSet Eval(const PrimExpr& expr) const {
 return IntervalSetEvaluator(analyzer_, GetCurrentBounds(), true).Eval(expr);
 return IntervalSetEvaluator(analyzer_, dom_map_, &dom_constraints_, true).Eval(expr);
 }

 void Bind(const Var& var, const Range& range, bool allow_override) {
Expand All@@ -541,10 +569,6 @@ class IntSetAnalyzer::Impl {
 std::function<void()> EnterConstraint(const PrimExpr& constraint);

 private:
 // Get the current variable bounds, including both global bounds and
 // scope-dependent bounds.
 Map<Var, IntSet> GetCurrentBounds() const;

 // Utility function to split a boolean condition into the domain
 // bounds implied by that condition.
 static std::vector<std::pair<Var, IntSet>> DetectBoundInfo(const PrimExpr& cond);
Expand All@@ -556,9 +580,11 @@ class IntSetAnalyzer::Impl {
 // ranges)
 Map<Var, IntSet> dom_map_;

 // Map of variables to implicit scope-dependent bounds (e.g. inside
 // the body of an if-statement)
 Map<Var, IntSet> constraints_;
 // List of implicit scope-dependent bounds (e.g. inside the body of
 // an if-statement). Maintained as a list of constraints, rather
 // than as a `Map<Var,IntSet>`, to avoid computing an Intersection
 // until required.
 std::vector<std::pair<Var, IntSet>> dom_constraints_;
};

IntSetAnalyzer::IntSetAnalyzer(Analyzer* parent) : impl_(new Impl(parent)) {}
Expand DownExpand Up@@ -603,29 +629,6 @@ void IntSetAnalyzer::Impl::Bind(const Var& var, const PrimExpr& expr, bool can_o
 Update(var, Eval(expr), can_override);
}

Map<Var, IntSet> IntSetAnalyzer::Impl::GetCurrentBounds() const {
 // If either constraints_ or dom_map_ is empty, return the other to
 // avoid constructing a new map.
 if (constraints_.empty()) {
 return dom_map_;
 } else if (dom_map_.empty()) {
 return constraints_;
 }

 // If neither is empty, construct a merged domain map with
 // information from both sources.
 Map<Var, IntSet> merged = dom_map_;
 for (const auto& pair : constraints_) {
 auto it = merged.find(pair.first);
 if (it == merged.end()) {
 merged.Set(pair.first, pair.second);
 } else {
 merged.Set(pair.first, Intersect({pair.second, (*it).second}));
 }
 }
 return merged;
}

std::vector<std::pair<Var, IntSet>> IntSetAnalyzer::Impl::DetectBoundInfo(
 const PrimExpr& constraint) {
 PVar<Var> x;
Expand DownExpand Up@@ -665,41 +668,16 @@ std::function<void()> IntSetAnalyzer::EnterConstraint(const PrimExpr& constraint
}

std::function<void()> IntSetAnalyzer::Impl::EnterConstraint(const PrimExpr& constraint) {
 Map<Var, IntSet> cached_values;

 auto bounds = DetectBoundInfo(constraint);

 if (bounds.size() == 0) return nullptr;

 // Collect the current values of each var that is changes by this
 // constraint.
 for (const auto& pair : bounds) {
 auto it = constraints_.find(pair.first);
 if (it == constraints_.end()) {
 cached_values.Set(pair.first, IntSet());
 } else {
 cached_values.Set(pair.first, (*it).second);
 }
 }

 // Update all constraints
 for (const auto& pair : bounds) {
 auto it = constraints_.find(pair.first);
 if (it == constraints_.end()) {
 constraints_.Set(pair.first, pair.second);
 } else {
 constraints_.Set(pair.first, Intersect({pair.second, (*it).second}));
 }
 }

 auto frecover = [cached_values, this]() {
 for (const auto& it : cached_values) {
 if (it.second.defined()) {
 constraints_.Set(it.first, it.second);
 } else {
 constraints_.erase(it.first);
 }
 }
 size_t old_size = dom_constraints_.size();
 dom_constraints_.insert(dom_constraints_.end(), bounds.begin(), bounds.end());
 size_t new_size = dom_constraints_.size();
 auto frecover = [old_size, new_size, this]() {
 ICHECK_EQ(dom_constraints_.size(), new_size);
 dom_constraints_.resize(old_size);
 };
 return frecover;
}
Expand DownExpand Up@@ -960,13 +938,13 @@ Map<Var, IntSet> ConvertDomMap(const std::unordered_map<const VarNode*, IntSet>&

IntSet EvalSet(PrimExpr e, const Map<Var, IntSet>& dom_map) {
 Analyzer ana;
 return IntervalSetEvaluator(&ana, dom_map, false).Eval(e);
 return IntervalSetEvaluator(&ana, dom_map, {}, false).Eval(e);
}

IntSet IntSet::Vector(PrimExpr x) {
 Analyzer ana;
 Map<Var, IntSet> dmap;
 return IntervalSetEvaluator(&ana, dmap, true).Eval(x);
 return IntervalSetEvaluator(&ana, dmap, {}, true).Eval(x);
}

IntSet EvalSet(PrimExpr e, const Map<IterVar, IntSet>& dom_map) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Arith][TIR] IntSetAnalyzer, delay intersection of IntSet until use#12821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tkonolige
merged 1 commit into

from

Sep 19, 2022
 Merged


[Arith][TIR] IntSetAnalyzer, delay intersection of IntSet until use
#12821
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


126 changes: 52 additions & 74 deletions
src/arith/int_set.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -362,8 +362,13 @@ using namespace tir;
// We might use better set analysis in the future to replace the intervalset.
class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {
 public:
 IntervalSetEvaluator(Analyzer* analyzer, const Map<Var, IntSet>& dom_map, bool eval_vec = false)
 : analyzer_(analyzer), dom_map_(dom_map), eval_vec_(eval_vec) {}
 IntervalSetEvaluator(Analyzer* analyzer, const Map<Var, IntSet>& dom_map,
 const std::vector<std::pair<Var, IntSet>>* dom_constraints = nullptr,
 bool eval_vec = false)
 : analyzer_(analyzer),
 dom_map_(dom_map),
 dom_constraints_(dom_constraints),
 eval_vec_(eval_vec) {}

 IntervalSet Eval(const PrimExpr& val) { return this->VisitExpr(val); }
 // evaluate and relax the set
Expand All@@ -383,18 +388,40 @@ class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {

 IntervalSet VisitExpr_(const VarNode* op) final {
 Var var = GetRef<Var>(op);

 Array<IntSet> values;
 if (dom_constraints_) {
 for (const auto& constraint : *dom_constraints_) {
 if (var.same_as(constraint.first)) {
 values.push_back(constraint.second);
 }
 }
 }

 auto it = dom_map_.find(var);
 if (it != dom_map_.end()) {
 IntervalSet res = ToIntervalSet((*it).second);
 if (res->min_value.same_as(var) && res->max_value.same_as(var)) {
 return res;
 }
 // recursively evaluate mapped result
 // in case the domain contains variables to be relaxed.
 return Eval(res);
 } else {
 values.push_back((*it).second);
 }

 if (values.empty()) {
 return IntervalSet::SinglePoint(var);
 }

 IntSet intersection = [&]() {
 if (values.size() == 1) {
 return values.front();
 } else {
 return Intersect(values);
 }
 }();

 IntervalSet res = ToIntervalSet(intersection);
 if (res->min_value.same_as(var) && res->max_value.same_as(var)) {
 return res;
 }
 // recursively evaluate mapped result
 // in case the domain contains variables to be relaxed.
 return Eval(res);
 }

 IntervalSet VisitExpr_(const AddNode* op) final { return VisitBinaryExpr_<Add>(op); }
Expand DownExpand Up@@ -517,6 +544,7 @@ class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {
 // analyzer
 Analyzer* analyzer_;
 const Map<Var, IntSet>& dom_map_;
 const std::vector<std::pair<Var, IntSet>>* dom_constraints_;
 bool eval_vec_{false};
};

Expand All@@ -529,7 +557,7 @@ class IntSetAnalyzer::Impl {
 }

 IntSet Eval(const PrimExpr& expr) const {
 return IntervalSetEvaluator(analyzer_, GetCurrentBounds(), true).Eval(expr);
 return IntervalSetEvaluator(analyzer_, dom_map_, &dom_constraints_, true).Eval(expr);
 }

 void Bind(const Var& var, const Range& range, bool allow_override) {
Expand All@@ -541,10 +569,6 @@ class IntSetAnalyzer::Impl {
 std::function<void()> EnterConstraint(const PrimExpr& constraint);

 private:
 // Get the current variable bounds, including both global bounds and
 // scope-dependent bounds.
 Map<Var, IntSet> GetCurrentBounds() const;

 // Utility function to split a boolean condition into the domain
 // bounds implied by that condition.
 static std::vector<std::pair<Var, IntSet>> DetectBoundInfo(const PrimExpr& cond);
Expand All@@ -556,9 +580,11 @@ class IntSetAnalyzer::Impl {
 // ranges)
 Map<Var, IntSet> dom_map_;

 // Map of variables to implicit scope-dependent bounds (e.g. inside
 // the body of an if-statement)
 Map<Var, IntSet> constraints_;
 // List of implicit scope-dependent bounds (e.g. inside the body of
 // an if-statement). Maintained as a list of constraints, rather
 // than as a `Map<Var,IntSet>`, to avoid computing an Intersection
 // until required.
 std::vector<std::pair<Var, IntSet>> dom_constraints_;
};

IntSetAnalyzer::IntSetAnalyzer(Analyzer* parent) : impl_(new Impl(parent)) {}
Expand DownExpand Up@@ -603,29 +629,6 @@ void IntSetAnalyzer::Impl::Bind(const Var& var, const PrimExpr& expr, bool can_o
 Update(var, Eval(expr), can_override);
}

Map<Var, IntSet> IntSetAnalyzer::Impl::GetCurrentBounds() const {
 // If either constraints_ or dom_map_ is empty, return the other to
 // avoid constructing a new map.
 if (constraints_.empty()) {
 return dom_map_;
 } else if (dom_map_.empty()) {
 return constraints_;
 }

 // If neither is empty, construct a merged domain map with
 // information from both sources.
 Map<Var, IntSet> merged = dom_map_;
 for (const auto& pair : constraints_) {
 auto it = merged.find(pair.first);
 if (it == merged.end()) {
 merged.Set(pair.first, pair.second);
 } else {
 merged.Set(pair.first, Intersect({pair.second, (*it).second}));
 }
 }
 return merged;
}

std::vector<std::pair<Var, IntSet>> IntSetAnalyzer::Impl::DetectBoundInfo(
 const PrimExpr& constraint) {
 PVar<Var> x;
Expand DownExpand Up@@ -665,41 +668,16 @@ std::function<void()> IntSetAnalyzer::EnterConstraint(const PrimExpr& constraint
}

std::function<void()> IntSetAnalyzer::Impl::EnterConstraint(const PrimExpr& constraint) {
 Map<Var, IntSet> cached_values;

 auto bounds = DetectBoundInfo(constraint);

 if (bounds.size() == 0) return nullptr;

 // Collect the current values of each var that is changes by this
 // constraint.
 for (const auto& pair : bounds) {
 auto it = constraints_.find(pair.first);
 if (it == constraints_.end()) {
 cached_values.Set(pair.first, IntSet());
 } else {
 cached_values.Set(pair.first, (*it).second);
 }
 }

 // Update all constraints
 for (const auto& pair : bounds) {
 auto it = constraints_.find(pair.first);
 if (it == constraints_.end()) {
 constraints_.Set(pair.first, pair.second);
 } else {
 constraints_.Set(pair.first, Intersect({pair.second, (*it).second}));
 }
 }

 auto frecover = [cached_values, this]() {
 for (const auto& it : cached_values) {
 if (it.second.defined()) {
 constraints_.Set(it.first, it.second);
 } else {
 constraints_.erase(it.first);
 }
 }
 size_t old_size = dom_constraints_.size();
 dom_constraints_.insert(dom_constraints_.end(), bounds.begin(), bounds.end());
 size_t new_size = dom_constraints_.size();
 auto frecover = [old_size, new_size, this]() {
 ICHECK_EQ(dom_constraints_.size(), new_size);
 dom_constraints_.resize(old_size);
 };
 return frecover;
}
Expand DownExpand Up@@ -960,13 +938,13 @@ Map<Var, IntSet> ConvertDomMap(const std::unordered_map<const VarNode*, IntSet>&

IntSet EvalSet(PrimExpr e, const Map<Var, IntSet>& dom_map) {
 Analyzer ana;
 return IntervalSetEvaluator(&ana, dom_map, false).Eval(e);
 return IntervalSetEvaluator(&ana, dom_map, {}, false).Eval(e);
}

IntSet IntSet::Vector(PrimExpr x) {
 Analyzer ana;
 Map<Var, IntSet> dmap;
 return IntervalSetEvaluator(&ana, dmap, true).Eval(x);
 return IntervalSetEvaluator(&ana, dmap, {}, true).Eval(x);
}

IntSet EvalSet(PrimExpr e, const Map<IterVar, IntSet>& dom_map) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[Arith][TIR] IntSetAnalyzer, delay intersection of IntSet until use#12821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tkonolige
merged 1 commit into

from

Sep 19, 2022
 Merged


[Arith][TIR] IntSetAnalyzer, delay intersection of IntSet until use
#12821
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


126 changes: 52 additions & 74 deletions
src/arith/int_set.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -362,8 +362,13 @@ using namespace tir;
// We might use better set analysis in the future to replace the intervalset.
class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {
 public:
 IntervalSetEvaluator(Analyzer* analyzer, const Map<Var, IntSet>& dom_map, bool eval_vec = false)
 : analyzer_(analyzer), dom_map_(dom_map), eval_vec_(eval_vec) {}
 IntervalSetEvaluator(Analyzer* analyzer, const Map<Var, IntSet>& dom_map,
 const std::vector<std::pair<Var, IntSet>>* dom_constraints = nullptr,
 bool eval_vec = false)
 : analyzer_(analyzer),
 dom_map_(dom_map),
 dom_constraints_(dom_constraints),
 eval_vec_(eval_vec) {}

 IntervalSet Eval(const PrimExpr& val) { return this->VisitExpr(val); }
 // evaluate and relax the set
Expand All@@ -383,18 +388,40 @@ class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {

 IntervalSet VisitExpr_(const VarNode* op) final {
 Var var = GetRef<Var>(op);

 Array<IntSet> values;
 if (dom_constraints_) {
 for (const auto& constraint : *dom_constraints_) {
 if (var.same_as(constraint.first)) {
 values.push_back(constraint.second);
 }
 }
 }

 auto it = dom_map_.find(var);
 if (it != dom_map_.end()) {
 IntervalSet res = ToIntervalSet((*it).second);
 if (res->min_value.same_as(var) && res->max_value.same_as(var)) {
 return res;
 }
 // recursively evaluate mapped result
 // in case the domain contains variables to be relaxed.
 return Eval(res);
 } else {
 values.push_back((*it).second);
 }

 if (values.empty()) {
 return IntervalSet::SinglePoint(var);
 }

 IntSet intersection = [&]() {
 if (values.size() == 1) {
 return values.front();
 } else {
 return Intersect(values);
 }
 }();

 IntervalSet res = ToIntervalSet(intersection);
 if (res->min_value.same_as(var) && res->max_value.same_as(var)) {
 return res;
 }
 // recursively evaluate mapped result
 // in case the domain contains variables to be relaxed.
 return Eval(res);
 }

 IntervalSet VisitExpr_(const AddNode* op) final { return VisitBinaryExpr_<Add>(op); }
Expand DownExpand Up@@ -517,6 +544,7 @@ class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {
 // analyzer
 Analyzer* analyzer_;
 const Map<Var, IntSet>& dom_map_;
 const std::vector<std::pair<Var, IntSet>>* dom_constraints_;
 bool eval_vec_{false};
};

Expand All@@ -529,7 +557,7 @@ class IntSetAnalyzer::Impl {
 }

 IntSet Eval(const PrimExpr& expr) const {
 return IntervalSetEvaluator(analyzer_, GetCurrentBounds(), true).Eval(expr);
 return IntervalSetEvaluator(analyzer_, dom_map_, &dom_constraints_, true).Eval(expr);
 }

 void Bind(const Var& var, const Range& range, bool allow_override) {
Expand All@@ -541,10 +569,6 @@ class IntSetAnalyzer::Impl {
 std::function<void()> EnterConstraint(const PrimExpr& constraint);

 private:
 // Get the current variable bounds, including both global bounds and
 // scope-dependent bounds.
 Map<Var, IntSet> GetCurrentBounds() const;

 // Utility function to split a boolean condition into the domain
 // bounds implied by that condition.
 static std::vector<std::pair<Var, IntSet>> DetectBoundInfo(const PrimExpr& cond);
Expand All@@ -556,9 +580,11 @@ class IntSetAnalyzer::Impl {
 // ranges)
 Map<Var, IntSet> dom_map_;

 // Map of variables to implicit scope-dependent bounds (e.g. inside
 // the body of an if-statement)
 Map<Var, IntSet> constraints_;
 // List of implicit scope-dependent bounds (e.g. inside the body of
 // an if-statement). Maintained as a list of constraints, rather
 // than as a `Map<Var,IntSet>`, to avoid computing an Intersection
 // until required.
 std::vector<std::pair<Var, IntSet>> dom_constraints_;
};

IntSetAnalyzer::IntSetAnalyzer(Analyzer* parent) : impl_(new Impl(parent)) {}
Expand DownExpand Up@@ -603,29 +629,6 @@ void IntSetAnalyzer::Impl::Bind(const Var& var, const PrimExpr& expr, bool can_o
 Update(var, Eval(expr), can_override);
}

Map<Var, IntSet> IntSetAnalyzer::Impl::GetCurrentBounds() const {
 // If either constraints_ or dom_map_ is empty, return the other to
 // avoid constructing a new map.
 if (constraints_.empty()) {
 return dom_map_;
 } else if (dom_map_.empty()) {
 return constraints_;
 }

 // If neither is empty, construct a merged domain map with
 // information from both sources.
 Map<Var, IntSet> merged = dom_map_;
 for (const auto& pair : constraints_) {
 auto it = merged.find(pair.first);
 if (it == merged.end()) {
 merged.Set(pair.first, pair.second);
 } else {
 merged.Set(pair.first, Intersect({pair.second, (*it).second}));
 }
 }
 return merged;
}

std::vector<std::pair<Var, IntSet>> IntSetAnalyzer::Impl::DetectBoundInfo(
 const PrimExpr& constraint) {
 PVar<Var> x;
Expand DownExpand Up@@ -665,41 +668,16 @@ std::function<void()> IntSetAnalyzer::EnterConstraint(const PrimExpr& constraint
}

std::function<void()> IntSetAnalyzer::Impl::EnterConstraint(const PrimExpr& constraint) {
 Map<Var, IntSet> cached_values;

 auto bounds = DetectBoundInfo(constraint);

 if (bounds.size() == 0) return nullptr;

 // Collect the current values of each var that is changes by this
 // constraint.
 for (const auto& pair : bounds) {
 auto it = constraints_.find(pair.first);
 if (it == constraints_.end()) {
 cached_values.Set(pair.first, IntSet());
 } else {
 cached_values.Set(pair.first, (*it).second);
 }
 }

 // Update all constraints
 for (const auto& pair : bounds) {
 auto it = constraints_.find(pair.first);
 if (it == constraints_.end()) {
 constraints_.Set(pair.first, pair.second);
 } else {
 constraints_.Set(pair.first, Intersect({pair.second, (*it).second}));
 }
 }

 auto frecover = [cached_values, this]() {
 for (const auto& it : cached_values) {
 if (it.second.defined()) {
 constraints_.Set(it.first, it.second);
 } else {
 constraints_.erase(it.first);
 }
 }
 size_t old_size = dom_constraints_.size();
 dom_constraints_.insert(dom_constraints_.end(), bounds.begin(), bounds.end());
 size_t new_size = dom_constraints_.size();
 auto frecover = [old_size, new_size, this]() {
 ICHECK_EQ(dom_constraints_.size(), new_size);
 dom_constraints_.resize(old_size);
 };
 return frecover;
}
Expand DownExpand Up@@ -960,13 +938,13 @@ Map<Var, IntSet> ConvertDomMap(const std::unordered_map<const VarNode*, IntSet>&

IntSet EvalSet(PrimExpr e, const Map<Var, IntSet>& dom_map) {
 Analyzer ana;
 return IntervalSetEvaluator(&ana, dom_map, false).Eval(e);
 return IntervalSetEvaluator(&ana, dom_map, {}, false).Eval(e);
}

IntSet IntSet::Vector(PrimExpr x) {
 Analyzer ana;
 Map<Var, IntSet> dmap;
 return IntervalSetEvaluator(&ana, dmap, true).Eval(x);
 return IntervalSetEvaluator(&ana, dmap, {}, true).Eval(x);
}

IntSet EvalSet(PrimExpr e, const Map<IterVar, IntSet>& dom_map) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Arith][TIR] IntSetAnalyzer, delay intersection of IntSet until use#12821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tkonolige
merged 1 commit into

from

Sep 19, 2022
 Merged


[Arith][TIR] IntSetAnalyzer, delay intersection of IntSet until use
#12821
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


126 changes: 52 additions & 74 deletions
src/arith/int_set.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -362,8 +362,13 @@ using namespace tir;
// We might use better set analysis in the future to replace the intervalset.
class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {
 public:
 IntervalSetEvaluator(Analyzer* analyzer, const Map<Var, IntSet>& dom_map, bool eval_vec = false)
 : analyzer_(analyzer), dom_map_(dom_map), eval_vec_(eval_vec) {}
 IntervalSetEvaluator(Analyzer* analyzer, const Map<Var, IntSet>& dom_map,
 const std::vector<std::pair<Var, IntSet>>* dom_constraints = nullptr,
 bool eval_vec = false)
 : analyzer_(analyzer),
 dom_map_(dom_map),
 dom_constraints_(dom_constraints),
 eval_vec_(eval_vec) {}

 IntervalSet Eval(const PrimExpr& val) { return this->VisitExpr(val); }
 // evaluate and relax the set
Expand All@@ -383,18 +388,40 @@ class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {

 IntervalSet VisitExpr_(const VarNode* op) final {
 Var var = GetRef<Var>(op);

 Array<IntSet> values;
 if (dom_constraints_) {
 for (const auto& constraint : *dom_constraints_) {
 if (var.same_as(constraint.first)) {
 values.push_back(constraint.second);
 }
 }
 }

 auto it = dom_map_.find(var);
 if (it != dom_map_.end()) {
 IntervalSet res = ToIntervalSet((*it).second);
 if (res->min_value.same_as(var) && res->max_value.same_as(var)) {
 return res;
 }
 // recursively evaluate mapped result
 // in case the domain contains variables to be relaxed.
 return Eval(res);
 } else {
 values.push_back((*it).second);
 }

 if (values.empty()) {
 return IntervalSet::SinglePoint(var);
 }

 IntSet intersection = [&]() {
 if (values.size() == 1) {
 return values.front();
 } else {
 return Intersect(values);
 }
 }();

 IntervalSet res = ToIntervalSet(intersection);
 if (res->min_value.same_as(var) && res->max_value.same_as(var)) {
 return res;
 }
 // recursively evaluate mapped result
 // in case the domain contains variables to be relaxed.
 return Eval(res);
 }

 IntervalSet VisitExpr_(const AddNode* op) final { return VisitBinaryExpr_<Add>(op); }
Expand DownExpand Up@@ -517,6 +544,7 @@ class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {
 // analyzer
 Analyzer* analyzer_;
 const Map<Var, IntSet>& dom_map_;
 const std::vector<std::pair<Var, IntSet>>* dom_constraints_;
 bool eval_vec_{false};
};

Expand All@@ -529,7 +557,7 @@ class IntSetAnalyzer::Impl {
 }

 IntSet Eval(const PrimExpr& expr) const {
 return IntervalSetEvaluator(analyzer_, GetCurrentBounds(), true).Eval(expr);
 return IntervalSetEvaluator(analyzer_, dom_map_, &dom_constraints_, true).Eval(expr);
 }

 void Bind(const Var& var, const Range& range, bool allow_override) {
Expand All@@ -541,10 +569,6 @@ class IntSetAnalyzer::Impl {
 std::function<void()> EnterConstraint(const PrimExpr& constraint);

 private:
 // Get the current variable bounds, including both global bounds and
 // scope-dependent bounds.
 Map<Var, IntSet> GetCurrentBounds() const;

 // Utility function to split a boolean condition into the domain
 // bounds implied by that condition.
 static std::vector<std::pair<Var, IntSet>> DetectBoundInfo(const PrimExpr& cond);
Expand All@@ -556,9 +580,11 @@ class IntSetAnalyzer::Impl {
 // ranges)
 Map<Var, IntSet> dom_map_;

 // Map of variables to implicit scope-dependent bounds (e.g. inside
 // the body of an if-statement)
 Map<Var, IntSet> constraints_;
 // List of implicit scope-dependent bounds (e.g. inside the body of
 // an if-statement). Maintained as a list of constraints, rather
 // than as a `Map<Var,IntSet>`, to avoid computing an Intersection
 // until required.
 std::vector<std::pair<Var, IntSet>> dom_constraints_;
};

IntSetAnalyzer::IntSetAnalyzer(Analyzer* parent) : impl_(new Impl(parent)) {}
Expand DownExpand Up@@ -603,29 +629,6 @@ void IntSetAnalyzer::Impl::Bind(const Var& var, const PrimExpr& expr, bool can_o
 Update(var, Eval(expr), can_override);
}

Map<Var, IntSet> IntSetAnalyzer::Impl::GetCurrentBounds() const {
 // If either constraints_ or dom_map_ is empty, return the other to
 // avoid constructing a new map.
 if (constraints_.empty()) {
 return dom_map_;
 } else if (dom_map_.empty()) {
 return constraints_;
 }

 // If neither is empty, construct a merged domain map with
 // information from both sources.
 Map<Var, IntSet> merged = dom_map_;
 for (const auto& pair : constraints_) {
 auto it = merged.find(pair.first);
 if (it == merged.end()) {
 merged.Set(pair.first, pair.second);
 } else {
 merged.Set(pair.first, Intersect({pair.second, (*it).second}));
 }
 }
 return merged;
}

std::vector<std::pair<Var, IntSet>> IntSetAnalyzer::Impl::DetectBoundInfo(
 const PrimExpr& constraint) {
 PVar<Var> x;
Expand DownExpand Up@@ -665,41 +668,16 @@ std::function<void()> IntSetAnalyzer::EnterConstraint(const PrimExpr& constraint
}

std::function<void()> IntSetAnalyzer::Impl::EnterConstraint(const PrimExpr& constraint) {
 Map<Var, IntSet> cached_values;

 auto bounds = DetectBoundInfo(constraint);

 if (bounds.size() == 0) return nullptr;

 // Collect the current values of each var that is changes by this
 // constraint.
 for (const auto& pair : bounds) {
 auto it = constraints_.find(pair.first);
 if (it == constraints_.end()) {
 cached_values.Set(pair.first, IntSet());
 } else {
 cached_values.Set(pair.first, (*it).second);
 }
 }

 // Update all constraints
 for (const auto& pair : bounds) {
 auto it = constraints_.find(pair.first);
 if (it == constraints_.end()) {
 constraints_.Set(pair.first, pair.second);
 } else {
 constraints_.Set(pair.first, Intersect({pair.second, (*it).second}));
 }
 }

 auto frecover = [cached_values, this]() {
 for (const auto& it : cached_values) {
 if (it.second.defined()) {
 constraints_.Set(it.first, it.second);
 } else {
 constraints_.erase(it.first);
 }
 }
 size_t old_size = dom_constraints_.size();
 dom_constraints_.insert(dom_constraints_.end(), bounds.begin(), bounds.end());
 size_t new_size = dom_constraints_.size();
 auto frecover = [old_size, new_size, this]() {
 ICHECK_EQ(dom_constraints_.size(), new_size);
 dom_constraints_.resize(old_size);
 };
 return frecover;
}
Expand DownExpand Up@@ -960,13 +938,13 @@ Map<Var, IntSet> ConvertDomMap(const std::unordered_map<const VarNode*, IntSet>&

IntSet EvalSet(PrimExpr e, const Map<Var, IntSet>& dom_map) {
 Analyzer ana;
 return IntervalSetEvaluator(&ana, dom_map, false).Eval(e);
 return IntervalSetEvaluator(&ana, dom_map, {}, false).Eval(e);
}

IntSet IntSet::Vector(PrimExpr x) {
 Analyzer ana;
 Map<Var, IntSet> dmap;
 return IntervalSetEvaluator(&ana, dmap, true).Eval(x);
 return IntervalSetEvaluator(&ana, dmap, {}, true).Eval(x);
}

IntSet EvalSet(PrimExpr e, const Map<IterVar, IntSet>& dom_map) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Arith][TIR] IntSetAnalyzer, delay intersection of IntSet until use#12821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tkonolige
merged 1 commit into

from

Sep 19, 2022
 Merged


[Arith][TIR] IntSetAnalyzer, delay intersection of IntSet until use
#12821
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


126 changes: 52 additions & 74 deletions
src/arith/int_set.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -362,8 +362,13 @@ using namespace tir;
// We might use better set analysis in the future to replace the intervalset.
class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {
 public:
 IntervalSetEvaluator(Analyzer* analyzer, const Map<Var, IntSet>& dom_map, bool eval_vec = false)
 : analyzer_(analyzer), dom_map_(dom_map), eval_vec_(eval_vec) {}
 IntervalSetEvaluator(Analyzer* analyzer, const Map<Var, IntSet>& dom_map,
 const std::vector<std::pair<Var, IntSet>>* dom_constraints = nullptr,
 bool eval_vec = false)
 : analyzer_(analyzer),
 dom_map_(dom_map),
 dom_constraints_(dom_constraints),
 eval_vec_(eval_vec) {}

 IntervalSet Eval(const PrimExpr& val) { return this->VisitExpr(val); }
 // evaluate and relax the set
Expand All@@ -383,18 +388,40 @@ class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {

 IntervalSet VisitExpr_(const VarNode* op) final {
 Var var = GetRef<Var>(op);

 Array<IntSet> values;
 if (dom_constraints_) {
 for (const auto& constraint : *dom_constraints_) {
 if (var.same_as(constraint.first)) {
 values.push_back(constraint.second);
 }
 }
 }

 auto it = dom_map_.find(var);
 if (it != dom_map_.end()) {
 IntervalSet res = ToIntervalSet((*it).second);
 if (res->min_value.same_as(var) && res->max_value.same_as(var)) {
 return res;
 }
 // recursively evaluate mapped result
 // in case the domain contains variables to be relaxed.
 return Eval(res);
 } else {
 values.push_back((*it).second);
 }

 if (values.empty()) {
 return IntervalSet::SinglePoint(var);
 }

 IntSet intersection = [&]() {
 if (values.size() == 1) {
 return values.front();
 } else {
 return Intersect(values);
 }
 }();

 IntervalSet res = ToIntervalSet(intersection);
 if (res->min_value.same_as(var) && res->max_value.same_as(var)) {
 return res;
 }
 // recursively evaluate mapped result
 // in case the domain contains variables to be relaxed.
 return Eval(res);
 }

 IntervalSet VisitExpr_(const AddNode* op) final { return VisitBinaryExpr_<Add>(op); }
Expand DownExpand Up@@ -517,6 +544,7 @@ class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {
 // analyzer
 Analyzer* analyzer_;
 const Map<Var, IntSet>& dom_map_;
 const std::vector<std::pair<Var, IntSet>>* dom_constraints_;
 bool eval_vec_{false};
};

Expand All@@ -529,7 +557,7 @@ class IntSetAnalyzer::Impl {
 }

 IntSet Eval(const PrimExpr& expr) const {
 return IntervalSetEvaluator(analyzer_, GetCurrentBounds(), true).Eval(expr);
 return IntervalSetEvaluator(analyzer_, dom_map_, &dom_constraints_, true).Eval(expr);
 }

 void Bind(const Var& var, const Range& range, bool allow_override) {
Expand All@@ -541,10 +569,6 @@ class IntSetAnalyzer::Impl {
 std::function<void()> EnterConstraint(const PrimExpr& constraint);

 private:
 // Get the current variable bounds, including both global bounds and
 // scope-dependent bounds.
 Map<Var, IntSet> GetCurrentBounds() const;

 // Utility function to split a boolean condition into the domain
 // bounds implied by that condition.
 static std::vector<std::pair<Var, IntSet>> DetectBoundInfo(const PrimExpr& cond);
Expand All@@ -556,9 +580,11 @@ class IntSetAnalyzer::Impl {
 // ranges)
 Map<Var, IntSet> dom_map_;

 // Map of variables to implicit scope-dependent bounds (e.g. inside
 // the body of an if-statement)
 Map<Var, IntSet> constraints_;
 // List of implicit scope-dependent bounds (e.g. inside the body of
 // an if-statement). Maintained as a list of constraints, rather
 // than as a `Map<Var,IntSet>`, to avoid computing an Intersection
 // until required.
 std::vector<std::pair<Var, IntSet>> dom_constraints_;
};

IntSetAnalyzer::IntSetAnalyzer(Analyzer* parent) : impl_(new Impl(parent)) {}
Expand DownExpand Up@@ -603,29 +629,6 @@ void IntSetAnalyzer::Impl::Bind(const Var& var, const PrimExpr& expr, bool can_o
 Update(var, Eval(expr), can_override);
}

Map<Var, IntSet> IntSetAnalyzer::Impl::GetCurrentBounds() const {
 // If either constraints_ or dom_map_ is empty, return the other to
 // avoid constructing a new map.
 if (constraints_.empty()) {
 return dom_map_;
 } else if (dom_map_.empty()) {
 return constraints_;
 }

 // If neither is empty, construct a merged domain map with
 // information from both sources.
 Map<Var, IntSet> merged = dom_map_;
 for (const auto& pair : constraints_) {
 auto it = merged.find(pair.first);
 if (it == merged.end()) {
 merged.Set(pair.first, pair.second);
 } else {
 merged.Set(pair.first, Intersect({pair.second, (*it).second}));
 }
 }
 return merged;
}

std::vector<std::pair<Var, IntSet>> IntSetAnalyzer::Impl::DetectBoundInfo(
 const PrimExpr& constraint) {
 PVar<Var> x;
Expand DownExpand Up@@ -665,41 +668,16 @@ std::function<void()> IntSetAnalyzer::EnterConstraint(const PrimExpr& constraint
}

std::function<void()> IntSetAnalyzer::Impl::EnterConstraint(const PrimExpr& constraint) {
 Map<Var, IntSet> cached_values;

 auto bounds = DetectBoundInfo(constraint);

 if (bounds.size() == 0) return nullptr;

 // Collect the current values of each var that is changes by this
 // constraint.
 for (const auto& pair : bounds) {
 auto it = constraints_.find(pair.first);
 if (it == constraints_.end()) {
 cached_values.Set(pair.first, IntSet());
 } else {
 cached_values.Set(pair.first, (*it).second);
 }
 }

 // Update all constraints
 for (const auto& pair : bounds) {
 auto it = constraints_.find(pair.first);
 if (it == constraints_.end()) {
 constraints_.Set(pair.first, pair.second);
 } else {
 constraints_.Set(pair.first, Intersect({pair.second, (*it).second}));
 }
 }

 auto frecover = [cached_values, this]() {
 for (const auto& it : cached_values) {
 if (it.second.defined()) {
 constraints_.Set(it.first, it.second);
 } else {
 constraints_.erase(it.first);
 }
 }
 size_t old_size = dom_constraints_.size();
 dom_constraints_.insert(dom_constraints_.end(), bounds.begin(), bounds.end());
 size_t new_size = dom_constraints_.size();
 auto frecover = [old_size, new_size, this]() {
 ICHECK_EQ(dom_constraints_.size(), new_size);
 dom_constraints_.resize(old_size);
 };
 return frecover;
}
Expand DownExpand Up@@ -960,13 +938,13 @@ Map<Var, IntSet> ConvertDomMap(const std::unordered_map<const VarNode*, IntSet>&

IntSet EvalSet(PrimExpr e, const Map<Var, IntSet>& dom_map) {
 Analyzer ana;
 return IntervalSetEvaluator(&ana, dom_map, false).Eval(e);
 return IntervalSetEvaluator(&ana, dom_map, {}, false).Eval(e);
}

IntSet IntSet::Vector(PrimExpr x) {
 Analyzer ana;
 Map<Var, IntSet> dmap;
 return IntervalSetEvaluator(&ana, dmap, true).Eval(x);
 return IntervalSetEvaluator(&ana, dmap, {}, true).Eval(x);
}

IntSet EvalSet(PrimExpr e, const Map<IterVar, IntSet>& dom_map) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[Arith][TIR] IntSetAnalyzer, delay intersection of IntSet until use#12821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tkonolige
merged 1 commit into

from

Sep 19, 2022
 Merged


[Arith][TIR] IntSetAnalyzer, delay intersection of IntSet until use
#12821
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


126 changes: 52 additions & 74 deletions
src/arith/int_set.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -362,8 +362,13 @@ using namespace tir;
// We might use better set analysis in the future to replace the intervalset.
class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {
 public:
 IntervalSetEvaluator(Analyzer* analyzer, const Map<Var, IntSet>& dom_map, bool eval_vec = false)
 : analyzer_(analyzer), dom_map_(dom_map), eval_vec_(eval_vec) {}
 IntervalSetEvaluator(Analyzer* analyzer, const Map<Var, IntSet>& dom_map,
 const std::vector<std::pair<Var, IntSet>>* dom_constraints = nullptr,
 bool eval_vec = false)
 : analyzer_(analyzer),
 dom_map_(dom_map),
 dom_constraints_(dom_constraints),
 eval_vec_(eval_vec) {}

 IntervalSet Eval(const PrimExpr& val) { return this->VisitExpr(val); }
 // evaluate and relax the set
Expand All@@ -383,18 +388,40 @@ class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {

 IntervalSet VisitExpr_(const VarNode* op) final {
 Var var = GetRef<Var>(op);

 Array<IntSet> values;
 if (dom_constraints_) {
 for (const auto& constraint : *dom_constraints_) {
 if (var.same_as(constraint.first)) {
 values.push_back(constraint.second);
 }
 }
 }

 auto it = dom_map_.find(var);
 if (it != dom_map_.end()) {
 IntervalSet res = ToIntervalSet((*it).second);
 if (res->min_value.same_as(var) && res->max_value.same_as(var)) {
 return res;
 }
 // recursively evaluate mapped result
 // in case the domain contains variables to be relaxed.
 return Eval(res);
 } else {
 values.push_back((*it).second);
 }

 if (values.empty()) {
 return IntervalSet::SinglePoint(var);
 }

 IntSet intersection = [&]() {
 if (values.size() == 1) {
 return values.front();
 } else {
 return Intersect(values);
 }
 }();

 IntervalSet res = ToIntervalSet(intersection);
 if (res->min_value.same_as(var) && res->max_value.same_as(var)) {
 return res;
 }
 // recursively evaluate mapped result
 // in case the domain contains variables to be relaxed.
 return Eval(res);
 }

 IntervalSet VisitExpr_(const AddNode* op) final { return VisitBinaryExpr_<Add>(op); }
Expand DownExpand Up@@ -517,6 +544,7 @@ class IntervalSetEvaluator : public ExprFunctor<IntervalSet(const PrimExpr&)> {
 // analyzer
 Analyzer* analyzer_;
 const Map<Var, IntSet>& dom_map_;
 const std::vector<std::pair<Var, IntSet>>* dom_constraints_;
 bool eval_vec_{false};
};

Expand All@@ -529,7 +557,7 @@ class IntSetAnalyzer::Impl {
 }

 IntSet Eval(const PrimExpr& expr) const {
 return IntervalSetEvaluator(analyzer_, GetCurrentBounds(), true).Eval(expr);
 return IntervalSetEvaluator(analyzer_, dom_map_, &dom_constraints_, true).Eval(expr);
 }

 void Bind(const Var& var, const Range& range, bool allow_override) {
Expand All@@ -541,10 +569,6 @@ class IntSetAnalyzer::Impl {
 std::function<void()> EnterConstraint(const PrimExpr& constraint);

 private:
 // Get the current variable bounds, including both global bounds and
 // scope-dependent bounds.
 Map<Var, IntSet> GetCurrentBounds() const;

 // Utility function to split a boolean condition into the domain
 // bounds implied by that condition.
 static std::vector<std::pair<Var, IntSet>> DetectBoundInfo(const PrimExpr& cond);
Expand All@@ -556,9 +580,11 @@ class IntSetAnalyzer::Impl {
 // ranges)
 Map<Var, IntSet> dom_map_;

 // Map of variables to implicit scope-dependent bounds (e.g. inside
 // the body of an if-statement)
 Map<Var, IntSet> constraints_;
 // List of implicit scope-dependent bounds (e.g. inside the body of
 // an if-statement). Maintained as a list of constraints, rather
 // than as a `Map<Var,IntSet>`, to avoid computing an Intersection
 // until required.
 std::vector<std::pair<Var, IntSet>> dom_constraints_;
};

IntSetAnalyzer::IntSetAnalyzer(Analyzer* parent) : impl_(new Impl(parent)) {}
Expand DownExpand Up@@ -603,29 +629,6 @@ void IntSetAnalyzer::Impl::Bind(const Var& var, const PrimExpr& expr, bool can_o
 Update(var, Eval(expr), can_override);
}

Map<Var, IntSet> IntSetAnalyzer::Impl::GetCurrentBounds() const {
 // If either constraints_ or dom_map_ is empty, return the other to
 // avoid constructing a new map.
 if (constraints_.empty()) {
 return dom_map_;
 } else if (dom_map_.empty()) {
 return constraints_;
 }

 // If neither is empty, construct a merged domain map with
 // information from both sources.
 Map<Var, IntSet> merged = dom_map_;
 for (const auto& pair : constraints_) {
 auto it = merged.find(pair.first);
 if (it == merged.end()) {
 merged.Set(pair.first, pair.second);
 } else {
 merged.Set(pair.first, Intersect({pair.second, (*it).second}));
 }
 }
 return merged;
}

std::vector<std::pair<Var, IntSet>> IntSetAnalyzer::Impl::DetectBoundInfo(
 const PrimExpr& constraint) {
 PVar<Var> x;
Expand DownExpand Up@@ -665,41 +668,16 @@ std::function<void()> IntSetAnalyzer::EnterConstraint(const PrimExpr& constraint
}

std::function<void()> IntSetAnalyzer::Impl::EnterConstraint(const PrimExpr& constraint) {
 Map<Var, IntSet> cached_values;

 auto bounds = DetectBoundInfo(constraint);

 if (bounds.size() == 0) return nullptr;

 // Collect the current values of each var that is changes by this
 // constraint.
 for (const auto& pair : bounds) {
 auto it = constraints_.find(pair.first);
 if (it == constraints_.end()) {
 cached_values.Set(pair.first, IntSet());
 } else {
 cached_values.Set(pair.first, (*it).second);
 }
 }

 // Update all constraints
 for (const auto& pair : bounds) {
 auto it = constraints_.find(pair.first);
 if (it == constraints_.end()) {
 constraints_.Set(pair.first, pair.second);
 } else {
 constraints_.Set(pair.first, Intersect({pair.second, (*it).second}));
 }
 }

 auto frecover = [cached_values, this]() {
 for (const auto& it : cached_values) {
 if (it.second.defined()) {
 constraints_.Set(it.first, it.second);
 } else {
 constraints_.erase(it.first);
 }
 }
 size_t old_size = dom_constraints_.size();
 dom_constraints_.insert(dom_constraints_.end(), bounds.begin(), bounds.end());
 size_t new_size = dom_constraints_.size();
 auto frecover = [old_size, new_size, this]() {
 ICHECK_EQ(dom_constraints_.size(), new_size);
 dom_constraints_.resize(old_size);
 };
 return frecover;
}
Expand DownExpand Up@@ -960,13 +938,13 @@ Map<Var, IntSet> ConvertDomMap(const std::unordered_map<const VarNode*, IntSet>&

IntSet EvalSet(PrimExpr e, const Map<Var, IntSet>& dom_map) {
 Analyzer ana;
 return IntervalSetEvaluator(&ana, dom_map, false).Eval(e);
 return IntervalSetEvaluator(&ana, dom_map, {}, false).Eval(e);
}

IntSet IntSet::Vector(PrimExpr x) {
 Analyzer ana;
 Map<Var, IntSet> dmap;
 return IntervalSetEvaluator(&ana, dmap, true).Eval(x);
 return IntervalSetEvaluator(&ana, dmap, {}, true).Eval(x);
}

IntSet EvalSet(PrimExpr e, const Map<IterVar, IntSet>& dom_map) {
Expand Down