Integrate llvm-project @f1595ecfdce5387e41826fd72ff930a1a39ae398 #18897

Max191 · 2024-10-25T02:09:59Z

bump llvm-project to llvm/llvm-project@f1595ec
- revert iree-org/llvm-project@1004865 due to compiler failures in VectorDistribute. Tracked in [VectorDistribute] Zero dimensional vectors causing distribution failure in VectorDistribute #18955.
bump stablehlo to openxla/stablehlo@c32f7c2
bump torch-mlir to llvm/torch-mlir@8b0bf2e
- revert llvm/torch-mlir@55ff110 due to new onnx failures. Tracked in [CPU][ONNX] Onnx test failures after pulling in torch-mlir changes #18961

Max191 · 2024-10-25T02:10:57Z

Waiting on stablehlo and torch-mlir to bump llvm, and then will bump them here to fix build failures.

EDIT: Both landed and bumped.

Signed-off-by: Max Dawkins <max.dawkins@gmail.com>

Max191 · 2024-10-31T14:47:27Z

tests/external/iree-test-suites/onnx_ops/onnx_ops_cpu_llvm_sync.json

@@ -380,6 +379,7 @@
    "onnx/node/generated/test_sce_none_weights_expanded",
    "onnx/node/generated/test_sce_none_weights_log_prob",
    "onnx/node/generated/test_sce_none_weights_log_prob_expanded",
+    "onnx/node/generated/test_shape_clip_start",


This shape test fails on top of main too, so I don't think the failure is related to the integrate. There is an issue filed in torch-mlir for this test here: llvm/torch-mlir#3841.

benvanik · 2024-10-31T18:08:09Z

