Google Git
Sign in
opensecura/3p/openxla/iree/052dae1ab8ead95dd99bdab4026b6cbee2767757^!/.
commit
052dae1ab8ead95dd99bdab4026b6cbee2767757
[log]
author
Rob Suderman <rob.suderman@gmail.com>
Mon Mar 23 14:26:46 2020 -0700
committer
Copybara-Service <copybara-worker@google.com>
Mon Mar 23 14:28:06 2020 -0700
tree
bcf46291e730853cbade57922c08b553a8a4e112
parent
48efde60429bf1aef9ce8f018e6be52ea36b6e65 [diff]
Updated submodules with CMake Changes

A few cmake changes were missed in the upstream.

Closes https://github.com/google/iree/pull/1218

PiperOrigin-RevId: 302517483

diff --git a/SUBMODULE_VERSIONS b/SUBMODULE_VERSIONS
index 2101284..97f85e1 100644
--- a/SUBMODULE_VERSIONS
+++ b/SUBMODULE_VERSIONS

@@ -6,14 +6,14 @@
 48233ad3d45b314a83474b3704ae09638e3e2621 third_party/glslang
 89ca6c25bae7c11d12409739b2ef707ed9afe6c2 third_party/google_tracing_framework
 f2fb48c3b3d79a75a88a99fba6576b25d42ec528 third_party/googletest
-4a7f2032a350bc7eefd26709563f65216df3e2ce third_party/llvm-project
+a711a3a46039154c38eade8bef1138b77fdb05ee third_party/llvm-project
 80d452484c5409444b0ec19383faa84bb7a4d351 third_party/pybind11
 3d62e9545bd15c5df9ccfdd8453b93d64a6dd8eb third_party/ruy
 b73f111094da3e380a1774b56b15f16c90ae8e23 third_party/sdl2
 b252a50953ac4375cb1864e94f4b0234db9d215d third_party/spirv_headers
 feb154921397dc8c43c130a6b5c123efdb432a9b third_party/spirv_tools
 6652f0b6428777b5a4a3d191cc30d8b31366b999 third_party/swiftshader
-cbc5ab117445ac0328311df8abea61be6256b92f third_party/tensorflow
+e7bbb424808eb7ebbeb959b993496adafd024609 third_party/tensorflow
 8a457f8552d8d47ce3a96ed80a714ff6396f8ad8 third_party/vulkan_extensionlayer
 9bd3f561bcee3f01d22912de10bb07ce4e23d378 third_party/vulkan_headers
 909f36b714c9239ee0b112a321220213a474ba53 third_party/vulkan_memory_allocator

diff --git a/build_tools/bazel/third_party_import/llvm-project/overlay/mlir/BUILD.bazel b/build_tools/bazel/third_party_import/llvm-project/overlay/mlir/BUILD.bazel
index aafe0e6..32a26d7 100644
--- a/build_tools/bazel/third_party_import/llvm-project/overlay/mlir/BUILD.bazel
+++ b/build_tools/bazel/third_party_import/llvm-project/overlay/mlir/BUILD.bazel

@@ -139,11 +139,15 @@
     ],
 )
 
