Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions xls/passes/partial_info_query_engine.cc
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,12 @@ bool IsExpensiveToEvaluate(
Op::kShra,
Op::kBitSliceUpdate,
Op::kDynamicBitSlice,
Op::kUMul,
Op::kSMul,
Op::kUDiv,
Op::kSDiv,
Op::kUMod,
Op::kSMod,
});
if (is_complex_evaluation) {
return node->operand(0)->GetType()->GetFlatBitCount() >
Expand Down
27 changes: 27 additions & 0 deletions xls/passes/range_query_engine.cc
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ class RangeQueryVisitor : public DfsVisitor {
// What size we should minimize interval sets to by default.
static constexpr int64_t kDefaultIntervalSize = 16;

// How many bits of operand width we allow for complex evaluations.
static constexpr int64_t kComplexEvaluationLimit = 256;

// The maximum number of points covered by an interval set that can be
// iterated over in an analysis.

Expand Down Expand Up @@ -1200,6 +1203,10 @@ absl::Status RangeQueryVisitor::HandleReverse(UnOp* reverse) {

absl::Status RangeQueryVisitor::HandleSDiv(BinOp* div) {
INITIALIZE_OR_SKIP(div);
if (div->operand(0)->GetType()->GetFlatBitCount() > kComplexEvaluationLimit) {
return SetIntervalSet(
div, IntervalSet::Maximal(div->GetType()->GetFlatBitCount()));
}
ASSIGN_INTERVAL_SET_REF_OR_RETURN(l, div->operand(0));
ASSIGN_INTERVAL_SET_REF_OR_RETURN(r, div->operand(1));
return SetIntervalSet(div, interval_ops::SDiv(l, r));
Expand Down Expand Up @@ -1235,13 +1242,21 @@ absl::Status RangeQueryVisitor::HandleSLt(CompareOp* lt) {

absl::Status RangeQueryVisitor::HandleSMod(BinOp* mod) {
INITIALIZE_OR_SKIP(mod);
if (mod->operand(0)->GetType()->GetFlatBitCount() > kComplexEvaluationLimit) {
return SetIntervalSet(
mod, IntervalSet::Maximal(mod->GetType()->GetFlatBitCount()));
}
ASSIGN_INTERVAL_SET_REF_OR_RETURN(l, mod->operand(0));
ASSIGN_INTERVAL_SET_REF_OR_RETURN(r, mod->operand(1));
return SetIntervalSet(mod, interval_ops::SMod(l, r));
}

absl::Status RangeQueryVisitor::HandleSMul(ArithOp* mul) {
INITIALIZE_OR_SKIP(mul);
if (mul->operand(0)->GetType()->GetFlatBitCount() > kComplexEvaluationLimit) {
return SetIntervalSet(
mul, IntervalSet::Maximal(mul->GetType()->GetFlatBitCount()));
}

ASSIGN_INTERVAL_SET_REF_OR_RETURN(l, mul->operand(0));
ASSIGN_INTERVAL_SET_REF_OR_RETURN(r, mul->operand(1));
Expand Down Expand Up @@ -1387,6 +1402,10 @@ absl::Status RangeQueryVisitor::HandleTupleIndex(TupleIndex* index) {

absl::Status RangeQueryVisitor::HandleUDiv(BinOp* div) {
INITIALIZE_OR_SKIP(div);
if (div->operand(0)->GetType()->GetFlatBitCount() > kComplexEvaluationLimit) {
return SetIntervalSet(
div, IntervalSet::Maximal(div->GetType()->GetFlatBitCount()));
}
ASSIGN_INTERVAL_SET_REF_OR_RETURN(l, div->operand(0));
ASSIGN_INTERVAL_SET_REF_OR_RETURN(r, div->operand(1));
return SetIntervalSet(div, interval_ops::UDiv(l, r));
Expand Down Expand Up @@ -1426,6 +1445,10 @@ absl::Status RangeQueryVisitor::HandleULt(CompareOp* lt) {

absl::Status RangeQueryVisitor::HandleUMod(BinOp* mod) {
INITIALIZE_OR_SKIP(mod);
if (mod->operand(0)->GetType()->GetFlatBitCount() > kComplexEvaluationLimit) {
return SetIntervalSet(
mod, IntervalSet::Maximal(mod->GetType()->GetFlatBitCount()));
}

ASSIGN_INTERVAL_SET_REF_OR_RETURN(l, mod->operand(0));
ASSIGN_INTERVAL_SET_REF_OR_RETURN(r, mod->operand(1));
Expand All @@ -1434,6 +1457,10 @@ absl::Status RangeQueryVisitor::HandleUMod(BinOp* mod) {

absl::Status RangeQueryVisitor::HandleUMul(ArithOp* mul) {
INITIALIZE_OR_SKIP(mul);
if (mul->operand(0)->GetType()->GetFlatBitCount() > kComplexEvaluationLimit) {
return SetIntervalSet(
mul, IntervalSet::Maximal(mul->GetType()->GetFlatBitCount()));
}

ASSIGN_INTERVAL_SET_REF_OR_RETURN(l, mul->operand(0));
ASSIGN_INTERVAL_SET_REF_OR_RETURN(r, mul->operand(1));
Expand Down
Loading