diff --git a/mlir/utils/vim/mlir.vim b/mlir/utils/vim/mlir.vim
new file mode 100644
index 000000000000..b2d70e7ca9e8
--- /dev/null
+++ b/mlir/utils/vim/mlir.vim
@@ -0,0 +1,35 @@
+" Vim syntax file
+" Language: MLIR
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn keyword mlirType affineint i1 i2 i4 i8 i13 i16 i32 i64
+      \ f16 f32
+syn keyword mlirType memref tensor vector
+
+syntax keyword mlirKeywords extfunc cfgfunc mlfunc for to step return
+syntax keyword mlirConditional if else
+
+syn match mlirInt "-\=\<\d\+\>"
+syn match mlirFloat "-\=\<\d\+\.\d\+\>"
+syn match mlirMapOutline "#.*$"
+syn match mlirOperator      "[+\-*=]"
+
+syn region mlirComment start="//" skip="\\$" end="$"
+syn region mlirString matchgroup=mlirString start=+"+ end=+"+
+
+hi def link mlirComment      Comment
+hi def link mlirKeywords     Statement
+hi def link mlirInt          Constant
+hi def link mlirType         Type
+hi def link mlirMapOutline   PreProc
+hi def link mlirConditional  Conditional
+hi def link mlirString       String
+hi def link mlirOperator     Operator
+hi def link mlirInstruction  Operator
+hi def link mlirAffineOp     Operator
+
+let b:current_syntax = "mlir"