Skip to content

Commit 5f52297

Browse files
Muzammiluddin-Syed-ECEpstarkcdpr
authored andcommitted
Still carrying these reverts: - llvm/llvm-project#160615 (See iree-org#22171) - llvm/llvm-project#163440 (See iree-org#22354 (comment)) Fixes: - Remove deprecated references to `.CaseLowers` - Added dependencies required due to new added dependency to LLVMIR llvm/llvm-project#163881 --------- Signed-off-by: Muzammiluddin Syed <[email protected]>
1 parent 4db2bea commit 5f52297

File tree

6 files changed

+12
-3
lines changed

6 files changed

+12
-3
lines changed

build_tools/bazel_to_cmake/bazel_to_cmake_targets.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ def __init__(self, repo_map: Dict[str, str]):
7474
"MLIRLinalgStructuredOpsIncGenLib"
7575
],
7676
"@llvm-project//mlir:ShapeTransforms": ["MLIRShapeOpsTransforms"],
77+
"@llvm-project//mlir:FromLLVMIRTranslation": ["MLIRTargetLLVMIRImport"],
7778
"@llvm-project//mlir:ToLLVMIRTranslation": ["MLIRTargetLLVMIRExport"],
7879
"@llvm-project//mlir:mlir-translate": ["mlir-translate"],
7980
"@llvm-project//mlir:MlirLspServerLib": ["MLIRLspServerLib"],

compiler/bindings/python/IREECompilerDialectsModule.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "mlir-c/BuiltinAttributes.h"
1313
#include "mlir-c/BuiltinTypes.h"
1414
#include "mlir-c/IR.h"
15+
#include "mlir-c/Target/LLVMIR.h"
1516
#include "mlir/Bindings/Python/Nanobind.h"
1617
#include "mlir/Bindings/Python/NanobindAdaptors.h"
1718
#include "mlir/CAPI/IR.h"

compiler/src/iree/compiler/API/BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,11 @@ iree_compiler_cc_library(
4444
"@llvm-project//mlir:CAPILLVM",
4545
"@llvm-project//mlir:CAPILinalg",
4646
"@llvm-project//mlir:CAPIPDL",
47+
"@llvm-project//mlir:CAPITarget",
4748
"@llvm-project//mlir:CAPITransformDialect",
4849
"@llvm-project//mlir:CAPITransformDialectTransforms",
4950
"@llvm-project//mlir:CAPITransforms",
51+
"@llvm-project//mlir:FromLLVMIRTranslation",
5052
],
5153
)
5254

compiler/src/iree/compiler/API/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@ iree_cc_library(
2222
MLIRCAPILLVM
2323
MLIRCAPILinalg
2424
MLIRCAPIPDL
25+
MLIRCAPITarget
2526
MLIRCAPITransformDialect
2627
MLIRCAPITransformDialectTransforms
2728
MLIRCAPITransforms
29+
MLIRTargetLLVMIRImport
2830
iree::compiler::API::Internal::CompilerDriver
2931
iree::compiler::API::Internal::IREECodegenDialectCAPI
3032
iree::compiler::API::Internal::IREECompileToolEntryPoint
@@ -75,9 +77,11 @@ set(_EXPORT_OBJECT_LIBS
7577
obj.MLIRCAPILLVM
7678
obj.MLIRCAPILinalg
7779
obj.MLIRCAPIPDL
80+
obj.MLIRCAPITarget
7881
obj.MLIRCAPITransforms
7982
obj.MLIRCAPITransformDialect
8083
obj.MLIRCAPITransformDialectTransforms
84+
obj.MLIRTargetLLVMIRImport
8185
iree_compiler_API_Internal_CompilerDriver.objects
8286
iree_compiler_API_Internal_IREECompileToolEntryPoint.objects
8387
iree_compiler_API_Internal_IREECodegenDialectCAPI.objects

compiler/src/iree/compiler/API/Internal/LLDToolEntryPoint.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,9 @@ static Flavor getFlavor(StringRef s) {
6262
.CasesLower("ld", "ld.lld", "gnu", Gnu)
6363
.CasesLower("wasm", "ld-wasm", Wasm)
6464
.CaseLower("link", WinLink)
65-
.CasesLower("ld64", "ld64.lld", "darwin", "darwinnew",
66-
"ld64.lld.darwinnew", Darwin)
65+
.CasesLower(
66+
{"ld64", "ld64.lld", "darwin", "darwinnew", "ld64.lld.darwinnew"},
67+
Darwin)
6768
.Default(Invalid);
6869
}
6970

third_party/llvm-project

Submodule llvm-project updated 623 files

0 commit comments

Comments
 (0)