diff --git a/mlir/include/mlir/Dialect/AffineOps/EDSC/Builders.h b/mlir/include/mlir/Dialect/AffineOps/EDSC/Builders.h
--- a/mlir/include/mlir/Dialect/AffineOps/EDSC/Builders.h
+++ b/mlir/include/mlir/Dialect/AffineOps/EDSC/Builders.h
@@ -92,7 +92,7 @@
 
 } // namespace op
 
-/// Operator overloadings.
+/// Arithmetic operator overloadings.
 template <typename Load, typename Store>
 ValueHandle TemplatedIndexedValue<Load, Store>::operator+(ValueHandle e) {
   using op::operator+;
@@ -113,7 +113,18 @@
   using op::operator/;
   return static_cast<ValueHandle>(*this) / e;
 }
+template <typename Load, typename Store>
+ValueHandle TemplatedIndexedValue<Load, Store>::operator%(ValueHandle e) {
+  using op::operator%;
+  return static_cast<ValueHandle>(*this) % e;
+}
+template <typename Load, typename Store>
+ValueHandle TemplatedIndexedValue<Load, Store>::operator^(ValueHandle e) {
+  using op::operator^;
+  return static_cast<ValueHandle>(*this) ^ e;
+}
 
+/// Assignment-arithmetic operator overloadings.
 template <typename Load, typename Store>
 OperationHandle TemplatedIndexedValue<Load, Store>::operator+=(ValueHandle e) {
   using op::operator+;
@@ -134,6 +145,60 @@
   using op::operator/;
   return Store(*this / e, getBase(), {indices.begin(), indices.end()});
 }
+template <typename Load, typename Store>
+OperationHandle TemplatedIndexedValue<Load, Store>::operator%=(ValueHandle e) {
+  using op::operator%;
+  return Store(*this % e, getBase(), {indices.begin(), indices.end()});
+}
+template <typename Load, typename Store>
+OperationHandle TemplatedIndexedValue<Load, Store>::operator^=(ValueHandle e) {
+  using op::operator^;
+  return Store(*this ^ e, getBase(), {indices.begin(), indices.end()});
+}
+
+/// Logical operator overloadings.
+template <typename Load, typename Store>
+ValueHandle TemplatedIndexedValue<Load, Store>::operator&&(ValueHandle e) {
+  using op::operator&&;
+  return static_cast<ValueHandle>(*this) && e;
+}
+template <typename Load, typename Store>
+ValueHandle TemplatedIndexedValue<Load, Store>::operator||(ValueHandle e) {
+  using op::operator||;
+  return static_cast<ValueHandle>(*this) || e;
+}
+
+/// Comparison operator overloadings.
+template <typename Load, typename Store>
+ValueHandle TemplatedIndexedValue<Load, Store>::operator==(ValueHandle e) {
+  using op::operator==;
+  return static_cast<ValueHandle>(*this) == e;
+}
+template <typename Load, typename Store>
+ValueHandle TemplatedIndexedValue<Load, Store>::operator!=(ValueHandle e) {
+  using op::operator!=;
+  return static_cast<ValueHandle>(*this) != e;
+}
+template <typename Load, typename Store>
+ValueHandle TemplatedIndexedValue<Load, Store>::operator<(ValueHandle e) {
+  using op::operator<;
+  return static_cast<ValueHandle>(*this) < e;
+}
+template <typename Load, typename Store>
+ValueHandle TemplatedIndexedValue<Load, Store>::operator<=(ValueHandle e) {
+  using op::operator<=;
+  return static_cast<ValueHandle>(*this) <= e;
+}
+template <typename Load, typename Store>
+ValueHandle TemplatedIndexedValue<Load, Store>::operator>(ValueHandle e) {
+  using op::operator>;
+  return static_cast<ValueHandle>(*this) > e;
+}
+template <typename Load, typename Store>
+ValueHandle TemplatedIndexedValue<Load, Store>::operator>=(ValueHandle e) {
+  using op::operator>=;
+  return static_cast<ValueHandle>(*this) >= e;
+}
 
 } // namespace edsc
 } // namespace mlir
