diff --git a/tensorflow/compiler/mlir/xla/BUILD b/tensorflow/compiler/mlir/xla/BUILD
index bf98b808f53..35c8d2bd0eb 100644
--- a/tensorflow/compiler/mlir/xla/BUILD
+++ b/tensorflow/compiler/mlir/xla/BUILD
@@ -31,67 +31,40 @@ filegroup(
 gentbl(
     name = "hlo_ops_inc_gen",
     tbl_outs = [
-        (
-            "-gen-op-decls",
-            "ir/hlo_ops.h.inc",
-        ),
-        (
-            "-gen-op-defs",
-            "ir/hlo_ops.cc.inc",
-        ),
+        ("-gen-op-decls", "ir/hlo_ops.h.inc"),
+        ("-gen-op-defs", "ir/hlo_ops.cc.inc"),
     ],
     tblgen = "@local_config_mlir//:mlir-tblgen",
     td_file = "ir/hlo_ops.td",
-    td_srcs = [
-        ":hlo_ops_td_files",
-    ],
+    td_srcs = [":hlo_ops_td_files"],
 )
 
 gentbl(
     name = "hlo_ops_base_inc_gen",
     tbl_outs = [
-        (
-            "-gen-op-decls",
-            "ir/hlo_ops_base.h.inc",
-        ),
-        (
-            "-gen-op-defs",
-            "ir/hlo_ops_base.cc.inc",
-        ),
+        ("-gen-op-decls", "ir/hlo_ops_base.h.inc"),
+        ("-gen-op-defs", "ir/hlo_ops_base.cc.inc"),
     ],
     tblgen = "@local_config_mlir//:mlir-tblgen",
     td_file = "ir/hlo_ops_base.td",
-    td_srcs = [
-        ":hlo_ops_td_files",
-    ],
+    td_srcs = [":hlo_ops_td_files"],
 )
 
 gentbl(
     name = "lhlo_ops_inc_gen",
     tbl_outs = [
-        (
-            "-gen-op-decls",
-            "ir/lhlo_ops.h.inc",
-        ),
-        (
-            "-gen-op-defs",
-            "ir/lhlo_ops.cc.inc",
-        ),
+        ("-gen-op-decls", "ir/lhlo_ops.h.inc"),
+        ("-gen-op-defs", "ir/lhlo_ops.cc.inc"),
     ],
     tblgen = "@local_config_mlir//:mlir-tblgen",
     td_file = "ir/lhlo_ops.td",
-    td_srcs = [
-        ":hlo_ops_td_files",
-    ],
+    td_srcs = [":hlo_ops_td_files"],
 )
 
 gentbl(
     name = "xla_legalize_tf_inc_gen",
     tbl_outs = [
-        (
-            "-gen-rewriters",
-            "transforms/generated_legalize_tf.inc",
-        ),
+        ("-gen-rewriters", "transforms/generated_legalize_tf.inc"),
     ],
     tblgen = "@local_config_mlir//:mlir-tblgen",
     td_file = "transforms/legalize_tf_patterns.td",
@@ -125,10 +98,7 @@ cc_library(
 gentbl(
     name = "xla_legalize_to_standard_inc_gen",
     tbl_outs = [
-        (
-            "-gen-rewriters",
-            "transforms/generated_legalize_to_standard.inc",
-        ),
+        ("-gen-rewriters", "transforms/generated_legalize_to_standard.inc"),
     ],
     tblgen = "@local_config_mlir//:mlir-tblgen",
     td_file = "transforms/legalize_to_standard_patterns.td",
@@ -158,9 +128,7 @@ cc_library(
 
 cc_library(
     name = "xla_legalize_to_standard",
-    srcs = [
-        "transforms/legalize_to_standard.cc",
-    ],
+    srcs = ["transforms/legalize_to_standard.cc"],
     copts = ["-std=c++14"],
     deps = [
         ":hlo",
@@ -298,12 +266,8 @@ cc_library(
 
 cc_library(
     name = "hlo_to_mlir_hlo",
-    srcs = [
-        "hlo_to_mlir_hlo.cc",
-    ],
-    hdrs = [
-        "hlo_to_mlir_hlo.h",
-    ],
+    srcs = ["hlo_to_mlir_hlo.cc"],
+    hdrs = ["hlo_to_mlir_hlo.h"],
     copts = ["-std=c++14"],
     deps = [
         ":hlo_module_importer",
@@ -344,12 +308,8 @@ cc_library(
 
 cc_library(
     name = "xla_mlir_translate",
-    srcs = [
-        "xla_mlir_translate.cc",
-    ],
-    hdrs = [
-        "xla_mlir_translate.h",
-    ],
+    srcs = ["xla_mlir_translate.cc"],
+    hdrs = ["xla_mlir_translate.h"],
     copts = ["-std=c++14"],
     deps = [
         ":hlo_to_mlir_hlo",
@@ -369,9 +329,7 @@ cc_library(
 
 tf_native_cc_binary(
     name = "operator_writer_gen",
-    srcs = [
-        "operator_writer_gen.cc",
-    ],
+    srcs = ["operator_writer_gen.cc"],
     deps = [
         "@llvm//:support",
         "@llvm//:tablegen",
@@ -386,9 +344,7 @@ genrule(
         "//tensorflow/compiler/mlir/xla:ir/hlo_ops.td",
         "//tensorflow/compiler/mlir/xla:ir/hlo_ops_base.td",
     ],
-    outs = [
-        "operator_writers.inc",
-    ],
+    outs = ["operator_writers.inc"],
     cmd = ("$(location :operator_writer_gen) " +
            "-I external/local_config_mlir/include " +
            "$(location //tensorflow/compiler/mlir/xla:ir/hlo_ops.td) " +