From 20572f9ed0f4c6b02b0226281809c63868773a0e Mon Sep 17 00:00:00 2001 From: Geoffrey Martin-Noble Date: Mon, 22 Jun 2020 14:27:36 -0700 Subject: [PATCH] Rename and alias MLIR targets to match CMake These differ from the CMake library names somewhat arbitrarily, which just creates confusion. PiperOrigin-RevId: 317735676 Change-Id: Ia9d3d1645467b1af72f917b01d1a3f6061bceb34 --- third_party/mlir/BUILD | 117 +++++++++++++++++++++++++---------------- 1 file changed, 71 insertions(+), 46 deletions(-) diff --git a/third_party/mlir/BUILD b/third_party/mlir/BUILD index a0d10667d23..2be59fc44b1 100644 --- a/third_party/mlir/BUILD +++ b/third_party/mlir/BUILD @@ -282,7 +282,7 @@ cc_library( deps = [ ":AVX512IncGen", ":IR", - ":SideEffects", + ":SideEffectInterfaces", ":VectorOps", "@llvm-project//llvm:Core", "@llvm-project//llvm:Support", @@ -305,9 +305,9 @@ cc_library( ":IR", ":LLVMAVX512", ":LLVMDialect", - ":LLVMTransforms", ":Pass", ":StandardOps", + ":StandardToLLVM", ":Support", ":Transforms", ":VectorOps", @@ -489,7 +489,7 @@ cc_library( ":EDSC", ":IR", ":LoopLikeInterface", - ":SideEffects", + ":SideEffectInterfaces", ":StandardOps", ":Support", "@llvm-project//llvm:Support", @@ -571,7 +571,7 @@ gentbl( ) cc_library( - name = "AffineToStandardTransforms", + name = "AffineToStandard", srcs = glob([ "lib/Conversion/AffineToStandard/*.cpp", "lib/Conversion/AffineToStandard/*.h", @@ -591,6 +591,11 @@ cc_library( ], ) +alias( + name = "AffineToStandardTransforms", + actual = "AffineToStandard", +) + # SDBM dialect only contains attribute components that can be constructed given # a dialect object, so whenever it is used it must also be registered. Therefore # we don't split out the registration library for it. @@ -631,7 +636,7 @@ cc_library( ":IR", ":LoopLikeInterface", ":SCFIncGen", - ":SideEffects", + ":SideEffectInterfaces", ":StandardOps", ":Support", "@llvm-project//llvm:Support", @@ -719,7 +724,7 @@ cc_library( ":InferTypeOpInterface", ":MLIRShapeCanonicalizationIncGen", ":ShapeOpsIncGen", - ":SideEffects", + ":SideEffectInterfaces", ":Support", "@llvm-project//llvm:Support", ], @@ -833,7 +838,7 @@ cc_library( ":ControlFlowInterfaces", ":EDSC", ":IR", - ":SideEffects", + ":SideEffectInterfaces", ":StandardOpsIncGen", ":Support", ":ViewLikeInterface", @@ -895,7 +900,7 @@ cc_library( ":DialectUtils", ":EDSC", ":IR", - ":SideEffects", + ":SideEffectInterfaces", ":StandardOps", ":Support", ":VectorOpsIncGen", @@ -1070,7 +1075,7 @@ cc_library( ":ControlFlowInterfaces", ":IR", ":LLVMOpsIncGen", - ":SideEffects", + ":SideEffectInterfaces", ":Support", "@llvm-project//llvm:AsmParser", "@llvm-project//llvm:BitReader", @@ -1193,7 +1198,7 @@ cc_library( ":GPUOpsIncGen", ":IR", ":LLVMDialect", - ":SideEffects", + ":SideEffectInterfaces", ":StandardOps", ":Support", ], @@ -1271,8 +1276,8 @@ cc_library( ":GPUDialect", ":IR", ":LLVMDialect", - ":LLVMTransforms", ":StandardOps", + ":StandardToLLVM", "@llvm-project//llvm:Support", ], ) @@ -1311,9 +1316,9 @@ cc_library( ":GPUToNVVMGen", ":GPUTransforms", ":IR", - ":LLVMTransforms", ":NVVMDialect", ":Pass", + ":StandardToLLVM", ":Transforms", "@llvm-project//llvm:Support", ], @@ -1333,10 +1338,10 @@ cc_library( ":ConversionPassIncGen", ":GPUDialect", ":LLVMDialect", - ":LLVMTransforms", ":Pass", ":ROCDLDialect", ":StandardOps", + ":StandardToLLVM", ":Transforms", ":VectorOps", ], @@ -1375,9 +1380,9 @@ cc_library( ":GPUDialect", ":GPUToROCDLTGen", ":GPUTransforms", - ":LLVMTransforms", ":Pass", ":ROCDLDialect", + ":StandardToLLVM", ":Transforms", ":VectorOps", ":VectorToLLVM", @@ -1475,7 +1480,7 @@ cc_library( ":SCFDialect", ":SPIRVDialect", ":SPIRVLowering", - ":StandardToSPIRVConversions", + ":StandardToSPIRVTransforms", ":Support", ":Transforms", ], @@ -1496,10 +1501,10 @@ cc_library( ":ConversionPassIncGen", ":IR", ":LLVMDialect", - ":LLVMTransforms", ":Pass", ":SPIRVDialect", ":StandardOps", + ":StandardToLLVM", ":Support", ":Transforms", ], @@ -1574,7 +1579,7 @@ cc_library( ":IR", ":LLVMDialect", ":NVVMOpsIncGen", - ":SideEffects", + ":SideEffectInterfaces", ":StandardOps", ":Support", "@llvm-project//llvm:AsmParser", @@ -1646,7 +1651,7 @@ cc_library( ":IR", ":LLVMDialect", ":ROCDLOpsIncGen", - ":SideEffects", + ":SideEffectInterfaces", ":StandardOps", ":Support", "@llvm-project//llvm:AsmParser", @@ -1894,7 +1899,7 @@ cc_library( ":SPIRVOpsIncGen", ":SPIRVSerializationGen", ":SPIRVTargetAndABIStructGen", - ":SideEffects", + ":SideEffectInterfaces", ":Support", ":Transforms", "@llvm-project//llvm:Support", @@ -1947,7 +1952,7 @@ cc_library( ) cc_library( - name = "StandardToSPIRVConversions", + name = "StandardToSPIRVTransforms", srcs = glob([ "lib/Conversion/StandardToSPIRV/*.cpp", "lib/Conversion/StandardToSPIRV/*.h", @@ -1972,6 +1977,11 @@ cc_library( ], ) +alias( + name = "StandardToSPIRVConversions", + actual = "StandardToSPIRVTransforms", +) + cc_library( name = "SPIRVSerialization", srcs = glob( @@ -2033,7 +2043,7 @@ cc_library( ":IR", ":LoopLikeInterface", ":SCFDialect", - ":SideEffects", + ":SideEffectInterfaces", ":StandardOps", ":Support", "@llvm-project//llvm:Support", @@ -2152,7 +2162,7 @@ cc_library( ":LoopLikeInterface", ":Pass", ":SCFDialect", - ":SideEffects", + ":SideEffectInterfaces", ":StandardOps", ":Support", ":TransformUtils", @@ -2182,7 +2192,7 @@ cc_library( includes = ["include"], deps = [ ":Affine", - ":AffineToStandardTransforms", + ":AffineToStandard", ":ConversionPassIncGen", ":GPUDialect", ":GPUTransforms", @@ -2222,7 +2232,7 @@ cc_library( ) cc_library( - name = "CFGTransforms", + name = "SCFToStandard", srcs = [ "lib/Conversion/PassDetail.h", "lib/Conversion/SCFToStandard/SCFToStandard.cpp", @@ -2244,8 +2254,13 @@ cc_library( ], ) +alias( + name = "CFGTransforms", + actual = "SCFToStandard", +) + cc_library( - name = "LLVMTransforms", + name = "StandardToLLVM", srcs = [ "lib/Conversion/PassDetail.h", "lib/Conversion/StandardToLLVM/StandardToLLVM.cpp", @@ -2269,6 +2284,11 @@ cc_library( ], ) +alias( + name = "LLVMTransforms", + actual = "StandardToLLVM", +) + gentbl( name = "CallOpInterfacesIncGen", strip_include_prefix = "include", @@ -2401,7 +2421,7 @@ gentbl( ) cc_library( - name = "SideEffects", + name = "SideEffectInterfaces", srcs = [ "lib/Interfaces/SideEffectInterfaces.cpp", ], @@ -2417,6 +2437,11 @@ cc_library( ], ) +alias( + name = "SideEffects", + actual = "SideEffectInterfaces", +) + cc_library( name = "Analysis", srcs = glob( @@ -2627,7 +2652,6 @@ cc_library( ":GPUTransforms", ":IR", ":LLVMDialect", - ":LLVMTransforms", ":LinalgToLLVM", ":LinalgToSPIRV", ":LinalgToStandard", @@ -2639,7 +2663,8 @@ cc_library( ":ShapeToStandard", ":ShapeTransforms", ":StandardOpsTransforms", - ":StandardToSPIRVConversions", + ":StandardToLLVM", + ":StandardToSPIRVTransforms", ":Support", ":Transforms", ":VectorToLLVM", @@ -2699,7 +2724,6 @@ cc_library( ":Affine", ":AffinePassIncGen", ":AffineTransforms", - ":CFGTransforms", ":ConversionPassIncGen", ":GPUDialect", ":GPUPassIncGen", @@ -2714,7 +2738,6 @@ cc_library( ":LLVMDialect", ":LLVMIRTransforms", ":LLVMPassIncGen", - ":LLVMTransforms", ":LinalgOps", ":LinalgPassIncGen", ":LinalgToLLVM", @@ -2729,6 +2752,7 @@ cc_library( ":ROCDLDialect", ":SCFDialect", ":SCFToGPUPass", + ":SCFToStandard", ":SCFTransforms", ":SDBM", ":SPIRVDialect", @@ -2743,7 +2767,8 @@ cc_library( ":StandardOps", ":StandardOpsTransforms", ":StandardOpsTransformsPassIncGen", - ":StandardToSPIRVConversions", + ":StandardToLLVM", + ":StandardToSPIRVTransforms", ":Transforms", ":TransformsPassIncGen", ":VectorOps", @@ -2809,13 +2834,13 @@ cc_library( includes = ["include"], deps = [ ":AllPassesAndDialectsNoRegistration", - ":CFGTransforms", ":ExecutionEngine", ":ExecutionEngineUtils", ":IR", ":LLVMDialect", ":Parser", ":Pass", + ":SCFToStandard", ":Support", "@llvm-project//llvm:Core", "@llvm-project//llvm:OrcJIT", @@ -2885,7 +2910,7 @@ cc_library( ":IR", ":Pass", ":SPIRVDialect", - ":SideEffects", + ":SideEffectInterfaces", ":StandardOps", ":Support", "@llvm-project//llvm:Support", @@ -2918,10 +2943,10 @@ cc_binary( ":GPUTransforms", ":IR", ":LLVMDialect", - ":LLVMTransforms", ":MlirJitRunner", ":NVVMDialect", ":Pass", + ":StandardToLLVM", ":TargetNVVMIR", ":Transforms", "//devtools/build/runtime:get_runfiles_dir", @@ -2945,11 +2970,11 @@ cc_binary( ":GPUToSPIRVTransforms", ":GPUToVulkanTransforms", ":GPUTransforms", - ":LLVMTransforms", ":MlirJitRunner", ":Pass", ":SPIRVDialect", - ":StandardToSPIRVConversions", + ":StandardToLLVM", + ":StandardToSPIRVTransforms", "@llvm-project//llvm:Support", ], ) @@ -3159,7 +3184,7 @@ cc_library( ":Pass", ":QuantOpsIncGen", ":QuantPassIncGen", - ":SideEffects", + ":SideEffectInterfaces", ":StandardOps", "@llvm-project//llvm:Support", ], @@ -3294,18 +3319,18 @@ cc_library( ]), includes = ["include"], deps = [ - ":AffineToStandardTransforms", + ":AffineToStandard", ":Analysis", - ":CFGTransforms", ":ConversionPassIncGen", ":EDSC", ":IR", ":LLVMDialect", - ":LLVMTransforms", ":LinalgOps", ":LinalgTransforms", ":Pass", + ":SCFToStandard", ":StandardOps", + ":StandardToLLVM", ":Support", ":Transforms", ":VectorToLLVM", @@ -3385,7 +3410,7 @@ cc_library( ":LinalgOpsIncGen", ":LinalgStructuredOpsIncGen", ":Parser", - ":SideEffects", + ":SideEffectInterfaces", ":StandardOps", ":Support", ":ViewLikeInterface", @@ -3431,21 +3456,21 @@ cc_library( includes = ["include"], deps = [ ":Affine", - ":AffineToStandardTransforms", + ":AffineToStandard", ":Analysis", - ":CFGTransforms", ":DialectUtils", ":EDSC", ":IR", ":LLVMDialect", - ":LLVMTransforms", ":LinalgOps", ":LinalgPassIncGen", ":LinalgStructuredOpsIncGen", ":Pass", ":SCFDialect", + ":SCFToStandard", ":SCFTransforms", ":StandardOps", + ":StandardToLLVM", ":Support", ":TransformUtils", ":Transforms", @@ -3537,9 +3562,9 @@ cc_library( ":EDSC", ":IR", ":LLVMDialect", - ":LLVMTransforms", ":Pass", ":StandardOps", + ":StandardToLLVM", ":Support", ":Transforms", ":VectorOps", @@ -3564,10 +3589,10 @@ cc_library( ":EDSC", ":IR", ":LLVMDialect", - ":LLVMTransforms", ":Pass", ":SCFDialect", ":StandardOps", + ":StandardToLLVM", ":Support", ":Transforms", ":VectorOps",