Updates LLVM usage to match
[930c74f12d79](https://github.com/llvm/llvm-project/commit/930c74f12d79)

PiperOrigin-RevId: 349426692
Change-Id: I6b5f4a1940dee0fc01bc766b2e581c86a0c8ccd0
This commit is contained in:
A. Unique TensorFlower 2020-12-29 08:28:35 -08:00 committed by TensorFlower Gardener
parent 78bce125bf
commit 41647e829c
3 changed files with 48 additions and 36 deletions

View File

@ -685,8 +685,8 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""):
) )
# Check out LLVM and MLIR from llvm-project. # Check out LLVM and MLIR from llvm-project.
LLVM_COMMIT = "c3acda0798f9b10ac3187ad941bbd8af82fb84a1" LLVM_COMMIT = "930c74f12d799c95e37a107bb692148b36493806"
LLVM_SHA256 = "bd707c585368c86a4d9de1f262d39adb230f7dac889aa786b2721bf67b447a8c" LLVM_SHA256 = "367b7c624839d24fb444e675c26db3df5f0c0ad5c2acc8c62a1647de751159f6"
LLVM_URLS = [ LLVM_URLS = [
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/llvm/llvm-project/archive/{commit}.tar.gz".format(commit = LLVM_COMMIT), "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), "https://github.com/llvm/llvm-project/archive/{commit}.tar.gz".format(commit = LLVM_COMMIT),

View File

@ -1260,7 +1260,7 @@ cc_library(
":GPUToGPURuntimeTransforms", ":GPUToGPURuntimeTransforms",
":GPUToNVVMTransforms", ":GPUToNVVMTransforms",
":GPUToROCDLTransforms", ":GPUToROCDLTransforms",
":GPUToSPIRVTransforms", ":GPUToSPIRV",
":GPUToVulkanTransforms", ":GPUToVulkanTransforms",
":LinalgToLLVM", ":LinalgToLLVM",
":LinalgToSPIRV", ":LinalgToSPIRV",
@ -1269,11 +1269,12 @@ cc_library(
":PDLToPDLInterp", ":PDLToPDLInterp",
":SCFToGPUPass", ":SCFToGPUPass",
":SCFToOpenMP", ":SCFToOpenMP",
":SCFToSPIRV",
":SCFToStandard", ":SCFToStandard",
":SPIRVToLLVM", ":SPIRVToLLVM",
":ShapeToStandard", ":ShapeToStandard",
":StandardToLLVM", ":StandardToLLVM",
":StandardToSPIRVTransforms", ":StandardToSPIRV",
":VectorToLLVM", ":VectorToLLVM",
":VectorToROCDL", ":VectorToROCDL",
":VectorToSCF", ":VectorToSCF",
@ -2051,14 +2052,13 @@ cc_library(
cc_library( cc_library(
name = "VectorToSPIRV", name = "VectorToSPIRV",
srcs = [ srcs = glob([
"lib/Conversion/PassDetail.h", "lib/Conversion/VectorToSPIRV/*.cpp",
"lib/Conversion/VectorToSPIRV/VectorToSPIRV.cpp", "lib/Conversion/VectorToSPIRV/*.h",
], ]) + ["lib/Conversion/PassDetail.h"],
hdrs = [ hdrs = glob([
"include/mlir/Conversion/VectorToSPIRV/ConvertVectorToSPIRV.h", "include/mlir/Conversion/VectorToSPIRV/*.h",
"include/mlir/Conversion/VectorToSPIRV/ConvertVectorToSPIRVPass.h", ]),
],
includes = ["include"], includes = ["include"],
deps = [ deps = [
":ConversionPassIncGen", ":ConversionPassIncGen",
@ -2181,16 +2181,14 @@ gentbl(
) )
cc_library( cc_library(
name = "GPUToSPIRVTransforms", name = "GPUToSPIRV",
srcs = [ srcs = glob([
"lib/Conversion/GPUToSPIRV/ConvertGPUToSPIRV.cpp", "lib/Conversion/GPUToSPIRV/*.cpp",
"lib/Conversion/GPUToSPIRV/ConvertGPUToSPIRVPass.cpp", "lib/Conversion/GPUToSPIRV/*.h",
"lib/Conversion/PassDetail.h", ]) + ["lib/Conversion/PassDetail.h"],
], hdrs = glob([
hdrs = [ "include/mlir/Conversion/GPUToSPIRV/*.h",
"include/mlir/Conversion/GPUToSPIRV/ConvertGPUToSPIRV.h", ]),
"include/mlir/Conversion/GPUToSPIRV/ConvertGPUToSPIRVPass.h",
],
includes = [ includes = [
"include", "include",
"lib/Conversions/GPUToSPIRV", "lib/Conversions/GPUToSPIRV",
@ -2205,7 +2203,7 @@ cc_library(
":SCFToSPIRV", ":SCFToSPIRV",
":SPIRVConversion", ":SPIRVConversion",
":SPIRVDialect", ":SPIRVDialect",
":StandardToSPIRVTransforms", ":StandardToSPIRV",
":Support", ":Support",
":Transforms", ":Transforms",
":VectorToSPIRV", ":VectorToSPIRV",
@ -2847,7 +2845,7 @@ cc_library(
) )
cc_library( cc_library(
name = "StandardToSPIRVTransforms", name = "StandardToSPIRV",
srcs = glob([ srcs = glob([
"lib/Conversion/StandardToSPIRV/*.cpp", "lib/Conversion/StandardToSPIRV/*.cpp",
"lib/Conversion/StandardToSPIRV/*.h", "lib/Conversion/StandardToSPIRV/*.h",
@ -2874,11 +2872,6 @@ cc_library(
], ],
) )
alias(
name = "StandardToSPIRVConversions",
actual = "StandardToSPIRVTransforms",
)
cc_library( cc_library(
name = "SPIRVBinaryUtils", name = "SPIRVBinaryUtils",
srcs = [ srcs = [
@ -3370,12 +3363,16 @@ cc_library(
cc_library( cc_library(
name = "SCFToSPIRV", name = "SCFToSPIRV",
srcs = ["lib/Conversion/SCFToSPIRV/SCFToSPIRV.cpp"], srcs = glob([
hdrs = ["include/mlir/Conversion/SCFToSPIRV/SCFToSPIRV.h"], "lib/Conversion/SCFToSPIRV/*.cpp",
"lib/Conversion/SCFToSPIRV/*.h",
]) + ["lib/Conversion/PassDetail.h"],
hdrs = glob([
"include/mlir/Conversion/SCFToSPIRV/*.h",
]),
includes = ["include"], includes = ["include"],
deps = [ deps = [
":Affine", ":Affine",
":AffineToStandard",
":ConversionPassIncGen", ":ConversionPassIncGen",
":IR", ":IR",
":Pass", ":Pass",
@ -3383,6 +3380,7 @@ cc_library(
":SPIRVConversion", ":SPIRVConversion",
":SPIRVDialect", ":SPIRVDialect",
":StandardOps", ":StandardOps",
":StandardToSPIRV",
":Support", ":Support",
":TransformUtils", ":TransformUtils",
":Transforms", ":Transforms",
@ -3842,9 +3840,22 @@ cc_library(
], ],
includes = ["include"], includes = ["include"],
deps = [ deps = [
":Analysis",
":ConversionPasses",
":GPUToGPURuntimeTransforms",
":GPUToNVVMTransforms",
":GPUToROCDLTransforms",
":GPUToSPIRV",
":GPUTransforms",
":IR", ":IR",
":Parser", ":Parser",
":Pass", ":Pass",
":SCFTransforms",
":ShapeToStandard",
":ShapeTransforms",
":StandardOpsTransforms",
":StandardToLLVM",
":StandardToSPIRV",
":Support", ":Support",
"@llvm-project//llvm:Support", "@llvm-project//llvm:Support",
], ],
@ -3910,7 +3921,7 @@ cc_library(
":GPUToGPURuntimeTransforms", ":GPUToGPURuntimeTransforms",
":GPUToNVVMTransforms", ":GPUToNVVMTransforms",
":GPUToROCDLTransforms", ":GPUToROCDLTransforms",
":GPUToSPIRVTransforms", ":GPUToSPIRV",
":GPUToVulkanTransforms", ":GPUToVulkanTransforms",
":GPUTransforms", ":GPUTransforms",
":IR", ":IR",
@ -3954,7 +3965,7 @@ cc_library(
":StandardOpsTransforms", ":StandardOpsTransforms",
":StandardOpsTransformsPassIncGen", ":StandardOpsTransformsPassIncGen",
":StandardToLLVM", ":StandardToLLVM",
":StandardToSPIRVTransforms", ":StandardToSPIRV",
":TensorDialect", ":TensorDialect",
":TensorTransforms", ":TensorTransforms",
":TosaDialect", ":TosaDialect",
@ -4172,7 +4183,7 @@ cc_binary(
deps = [ deps = [
":AllPassesAndDialectsNoRegistration", ":AllPassesAndDialectsNoRegistration",
":ExecutionEngineUtils", ":ExecutionEngineUtils",
":GPUToSPIRVTransforms", ":GPUToSPIRV",
":GPUToVulkanTransforms", ":GPUToVulkanTransforms",
":GPUTransforms", ":GPUTransforms",
":MlirJitRunner", ":MlirJitRunner",
@ -4180,7 +4191,7 @@ cc_binary(
":SPIRVDialect", ":SPIRVDialect",
":SPIRVTransforms", ":SPIRVTransforms",
":StandardToLLVM", ":StandardToLLVM",
":StandardToSPIRVTransforms", ":StandardToSPIRV",
"@llvm-project//llvm:Support", "@llvm-project//llvm:Support",
], ],
) )

View File

@ -311,6 +311,7 @@ cc_library(
"@llvm-project//mlir:SPIRVConversion", "@llvm-project//mlir:SPIRVConversion",
"@llvm-project//mlir:SPIRVDialect", "@llvm-project//mlir:SPIRVDialect",
"@llvm-project//mlir:SPIRVModuleCombiner", "@llvm-project//mlir:SPIRVModuleCombiner",
"@llvm-project//mlir:Transforms",
], ],
) )