From 6ebbf755b61539788919163853446e73fcff74c2 Mon Sep 17 00:00:00 2001 From: Geoffrey Martin-Noble Date: Mon, 12 Jul 2021 11:24:13 -0700 Subject: [PATCH] [Bazel] Update configuration to HEAD Bazel configuration updates for https://github.com/llvm/llvm-project/commit/75e5f0aac97d, https://github.com/llvm/llvm-project/commit/c282d55a3857, and https://github.com/llvm/llvm-project/commit/26e59cc19f86 Tested: `bazel test ... @llvm-project//...` Differential Revision: https://reviews.llvm.org/D105830 --- .../llvm-project-overlay/mlir/BUILD.bazel | 75 +++++++++++++++++-- .../mlir/test/BUILD.bazel | 3 +- 2 files changed, 69 insertions(+), 9 deletions(-) diff --git a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel index c3dce2d3f43b..726ac6965e69 100644 --- a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel @@ -1169,10 +1169,10 @@ cc_library( deps = [ ":ArmSVE", ":IR", + ":LLVMCommonConversion", ":LLVMDialect", ":Pass", ":StandardOps", - ":StandardToLLVM", ":TransformUtils", "//llvm:Core", "//llvm:Support", @@ -1266,9 +1266,9 @@ cc_library( deps = [ ":AMX", ":IR", + ":LLVMCommonConversion", ":LLVMDialect", ":StandardOps", - ":StandardToLLVM", "//llvm:Core", "//llvm:Support", ], @@ -1360,9 +1360,9 @@ cc_library( includes = ["include"], deps = [ ":IR", + ":LLVMCommonConversion", ":LLVMDialect", ":StandardOps", - ":StandardToLLVM", ":X86Vector", "//llvm:Core", "//llvm:Support", @@ -1910,7 +1910,9 @@ cc_library( ":LinalgToLLVM", ":LinalgToSPIRV", ":LinalgToStandard", + ":MathToLLVM", ":MathToLibm", + ":MemRefToLLVM", ":OpenACCToLLVM", ":OpenACCToSCF", ":OpenMPToLLVM", @@ -1946,6 +1948,7 @@ cc_library( ":Async", ":ConversionPassIncGen", ":IR", + ":LLVMCommonConversion", ":LLVMDialect", ":Pass", ":StandardOps", @@ -2764,9 +2767,9 @@ cc_library( deps = [ ":GPUDialect", ":IR", + ":LLVMCommonConversion", ":LLVMDialect", ":StandardOps", - ":StandardToLLVM", "//llvm:Support", ], ) @@ -2809,6 +2812,7 @@ cc_library( ":LLVMDialect", ":MathDialect", ":MemRefDialect", + ":MemRefToLLVM", ":NVVMDialect", ":Pass", ":StandardToLLVM", @@ -2828,7 +2832,9 @@ cc_library( deps = [ ":ConversionPassIncGen", ":GPUDialect", + ":LLVMCommonConversion", ":LLVMDialect", + ":MemRefToLLVM", ":Pass", ":ROCDLDialect", ":StandardOps", @@ -2891,6 +2897,7 @@ cc_library( ":GPUTransforms", ":LLVMCommonConversion", ":MathDialect", + ":MemRefToLLVM", ":Pass", ":ROCDLDialect", ":StandardToLLVM", @@ -2943,6 +2950,7 @@ cc_library( ":IR", ":LLVMCommonConversion", ":LLVMDialect", + ":MemRefToLLVM", ":NVVMToLLVMIRTranslation", ":Pass", ":StandardToLLVM", @@ -3017,6 +3025,7 @@ cc_library( ":IR", ":LLVMCommonConversion", ":LLVMDialect", + ":MemRefToLLVM", ":Pass", ":SPIRVDialect", ":SPIRVUtils", @@ -4289,6 +4298,44 @@ cc_library( ], ) +cc_library( + name = "MemRefToLLVM", + srcs = glob(["lib/Conversion/MemRefToLLVM/*.cpp"]) + ["lib/Conversion/PassDetail.h"], + hdrs = glob(["include/mlir/Conversion/MemRefToLLVM/*.h"]), + includes = ["include"], + deps = [ + ":Analysis", + ":ConversionPassIncGen", + ":DataLayoutInterfaces", + ":IR", + ":LLVMCommonConversion", + ":LLVMDialect", + ":MemRefDialect", + ":Pass", + ":Support", + ":Transforms", + ], +) + +cc_library( + name = "MathToLLVM", + srcs = glob(["lib/Conversion/MathToLLVM/*.cpp"]) + ["lib/Conversion/PassDetail.h"], + hdrs = glob(["include/mlir/Conversion/MathToLLVM/*.h"]), + includes = ["include"], + deps = [ + ":Analysis", + ":ConversionPassIncGen", + ":DataLayoutInterfaces", + ":IR", + ":LLVMCommonConversion", + ":LLVMDialect", + ":MathDialect", + ":Pass", + ":Support", + ":Transforms", + ], +) + alias( name = "LLVMTransforms", actual = "StandardToLLVM", @@ -4888,9 +4935,11 @@ cc_library( ":LinalgToStandard", ":LinalgTransforms", ":MathDialect", + ":MathToLLVM", ":MathToLibm", ":MathTransforms", ":MemRefDialect", + ":MemRefToLLVM", ":MemRefTransforms", ":NVVMDialect", ":OpenACCDialect", @@ -5152,6 +5201,7 @@ cc_binary( ":LLVMDialect", ":LLVMToLLVMIRTranslation", ":MemRefDialect", + ":MemRefToLLVM", ":MemRefTransforms", ":MlirJitRunner", ":Pass", @@ -5422,6 +5472,14 @@ gentbl_cc_library( ], "include/mlir/Dialect/OpenMP/OpenMPOpsDialect.cpp.inc", ), + ( + ["-gen-type-interface-decls"], + "include/mlir/Dialect/OpenMP/OpenMPTypeInterfaces.h.inc", + ), + ( + ["-gen-type-interface-defs"], + "include/mlir/Dialect/OpenMP/OpenMPTypeInterfaces.cpp.inc", + ), ( ["-gen-op-doc"], "g3doc/Dialects/OpenMP/OpenMPOps.md", @@ -5489,11 +5547,11 @@ cc_library( deps = [ ":ConversionPassIncGen", ":IR", + ":LLVMCommonConversion", ":LLVMDialect", ":OpenACCDialect", ":Pass", ":StandardOps", - ":StandardToLLVM", ":Transforms", "//llvm:Core", "//llvm:Support", @@ -5513,7 +5571,9 @@ cc_library( deps = [ ":ConversionPassIncGen", ":IR", + ":LLVMCommonConversion", ":LLVMDialect", + ":MemRefToLLVM", ":OpenMPDialect", ":Pass", ":StandardOps", @@ -5792,6 +5852,7 @@ cc_library( ":Analysis", ":ConversionPassIncGen", ":IR", + ":LLVMCommonConversion", ":LLVMDialect", ":LinalgOps", ":LinalgTransforms", @@ -5799,7 +5860,6 @@ cc_library( ":SCFDialect", ":SCFToStandard", ":StandardOps", - ":StandardToLLVM", ":Support", ":Transforms", ":VectorToLLVM", @@ -6045,11 +6105,11 @@ cc_library( ":ConversionPassIncGen", ":DialectUtils", ":IR", + ":LLVMCommonConversion", ":LLVMDialect", ":MemRefDialect", ":Pass", ":StandardOps", - ":StandardToLLVM", ":Support", ":ToLLVMIRTranslation", ":Transforms", @@ -6405,7 +6465,6 @@ cc_library( ":LLVMCommonConversion", ":LLVMDialect", ":Pass", - ":StandardToLLVM", ":Support", ":Transforms", "//llvm:Core", diff --git a/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel index 6f543024ef75..f76a5a4ec0fe 100644 --- a/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel @@ -316,10 +316,11 @@ cc_library( includes = ["lib/Dialect/Test"], deps = [ ":TestDialect", + "//mlir:LLVMCommonConversion", "//mlir:LLVMDialect", - "//mlir:LLVMTransforms", "//mlir:Pass", "//mlir:StandardOps", + "//mlir:StandardToLLVM", ], )