Skip to content

Commit

Permalink
Integrate torch-mlir at c9694c6 and disable TOSA. (#19976)
Browse files Browse the repository at this point in the history 
Integrated at
llvm/torch-mlir@c9694c6
which makes TOSA support controlled by an option.

Since we have our own CMakeLists for torch-mlir, which do not add
`-DTORCH_MLIR_ENABLE_TOSA`, all we need to do is to drop TOSA files from
them.

---------

Signed-off-by: Benoit Jacob <[email protected]>
  • Loading branch information
@bjacob
bjacob authored Feb 13, 2025
1 parent 73be116 commit 04dc4a4
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 7 deletions.
2 changes: 0 additions & 2 deletions compiler/plugins/input/Torch/torch-mlir/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ file(GLOB _ConversionPasses_SRCS
"${TORCH_MLIR_ROOT_DIR}/lib/Conversion/TorchConversionToMLProgram/*.cpp"
"${TORCH_MLIR_ROOT_DIR}/lib/Conversion/TorchToSCF/*.cpp"
"${TORCH_MLIR_ROOT_DIR}/lib/Conversion/TorchToTensor/*.cpp"
"${TORCH_MLIR_ROOT_DIR}/lib/Conversion/TorchToTosa/*.cpp"
"${TORCH_MLIR_ROOT_DIR}/lib/Conversion/TorchToTMTensor/*.cpp"
"${TORCH_MLIR_ROOT_DIR}/lib/Conversion/Utils/*.cpp"
"${TORCH_MLIR_ROOT_DIR}/lib/Dialect/TorchConversion/Transforms/*.cpp"
Expand All @@ -202,7 +201,6 @@ iree_cc_library(
MLIRMathDialect
MLIRMLProgramDialect
MLIRSCFDialect
MLIRTosaDialect
)

iree_tablegen_library(
Expand Down
16 changes: 14 additions & 2 deletions tests/external/iree-test-suites/onnx_ops/onnx_ops_cpu_llvm_sync.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,9 +235,15 @@
"onnx/node/generated/test_reduce_sum_square_negative_axes_keepdims_random_expanded",
"onnx/node/generated/test_reflect_pad",
"onnx/node/generated/test_reshape_allowzero_reordered",
"onnx/node/generated/test_resize_downsample_scales_cubic",
"onnx/node/generated/test_resize_downsample_scales_cubic_A_n0p5_exclude_outside",
"onnx/node/generated/test_resize_downsample_scales_cubic_align_corners",
"onnx/node/generated/test_resize_downsample_scales_cubic_antialias",
"onnx/node/generated/test_resize_downsample_scales_linear",
"onnx/node/generated/test_resize_downsample_scales_linear_align_corners",
"onnx/node/generated/test_resize_downsample_scales_linear_antialias",
"onnx/node/generated/test_resize_downsample_scales_linear_half_pixel_symmetric",
"onnx/node/generated/test_resize_downsample_scales_nearest",
"onnx/node/generated/test_resize_downsample_sizes_cubic_antialias",
"onnx/node/generated/test_resize_downsample_sizes_linear_antialias",
"onnx/node/generated/test_resize_downsample_sizes_nearest_not_larger",
Expand All @@ -246,7 +252,14 @@
"onnx/node/generated/test_resize_tf_crop_and_resize_axes_2_3",
"onnx/node/generated/test_resize_tf_crop_and_resize_axes_3_2",
"onnx/node/generated/test_resize_tf_crop_and_resize_extrapolation_value",
"onnx/node/generated/test_resize_upsample_scales_cubic",
"onnx/node/generated/test_resize_upsample_scales_cubic_A_n0p5_exclude_outside",
"onnx/node/generated/test_resize_upsample_scales_cubic_align_corners",
"onnx/node/generated/test_resize_upsample_scales_cubic_asymmetric",
"onnx/node/generated/test_resize_upsample_scales_linear",
"onnx/node/generated/test_resize_upsample_scales_linear_align_corners",
"onnx/node/generated/test_resize_upsample_scales_linear_half_pixel_symmetric",
"onnx/node/generated/test_resize_upsample_scales_nearest",
"onnx/node/generated/test_resize_upsample_scales_nearest_axes_2_3",
"onnx/node/generated/test_resize_upsample_scales_nearest_axes_3_2",
"onnx/node/generated/test_resize_upsample_sizes_nearest_axes_2_3",
Expand Down Expand Up @@ -318,6 +331,7 @@
"onnx/node/generated/test_unique_sorted_with_axis_3d",
"onnx/node/generated/test_unique_sorted_with_negative_axis",
"onnx/node/generated/test_unique_sorted_without_axis",
"onnx/node/generated/test_upsample_nearest",
"onnx/node/generated/test_wrap_pad"
],
"expected_run_failures": [
Expand Down Expand Up @@ -354,8 +368,6 @@
"onnx/node/generated/test_reduce_min_bool_inputs",
"onnx/node/generated/test_reduce_min_empty_set",
"onnx/node/generated/test_reduce_sum_empty_set_non_reduced_axis_zero",
"onnx/node/generated/test_resize_downsample_scales_cubic_align_corners",
"onnx/node/generated/test_resize_downsample_scales_linear_align_corners",
"onnx/node/generated/test_scan_sum",
"onnx/node/generated/test_sce_mean_weight",
"onnx/node/generated/test_sce_mean_weight_ii",
Expand Down
16 changes: 14 additions & 2 deletions tests/external/iree-test-suites/onnx_ops/onnx_ops_gpu_rocm_rdna3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,15 @@
"onnx/node/generated/test_reduce_sum_square_negative_axes_keepdims_random_expanded",
"onnx/node/generated/test_reflect_pad",
"onnx/node/generated/test_reshape_allowzero_reordered",
"onnx/node/generated/test_resize_downsample_scales_cubic",
"onnx/node/generated/test_resize_downsample_scales_cubic_A_n0p5_exclude_outside",
"onnx/node/generated/test_resize_downsample_scales_cubic_align_corners",
"onnx/node/generated/test_resize_downsample_scales_cubic_antialias",
"onnx/node/generated/test_resize_downsample_scales_linear",
"onnx/node/generated/test_resize_downsample_scales_linear_align_corners",
"onnx/node/generated/test_resize_downsample_scales_linear_antialias",
"onnx/node/generated/test_resize_downsample_scales_linear_half_pixel_symmetric",
"onnx/node/generated/test_resize_downsample_scales_nearest",
"onnx/node/generated/test_resize_downsample_sizes_cubic_antialias",
"onnx/node/generated/test_resize_downsample_sizes_linear_antialias",
"onnx/node/generated/test_resize_downsample_sizes_nearest_not_larger",
Expand All @@ -230,7 +236,14 @@
"onnx/node/generated/test_resize_tf_crop_and_resize_axes_2_3",
"onnx/node/generated/test_resize_tf_crop_and_resize_axes_3_2",
"onnx/node/generated/test_resize_tf_crop_and_resize_extrapolation_value",
"onnx/node/generated/test_resize_upsample_scales_cubic",
"onnx/node/generated/test_resize_upsample_scales_cubic_A_n0p5_exclude_outside",
"onnx/node/generated/test_resize_upsample_scales_cubic_align_corners",
"onnx/node/generated/test_resize_upsample_scales_cubic_asymmetric",
"onnx/node/generated/test_resize_upsample_scales_linear",
"onnx/node/generated/test_resize_upsample_scales_linear_align_corners",
"onnx/node/generated/test_resize_upsample_scales_linear_half_pixel_symmetric",
"onnx/node/generated/test_resize_upsample_scales_nearest",
"onnx/node/generated/test_resize_upsample_scales_nearest_axes_2_3",
"onnx/node/generated/test_resize_upsample_scales_nearest_axes_3_2",
"onnx/node/generated/test_resize_upsample_sizes_nearest_axes_2_3",
Expand Down Expand Up @@ -306,6 +319,7 @@
"onnx/node/generated/test_unique_sorted_with_axis_3d",
"onnx/node/generated/test_unique_sorted_with_negative_axis",
"onnx/node/generated/test_unique_sorted_without_axis",
"onnx/node/generated/test_upsample_nearest",
"onnx/node/generated/test_wrap_pad"
],
"expected_run_failures": [
Expand Down Expand Up @@ -362,8 +376,6 @@
"onnx/node/generated/test_reduce_sum_square_default_axes_keepdims_example_expanded",
"onnx/node/generated/test_reduce_sum_square_default_axes_keepdims_random",
"onnx/node/generated/test_reduce_sum_square_default_axes_keepdims_random_expanded",
"onnx/node/generated/test_resize_downsample_scales_cubic_align_corners",
"onnx/node/generated/test_resize_downsample_scales_linear_align_corners",
"onnx/node/generated/test_scan_sum",
"onnx/node/generated/test_sce_mean_weight",
"onnx/node/generated/test_sce_mean_weight_ii",
Expand Down
2 changes: 1 addition & 1 deletion third_party/torch-mlir
Submodule torch-mlir updated 36 files
+10 −0 CMakeLists.txt
+1 −0 build-requirements.txt
+7 −2 build_tools/autogen_ltc_backend.py
+4 −0 build_tools/ci/test_posix.sh
+1 −1 externals/llvm-project
+5 −5 include/torch-mlir/Conversion/CMakeLists.txt
+2 −0 include/torch-mlir/Conversion/Passes.td
+2 −3 include/torch-mlir/Conversion/TorchToTosa/TosaLegalizeCommon.h
+50 −24 include/torch-mlir/Conversion/TorchToTosa/TosaLegalizeUtils.h
+71 −0 include/torch-mlir/Dialect/Torch/IR/GeneratedTorchOps.td
+3 −5 include/torch-mlir/Dialect/TorchConversion/Transforms/CMakeLists.txt
+6 −3 include/torch-mlir/Dialect/TorchConversion/Transforms/Passes.h
+2 −0 include/torch-mlir/Dialect/TorchConversion/Transforms/Passes.td
+5 −2 lib/CMakeLists.txt
+6 −2 lib/Conversion/CMakeLists.txt
+3 −0 lib/Conversion/Passes.cpp
+184 −80 lib/Conversion/TorchOnnxToTorch/DefaultDomainQtoZ.cpp
+66 −0 lib/Conversion/TorchToLinalg/Uncategorized.cpp
+123 −5 lib/Conversion/TorchToTMTensor/TorchToTMTensor.cpp
+227 −279 lib/Conversion/TorchToTosa/TorchToTosa.cpp
+12 −16 lib/Conversion/TorchToTosa/TosaLegalizeCommon.cpp
+78 −55 lib/Conversion/TorchToTosa/TosaLegalizeUtils.cpp
+78 −0 lib/Dialect/Torch/Transforms/DecomposeComplexOps.cpp
+10 −4 lib/Dialect/TorchConversion/Transforms/Passes.cpp
+2 −1 lib/Dialect/TorchConversion/Transforms/VerifyTosaBackendContract.cpp
+8 −2 lib/InitAll.cpp
+12 −0 projects/ltc/csrc/base_lazy_backend/shape_inference.cpp
+17 −1 projects/pt1/e2e_testing/xfail_sets.py
+5 −0 projects/pt1/python/torch_mlir/jit_ir_importer/build_tools/torch_ods_gen.py
+86 −0 projects/pt1/python/torch_mlir_e2e_test/test_suite/basic.py
+6 −4 python/torch_mlir/extras/fx_importer.py
+26 −11 test/Conversion/TorchOnnxToTorch/simple_ops_q_to_z.mlir
+30 −0 test/Conversion/TorchToLinalg/constraints.mlir
+389 −483 test/Conversion/TorchToTosa/basic.mlir
+7 −9 test/Conversion/TorchToTosa/torch-backend-to-tosa-backend-pipeline.mlir
+50 −0 test/Dialect/Torch/decompose-complex-ops.mlir

0 comments on commit 04dc4a4

Please sign in to comment.