Integrate llvm-project @0cc3fe460105c4c0c78139d7a78da557c3502298 (#17770

) Bump llvm-project to llvm/llvm-project@0cc3fe4 - revert llvm/llvm-project@2c06fb8 - revert llvm/llvm-project@fa06668 - revert llvm/llvm-project@137a745 Bump torch-mlir to llvm/torch-mlir@6fece25 --------- Signed-off-by: Max Dawkins <[email protected]>
iree-org · Jul 2, 2024 · d2bca4e · d2bca4e
1 parent 4cdc8e4
commit d2bca4e
Show file tree

Hide file tree

Showing 17 changed files with 127 additions and 243 deletions.
diff --git a/build_tools/pkgci/external_test_suite/onnx_cpu_llvm_sync.json b/build_tools/pkgci/external_test_suite/onnx_cpu_llvm_sync.json
@@ -29,15 +29,9 @@
     "onnx/node/generated/test_ai_onnx_ml_label_encoder_string_int",
     "onnx/node/generated/test_ai_onnx_ml_label_encoder_string_int_no_default",
     "onnx/node/generated/test_ai_onnx_ml_label_encoder_tensor_value_only_mapping",
-    "onnx/node/generated/test_averagepool_2d_dilations",
     "onnx/node/generated/test_averagepool_2d_precomputed_same_upper",
     "onnx/node/generated/test_averagepool_2d_same_lower",
     "onnx/node/generated/test_averagepool_2d_same_upper",
-    "onnx/node/generated/test_averagepool_3d_dilations_large_count_include_pad_is_0_ceil_mode_is_False",
-    "onnx/node/generated/test_averagepool_3d_dilations_large_count_include_pad_is_0_ceil_mode_is_True",
-    "onnx/node/generated/test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_False",
-    "onnx/node/generated/test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_True",
-    "onnx/node/generated/test_averagepool_3d_dilations_small",
     "onnx/node/generated/test_basic_deform_conv_with_padding",
     "onnx/node/generated/test_basic_deform_conv_without_padding",
     "onnx/node/generated/test_batchnorm_epsilon_training_mode",
@@ -183,21 +177,14 @@
     "onnx/node/generated/test_image_decoder_decode_tiff_rgb",
     "onnx/node/generated/test_image_decoder_decode_webp_rgb",
     "onnx/node/generated/test_loop11",
-    "onnx/node/generated/test_lppool_1d_default",
-    "onnx/node/generated/test_lppool_2d_default",
     "onnx/node/generated/test_lppool_2d_dilations",
-    "onnx/node/generated/test_lppool_2d_pads",
     "onnx/node/generated/test_lppool_2d_same_lower",
     "onnx/node/generated/test_lppool_2d_same_upper",
-    "onnx/node/generated/test_lppool_2d_strides",
-    "onnx/node/generated/test_lppool_3d_default",
-    "onnx/node/generated/test_lrn",
-    "onnx/node/generated/test_lrn_default",
     "onnx/node/generated/test_lstm_batchwise",
     "onnx/node/generated/test_lstm_defaults",
     "onnx/node/generated/test_lstm_with_initial_bias",
     "onnx/node/generated/test_lstm_with_peepholes",
-    "onnx/node/generated/test_maxpool_1d_default",
+    "onnx/node/generated/test_maxpool_2d_ceil_output_size_reduce_by_one",
     "onnx/node/generated/test_maxpool_2d_precomputed_same_upper",
     "onnx/node/generated/test_maxpool_2d_same_lower",
     "onnx/node/generated/test_maxpool_2d_same_upper",
@@ -213,7 +200,6 @@
     "onnx/node/generated/test_momentum_multiple",
     "onnx/node/generated/test_mvn",
     "onnx/node/generated/test_nesterov_momentum",
-    "onnx/node/generated/test_nllloss_NC",
     "onnx/node/generated/test_nllloss_NCd1",
     "onnx/node/generated/test_nllloss_NCd1_ii",
     "onnx/node/generated/test_nllloss_NCd1_mean_weight_negative_ii",
@@ -243,11 +229,6 @@
     "onnx/node/generated/test_nonzero_example",
     "onnx/node/generated/test_onehot_with_axis",
     "onnx/node/generated/test_onehot_with_negative_axis",
