Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Commit fbf7db0

Browse files
authored
Update BUILD files and submodule for [892d2822b62e](llvm/llvm-project@892d2822b62e)
1 parent 73b10bd commit fbf7db0

File tree

3 files changed

+148
-81
lines changed

3 files changed

+148
-81
lines changed

llvm-bazel/llvm-project-overlay/mlir/BUILD

Lines changed: 141 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -484,9 +484,9 @@ cc_library(
484484
":ConversionPassIncGen",
485485
":EDSC",
486486
":IR",
487-
":MathDialect",
488487
":LLVMArmNeon",
489488
":LLVMDialect",
489+
":MathDialect",
490490
":Pass",
491491
":StandardOps",
492492
":StandardToLLVM",
@@ -560,21 +560,6 @@ gentbl(
560560
td_srcs = [":LLVMArmNeonTdFiles"],
561561
)
562562

563-
cc_library(
564-
name = "TargetLLVMArmNeonIntr",
565-
srcs = ["lib/Target/LLVMIR/LLVMArmNeonIntr.cpp"],
566-
includes = ["include"],
567-
deps = [
568-
":IR",
569-
":LLVMArmNeon",
570-
":LLVMArmNeonConversionIncGen",
571-
":LLVMIRModuleTranslation",
572-
":Translation",
573-
"//llvm:Core",
574-
"//llvm:Support",
575-
],
576-
)
577-
578563
##---------------------------------------------------------------------------##
579564
# ArmSVE dialect.
580565
##---------------------------------------------------------------------------##
@@ -723,21 +708,6 @@ gentbl(
723708
td_srcs = [":LLVMArmSVETdFiles"],
724709
)
725710

726-
cc_library(
727-
name = "TargetLLVMArmSVEIntr",
728-
srcs = ["lib/Target/LLVMIR/LLVMArmSVEIntr.cpp"],
729-
includes = ["include"],
730-
deps = [
731-
":IR",
732-
":LLVMArmSVE",
733-
":LLVMArmSVEConversionIncGen",
734-
":LLVMIRModuleTranslation",
735-
":Translation",
736-
"//llvm:Core",
737-
"//llvm:Support",
738-
],
739-
)
740-
741711
##---------------------------------------------------------------------------##
742712
# AVX512 dialect.
743713
##---------------------------------------------------------------------------##
@@ -879,21 +849,6 @@ gentbl(
879849
td_srcs = [":LLVMAVX512TdFiles"],
880850
)
881851

882-
cc_library(
883-
name = "TargetLLVMAVX512Intr",
884-
srcs = ["lib/Target/LLVMIR/LLVMAVX512Intr.cpp"],
885-
includes = ["include"],
886-
deps = [
887-
":IR",
888-
":LLVMAVX512",
889-
":LLVMAVX512ConversionIncGen",
890-
":LLVMIRModuleTranslation",
891-
":Translation",
892-
"//llvm:Core",
893-
"//llvm:Support",
894-
],
895-
)
896-
897852
##---------------------------------------------------------------------------##
898853
# SCF dialect.
899854
##---------------------------------------------------------------------------##
@@ -1932,12 +1887,14 @@ filegroup(
19321887

19331888
cc_library(
19341889
name = "GPUCommonTransforms",
1890+
srcs = [
1891+
"lib/Conversion/GPUCommon/GPUOpsLowering.cpp",
1892+
],
19351893
hdrs = [
1894+
"lib/Conversion/GPUCommon/GPUOpsLowering.h",
19361895
"lib/Conversion/GPUCommon/IndexIntrinsicsOpLowering.h",
19371896
"lib/Conversion/GPUCommon/OpToFuncCallLowering.h",
19381897
],
1939-
# TODO(b/155492113): Move back to hdrs once fixed.
1940-
textual_hdrs = ["lib/Conversion/GPUCommon/GPUOpsLowering.h"],
19411898
deps = [
19421899
":GPUDialect",
19431900
":IR",
@@ -2114,10 +2071,10 @@ cc_library(
21142071
":GPUDialect",
21152072
":IR",
21162073
":LLVMDialect",
2074+
":NVVMToLLVMIRTranslation",
21172075
":Pass",
21182076
":StandardToLLVM",
21192077
":Support",
2120-
":TargetNVVMIR",
21212078
"//llvm:Core",
21222079
"//llvm:NVPTXCodeGen",
21232080
"//llvm:Support",
@@ -3589,6 +3546,8 @@ cc_library(
35893546
"lib/Target/LLVMIR/TypeTranslation.cpp",
35903547
],
35913548
hdrs = [
3549+
"include/mlir/Target/LLVMIR/Export.h",
3550+
"include/mlir/Target/LLVMIR/LLVMTranslationInterface.h",
35923551
"include/mlir/Target/LLVMIR/ModuleTranslation.h",
35933552
"include/mlir/Target/LLVMIR/TypeTranslation.h",
35943553
],
@@ -3608,69 +3567,152 @@ cc_library(
36083567
)
36093568

36103569
cc_library(
3611-
name = "TargetLLVMIR",
3612-
srcs = [
3613-
"lib/Target/LLVMIR/ConvertFromLLVMIR.cpp",
3614-
"lib/Target/LLVMIR/ConvertToLLVMIR.cpp",
3570+
name = "LLVMAVX512ToLLVMIRTranslation",
3571+
srcs = glob(["lib/Target/LLVMIR/Dialect/LLVMAVX512/*.cpp"]),
3572+
hdrs = glob(["include/mlir/Target/LLVMIR/Dialect/LLVMAVX512/*.h"]),
3573+
includes = ["include"],
3574+
deps = [
3575+
":IR",
3576+
":LLVMAVX512",
3577+
":LLVMAVX512ConversionIncGen",
3578+
":LLVMIRModuleTranslation",
3579+
":Support",
3580+
"//llvm:Core",
3581+
"//llvm:Support",
36153582
],
3616-
hdrs = ["include/mlir/Target/LLVMIR.h"],
3583+
)
3584+
3585+
cc_library(
3586+
name = "LLVMArmNeonToLLVMIRTranslation",
3587+
srcs = glob(["lib/Target/LLVMIR/Dialect/LLVMArmNeon/*.cpp"]),
3588+
hdrs = glob(["include/mlir/Target/LLVMIR/Dialect/LLVMArmNeon/*.h"]),
36173589
includes = ["include"],
36183590
deps = [
36193591
":IR",
3620-
":LLVMConversionIncGen",
3621-
":LLVMDialect",
3592+
":LLVMArmNeon",
3593+
":LLVMArmNeonConversionIncGen",
3594+
":LLVMArmNeonIncGen",
36223595
":LLVMIRModuleTranslation",
3623-
":OpenMPDialect",
36243596
":Support",
3625-
":TargetLLVMAVX512Intr",
3626-
":TargetLLVMArmNeonIntr",
3627-
":TargetLLVMArmSVEIntr",
3628-
":Translation",
36293597
"//llvm:Core",
3630-
"//llvm:IRReader",
36313598
"//llvm:Support",
36323599
],
36333600
)
36343601

36353602
cc_library(
3636-
name = "TargetNVVMIR",
3637-
srcs = ["lib/Target/LLVMIR/ConvertToNVVMIR.cpp"],
3638-
hdrs = ["include/mlir/Target/NVVMIR.h"],
3603+
name = "LLVMArmSVEToLLVMIRTranslation",
3604+
srcs = glob(["lib/Target/LLVMIR/Dialect/LLVMArmSVE/*.cpp"]),
3605+
hdrs = glob(["include/mlir/Target/LLVMIR/Dialect/LLVMArmSVE/*.h"]),
3606+
includes = ["include"],
3607+
deps = [
3608+
":IR",
3609+
":LLVMArmSVE",
3610+
":LLVMArmSVEConversionIncGen",
3611+
":LLVMIRModuleTranslation",
3612+
":Support",
3613+
"//llvm:Core",
3614+
"//llvm:Support",
3615+
],
3616+
)
3617+
3618+
cc_library(
3619+
name = "NVVMToLLVMIRTranslation",
3620+
srcs = glob(["lib/Target/LLVMIR/Dialect/NVVM/*.cpp"]),
3621+
hdrs = glob(["include/mlir/Target/LLVMIR/Dialect/NVVM/*.h"]),
36393622
includes = ["include"],
36403623
deps = [
3641-
":GPUDialect",
36423624
":IR",
3643-
":LLVMDialect",
36443625
":LLVMIRModuleTranslation",
36453626
":NVVMConversionIncGen",
36463627
":NVVMDialect",
36473628
":Support",
3648-
":Translation",
36493629
"//llvm:Core",
36503630
"//llvm:Support",
36513631
],
36523632
)
36533633

36543634
cc_library(
3655-
name = "TargetROCDLIR",
3656-
srcs = ["lib/Target/LLVMIR/ConvertToROCDLIR.cpp"],
3657-
hdrs = ["include/mlir/Target/ROCDLIR.h"],
3635+
name = "ROCDLToLLVMIRTranslation",
3636+
srcs = glob(["lib/Target/LLVMIR/Dialect/ROCDL/*.cpp"]),
3637+
hdrs = glob(["include/mlir/Target/LLVMIR/Dialect/ROCDL/*.h"]),
36583638
includes = ["include"],
36593639
deps = [
3660-
":GPUDialect",
36613640
":IR",
3662-
":LLVMDialect",
36633641
":LLVMIRModuleTranslation",
36643642
":ROCDLConversionIncGen",
36653643
":ROCDLDialect",
36663644
":Support",
3645+
"//llvm:Core",
3646+
"//llvm:Support",
3647+
],
3648+
)
3649+
3650+
cc_library(
3651+
name = "LLVMToLLVMIRTranslation",
3652+
srcs = glob(["lib/Target/LLVMIR/Dialect/LLVMIR/*.cpp"]),
3653+
hdrs = glob(["include/mlir/Target/LLVMIR/Dialect/LLVMIR/*.h"]),
3654+
includes = ["include"],
3655+
deps = [
3656+
":IR",
3657+
":LLVMConversionIncGen",
3658+
":LLVMDialect",
3659+
":LLVMIRModuleTranslation",
3660+
":Support",
3661+
"//llvm:Core",
3662+
"//llvm:Support",
3663+
],
3664+
)
3665+
3666+
cc_library(
3667+
name = "OpenMPToLLVMIRTranslation",
3668+
srcs = glob(["lib/Target/LLVMIR/Dialect/OpenMP/*.cpp"]),
3669+
hdrs = glob(["include/mlir/Target/LLVMIR/Dialect/OpenMP/*.h"]),
3670+
includes = ["include"],
3671+
deps = [
3672+
":IR",
3673+
":LLVMIRModuleTranslation",
3674+
":OpenMPDialect",
3675+
":Support",
3676+
"//llvm:Core",
3677+
"//llvm:FrontendOpenMP",
3678+
"//llvm:Support",
3679+
],
3680+
)
3681+
3682+
cc_library(
3683+
name = "TargetLLVMIR",
3684+
srcs = [
3685+
"lib/Target/LLVMIR/ConvertFromLLVMIR.cpp",
3686+
"lib/Target/LLVMIR/ConvertToLLVMIR.cpp",
3687+
],
3688+
hdrs = ["include/mlir/Target/LLVMIR.h"],
3689+
includes = ["include"],
3690+
deps = [
3691+
":IR",
3692+
":LLVMAVX512",
3693+
":LLVMAVX512ToLLVMIRTranslation",
3694+
":LLVMArmNeon",
3695+
":LLVMArmNeonToLLVMIRTranslation",
3696+
":LLVMArmSVE",
3697+
":LLVMArmSVEToLLVMIRTranslation",
3698+
":LLVMConversionIncGen",
3699+
":LLVMDialect",
3700+
":LLVMIRModuleTranslation",
3701+
":LLVMToLLVMIRTranslation",
3702+
":NVVMDialect",
3703+
":NVVMToLLVMIRTranslation",
3704+
":OpenMPDialect",
3705+
":OpenMPToLLVMIRTranslation",
3706+
":ROCDLDialect",
3707+
":ROCDLToLLVMIRTranslation",
3708+
":Support",
36673709
":Translation",
36683710
"//llvm:Core",
3711+
"//llvm:IRReader",
36693712
"//llvm:Support",
36703713
],
36713714
)
36723715

3673-
# TODO(zinenko): Update these so that we can simplify mapping to cmake.
36743716
cc_library(
36753717
name = "ExecutionEngine",
36763718
srcs = ["lib/ExecutionEngine/ExecutionEngine.cpp"],
@@ -3679,6 +3721,7 @@ cc_library(
36793721
deps = [
36803722
":IR",
36813723
":LLVMDialect",
3724+
":LLVMIRModuleTranslation",
36823725
":Support",
36833726
":TargetLLVMIR",
36843727
":Translation",
@@ -3744,10 +3787,14 @@ cc_library(
37443787
name = "AllTranslations",
37453788
hdrs = ["include/mlir/InitAllTranslations.h"],
37463789
deps = [
3790+
":LLVMAVX512ToLLVMIRTranslation",
3791+
":LLVMArmNeonToLLVMIRTranslation",
3792+
":LLVMArmSVEToLLVMIRTranslation",
3793+
":LLVMToLLVMIRTranslation",
3794+
":NVVMToLLVMIRTranslation",
3795+
":ROCDLToLLVMIRTranslation",
37473796
":SPIRVTranslateRegistration",
37483797
":TargetLLVMIR",
3749-
":TargetNVVMIR",
3750-
":TargetROCDLIR",
37513798
],
37523799
)
37533800

@@ -3910,6 +3957,8 @@ cc_library(
39103957
":ExecutionEngineUtils",
39113958
":IR",
39123959
":LLVMDialect",
3960+
":LLVMToLLVMIRTranslation",
3961+
":OpenMPToLLVMIRTranslation",
39133962
":Parser",
39143963
":Pass",
39153964
":SCFToStandard",
@@ -3965,6 +4014,8 @@ cc_binary(
39654014
":AllPassesAndDialectsNoRegistration",
39664015
":ExecutionEngineUtils",
39674016
":MlirJitRunner",
4017+
":OpenMPToLLVMIRTranslation",
4018+
":TargetLLVMIR",
39684019
"//llvm:AsmParser",
39694020
"//llvm:Support",
39704021
"//llvm:X86AsmParser",
@@ -4040,13 +4091,14 @@ cc_binary(
40404091
":GPUTransforms",
40414092
":IR",
40424093
":LLVMDialect",
4094+
":LLVMIRModuleTranslation",
40434095
":MlirJitRunner",
40444096
":NVVMDialect",
4097+
":NVVMToLLVMIRTranslation",
40454098
":Pass",
40464099
":StandardToLLVM",
4047-
":TargetNVVMIR",
4100+
":TargetLLVMIR",
40484101
":Transforms",
4049-
"//devtools/build/runtime:get_runfiles_dir",
40504102
"//llvm:Support",
40514103
"@cuda//:cuda_headers",
40524104
"@cuda//:cuda_runtime",
@@ -4067,12 +4119,14 @@ cc_binary(
40674119
":GPUToSPIRV",
40684120
":GPUToVulkanTransforms",
40694121
":GPUTransforms",
4122+
":LLVMIRModuleTranslation",
40704123
":MlirJitRunner",
40714124
":Pass",
40724125
":SPIRVDialect",
40734126
":SPIRVTransforms",
40744127
":StandardToLLVM",
40754128
":StandardToSPIRV",
4129+
":TargetLLVMIR",
40764130
"//llvm:Support",
40774131
],
40784132
)
@@ -4088,6 +4142,7 @@ cc_binary(
40884142
":GPUTransforms",
40894143
":IR",
40904144
":LLVMDialect",
4145+
":LLVMIRModuleTranslation",
40914146
":MlirJitRunner",
40924147
":Pass",
40934148
":SPIRVConversion",
@@ -4804,6 +4859,14 @@ gentbl(
48044859
"-gen-dialect-decls -dialect=vector",
48054860
"include/mlir/Dialect/Vector/VectorOpsDialect.h.inc",
48064861
),
4862+
(
4863+
"-gen-enum-decls",
4864+
"include/mlir/Dialect/Vector/VectorOpsEnums.h.inc",
4865+
),
4866+
(
4867+
"-gen-enum-defs",
4868+
"include/mlir/Dialect/Vector/VectorOpsEnums.cpp.inc",
4869+
),
48074870
(
48084871
"-gen-op-doc",
48094872
"g3doc/Dialects/Vector/VectorOps.md",

0 commit comments

Comments
 (0)