diff --git a/mlir/include/mlir/EDSC/Builders.h b/mlir/include/mlir/EDSC/Builders.h
--- a/mlir/include/mlir/EDSC/Builders.h
+++ b/mlir/include/mlir/EDSC/Builders.h
@@ -538,15 +538,13 @@
 
   ValueHandle getBase() const { return base; }
 
-  /// Operator overloadings.
+  /// Arithmetic operator overloadings.
   ValueHandle operator+(ValueHandle e);
   ValueHandle operator-(ValueHandle e);
   ValueHandle operator*(ValueHandle e);
   ValueHandle operator/(ValueHandle e);
-  OperationHandle operator+=(ValueHandle e);
-  OperationHandle operator-=(ValueHandle e);
-  OperationHandle operator*=(ValueHandle e);
-  OperationHandle operator/=(ValueHandle e);
+  ValueHandle operator%(ValueHandle e);
+  ValueHandle operator^(ValueHandle e);
   ValueHandle operator+(TemplatedIndexedValue e) {
     return *this + static_cast<ValueHandle>(e);
   }
@@ -559,6 +557,20 @@
   ValueHandle operator/(TemplatedIndexedValue e) {
     return *this / static_cast<ValueHandle>(e);
   }
+  ValueHandle operator%(TemplatedIndexedValue e) {
+    return *this % static_cast<ValueHandle>(e);
+  }
+  ValueHandle operator^(TemplatedIndexedValue e) {
+    return *this ^ static_cast<ValueHandle>(e);
+  }
+
+  /// Assignment-arithmetic operator overloadings.
+  OperationHandle operator+=(ValueHandle e);
+  OperationHandle operator-=(ValueHandle e);
+  OperationHandle operator*=(ValueHandle e);
+  OperationHandle operator/=(ValueHandle e);
+  OperationHandle operator%=(ValueHandle e);
+  OperationHandle operator^=(ValueHandle e);
   OperationHandle operator+=(TemplatedIndexedValue e) {
     return this->operator+=(static_cast<ValueHandle>(e));
   }
@@ -571,6 +583,48 @@
   OperationHandle operator/=(TemplatedIndexedValue e) {
     return this->operator/=(static_cast<ValueHandle>(e));
   }
+  OperationHandle operator%=(TemplatedIndexedValue e) {
+    return this->operator%=(static_cast<ValueHandle>(e));
+  }
+  OperationHandle operator^=(TemplatedIndexedValue e) {
+    return this->operator^=(static_cast<ValueHandle>(e));
+  }
+
+  /// Logical operator overloadings.
+  ValueHandle operator&&(ValueHandle e);
+  ValueHandle operator||(ValueHandle e);
+  ValueHandle operator&&(TemplatedIndexedValue e) {
+    return *this && static_cast<ValueHandle>(e);
+  }
+  ValueHandle operator||(TemplatedIndexedValue e) {
+    return *this || static_cast<ValueHandle>(e);
+  }
+
+  /// Comparison operator overloadings.
+  ValueHandle operator==(ValueHandle e);
+  ValueHandle operator!=(ValueHandle e);
+  ValueHandle operator<(ValueHandle e);
+  ValueHandle operator<=(ValueHandle e);
+  ValueHandle operator>(ValueHandle e);
+  ValueHandle operator>=(ValueHandle e);
+  ValueHandle operator==(TemplatedIndexedValue e) {
+    return *this == static_cast<ValueHandle>(e);
+  }
+  ValueHandle operator!=(TemplatedIndexedValue e) {
+    return *this != static_cast<ValueHandle>(e);
+  }
+  ValueHandle operator<(TemplatedIndexedValue e) {
+    return *this < static_cast<ValueHandle>(e);
+  }
+  ValueHandle operator<=(TemplatedIndexedValue e) {
+    return *this <= static_cast<ValueHandle>(e);
+  }
+  ValueHandle operator>(TemplatedIndexedValue e) {
+    return *this > static_cast<ValueHandle>(e);
+  }
+  ValueHandle operator>=(TemplatedIndexedValue e) {
+    return *this >= static_cast<ValueHandle>(e);
+  }
 
 private:
   TemplatedIndexedValue(ValueHandle base, ArrayRef<ValueHandle> indices)