-    "onnx/node/generated/test_optional_get_element_tensor",
-    "onnx/node/generated/test_optional_has_element_empty_no_input_name_optional_input",
-    "onnx/node/generated/test_optional_has_element_empty_no_input_name_tensor_input",
-    "onnx/node/generated/test_optional_has_element_empty_no_input_optional_input",
-    "onnx/node/generated/test_optional_has_element_empty_no_input_tensor_input",
     "onnx/node/generated/test_pow_types_int32_float32",
     "onnx/node/generated/test_pow_types_int32_int32",
     "onnx/node/generated/test_pow_types_int64_float32",
@@ -387,8 +368,6 @@
     "onnx/node/generated/test_resize_upsample_sizes_nearest_axes_3_2",
     "onnx/node/generated/test_resize_upsample_sizes_nearest_floor_align_corners",
     "onnx/node/generated/test_resize_upsample_sizes_nearest_not_larger",
-    "onnx/node/generated/test_reversesequence_batch",
-    "onnx/node/generated/test_reversesequence_time",
     "onnx/node/generated/test_rnn_seq_length",
     "onnx/node/generated/test_roialign_aligned_false",
     "onnx/node/generated/test_roialign_aligned_true",
@@ -427,8 +406,6 @@
     "onnx/node/generated/test_sce_mean_3d_expanded",
     "onnx/node/generated/test_sce_mean_3d_log_prob",
     "onnx/node/generated/test_sce_mean_3d_log_prob_expanded",
-    "onnx/node/generated/test_sce_mean_expanded",
-    "onnx/node/generated/test_sce_mean_log_prob_expanded",
     "onnx/node/generated/test_sce_mean_no_weight_ii_3d",
     "onnx/node/generated/test_sce_mean_no_weight_ii_3d_expanded",
     "onnx/node/generated/test_sce_mean_no_weight_ii_3d_log_prob",
@@ -437,8 +414,6 @@
     "onnx/node/generated/test_sce_mean_no_weight_ii_4d_expanded",
     "onnx/node/generated/test_sce_mean_no_weight_ii_4d_log_prob",
     "onnx/node/generated/test_sce_mean_no_weight_ii_4d_log_prob_expanded",
-    "onnx/node/generated/test_sce_mean_no_weight_ii_expanded",
-    "onnx/node/generated/test_sce_mean_no_weight_ii_log_prob_expanded",
     "onnx/node/generated/test_sce_mean_weight",
     "onnx/node/generated/test_sce_mean_weight_expanded",
     "onnx/node/generated/test_sce_mean_weight_ii",
@@ -455,14 +430,10 @@
     "onnx/node/generated/test_sce_mean_weight_ii_log_prob_expanded",
     "onnx/node/generated/test_sce_mean_weight_log_prob",
     "onnx/node/generated/test_sce_mean_weight_log_prob_expanded",
-    "onnx/node/generated/test_sce_none_expanded",
-    "onnx/node/generated/test_sce_none_log_prob_expanded",
     "onnx/node/generated/test_sce_none_weights",
     "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_sce_sum_expanded",
-    "onnx/node/generated/test_sce_sum_log_prob_expanded",
     "onnx/node/generated/test_shrink_hard",
     "onnx/node/generated/test_shrink_soft",
     "onnx/node/generated/test_simple_rnn_batchwise",
