Skip to content

Commit 9a3452d

Browse files
krzysz00krzysz00
authored
Integrate llvm-project@79487757b7 (iree-org#20434)
IREE changes: there have been some minor tweaks to the EquivalenceClasses API upstream. This means 1. Getting rid of the `findValue` method, which we weren't using anyway 2. `member_begin()` now takes an equivalence class, not an iterator, so various `member_begin(it)` have been changed to `member_begin(*it)` Neither of these updates is a functional change in IREE. 30 SPIR-V tests move from failing to compile to passing because upstream's wide integer emulation now supports fpto{u,s}i. 10 SPIR-V tests move from compile failures to runtime failures for similar reasons. It's unclear if the runtime failure is due to a correctness issue in the upstream fpto*i lowerings.
1 parent 27a170b commit 9a3452d

File tree

7 files changed

+19
-53
lines changed

7 files changed

+19
-53
lines changed

‎compiler/src/iree/compiler/Codegen/Common/BufferizationAnalysis.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -483,11 +483,11 @@ void BufferizationPlan::dump() {
483483
continue;
484484
llvm::dbgs() << "\tSet " << numSets;
485485
if (storeLeaders.count(
486-
getLeaderValue(getValue(*mappedTensors.member_begin(it))))) {
486+
getLeaderValue(getValue(*mappedTensors.member_begin(*it))))) {
487487
llvm::dbgs() << "(StoreSet) ";
488488
}
489489
llvm::dbgs() << ":\n";
490-
for (auto member : llvm::make_range(mappedTensors.member_begin(it),
490+
for (auto member : llvm::make_range(mappedTensors.member_begin(*it),
491491
mappedTensors.member_end())) {
492492
llvm::dbgs() << "\t\t";
493493
getValue(member).print(llvm::dbgs());

‎compiler/src/iree/compiler/Codegen/Common/BufferizationAnalysis.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ namespace mlir::iree_compiler {
2727
/// `Value` not directly supported as a value type by this class.
2828
class BufferizationPlan {
2929
public:
30-
llvm::EquivalenceClasses<void *>::iterator findValue(Value v) const {
31-
return mappedTensors.findValue(getPointer(v));
32-
}
33-
3430
llvm::EquivalenceClasses<void *>::iterator end() const {
3531
return mappedTensors.end();
3632
}

‎compiler/src/iree/compiler/Dialect/Stream/Transforms/ScheduleAllocation.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class ValueAliasingSet {
5151
if (!it->isLeader())
5252
continue; // Ignore non-leader sets.
5353
auto &aliasSet = result.emplace_back();
54-
for (auto mi = valueAliasing.member_begin(it);
54+
for (auto mi = valueAliasing.member_begin(*it);
5555
mi != valueAliasing.member_end(); ++mi) {
5656
aliasSet.push_back(mi->value);
5757
}

‎compiler/src/iree/compiler/Dialect/Util/Transforms/FoldGlobals.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,14 +314,14 @@ static bool deduplicateConstantGlobals(GlobalTable &globalTable) {
314314
if (!it->isLeader()) {
315315
// Ignore non-leader sets.
316316
continue;
317-
} else if (++ec.member_begin(it) == ec.member_end()) {
317+
} else if (++ec.member_begin(*it) == ec.member_end()) {
318318
continue;
319319
}
320320
auto *baseGlobal = &globalTable.lookup(it->getData());
321321

322322
// Build fused location from all of the globals.
323323
SmallVector<Location> locs;
324-
for (auto mi = ec.member_begin(it); mi != ec.member_end(); ++mi) {
324+
for (auto mi = ec.member_begin(*it); mi != ec.member_end(); ++mi) {
325325
Global &global = globalTable.lookup(*mi);
326326
locs.push_back(global.op.getLoc());
327327
if (global.ordinal < baseGlobal->ordinal) {
@@ -335,7 +335,7 @@ static bool deduplicateConstantGlobals(GlobalTable &globalTable) {
335335
baseGlobalOp->setLoc(fusedLoc);
336336

337337
// Replace all other globals to point at the new one.
338-
for (auto mi = ec.member_begin(it); mi != ec.member_end(); ++mi) {
338+
for (auto mi = ec.member_begin(*it); mi != ec.member_end(); ++mi) {
339339
Global &global = globalTable.lookup(*mi);
340340
if (global.op == baseGlobalOp) {
341341
continue;

‎compiler/src/iree/compiler/Dialect/Util/Transforms/FuseGlobals.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,11 @@ class FuseGlobalsPass : public impl::FuseGlobalsPassBase<FuseGlobalsPass> {
186186
if (!it->isLeader()) {
187187
continue; // Ignore non-leader sets.
188188
}
189-
if (++ec.member_begin(it) == ec.member_end()) {
189+
if (++ec.member_begin(*it) == ec.member_end()) {
190190
continue; // size 1
191191
}
192192
DenseMap<Attribute, SmallVector<Global *>> initialValueMap;
193-
for (auto mi = ec.member_begin(it); mi != ec.member_end(); ++mi) {
193+
for (auto mi = ec.member_begin(*it); mi != ec.member_end(); ++mi) {
194194
Global &global = globalTable.lookup(*mi);
195195
initialValueMap[global.op.getGlobalInitialValue()].push_back(&global);
196196
}

‎tests/external/iree-test-suites/onnx_ops/onnx_ops_gpu_vulkan.json‎

Lines changed: 10 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -89,24 +89,15 @@
8989
"onnx/node/generated/test_dft_inverse_opset19",
9090
"onnx/node/generated/test_dft_opset19",
9191
"onnx/node/generated/test_edge_pad",
92-
"onnx/node/generated/test_gridsample",
93-
"onnx/node/generated/test_gridsample_aligncorners_true",
9492
"onnx/node/generated/test_gridsample_bicubic",
9593
"onnx/node/generated/test_gridsample_bicubic_align_corners_0_additional_1",
9694
"onnx/node/generated/test_gridsample_bicubic_align_corners_1_additional_1",
97-
"onnx/node/generated/test_gridsample_bilinear",
98-
"onnx/node/generated/test_gridsample_bilinear_align_corners_0_additional_1",
99-
"onnx/node/generated/test_gridsample_bilinear_align_corners_1_additional_1",
10095
"onnx/node/generated/test_gridsample_border_padding",
101-
"onnx/node/generated/test_gridsample_nearest",
102-
"onnx/node/generated/test_gridsample_nearest_align_corners_0_additional_1",
103-
"onnx/node/generated/test_gridsample_nearest_align_corners_1_additional_1",
10496
"onnx/node/generated/test_gridsample_reflection_padding",
10597
"onnx/node/generated/test_gridsample_volumetric_bilinear_align_corners_0",
10698
"onnx/node/generated/test_gridsample_volumetric_bilinear_align_corners_1",
10799
"onnx/node/generated/test_gridsample_volumetric_nearest_align_corners_0",
108100
"onnx/node/generated/test_gridsample_volumetric_nearest_align_corners_1",
109-
"onnx/node/generated/test_gridsample_zeros_padding",
110101
"onnx/node/generated/test_image_decoder_decode_bmp_rgb",
111102
"onnx/node/generated/test_image_decoder_decode_jpeg2k_rgb",
112103
"onnx/node/generated/test_image_decoder_decode_jpeg_bgr",
@@ -155,12 +146,6 @@
155146
"onnx/node/generated/test_nonmaxsuppression_two_batches",
156147
"onnx/node/generated/test_nonmaxsuppression_two_classes",
157148
"onnx/node/generated/test_nonzero_example",
158-
"onnx/node/generated/test_onehot_negative_indices",
159-
"onnx/node/generated/test_onehot_with_axis",
160-
"onnx/node/generated/test_onehot_with_negative_axis",
161-
"onnx/node/generated/test_onehot_without_axis",
162-
"onnx/node/generated/test_pow_types_int64_float32",
163-
"onnx/node/generated/test_pow_types_int64_int64",
164149
"onnx/node/generated/test_quantizelinear_axis",
165150
"onnx/node/generated/test_quantizelinear_blocked_asymmetric",
166151
"onnx/node/generated/test_quantizelinear_blocked_symmetric",
@@ -269,45 +254,25 @@
269254
"onnx/node/generated/test_reduce_sum_square_negative_axes_keepdims_random_expanded",
270255
"onnx/node/generated/test_reflect_pad",
271256
"onnx/node/generated/test_reshape_allowzero_reordered",
272-
"onnx/node/generated/test_resize_downsample_scales_cubic",
273257
"onnx/node/generated/test_resize_downsample_scales_cubic_A_n0p5_exclude_outside",
274-
"onnx/node/generated/test_resize_downsample_scales_cubic_align_corners",
275258
"onnx/node/generated/test_resize_downsample_scales_cubic_antialias",
276-
"onnx/node/generated/test_resize_downsample_scales_linear",
277-
"onnx/node/generated/test_resize_downsample_scales_linear_align_corners",
278259
"onnx/node/generated/test_resize_downsample_scales_linear_antialias",
279-
"onnx/node/generated/test_resize_downsample_scales_linear_half_pixel_symmetric",
280-
"onnx/node/generated/test_resize_downsample_scales_nearest",
281-
"onnx/node/generated/test_resize_downsample_sizes_cubic",
282260
"onnx/node/generated/test_resize_downsample_sizes_cubic_antialias",
283261
"onnx/node/generated/test_resize_downsample_sizes_linear_antialias",
284-
"onnx/node/generated/test_resize_downsample_sizes_linear_pytorch_half_pixel",
285-
"onnx/node/generated/test_resize_downsample_sizes_nearest",
286262
"onnx/node/generated/test_resize_downsample_sizes_nearest_not_larger",
287263
"onnx/node/generated/test_resize_downsample_sizes_nearest_not_smaller",
288264
"onnx/node/generated/test_resize_tf_crop_and_resize",
289265
"onnx/node/generated/test_resize_tf_crop_and_resize_axes_2_3",
290266
"onnx/node/generated/test_resize_tf_crop_and_resize_axes_3_2",
291267
"onnx/node/generated/test_resize_tf_crop_and_resize_extrapolation_value",
292-
"onnx/node/generated/test_resize_upsample_scales_cubic",
293268
"onnx/node/generated/test_resize_upsample_scales_cubic_A_n0p5_exclude_outside",
294-
"onnx/node/generated/test_resize_upsample_scales_cubic_align_corners",
295-
"onnx/node/generated/test_resize_upsample_scales_cubic_asymmetric",
296-
"onnx/node/generated/test_resize_upsample_scales_linear",
297-
"onnx/node/generated/test_resize_upsample_scales_linear_align_corners",
298-
"onnx/node/generated/test_resize_upsample_scales_linear_half_pixel_symmetric",
299-
"onnx/node/generated/test_resize_upsample_scales_nearest",
300269
"onnx/node/generated/test_resize_upsample_scales_nearest_axes_2_3",
301270
"onnx/node/generated/test_resize_upsample_scales_nearest_axes_3_2",
302-
"onnx/node/generated/test_resize_upsample_sizes_cubic",
303-
"onnx/node/generated/test_resize_upsample_sizes_nearest",
304271
"onnx/node/generated/test_resize_upsample_sizes_nearest_axes_2_3",
305272
"onnx/node/generated/test_resize_upsample_sizes_nearest_axes_3_2",
306-
"onnx/node/generated/test_resize_upsample_sizes_nearest_ceil_half_pixel",
307273
"onnx/node/generated/test_resize_upsample_sizes_nearest_floor_align_corners",
308274
"onnx/node/generated/test_resize_upsample_sizes_nearest_not_larger",
309275
"onnx/node/generated/test_resize_upsample_sizes_nearest_not_smaller",
310-
"onnx/node/generated/test_resize_upsample_sizes_nearest_round_prefer_ceil_asymmetric",
311276
"onnx/node/generated/test_roialign_aligned_false",
312277
"onnx/node/generated/test_roialign_aligned_true",
313278
"onnx/node/generated/test_roialign_mode_max",
@@ -341,8 +306,6 @@
341306
"onnx/node/generated/test_sce_mean_no_weight_ii_4d_expanded",
342307
"onnx/node/generated/test_sce_mean_no_weight_ii_4d_log_prob",
343308
"onnx/node/generated/test_sce_mean_no_weight_ii_4d_log_prob_expanded",
344-
"onnx/node/generated/test_sce_mean_weight",
345-
"onnx/node/generated/test_sce_mean_weight_ii",
346309
"onnx/node/generated/test_sce_mean_weight_ii_3d",
347310
"onnx/node/generated/test_sce_mean_weight_ii_3d_expanded",
348311
"onnx/node/generated/test_sce_mean_weight_ii_3d_log_prob",
@@ -351,8 +314,6 @@
351314
"onnx/node/generated/test_sce_mean_weight_ii_4d_expanded",
352315
"onnx/node/generated/test_sce_mean_weight_ii_4d_log_prob",
353316
"onnx/node/generated/test_sce_mean_weight_ii_4d_log_prob_expanded",
354-
"onnx/node/generated/test_sce_mean_weight_ii_log_prob",
355-
"onnx/node/generated/test_sce_mean_weight_log_prob",
356317
"onnx/node/generated/test_slice",
357318
"onnx/node/generated/test_slice_default_steps",
358319
"onnx/node/generated/test_slice_end_out_of_bounds",
@@ -377,7 +338,6 @@
377338
"onnx/node/generated/test_unique_sorted_with_axis_3d",
378339
"onnx/node/generated/test_unique_sorted_with_negative_axis",
379340
"onnx/node/generated/test_unique_sorted_without_axis",
380-
"onnx/node/generated/test_upsample_nearest",
381341
"onnx/node/generated/test_wrap_pad"
382342
],
383343
"expected_run_failures": [
@@ -439,6 +399,9 @@
439399
"onnx/node/generated/test_eyelike_populate_off_main_diagonal",
440400
"onnx/node/generated/test_eyelike_with_dtype",
441401
"onnx/node/generated/test_eyelike_without_dtype",
402+
"onnx/node/generated/test_gridsample_nearest",
403+
"onnx/node/generated/test_gridsample_nearest_align_corners_0_additional_1",
404+
"onnx/node/generated/test_gridsample_nearest_align_corners_1_additional_1",
442405
"onnx/node/generated/test_if",
443406
"onnx/node/generated/test_isinf_float16",
444407
"onnx/node/generated/test_isnan_float16",
@@ -501,7 +464,14 @@
501464
"onnx/node/generated/test_reduce_sum_square_default_axes_keepdims_example_expanded",
502465
"onnx/node/generated/test_reduce_sum_square_default_axes_keepdims_random",
503466
"onnx/node/generated/test_reduce_sum_square_default_axes_keepdims_random_expanded",
467+
"onnx/node/generated/test_resize_downsample_scales_cubic_align_corners",
468+
"onnx/node/generated/test_resize_downsample_scales_linear_align_corners",
469+
"onnx/node/generated/test_resize_upsample_scales_linear_align_corners",
504470
"onnx/node/generated/test_scan_sum",
471+
"onnx/node/generated/test_sce_mean_weight",
472+
"onnx/node/generated/test_sce_mean_weight_ii",
473+
"onnx/node/generated/test_sce_mean_weight_ii_log_prob",
474+
"onnx/node/generated/test_sce_mean_weight_log_prob",
505475
"onnx/node/generated/test_shape",
506476
"onnx/node/generated/test_shape_clip_end",
507477
"onnx/node/generated/test_shape_clip_start",

‎third_party/llvm-project‎

Submodule llvm-project updated 2239 files

0 commit comments

Comments
 (0)