+##---------------------------------------------------------------------------##
+# Affine dialect.
+##---------------------------------------------------------------------------##
+
 filegroup(
     name = "AffineOpsTdFiles",
     srcs = [
-        "include/mlir/Dialect/AffineOps/AffineOps.td",
-        "include/mlir/Dialect/AffineOps/AffineOpsBase.td",
+        "include/mlir/Dialect/Affine/IR/AffineOps.td",
+        "include/mlir/Dialect/Affine/IR/AffineOpsBase.td",
         "include/mlir/Interfaces/LoopLikeInterface.td",
         "include/mlir/Interfaces/SideEffects.td",
         ":OpBaseTdFiles",
@@ -156,24 +160,112 @@
     tbl_outs = [
         (
             "-gen-op-decls",
-            "include/mlir/Dialect/AffineOps/AffineOps.h.inc",
+            "include/mlir/Dialect/Affine/IR/AffineOps.h.inc",
         ),
         (
             "-gen-op-defs",
-            "include/mlir/Dialect/AffineOps/AffineOps.cpp.inc",
+            "include/mlir/Dialect/Affine/IR/AffineOps.cpp.inc",
         ),
         (
             "-gen-dialect-decls",
-            "include/mlir/Dialect/AffineOps/AffineOpsDialect.h.inc",
+            "include/mlir/Dialect/Affine/IR/AffineOpsDialect.h.inc",
         ),
     ],
     tblgen = ":mlir-tblgen",
-    td_file = "include/mlir/Dialect/AffineOps/AffineOps.td",
+    td_file = "include/mlir/Dialect/Affine/IR/AffineOps.td",
     td_srcs = [
         ":AffineOpsTdFiles",
     ],
 )
 
+##---------------------------------------------------------------------------##
+# AVX512 dialect.
+##---------------------------------------------------------------------------##
+
+filegroup(
+    name = "AVX512TdFiles",
+    srcs = [
+        "include/mlir/Dialect/AVX512/AVX512.td",
+        "include/mlir/Dialect/LLVMIR/LLVMOpBase.td",
+        "include/mlir/IR/OpBase.td",
+        "include/mlir/Interfaces/SideEffects.td",
+    ],
+)
+
+gentbl(
+    name = "AVX512IncGen",
+    strip_include_prefix = "include",
+    tbl_outs = [
+        (
+            "-gen-dialect-decls -dialect=avx512",
+            "include/mlir/Dialect/AVX512/AVX512Dialect.h.inc",
+        ),
+        (
+            "-gen-op-decls",
+            "include/mlir/Dialect/AVX512/AVX512.h.inc",
+        ),
+        (
+            "-gen-op-defs",
+            "include/mlir/Dialect/AVX512/AVX512.cpp.inc",
+        ),
+        (
+            "-gen-op-doc",
+            "g3doc/Dialects/AVX512/AVX512.md",
+        ),
+    ],
+    tblgen = ":mlir-tblgen",
+    td_file = "include/mlir/Dialect/AVX512/AVX512.td",
+    td_srcs = [
+        ":AVX512TdFiles",
+    ],
+)
+
+cc_library(
+    name = "AVX512",
+    srcs = [
+        "lib/Dialect/AVX512/IR/AVX512Dialect.cpp",
+    ],
+    hdrs = [
+        "include/mlir/Dialect/AVX512/AVX512Dialect.h",
+    ],
+    includes = ["include"],
+    deps = [
+        ":AVX512IncGen",
+        ":IR",
+        ":SideEffects",
+        ":VectorOps",
+        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:support",
+    ],
+)
+
+cc_library(
+    name = "AVX512ToLLVM",
+    srcs = glob([
+        "lib/Conversion/AVX512ToLLVM/*.cpp",
+    ]),
+    hdrs = glob([
+        "include/mlir/Conversion/AVX512ToLLVM/*.h",
+    ]),
+    includes = ["include"],
+    deps = [
+        ":AVX512",
+        ":EDSC",
+        ":IR",
+        ":LLVMAVX512",
+        ":LLVMDialect",
+        ":LLVMTransforms",
+        ":Pass",
+        ":StandardOps",
+        ":Support",
+        ":Transforms",
+        ":VectorOps",
+        ":VectorToLLVM",
+        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:support",
+    ],
+)
+
 filegroup(
     name = "LoopOpsTdFiles",
     srcs = [
@@ -214,7 +306,7 @@
     hdrs = ["include/mlir/Dialect/LoopOps/Passes.h"],
     includes = ["include"],
     deps = [
-        ":AffineOps",
+        ":Affine",
         ":IR",
         ":LoopOps",
         ":Pass",
@@ -303,19 +395,19 @@
 )
 
 cc_library(
-    name = "AffineOps",
+    name = "Affine",
     srcs = glob(
         [
-            "lib/Dialect/AffineOps/*.cpp",
-            "lib/Dialect/AffineOps/*.h",
-            "lib/Dialect/AffineOps/EDSC/*.cpp",
+            "lib/Dialect/Affine/IR/*.cpp",
+            "lib/Dialect/Affine/IR/*.h",
+            "lib/Dialect/Affine/EDSC/*.cpp",
         ],
     ) + [
         "include/mlir/Transforms/InliningUtils.h",
     ],
     hdrs = glob([
-        "include/mlir/Dialect/AffineOps/*.h",
-        "include/mlir/Dialect/AffineOps/EDSC/*.h",
+        "include/mlir/Dialect/Affine/IR/*.h",
+        "include/mlir/Dialect/Affine/EDSC/*.h",
     ]),
     includes = ["include"],
     deps = [
@@ -331,6 +423,29 @@
 )
 
 cc_library(
+    name = "AffineTransforms",
+    srcs = glob([
+        "lib/Dialect/Affine/Transforms/*.cpp",
+    ]),
+    hdrs = [
+        "include/mlir/Dialect/Affine/Passes.h",
+    ],
+    includes = ["include"],
+    deps = [
+        ":Affine",
+        ":Analysis",
+        ":IR",
+        ":LoopOps",
+        ":Pass",
+        ":StandardOps",
+        ":Support",
+        ":Transforms",
+        ":VectorOps",
+        "@llvm-project//llvm:support",
+    ],
+)
+
+cc_library(
     name = "AffineToStandardTransforms",
     srcs = glob([
         "lib/Conversion/AffineToStandard/*.cpp",
@@ -339,7 +454,7 @@
     hdrs = glob(["include/mlir/Conversion/AffineToStandard/*.h"]),
     includes = ["include"],
     deps = [
-        ":AffineOps",
+        ":Affine",
         ":IR",
         ":LoopOps",
         ":Pass",
@@ -482,6 +597,28 @@
 )
 
 cc_library(
+    name = "StandardOpsTransforms",
+    srcs = glob(
+        [
+            "lib/Dialect/StandardOps/Transforms/*.cpp",
+            "lib/Dialect/StandardOps/Transforms/*.h",
+        ],
+    ),
+    hdrs = glob([
+        "include/mlir/Dialect/StandardOps/Transforms/*.h",
+    ]),
+    includes = ["include"],
+    deps = [
+        ":Analysis",
+        ":ControlFlowInterfaces",
+        ":IR",
+        ":StandardOps",
+        ":Support",
+        "@llvm-project//llvm:support",
+    ],
+)
+
+cc_library(
     name = "VectorOps",
     srcs = glob(
         [
@@ -497,7 +634,7 @@
     ]),
     includes = ["include"],
     deps = [
-        ":AffineOps",
+        ":Affine",
         ":Analysis",
         ":DialectUtils",
         ":EDSC",
@@ -567,6 +704,94 @@
     ],
 )
 
+filegroup(
+    name = "LLVMAVX512TdFiles",
+    srcs = [
+        "include/mlir/Dialect/LLVMIR/LLVMAVX512.td",
+        ":LLVMOpsTdFiles",
+    ],
+)
+
+gentbl(
+    name = "LLVMAVX512IncGen",
+    strip_include_prefix = "include",
+    tbl_outs = [
+        (
+            "-gen-dialect-decls -dialect=llvm_avx512",
+            "include/mlir/Dialect/LLVMIR/LLVMAVX512Dialect.h.inc",
+        ),
+        (
+            "-gen-op-decls",
+            "include/mlir/Dialect/LLVMIR/LLVMAVX512.h.inc",
+        ),
+        (
+            "-gen-op-defs",
+            "include/mlir/Dialect/LLVMIR/LLVMAVX512.cpp.inc",
+        ),
+        (
+            "-gen-op-doc",
+            "g3doc/Dialects/LLVMIR/LLVMAVX512.md",
+        ),
+    ],
+    tblgen = ":mlir-tblgen",
+    td_file = "include/mlir/Dialect/LLVMIR/LLVMAVX512.td",
+    td_srcs = [
+        ":LLVMAVX512TdFiles",
+    ],
+)
+
+cc_library(
+    name = "LLVMAVX512",
+    srcs = [
+        "lib/Dialect/LLVMIR/IR/LLVMAVX512Dialect.cpp",
+    ],
+    hdrs = [
+        "include/mlir/Dialect/LLVMIR/LLVMAVX512Dialect.h",
+    ],
+    includes = ["include"],
+    deps = [
+        ":IR",
+        ":LLVMAVX512IncGen",
+        ":LLVMDialect",
+        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:support",
+    ],
+)
+
+gentbl(
+    name = "LLVMAVX512ConversionIncGen",
+    strip_include_prefix = "include",
+    tbl_outs = [
+        (
+            "-gen-llvmir-conversions",
+            "include/mlir/Dialect/LLVMIR/LLVMAVX512Conversions.inc",
+        ),
+    ],
+    tblgen = ":mlir-tblgen",
+    td_file = "include/mlir/Dialect/LLVMIR/LLVMAVX512.td",
+    td_srcs = [
+        ":LLVMAVX512TdFiles",
+    ],
+)
+
+cc_library(
+    name = "TargetLLVMAVX512Intr",
+    srcs = [
+        "lib/Target/LLVMIR/LLVMAVX512Intr.cpp",
+    ],
+    includes = ["include"],
+    deps = [
+        ":IR",
+        ":LLVMAVX512",
+        ":LLVMAVX512ConversionIncGen",
+        ":LLVMIRModuleTranslation",
+        ":Translation",
+        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:support",
+    ],
+    alwayslink = 1,
+)
+
 cc_library(
     name = "LLVMDialect",
     srcs = glob(
@@ -575,6 +800,8 @@
             "lib/Dialect/LLVMIR/IR/*.h",
         ],
         exclude = [
+            "lib/Dialect/LLVMIR/IR/*AVX512*.cpp",
+            "lib/Dialect/LLVMIR/IR/*AVX512*.h",
             "lib/Dialect/LLVMIR/IR/NVVM*.cpp",
             "lib/Dialect/LLVMIR/IR/NVVM*.h",
             "lib/Dialect/LLVMIR/IR/ROCDL*.cpp",
@@ -586,6 +813,7 @@
             "include/mlir/Dialect/LLVMIR/*.h",
         ],
         exclude = [
+            "include/mlir/Dialect/LLVMIR/*AVX512*.h",
             "include/mlir/Dialect/LLVMIR/NVVM*.h",
             "include/mlir/Dialect/LLVMIR/ROCDL*.h",
         ],
@@ -1393,7 +1621,7 @@
     ]),
     includes = ["include"],
     deps = [
-        ":AffineOps",
+        ":Affine",
         ":Analysis",
         ":ControlFlowInterfaces",
         ":IR",
@@ -1474,7 +1702,7 @@
     ]),
     includes = ["include"],
     deps = [
-        ":AffineOps",
+        ":Affine",
         ":Analysis",
         ":IR",
         ":LoopLikeInterface",
@@ -1513,7 +1741,7 @@
     ],
     includes = ["include"],
     deps = [
-        ":AffineOps",
+        ":Affine",
         ":AffineToStandardTransforms",
         ":GPUDialect",
         ":IR",
@@ -1537,7 +1765,7 @@
     ],
     includes = ["include"],
     deps = [
-        ":AffineOps",
+        ":Affine",
         ":GPUDialect",
         ":LoopOps",
         ":LoopsToGPU",
@@ -1552,7 +1780,7 @@
 cc_library(
     name = "CFGTransforms",
     srcs = [
-        "lib/Conversion/LoopToStandard/ConvertLoopToStandard.cpp",
+        "lib/Conversion/LoopToStandard/LoopToStandard.cpp",
     ],
     hdrs = [
         "include/mlir/Conversion/LoopToStandard/ConvertLoopToStandard.h",
@@ -1573,7 +1801,7 @@
 cc_library(
     name = "LLVMTransforms",
     srcs = [
-        "lib/Conversion/StandardToLLVM/ConvertStandardToLLVM.cpp",
+        "lib/Conversion/StandardToLLVM/StandardToLLVM.cpp",
     ],
     hdrs = [
         "include/mlir/Conversion/StandardToLLVM/ConvertStandardToLLVM.h",
@@ -1763,7 +1991,7 @@
     ),
     includes = ["include"],
     deps = [
-        ":AffineOps",
+        ":Affine",
         ":CallOpInterfaces",
         ":IR",
         ":LoopOps",
@@ -1833,6 +2061,7 @@
         ":LLVMDialect",
         ":LLVMIRModuleTranslation",
         ":Support",
+        ":TargetLLVMAVX512Intr",
         ":Translation",
         "@llvm-project//llvm:core",
         "@llvm-project//llvm:ir_reader",
@@ -1943,9 +2172,6 @@
     srcs = [
         "lib/Support/MlirOptMain.cpp",
     ],
-    hdrs = [
-        "include/mlir/Analysis/Passes.h",
-    ],
     includes = ["include"],
     deps = [
         ":Analysis",
@@ -1970,6 +2196,7 @@
         ":VectorToLLVM",
         ":VectorToLoops",
         "@llvm-project//llvm:support",
+        "@llvm-project//mlir/test:TestAffine",
         "@llvm-project//mlir/test:TestDialect",
         "@llvm-project//mlir/test:TestIR",
         "@llvm-project//mlir/test:TestPass",
@@ -2026,7 +2253,10 @@
     ],
     defines = ["MLIR_CUDA_CONVERSIONS_ENABLED"],
     deps = [
-        ":AffineOps",
+        ":AVX512",
+        ":AVX512ToLLVM",
+        ":Affine",
+        ":AffineTransforms",
         ":Analysis",
         ":FxpMathOps",
         ":GPUDialect",
@@ -2037,6 +2267,7 @@
         ":GPUToVulkanTransforms",
         ":GPUTransforms",
         ":IR",
+        ":LLVMAVX512",
         ":LLVMDialect",
         ":LLVMIRTransforms",
         ":LinalgOps",
@@ -2103,6 +2334,7 @@
         ":Transforms",
         "@llvm-project//llvm:all_targets",
         "@llvm-project//llvm:support",
+        "@llvm-project//mlir/test:TestAffine",
         "@llvm-project//mlir/test:TestDialect",
         "@llvm-project//mlir/test:TestIR",
         "@llvm-project//mlir/test:TestPass",
@@ -2661,7 +2893,7 @@
     ],
     includes = ["include"],
     deps = [
-        ":AffineOps",
+        ":Affine",
         ":AffineToStandardTransforms",
         ":Analysis",
         ":CFGTransforms",
@@ -2832,7 +3064,7 @@
     ]),
     includes = ["include"],
     deps = [
-        ":AffineOps",
+        ":Affine",
         ":EDSC",
         ":IR",
         ":LLVMDialect",
@@ -2867,7 +3099,7 @@
         "include/mlir/IR/OpBase.td",
         "include/mlir/Transforms/InliningUtils.h",
     ],
-    visibility = ["@llvm-project//mlir:friends"],
+    visibility = [":friends"],
 )
 
 exports_files(
@@ -2875,5 +3107,5 @@
         "include/mlir/Interfaces/InferTypeOpInterface.td",
         "include/mlir/Interfaces/LoopLikeInterface.td",
     ],
-    visibility = ["@llvm-project//mlir:friends"],
+    visibility = [":friends"],
 )

diff --git a/build_tools/bazel/third_party_import/llvm-project/overlay/mlir/test/BUILD.bazel b/build_tools/bazel/third_party_import/llvm-project/overlay/mlir/test/BUILD.bazel
index 19f433a..ad5a3ff 100644
--- a/build_tools/bazel/third_party_import/llvm-project/overlay/mlir/test/BUILD.bazel
+++ b/build_tools/bazel/third_party_import/llvm-project/overlay/mlir/test/BUILD.bazel

@@ -153,16 +153,18 @@
     srcs = glob([
         "lib/Transforms/*.cpp",
     ]),
+    defines = ["MLIR_CUDA_CONVERSIONS_ENABLED"],
     includes = ["lib/TestDialect"],
     deps = [
         ":TestDialect",
         ":TestLinalgTransformPatternsIncGen",
         ":TestVectorTransformPatternsIncGen",
         "@llvm-project//llvm:support",
-        "@llvm-project//mlir:AffineOps",
+        "@llvm-project//mlir:Affine",
         "@llvm-project//mlir:Analysis",
         "@llvm-project//mlir:EDSC",
         "@llvm-project//mlir:GPUDialect",
+        "@llvm-project//mlir:GPUToCUDATransforms",
         "@llvm-project//mlir:GPUTransforms",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:LinalgOps",
@@ -180,6 +182,24 @@
 )
 
 cc_library(
+    name = "TestAffine",
+    srcs = glob([
+        "lib/Dialect/Affine/*.cpp",
+    ]),
+    deps = [
+        "@llvm-project//llvm:support",
+        "@llvm-project//mlir:Affine",
+        "@llvm-project//mlir:AffineTransforms",
+        "@llvm-project//mlir:Analysis",
+        "@llvm-project//mlir:IR",
+        "@llvm-project//mlir:Pass",
+        "@llvm-project//mlir:Support",
+        "@llvm-project//mlir:Transforms",
+        "@llvm-project//mlir:VectorOps",
+    ],
+)
+
+cc_library(
     name = "TestSPIRV",
     srcs = glob([
         "lib/Dialect/SPIRV/*.cpp",

diff --git a/iree/compiler/Translation/SPIRV/LinalgToSPIRV/CMakeLists.txt b/iree/compiler/Translation/SPIRV/LinalgToSPIRV/CMakeLists.txt
index 21b9b30..370c17b 100644
--- a/iree/compiler/Translation/SPIRV/LinalgToSPIRV/CMakeLists.txt
+++ b/iree/compiler/Translation/SPIRV/LinalgToSPIRV/CMakeLists.txt

@@ -25,7 +25,7 @@
     "LowerToSPIRV.cpp"
   DEPS
     LLVMSupport
-    MLIRAffineOps
+    MLIRAffine
     MLIRAffineToStandard
     MLIREDSC
     MLIRGPU

diff --git a/iree/compiler/Translation/SPIRV/XLAToSPIRV/CMakeLists.txt b/iree/compiler/Translation/SPIRV/XLAToSPIRV/CMakeLists.txt
index 08a7a6f..aff9a6b 100644
--- a/iree/compiler/Translation/SPIRV/XLAToSPIRV/CMakeLists.txt
+++ b/iree/compiler/Translation/SPIRV/XLAToSPIRV/CMakeLists.txt

@@ -30,7 +30,7 @@
     "XLAToSPIRV.cpp"
   DEPS
     LLVMSupport
-    MLIRAffineOps
+    MLIRAffine
     MLIRAffineToStandard
     MLIRIR
     MLIRPass

diff --git a/iree/tools/CMakeLists.txt b/iree/tools/CMakeLists.txt
index c7d71c8..1285165 100644
--- a/iree/tools/CMakeLists.txt
+++ b/iree/tools/CMakeLists.txt

@@ -79,7 +79,8 @@
     "init_dialects.h"
     "init_passes.h"
   DEPS
-    MLIRAffineOps
+    MLIRAffine
+    MLIRAffineTransforms
     MLIRAnalysis
     MLIRFxpMathOps
     MLIRGPU

diff --git a/third_party/llvm-project b/third_party/llvm-project
index 4a7f203..a711a3a 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project

@@ -1 +1 @@
-Subproject commit 4a7f2032a350bc7eefd26709563f65216df3e2ce
+Subproject commit a711a3a46039154c38eade8bef1138b77fdb05ee

diff --git a/third_party/tensorflow b/third_party/tensorflow
index cbc5ab1..e7bbb42 160000
--- a/third_party/tensorflow
+++ b/third_party/tensorflow

@@ -1 +1 @@
-Subproject commit cbc5ab117445ac0328311df8abea61be6256b92f
+Subproject commit e7bbb424808eb7ebbeb959b993496adafd024609