From 41647e829c50e18984493285f066673a026fde67 Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Tue, 29 Dec 2020 08:28:35 -0800 Subject: [PATCH] Integrate LLVM at llvm/llvm-project@930c74f12d79 Updates LLVM usage to match [930c74f12d79](https://github.com/llvm/llvm-project/commit/930c74f12d79) PiperOrigin-RevId: 349426692 Change-Id: I6b5f4a1940dee0fc01bc766b2e581c86a0c8ccd0 --- tensorflow/workspace.bzl | 4 +- third_party/mlir/BUILD | 79 +++++++++++++++++++++---------------- third_party/mlir/test.BUILD | 1 + 3 files changed, 48 insertions(+), 36 deletions(-) diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl index 9eb7073e5e8..9f2f5f0a65f 100755 --- a/tensorflow/workspace.bzl +++ b/tensorflow/workspace.bzl @@ -685,8 +685,8 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""): ) # Check out LLVM and MLIR from llvm-project. - LLVM_COMMIT = "c3acda0798f9b10ac3187ad941bbd8af82fb84a1" - LLVM_SHA256 = "bd707c585368c86a4d9de1f262d39adb230f7dac889aa786b2721bf67b447a8c" + LLVM_COMMIT = "930c74f12d799c95e37a107bb692148b36493806" + LLVM_SHA256 = "367b7c624839d24fb444e675c26db3df5f0c0ad5c2acc8c62a1647de751159f6" LLVM_URLS = [ "https://storage.googleapis.com/mirror.tensorflow.org/github.com/llvm/llvm-project/archive/{commit}.tar.gz".format(commit = LLVM_COMMIT), "https://github.com/llvm/llvm-project/archive/{commit}.tar.gz".format(commit = LLVM_COMMIT), diff --git a/third_party/mlir/BUILD b/third_party/mlir/BUILD index 1cec46b4b4c..c94d3ba5283 100644 --- a/third_party/mlir/BUILD +++ b/third_party/mlir/BUILD @@ -1260,7 +1260,7 @@ cc_library( ":GPUToGPURuntimeTransforms", ":GPUToNVVMTransforms", ":GPUToROCDLTransforms", - ":GPUToSPIRVTransforms", + ":GPUToSPIRV", ":GPUToVulkanTransforms", ":LinalgToLLVM", ":LinalgToSPIRV", @@ -1269,11 +1269,12 @@ cc_library( ":PDLToPDLInterp", ":SCFToGPUPass", ":SCFToOpenMP", + ":SCFToSPIRV", ":SCFToStandard", ":SPIRVToLLVM", ":ShapeToStandard", ":StandardToLLVM", - ":StandardToSPIRVTransforms", + ":StandardToSPIRV", ":VectorToLLVM", ":VectorToROCDL", ":VectorToSCF", @@ -2051,14 +2052,13 @@ cc_library( cc_library( name = "VectorToSPIRV", - srcs = [ - "lib/Conversion/PassDetail.h", - "lib/Conversion/VectorToSPIRV/VectorToSPIRV.cpp", - ], - hdrs = [ - "include/mlir/Conversion/VectorToSPIRV/ConvertVectorToSPIRV.h", - "include/mlir/Conversion/VectorToSPIRV/ConvertVectorToSPIRVPass.h", - ], + srcs = glob([ + "lib/Conversion/VectorToSPIRV/*.cpp", + "lib/Conversion/VectorToSPIRV/*.h", + ]) + ["lib/Conversion/PassDetail.h"], + hdrs = glob([ + "include/mlir/Conversion/VectorToSPIRV/*.h", + ]), includes = ["include"], deps = [ ":ConversionPassIncGen", @@ -2181,16 +2181,14 @@ gentbl( ) cc_library( - name = "GPUToSPIRVTransforms", - srcs = [ - "lib/Conversion/GPUToSPIRV/ConvertGPUToSPIRV.cpp", - "lib/Conversion/GPUToSPIRV/ConvertGPUToSPIRVPass.cpp", - "lib/Conversion/PassDetail.h", - ], - hdrs = [ - "include/mlir/Conversion/GPUToSPIRV/ConvertGPUToSPIRV.h", - "include/mlir/Conversion/GPUToSPIRV/ConvertGPUToSPIRVPass.h", - ], + name = "GPUToSPIRV", + srcs = glob([ + "lib/Conversion/GPUToSPIRV/*.cpp", + "lib/Conversion/GPUToSPIRV/*.h", + ]) + ["lib/Conversion/PassDetail.h"], + hdrs = glob([ + "include/mlir/Conversion/GPUToSPIRV/*.h", + ]), includes = [ "include", "lib/Conversions/GPUToSPIRV", @@ -2205,7 +2203,7 @@ cc_library( ":SCFToSPIRV", ":SPIRVConversion", ":SPIRVDialect", - ":StandardToSPIRVTransforms", + ":StandardToSPIRV", ":Support", ":Transforms", ":VectorToSPIRV", @@ -2847,7 +2845,7 @@ cc_library( ) cc_library( - name = "StandardToSPIRVTransforms", + name = "StandardToSPIRV", srcs = glob([ "lib/Conversion/StandardToSPIRV/*.cpp", "lib/Conversion/StandardToSPIRV/*.h", @@ -2874,11 +2872,6 @@ cc_library( ], ) -alias( - name = "StandardToSPIRVConversions", - actual = "StandardToSPIRVTransforms", -) - cc_library( name = "SPIRVBinaryUtils", srcs = [ @@ -3370,12 +3363,16 @@ cc_library( cc_library( name = "SCFToSPIRV", - srcs = ["lib/Conversion/SCFToSPIRV/SCFToSPIRV.cpp"], - hdrs = ["include/mlir/Conversion/SCFToSPIRV/SCFToSPIRV.h"], + srcs = glob([ + "lib/Conversion/SCFToSPIRV/*.cpp", + "lib/Conversion/SCFToSPIRV/*.h", + ]) + ["lib/Conversion/PassDetail.h"], + hdrs = glob([ + "include/mlir/Conversion/SCFToSPIRV/*.h", + ]), includes = ["include"], deps = [ ":Affine", - ":AffineToStandard", ":ConversionPassIncGen", ":IR", ":Pass", @@ -3383,6 +3380,7 @@ cc_library( ":SPIRVConversion", ":SPIRVDialect", ":StandardOps", + ":StandardToSPIRV", ":Support", ":TransformUtils", ":Transforms", @@ -3842,9 +3840,22 @@ cc_library( ], includes = ["include"], deps = [ + ":Analysis", + ":ConversionPasses", + ":GPUToGPURuntimeTransforms", + ":GPUToNVVMTransforms", + ":GPUToROCDLTransforms", + ":GPUToSPIRV", + ":GPUTransforms", ":IR", ":Parser", ":Pass", + ":SCFTransforms", + ":ShapeToStandard", + ":ShapeTransforms", + ":StandardOpsTransforms", + ":StandardToLLVM", + ":StandardToSPIRV", ":Support", "@llvm-project//llvm:Support", ], @@ -3910,7 +3921,7 @@ cc_library( ":GPUToGPURuntimeTransforms", ":GPUToNVVMTransforms", ":GPUToROCDLTransforms", - ":GPUToSPIRVTransforms", + ":GPUToSPIRV", ":GPUToVulkanTransforms", ":GPUTransforms", ":IR", @@ -3954,7 +3965,7 @@ cc_library( ":StandardOpsTransforms", ":StandardOpsTransformsPassIncGen", ":StandardToLLVM", - ":StandardToSPIRVTransforms", + ":StandardToSPIRV", ":TensorDialect", ":TensorTransforms", ":TosaDialect", @@ -4172,7 +4183,7 @@ cc_binary( deps = [ ":AllPassesAndDialectsNoRegistration", ":ExecutionEngineUtils", - ":GPUToSPIRVTransforms", + ":GPUToSPIRV", ":GPUToVulkanTransforms", ":GPUTransforms", ":MlirJitRunner", @@ -4180,7 +4191,7 @@ cc_binary( ":SPIRVDialect", ":SPIRVTransforms", ":StandardToLLVM", - ":StandardToSPIRVTransforms", + ":StandardToSPIRV", "@llvm-project//llvm:Support", ], ) diff --git a/third_party/mlir/test.BUILD b/third_party/mlir/test.BUILD index 6ba0fbed530..a54cfc568d5 100644 --- a/third_party/mlir/test.BUILD +++ b/third_party/mlir/test.BUILD @@ -311,6 +311,7 @@ cc_library( "@llvm-project//mlir:SPIRVConversion", "@llvm-project//mlir:SPIRVDialect", "@llvm-project//mlir:SPIRVModuleCombiner", + "@llvm-project//mlir:Transforms", ], )