diff --git a/deps.bzl b/deps.bzl index 969cce6..8fcf9f5 100644 --- a/deps.bzl +++ b/deps.bzl @@ -22,8 +22,8 @@ def third_party_deps(): path = local_llvm_repo_path(), ) else: - LLVM_COMMIT = "813f7c3820d00349fe23bfc6ba26159764541540" - LLVM_SHA256 = "a04830a729c030002ce2f1b83e5f894a645fc48830005d40d029aae9acd24340" + LLVM_COMMIT = "5d6d982df61d16b6d498e6d59dd91c059679d3d8" + LLVM_SHA256 = "834184126812eecbdb2ed30de255554a6529295afaf44e9dfd3851d61195dbb5" http_archive( name = "llvm-raw", build_file_content = "# empty", @@ -39,8 +39,8 @@ def third_party_deps(): path = local_torch_mlir_repo_path(), ) else: - TORCH_MLIR_COMMIT = "2fb7d6e4dcd06eadb759f2a2e769e53718d0a2f1" - TORCH_MLIR_SHA256 = "111dc77c81706e93728235ffba467277178f10356817e09dc5bd5ab08934323c" + TORCH_MLIR_COMMIT = "169032010793ee7fe3e305ab920e4119fdfc3b11" + TORCH_MLIR_SHA256 = "0f25459b0d6828983c8aa78d139adad4325508bff150b57e97345e9798377dd3" http_archive( name = "torch-mlir-raw", build_file_content = "# empty", @@ -55,8 +55,8 @@ def third_party_deps(): path = local_stablehlo_repo_path(), ) else: - STABLEHLO_COMMIT = "6e403b1aa6a71f5eaa09cc720e4ad42f692745e6" - STABLEHLO_SHA256 = "5b6a207f7c41aa986866103a4929e7146acff05830234df5714a45c7100cae3c" + STABLEHLO_COMMIT = "b62dc66da9946b4c400c0d99c9d5bb8e04edaee6" + STABLEHLO_SHA256 = "a51842f5cbcccc2dc74de232793e6fdc0b4403b616281a73bbc704cd227b50db" http_archive( name = "stablehlo", sha256 = STABLEHLO_SHA256, diff --git a/lib/Pipeline/Pipeline.cpp b/lib/Pipeline/Pipeline.cpp index 6387d91..e044057 100644 --- a/lib/Pipeline/Pipeline.cpp +++ b/lib/Pipeline/Pipeline.cpp @@ -21,6 +21,7 @@ #include "mlir/Conversion/AffineToStandard/AffineToStandard.h" #include "mlir/Conversion/ArithToLLVM/ArithToLLVM.h" #include "mlir/Conversion/BufferizationToMemRef/BufferizationToMemRef.h" +#include "mlir/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.h" #include "mlir/Conversion/FuncToLLVM/ConvertFuncToLLVMPass.h" #include "mlir/Conversion/MathToLLVM/MathToLLVM.h" #include "mlir/Conversion/MathToLibm/MathToLibm.h" @@ -84,8 +85,6 @@ static void createTcpToLlvmPipeline(OpPassManager &pm) { bufferizationOptions.setFunctionBoundaryTypeConversion( bufferization::LayoutMapOption::IdentityLayoutMap); pm.addPass(bufferization::createOneShotBufferizePass(bufferizationOptions)); - pm.addNestedPass( - bufferization::createFinalizingBufferizePass()); // Buffer deallocation pipeline for automatically inserting // buffer deallocation ops after one-shot bufferization. // https://sourcegraph.com/github.com/llvm/llvm-project@09bc1e825068f314db71ee7eb32d9f93c5ac87a0/-/blob/mlir/lib/Dialect/Bufferization/Pipelines/BufferizationPipelines.cpp?L21 @@ -122,6 +121,8 @@ static void createTcpToLlvmPipeline(OpPassManager &pm) { pm.addPass(createFinalizeMemRefToLLVMConversionPass()); // Convert Func to LLVM (always needed). pm.addPass(createConvertFuncToLLVMPass()); + // Convert CF to LLVM (always needed). + pm.addPass(createConvertControlFlowToLLVMPass()); // Sprinkle some cleanups. pm.addPass(createCanonicalizerPass()); diff --git a/requirements_lock.txt b/requirements_lock.txt index df15c1d..5f65004 100644 --- a/requirements_lock.txt +++ b/requirements_lock.txt @@ -157,31 +157,34 @@ sympy==1.13.1 \ --hash=sha256:9cebf7e04ff162015ce31c9c6c9144daa34a93bd082f54fd8f12deca4f47515f \ --hash=sha256:db36cdc64bf61b9b24578b6f7bab1ecdd2452cf008f34faa33776680c26d66f8 # via torch -torch==2.7.0.dev20250121+cpu \ - --hash=sha256:085c327b9d5a2438a79ef62bc03c82910d1285799598d98b940f31f5e391029a \ - --hash=sha256:08e96e878f06cef5765e5fdc819262b073d2470241ea73ede337e22c3e7abd69 \ - --hash=sha256:098ab0ff55481966f2005cdfeda8a54b34351cd7f56792e0be139a0073f43624 \ - --hash=sha256:156142c172dc27efc63be5b0a6fab0150cb0e6dab5d5a6ad0106f293c63db26b \ - --hash=sha256:1f2e39a6a3a920e2466bd4668a050f929ab03a6a68f85577b5c9a9d484f7b792 \ - --hash=sha256:39be1bc191dc449e017d0aa244100917fb71cca76566440b984b8154281f3000 \ - --hash=sha256:41047ab28ebde5bd1713063c3691fcfd40137d2226d42b98620d6a6996fa40e5 \ - --hash=sha256:49e2264c58e03bfe58fce3da1179027a29fd03065dfb21e15454c762c556ff14 \ - --hash=sha256:527105157e95252d5e30daf6480babbcb1716dbfaefe1eb5d6fe71dca8a078e0 \ - --hash=sha256:5ce1adf63bb6b06e1c18c21c14a701a9e0a959a5e93811b1d77f6a60f4fd9641 \ - --hash=sha256:61f03785b89ebf54e0edc45105dc65217daead463f72f5eb2b850561a8e4cb5d \ - --hash=sha256:8903c69e25dce43bcd033e0e13b31a4dde4c2267b35d15ce1c99cf156b44b07f \ - --hash=sha256:91703b06d66f72e00e36f8517639cc5b111f8c56e75c74fec4064475a3a157aa \ - --hash=sha256:95973d2de0e29c05554aaed3cad0e0c1cfd56037b3cd047acdc1da55941e8d44 \ - --hash=sha256:99799e1a5230fd4ff5b5fea0f38575c9ae59b9d1d0937ef5540d3ff79bd0e7df \ - --hash=sha256:a7b42cd2eb41477629ab90a644ed1b1ee44308378854229be59835eff9acea90 \ - --hash=sha256:b3345244bd4d19358c6a488a30b02c2b1a63dbbd303a2deed35a339c81b7217e \ - --hash=sha256:d58ef0520c38a847c6c887b2cb50e526b628d751023e4c1f02b8b79eb3e0cbb8 \ - --hash=sha256:e362a05de22ecb4e43376e58bb094cb89db07e55ffde23c617adc6a0ea50604d +torch==2.7.0.dev20250131+cpu \ + --hash=sha256:022eb7ef864640b7b15e4a500dd1354bfc1658cc153e141daf7496d363966179 \ + --hash=sha256:1541bffc5543a9b10cd7b35aa9c425ccc46b628f73d4373bef79da6553fe68df \ + --hash=sha256:175bf1384ff95f258728b5134c6caec3e6dbaadaa2c458430dd937464295545e \ + --hash=sha256:2aea676c6ea0e8a8b7e72ceefe1668cd781a65a58690a9d0e7519a9f5425886e \ + --hash=sha256:2b6ddf8dc1040c9ee25984d07ac752a68631b919222d778db94798c24e84d3ff \ + --hash=sha256:2f51554094f2d6857ff52517fbb8186b6329a6cacf9fa1de1c0c983542f77678 \ + --hash=sha256:3030deb8a2466308f8ebb8b755503735b880442fde88ad93f216f5a866cae5fe \ + --hash=sha256:3c5eeaff12c910d9c86b5ebe16f3614abab14744fc961e0c445fb906462f9377 \ + --hash=sha256:49c4c50e1557d6b507ea05d762bbf2744c1e9287852baa6d6b75de6c4c011da2 \ + --hash=sha256:596a4f0586ad121db78f92b602320a6b581ebde99dd53b056767923c90fc989a \ + --hash=sha256:61a5012814824221b3f44552411c60f3b217e0077197288b29646c528abad073 \ + --hash=sha256:63fd0a0239f7147f05e840a679904577b7633cf0568494b23aebffca1bea2edf \ + --hash=sha256:75a7d8692dd1ac09933fd66980d05c6f13754d19a2bdf9519ad7819b267971cd \ + --hash=sha256:859e91760d7151bdf18caf7f2a9afc514c150bda9a4679b1261699dfff56a33d \ + --hash=sha256:8e61f9d174ab180592190a011ea0261afdf53f1df85d3eaf7e72a555ea106044 \ + --hash=sha256:9f98be38a676681236ac8850b6cece04d53679e95e389952a57dd1fa089f8cb9 \ + --hash=sha256:bb9bb80a25c1b4d55ff6e23a016493db31f3b66b43cd87277244cd250e979689 \ + --hash=sha256:cb6ca0cdc88cdf80f35925844dcf0c0fd55dcd6d2a7f7a96c20fa47700b38e8b \ + --hash=sha256:d3c7633aad4005230783d4e8b87b143b3cef6fdaa2ff695354b4b1670c9b7656 \ + --hash=sha256:d5ef26cd431a46792a4ea045995d2900ea2a36a4281d3b67e208ea9988c1caff \ + --hash=sha256:f0cf7ab37a4b4e1d38c1b9b2b5cd4a8ae03a46e14707ffc5ee88dfdd6ea9ac41 \ + --hash=sha256:f5a9b35bd115f1009064fc36f5d9fff040f9ae096b9a35da09f5293d1b127fe0 # via -r requirements.txt -torch-mlir==20250121.351 \ - --hash=sha256:613493ac6c15467e6531ed4f805b57b755085974c2a976bb5d2d929ca4d617f4 \ - --hash=sha256:82626b0cfdd1d7ac513960581b3aaf5783c18a62e6684a6ec5de0eaf4efd9b04 \ - --hash=sha256:9357bcb06ebb55b3a166b2f85caee52fbd213a0f5e997760ee54401d59aa3bd2 +torch-mlir==20250127.357 \ + --hash=sha256:43c2362b6a5265405ac5d2291982d6b0d83afafc7ee37165f4cc6b845dec4c15 \ + --hash=sha256:62dd44c74212ce772cf245be5610c2ed9cc60c0a51fcf1c3a2e4f1bd3245da29 \ + --hash=sha256:b72097a773b3a90adae71a92919868695d32bd487622a32486baa9a75b033bdd # via -r requirements.txt typing-extensions==4.12.2 \ --hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \