diff --git a/mlir/include/mlir/EDSC/Intrinsics.h b/mlir/include/mlir/EDSC/Intrinsics.h
--- a/mlir/include/mlir/EDSC/Intrinsics.h
+++ b/mlir/include/mlir/EDSC/Intrinsics.h
@@ -200,11 +200,14 @@
 using affine_store = OperationBuilder<AffineStoreOp>;
 using alloc = ValueBuilder<AllocOp>;
 using call = OperationBuilder<mlir::CallOp>;
+using constant = ValueBuilder<ConstantOp>;
 using constant_float = ValueBuilder<ConstantFloatOp>;
 using constant_index = ValueBuilder<ConstantIndexOp>;
 using constant_int = ValueBuilder<ConstantIntOp>;
 using dealloc = OperationBuilder<DeallocOp>;
 using dim = ValueBuilder<DimOp>;
+using extract_element = ValueBuilder<ExtractElementOp>;
+using index_cast = ValueBuilder<IndexCastOp>;
 using muli = ValueBuilder<MulIOp>;
 using mulf = ValueBuilder<MulFOp>;
 using memref_cast = ValueBuilder<MemRefCastOp>;
@@ -213,7 +216,10 @@
 using std_load = ValueBuilder<LoadOp>;
 using std_store = OperationBuilder<StoreOp>;
 using subi = ValueBuilder<SubIOp>;
+using sub_view = ValueBuilder<SubViewOp>;
 using tanh = ValueBuilder<TanhOp>;
+using tensor_load = ValueBuilder<TensorLoadOp>;
+using tensor_store = OperationBuilder<TensorStoreOp>;
 using view = ValueBuilder<ViewOp>;
 using zero_extendi = ValueBuilder<ZeroExtendIOp>;
 using sign_extendi = ValueBuilder<SignExtendIOp>;
diff --git a/mlir/lib/Conversion/LinalgToLLVM/LinalgToLLVM.cpp b/mlir/lib/Conversion/LinalgToLLVM/LinalgToLLVM.cpp
--- a/mlir/lib/Conversion/LinalgToLLVM/LinalgToLLVM.cpp
+++ b/mlir/lib/Conversion/LinalgToLLVM/LinalgToLLVM.cpp
@@ -51,7 +51,7 @@
 using addi = ValueBuilder<mlir::AddIOp>;
 using bitcast = ValueBuilder<mlir::LLVM::BitcastOp>;
 using cmpi = ValueBuilder<mlir::CmpIOp>;
-using constant = ValueBuilder<mlir::LLVM::ConstantOp>;
+using llvm_constant = ValueBuilder<mlir::LLVM::ConstantOp>;
 using extractvalue = ValueBuilder<mlir::LLVM::ExtractValueOp>;
 using gep = ValueBuilder<mlir::LLVM::GEPOp>;
 using insertvalue = ValueBuilder<mlir::LLVM::InsertValueOp>;
@@ -265,7 +265,7 @@
       return rewriter.replaceOp(op, {desc}), matchSuccess();
 
     Value zero =
-        constant(int64Ty, rewriter.getIntegerAttr(rewriter.getIndexType(), 0));
+        llvm_constant(int64Ty, rewriter.getIntegerAttr(rewriter.getIndexType(), 0));
     // Compute and insert view sizes (max - min along the range) and strides.
     // Skip the non-range operands as they will be projected away from the view.
     int numNewDims = 0;