@Max191 this has a typo in one of the tests (tile_and_distribute_to_workgroups.mlir):

        %cl_4 = hal.interface.constant.load layout(#pipeline_layout) ordinal(4) : i32
        %cl_5 = hal.interface.constant.load layout(#pipeline_layout) ordinal(5) : i32
        %0 = arith.index_castui %cl_0 : i32 to index
        %1 = arith.index_castui %cl_1 : i32 to index
        %2 = arith.index_castui %cl_2 : i32 to index
        %3 = arith.index_castui %cl_3 : i32 to index
        %tile0 = arith.index_castui %cl_3 : i32 to index
        %tile1 = arith.index_castui %cl_3 : i32 to index

that should be

        %tile0 = arith.index_castui %cl_4 : i32 to index
        %tile1 = arith.index_castui %cl_5 : i32 to index

(the new ones that were added)

Max191 · 2024-10-31T21:20:53Z

@Max191 this has a typo in one of the tests (tile_and_distribute_to_workgroups.mlir):

Fixed here: #18982

Fixes a typo in a lit test that was added in #18897. Signed-off-by: Max Dawkins <max.dawkins@gmail.com>

ScottTodd · 2024-11-01T12:59:38Z

Build error (warning as error) on gcc: https://github.com/iree-org/iree/actions/runs/11627279570/job/32380341216#step:4:6312

ScottTodd · 2024-11-01T17:29:47Z

Build error (warning as error) on gcc: https://github.com/iree-org/iree/actions/runs/11627279570/job/32380341216#step:4:6312

Left a comment upstream: llvm/torch-mlir#3813 (comment)

) Test runs: * https://github.com/iree-org/iree/actions/runs/11689400528 (global error disable) * https://github.com/iree-org/iree/actions/runs/11714927110 (local error disable) * https://github.com/iree-org/iree/actions/runs/11716788601 (local error disable, different check) Working around the build break reported here: * #18897 (comment) * llvm/torch-mlir#3813 (comment) Logs: ``` FAILED: compiler/plugins/input/Torch/torch-mlir/CMakeFiles/iree_compiler_plugins_input_Torch_torch-mlir_TorchDialectIR.objects.dir/__/__/__/__/__/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp.o /usr/local/bin/ccache /usr/bin/g++-9 -I/__w/iree/iree -I/__w/iree/iree/build-gcc -I/__w/iree/iree/third_party/torch-mlir/include -I/__w/iree/iree/compiler/plugins/input/Torch -I/__w/iree/iree/build-gcc/compiler/plugins/input/Torch -I/__w/iree/iree/third_party/llvm-project/llvm/include -I/__w/iree/iree/build-gcc/llvm-project/include -I/__w/iree/iree/third_party/llvm-project/mlir/include -I/__w/iree/iree/build-gcc/llvm-project/tools/mlir/include -I/__w/iree/iree/third_party/llvm-project/lld/include -I/__w/iree/iree/build-gcc/llvm-project/tools/lld/include -O3 -fPIC -Wno-deprecated-declarations -fvisibility=hidden -fno-rtti -fno-exceptions -Wall -Werror -Wno-error=deprecated-declarations -Wno-address -Wno-address-of-packed-member -Wno-comment -Wno-format-zero-length -Wno-uninitialized -Wno-overloaded-virtual -Wno-invalid-offsetof -Wno-sign-compare -Wno-unused-function -Wno-unknown-pragmas -Wno-unused-but-set-variable -Wno-misleading-indentation -fmacro-prefix-map=/__w/iree/iree=iree -std=gnu++17 -MD -MT compiler/plugins/input/Torch/torch-mlir/CMakeFiles/iree_compiler_plugins_input_Torch_torch-mlir_TorchDialectIR.objects.dir/__/__/__/__/__/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp.o -MF compiler/plugins/input/Torch/torch-mlir/CMakeFiles/iree_compiler_plugins_input_Torch_torch-mlir_TorchDialectIR.objects.dir/__/__/__/__/__/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp.o.d -o compiler/plugins/input/Torch/torch-mlir/CMakeFiles/iree_compiler_plugins_input_Torch_torch-mlir_TorchDialectIR.objects.dir/__/__/__/__/__/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp.o -c /__w/iree/iree/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp In file included from /usr/include/c++/9/cassert:44, from /__w/iree/iree/third_party/llvm-project/llvm/include/llvm/Support/TypeSize.h:22, from /__w/iree/iree/third_party/llvm-project/mlir/include/mlir/Interfaces/DataLayoutInterfaces.h:21, from /__w/iree/iree/third_party/llvm-project/mlir/include/mlir/IR/BuiltinOps.h:21, from /__w/iree/iree/third_party/llvm-project/mlir/include/mlir/IR/PatternMatch.h:13, from /__w/iree/iree/third_party/torch-mlir/include/torch-mlir/Dialect/Torch/Utils/Utils.h:12, from /__w/iree/iree/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp:11: /__w/iree/iree/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp: In member function 'mlir::OpFoldResult mlir::torch::Torch::AtenSliceTensorOp::fold(mlir::torch::Torch::AtenSliceTensorOp::FoldAdaptor)': /__w/iree/iree/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp:4005:42: error: suggest parentheses around '&&' within '||' [-Werror=parentheses] 4005 | (stride < 0 && begin > limit) && | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~ 4006 | "aten.slice.Tensor iteration args are statically invalid."); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1plus: all warnings being treated as errors ```

…e-org#19030) Test runs: * https://github.com/iree-org/iree/actions/runs/11689400528 (global error disable) * https://github.com/iree-org/iree/actions/runs/11714927110 (local error disable) * https://github.com/iree-org/iree/actions/runs/11716788601 (local error disable, different check) Working around the build break reported here: * iree-org#18897 (comment) * llvm/torch-mlir#3813 (comment) Logs: ``` FAILED: compiler/plugins/input/Torch/torch-mlir/CMakeFiles/iree_compiler_plugins_input_Torch_torch-mlir_TorchDialectIR.objects.dir/__/__/__/__/__/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp.o /usr/local/bin/ccache /usr/bin/g++-9 -I/__w/iree/iree -I/__w/iree/iree/build-gcc -I/__w/iree/iree/third_party/torch-mlir/include -I/__w/iree/iree/compiler/plugins/input/Torch -I/__w/iree/iree/build-gcc/compiler/plugins/input/Torch -I/__w/iree/iree/third_party/llvm-project/llvm/include -I/__w/iree/iree/build-gcc/llvm-project/include -I/__w/iree/iree/third_party/llvm-project/mlir/include -I/__w/iree/iree/build-gcc/llvm-project/tools/mlir/include -I/__w/iree/iree/third_party/llvm-project/lld/include -I/__w/iree/iree/build-gcc/llvm-project/tools/lld/include -O3 -fPIC -Wno-deprecated-declarations -fvisibility=hidden -fno-rtti -fno-exceptions -Wall -Werror -Wno-error=deprecated-declarations -Wno-address -Wno-address-of-packed-member -Wno-comment -Wno-format-zero-length -Wno-uninitialized -Wno-overloaded-virtual -Wno-invalid-offsetof -Wno-sign-compare -Wno-unused-function -Wno-unknown-pragmas -Wno-unused-but-set-variable -Wno-misleading-indentation -fmacro-prefix-map=/__w/iree/iree=iree -std=gnu++17 -MD -MT compiler/plugins/input/Torch/torch-mlir/CMakeFiles/iree_compiler_plugins_input_Torch_torch-mlir_TorchDialectIR.objects.dir/__/__/__/__/__/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp.o -MF compiler/plugins/input/Torch/torch-mlir/CMakeFiles/iree_compiler_plugins_input_Torch_torch-mlir_TorchDialectIR.objects.dir/__/__/__/__/__/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp.o.d -o compiler/plugins/input/Torch/torch-mlir/CMakeFiles/iree_compiler_plugins_input_Torch_torch-mlir_TorchDialectIR.objects.dir/__/__/__/__/__/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp.o -c /__w/iree/iree/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp In file included from /usr/include/c++/9/cassert:44, from /__w/iree/iree/third_party/llvm-project/llvm/include/llvm/Support/TypeSize.h:22, from /__w/iree/iree/third_party/llvm-project/mlir/include/mlir/Interfaces/DataLayoutInterfaces.h:21, from /__w/iree/iree/third_party/llvm-project/mlir/include/mlir/IR/BuiltinOps.h:21, from /__w/iree/iree/third_party/llvm-project/mlir/include/mlir/IR/PatternMatch.h:13, from /__w/iree/iree/third_party/torch-mlir/include/torch-mlir/Dialect/Torch/Utils/Utils.h:12, from /__w/iree/iree/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp:11: /__w/iree/iree/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp: In member function 'mlir::OpFoldResult mlir::torch::Torch::AtenSliceTensorOp::fold(mlir::torch::Torch::AtenSliceTensorOp::FoldAdaptor)': /__w/iree/iree/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp:4005:42: error: suggest parentheses around '&&' within '||' [-Werror=parentheses] 4005 | (stride < 0 && begin > limit) && | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~ 4006 | "aten.slice.Tensor iteration args are statically invalid."); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1plus: all warnings being treated as errors ```

…e-org#18897) - bump llvm-project to llvm/llvm-project@f1595ec - revert iree-org/llvm-project@1004865 due to compiler failures in VectorDistribute. Tracked in iree-org#18955. - bump stablehlo to openxla/stablehlo@c32f7c2 - bump torch-mlir to llvm/torch-mlir@8b0bf2e - revert llvm/torch-mlir@55ff110 due to new onnx failures. Tracked in iree-org#18961 --------- Signed-off-by: Max Dawkins <max.dawkins@gmail.com> Signed-off-by: Giacomo Serafini <179146510+giacs-epic@users.noreply.github.com>

Fixes a typo in a lit test that was added in iree-org#18897. Signed-off-by: Max Dawkins <max.dawkins@gmail.com> Signed-off-by: Giacomo Serafini <179146510+giacs-epic@users.noreply.github.com>

…e-org#19030) Test runs: * https://github.com/iree-org/iree/actions/runs/11689400528 (global error disable) * https://github.com/iree-org/iree/actions/runs/11714927110 (local error disable) * https://github.com/iree-org/iree/actions/runs/11716788601 (local error disable, different check) Working around the build break reported here: * iree-org#18897 (comment) * llvm/torch-mlir#3813 (comment) Logs: ``` FAILED: compiler/plugins/input/Torch/torch-mlir/CMakeFiles/iree_compiler_plugins_input_Torch_torch-mlir_TorchDialectIR.objects.dir/__/__/__/__/__/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp.o /usr/local/bin/ccache /usr/bin/g++-9 -I/__w/iree/iree -I/__w/iree/iree/build-gcc -I/__w/iree/iree/third_party/torch-mlir/include -I/__w/iree/iree/compiler/plugins/input/Torch -I/__w/iree/iree/build-gcc/compiler/plugins/input/Torch -I/__w/iree/iree/third_party/llvm-project/llvm/include -I/__w/iree/iree/build-gcc/llvm-project/include -I/__w/iree/iree/third_party/llvm-project/mlir/include -I/__w/iree/iree/build-gcc/llvm-project/tools/mlir/include -I/__w/iree/iree/third_party/llvm-project/lld/include -I/__w/iree/iree/build-gcc/llvm-project/tools/lld/include -O3 -fPIC -Wno-deprecated-declarations -fvisibility=hidden -fno-rtti -fno-exceptions -Wall -Werror -Wno-error=deprecated-declarations -Wno-address -Wno-address-of-packed-member -Wno-comment -Wno-format-zero-length -Wno-uninitialized -Wno-overloaded-virtual -Wno-invalid-offsetof -Wno-sign-compare -Wno-unused-function -Wno-unknown-pragmas -Wno-unused-but-set-variable -Wno-misleading-indentation -fmacro-prefix-map=/__w/iree/iree=iree -std=gnu++17 -MD -MT compiler/plugins/input/Torch/torch-mlir/CMakeFiles/iree_compiler_plugins_input_Torch_torch-mlir_TorchDialectIR.objects.dir/__/__/__/__/__/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp.o -MF compiler/plugins/input/Torch/torch-mlir/CMakeFiles/iree_compiler_plugins_input_Torch_torch-mlir_TorchDialectIR.objects.dir/__/__/__/__/__/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp.o.d -o compiler/plugins/input/Torch/torch-mlir/CMakeFiles/iree_compiler_plugins_input_Torch_torch-mlir_TorchDialectIR.objects.dir/__/__/__/__/__/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp.o -c /__w/iree/iree/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp In file included from /usr/include/c++/9/cassert:44, from /__w/iree/iree/third_party/llvm-project/llvm/include/llvm/Support/TypeSize.h:22, from /__w/iree/iree/third_party/llvm-project/mlir/include/mlir/Interfaces/DataLayoutInterfaces.h:21, from /__w/iree/iree/third_party/llvm-project/mlir/include/mlir/IR/BuiltinOps.h:21, from /__w/iree/iree/third_party/llvm-project/mlir/include/mlir/IR/PatternMatch.h:13, from /__w/iree/iree/third_party/torch-mlir/include/torch-mlir/Dialect/Torch/Utils/Utils.h:12, from /__w/iree/iree/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp:11: /__w/iree/iree/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp: In member function 'mlir::OpFoldResult mlir::torch::Torch::AtenSliceTensorOp::fold(mlir::torch::Torch::AtenSliceTensorOp::FoldAdaptor)': /__w/iree/iree/third_party/torch-mlir/lib/Dialect/Torch/IR/TorchOps.cpp:4005:42: error: suggest parentheses around '&&' within '||' [-Werror=parentheses] 4005 | (stride < 0 && begin > limit) && | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~ 4006 | "aten.slice.Tensor iteration args are statically invalid."); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1plus: all warnings being treated as errors ``` Signed-off-by: Giacomo Serafini <179146510+giacs-epic@users.noreply.github.com>

Max191 mentioned this pull request Oct 25, 2024

tileConsumerAndFuseProducersUsingScf stuck in the infinite loop. #18875

Closed

Max191 force-pushed the integrates/llvm-20241024 branch from 32fd817 to 9542b5d Compare October 25, 2024 17:44

zjgarvey mentioned this pull request Oct 28, 2024

bump torch-mlir to 76209db #18895

Closed

bump llvm to f1595ecfdce5387e41826fd72ff930a1a39ae398

7e05cb6

Signed-off-by: Max Dawkins <max.dawkins@gmail.com>

Max191 force-pushed the integrates/llvm-20241024 branch 3 times, most recently from a46d4bd to bee3ab3 Compare October 30, 2024 14:18

Max191 added 5 commits October 30, 2024 14:17

revert 0d vector transfer patch

75235f4

Signed-off-by: Max Dawkins <max.dawkins@gmail.com>

bump stablehlo

7efe495

Signed-off-by: Max Dawkins <max.dawkins@gmail.com>

bump torch-mlir

9d3d93c

Signed-off-by: Max Dawkins <max.dawkins@gmail.com>

fix materialization functions

a4f439f

Signed-off-by: Max Dawkins <max.dawkins@gmail.com>

use real dynamic tiles in dynamic tile unpack test

136f18e

Signed-off-by: Max Dawkins <max.dawkins@gmail.com>

Max191 force-pushed the integrates/llvm-20241024 branch from 7cf4429 to 136f18e Compare October 30, 2024 18:20

Max191 added 2 commits October 31, 2024 09:08

revert torch-mlir/55ff110dc29cab7e2495ccdbec9a60512c29c665

c032e71

Signed-off-by: Max Dawkins <max.dawkins@gmail.com>

update onnx xfail list

b9f06af

Signed-off-by: Max Dawkins <max.dawkins@gmail.com>

Max191 force-pushed the integrates/llvm-20241024 branch from 04759cd to b9f06af Compare October 31, 2024 14:04

Max191 marked this pull request as ready for review October 31, 2024 14:31

Max191 requested review from hanhanW, MaheshRavishankar, rsuderman and benvanik as code owners October 31, 2024 14:31

Max191 commented Oct 31, 2024

View reviewed changes

MaheshRavishankar approved these changes Oct 31, 2024

View reviewed changes

Max191 merged commit df2b8a4 into main Oct 31, 2024
39 checks passed

Max191 deleted the integrates/llvm-20241024 branch October 31, 2024 16:04

Max191 mentioned this pull request Oct 31, 2024

Fix typo in tile_and_distribute_to_workgroups.mlir test #18982

Merged

Max191 added a commit that referenced this pull request Oct 31, 2024

Fix typo in tile_and_distribute_to_workgroups.mlir test (#18982)

20c8347

Fixes a typo in a lit test that was added in #18897. Signed-off-by: Max Dawkins <max.dawkins@gmail.com>

Max191 mentioned this pull request Nov 1, 2024

Integrates/llvm 20241101@e577f14 #18987

Merged

ScottTodd mentioned this pull request Nov 5, 2024

Disable -Wno-error=parentheses on gcc to fix torch-mlir build. #19030

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Integrate llvm-project @f1595ecfdce5387e41826fd72ff930a1a39ae398 #18897

Integrate llvm-project @f1595ecfdce5387e41826fd72ff930a1a39ae398 #18897

Max191 commented Oct 25, 2024 •

edited

Loading

Max191 commented Oct 25, 2024 •

edited

Loading

Max191 Oct 31, 2024

benvanik commented Oct 31, 2024

Max191 commented Oct 31, 2024

ScottTodd commented Nov 1, 2024

ScottTodd commented Nov 1, 2024

Integrate llvm-project @f1595ecfdce5387e41826fd72ff930a1a39ae398 #18897

Integrate llvm-project @f1595ecfdce5387e41826fd72ff930a1a39ae398 #18897

Conversation

Max191 commented Oct 25, 2024 • edited Loading

Max191 commented Oct 25, 2024 • edited Loading

Max191 Oct 31, 2024

Choose a reason for hiding this comment

benvanik commented Oct 31, 2024

Max191 commented Oct 31, 2024

ScottTodd commented Nov 1, 2024

ScottTodd commented Nov 1, 2024

Max191 commented Oct 25, 2024 •

edited

Loading

Max191 commented Oct 25, 2024 •

edited

Loading