@@ -529,6 +500,7 @@
   ],
   "expected_run_failures": [
     "onnx/node/generated/test_asin",
+    "onnx/node/generated/test_averagepool_3d_dilations_large_count_include_pad_is_0_ceil_mode_is_True",
     "onnx/node/generated/test_bernoulli",
     "onnx/node/generated/test_bernoulli_double",
     "onnx/node/generated/test_bernoulli_double_expanded",
@@ -565,12 +537,7 @@
     "onnx/node/generated/test_gridsample_nearest",
     "onnx/node/generated/test_gridsample_nearest_align_corners_0_additional_1",
     "onnx/node/generated/test_gridsample_nearest_align_corners_1_additional_1",
-    "onnx/node/generated/test_hardsigmoid",
-    "onnx/node/generated/test_hardsigmoid_default",
-    "onnx/node/generated/test_hardsigmoid_example",
-    "onnx/node/generated/test_hardswish_expanded",
     "onnx/node/generated/test_max_float64",
-    "onnx/node/generated/test_maxpool_2d_ceil_output_size_reduce_by_one",
     "onnx/node/generated/test_min_float64",
     "onnx/node/generated/test_mod_mixed_sign_int16",
     "onnx/node/generated/test_mod_mixed_sign_int32",
@@ -596,7 +563,9 @@
     "onnx/node/generated/test_resize_downsample_scales_linear_align_corners",
     "onnx/node/generated/test_scatter_elements_with_negative_indices",
     "onnx/node/generated/test_sce_mean_no_weight_ii",
+    "onnx/node/generated/test_sce_mean_no_weight_ii_expanded",
     "onnx/node/generated/test_sce_mean_no_weight_ii_log_prob",
+    "onnx/node/generated/test_sce_mean_no_weight_ii_log_prob_expanded",
     "onnx/node/generated/test_shape_end_1",
     "onnx/node/generated/test_shape_start_1",
     "onnx/node/generated/test_shape_start_1_end_2",

diff --git a/build_tools/pkgci/external_test_suite/onnx_gpu_cuda.json b/build_tools/pkgci/external_test_suite/onnx_gpu_cuda.json
@@ -35,15 +35,9 @@
     "onnx/node/generated/test_ai_onnx_ml_label_encoder_string_int",
     "onnx/node/generated/test_ai_onnx_ml_label_encoder_string_int_no_default",
     "onnx/node/generated/test_ai_onnx_ml_label_encoder_tensor_value_only_mapping",
-    "onnx/node/generated/test_averagepool_2d_dilations",
     "onnx/node/generated/test_averagepool_2d_precomputed_same_upper",
     "onnx/node/generated/test_averagepool_2d_same_lower",
     "onnx/node/generated/test_averagepool_2d_same_upper",
-    "onnx/node/generated/test_averagepool_3d_dilations_large_count_include_pad_is_0_ceil_mode_is_False",
-    "onnx/node/generated/test_averagepool_3d_dilations_large_count_include_pad_is_0_ceil_mode_is_True",
-    "onnx/node/generated/test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_False",
-    "onnx/node/generated/test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_True",
-    "onnx/node/generated/test_averagepool_3d_dilations_small",
     "onnx/node/generated/test_basic_deform_conv_with_padding",
     "onnx/node/generated/test_basic_deform_conv_without_padding",
     "onnx/node/generated/test_batchnorm_epsilon_training_mode",
@@ -189,21 +183,14 @@
     "onnx/node/generated/test_image_decoder_decode_tiff_rgb",
     "onnx/node/generated/test_image_decoder_decode_webp_rgb",
     "onnx/node/generated/test_loop11",
-    "onnx/node/generated/test_lppool_1d_default",
-    "onnx/node/generated/test_lppool_2d_default",
     "onnx/node/generated/test_lppool_2d_dilations",
-    "onnx/node/generated/test_lppool_2d_pads",
     "onnx/node/generated/test_lppool_2d_same_lower",
     "onnx/node/generated/test_lppool_2d_same_upper",
-    "onnx/node/generated/test_lppool_2d_strides",
-    "onnx/node/generated/test_lppool_3d_default",
-    "onnx/node/generated/test_lrn",
-    "onnx/node/generated/test_lrn_default",
     "onnx/node/generated/test_lstm_batchwise",
     "onnx/node/generated/test_lstm_defaults",
     "onnx/node/generated/test_lstm_with_initial_bias",
     "onnx/node/generated/test_lstm_with_peepholes",
-    "onnx/node/generated/test_maxpool_1d_default",
+    "onnx/node/generated/test_maxpool_2d_ceil_output_size_reduce_by_one",
     "onnx/node/generated/test_maxpool_2d_precomputed_same_upper",
     "onnx/node/generated/test_maxpool_2d_same_lower",
     "onnx/node/generated/test_maxpool_2d_same_upper",
@@ -216,7 +203,6 @@
     "onnx/node/generated/test_momentum_multiple",
     "onnx/node/generated/test_mvn",
     "onnx/node/generated/test_nesterov_momentum",
-    "onnx/node/generated/test_nllloss_NC",
     "onnx/node/generated/test_nllloss_NCd1",
     "onnx/node/generated/test_nllloss_NCd1_ii",
     "onnx/node/generated/test_nllloss_NCd1_mean_weight_negative_ii",
@@ -246,11 +232,6 @@
     "onnx/node/generated/test_nonzero_example",
     "onnx/node/generated/test_onehot_with_axis",
     "onnx/node/generated/test_onehot_with_negative_axis",
-    "onnx/node/generated/test_optional_get_element_tensor",
-    "onnx/node/generated/test_optional_has_element_empty_no_input_name_optional_input",
-    "onnx/node/generated/test_optional_has_element_empty_no_input_name_tensor_input",
-    "onnx/node/generated/test_optional_has_element_empty_no_input_optional_input",
-    "onnx/node/generated/test_optional_has_element_empty_no_input_tensor_input",
     "onnx/node/generated/test_pow_types_int32_float32",
     "onnx/node/generated/test_pow_types_int32_int32",
     "onnx/node/generated/test_pow_types_int64_float32",
@@ -390,8 +371,6 @@
     "onnx/node/generated/test_resize_upsample_sizes_nearest_axes_3_2",
     "onnx/node/generated/test_resize_upsample_sizes_nearest_floor_align_corners",
     "onnx/node/generated/test_resize_upsample_sizes_nearest_not_larger",
-    "onnx/node/generated/test_reversesequence_batch",
-    "onnx/node/generated/test_reversesequence_time",
     "onnx/node/generated/test_rnn_seq_length",
     "onnx/node/generated/test_roialign_aligned_false",
     "onnx/node/generated/test_roialign_aligned_true",
@@ -430,8 +409,6 @@
     "onnx/node/generated/test_sce_mean_3d_expanded",
     "onnx/node/generated/test_sce_mean_3d_log_prob",
     "onnx/node/generated/test_sce_mean_3d_log_prob_expanded",
-    "onnx/node/generated/test_sce_mean_expanded",
-    "onnx/node/generated/test_sce_mean_log_prob_expanded",
     "onnx/node/generated/test_sce_mean_no_weight_ii_3d",
     "onnx/node/generated/test_sce_mean_no_weight_ii_3d_expanded",
     "onnx/node/generated/test_sce_mean_no_weight_ii_3d_log_prob",
@@ -440,8 +417,6 @@
     "onnx/node/generated/test_sce_mean_no_weight_ii_4d_expanded",
     "onnx/node/generated/test_sce_mean_no_weight_ii_4d_log_prob",
     "onnx/node/generated/test_sce_mean_no_weight_ii_4d_log_prob_expanded",
-    "onnx/node/generated/test_sce_mean_no_weight_ii_expanded",
-    "onnx/node/generated/test_sce_mean_no_weight_ii_log_prob_expanded",
     "onnx/node/generated/test_sce_mean_weight",
     "onnx/node/generated/test_sce_mean_weight_expanded",
     "onnx/node/generated/test_sce_mean_weight_ii",
@@ -458,14 +433,10 @@
     "onnx/node/generated/test_sce_mean_weight_ii_log_prob_expanded",
     "onnx/node/generated/test_sce_mean_weight_log_prob",
     "onnx/node/generated/test_sce_mean_weight_log_prob_expanded",
-    "onnx/node/generated/test_sce_none_expanded",
-    "onnx/node/generated/test_sce_none_log_prob_expanded",
     "onnx/node/generated/test_sce_none_weights",
     "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_sce_sum_expanded",
-    "onnx/node/generated/test_sce_sum_log_prob_expanded",
     "onnx/node/generated/test_shrink_hard",
     "onnx/node/generated/test_shrink_soft",
     "onnx/node/generated/test_simple_rnn_batchwise",
@@ -532,6 +503,7 @@
   ],
   "expected_run_failures": [
     "onnx/node/generated/test_asin",
+    "onnx/node/generated/test_averagepool_3d_dilations_large_count_include_pad_is_0_ceil_mode_is_True",
     "onnx/node/generated/test_bernoulli",
     "onnx/node/generated/test_bernoulli_double",
     "onnx/node/generated/test_bernoulli_double_expanded",
@@ -567,12 +539,7 @@
     "onnx/node/generated/test_gridsample_nearest",
     "onnx/node/generated/test_gridsample_nearest_align_corners_0_additional_1",
     "onnx/node/generated/test_gridsample_nearest_align_corners_1_additional_1",
-    "onnx/node/generated/test_hardsigmoid",
-    "onnx/node/generated/test_hardsigmoid_default",
-    "onnx/node/generated/test_hardsigmoid_example",
-    "onnx/node/generated/test_hardswish_expanded",
     "onnx/node/generated/test_max_float64",
-    "onnx/node/generated/test_maxpool_2d_ceil_output_size_reduce_by_one",
     "onnx/node/generated/test_min_float64",
     "onnx/node/generated/test_mod_mixed_sign_float64",
     "onnx/node/generated/test_mod_mixed_sign_int16",
@@ -613,7 +580,9 @@
     "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_sce_mean_no_weight_ii",
+    "onnx/node/generated/test_sce_mean_no_weight_ii_expanded",
     "onnx/node/generated/test_sce_mean_no_weight_ii_log_prob",
+    "onnx/node/generated/test_sce_mean_no_weight_ii_log_prob_expanded",
     "onnx/node/generated/test_shape_end_1",
     "onnx/node/generated/test_shape_start_1",
     "onnx/node/generated/test_shape_start_1_end_2",