Fixes for LLVM changes.

Signed-off-by: MaheshRavishankar <[email protected]>
iree-org · Oct 13, 2024 · a3e1227 · a3e1227
1 parent 14afd21
commit a3e1227
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/compiler/src/iree/compiler/DispatchCreation/test/attention_fuse_by_expansion.mlir b/compiler/src/iree/compiler/DispatchCreation/test/attention_fuse_by_expansion.mlir
@@ -183,8 +183,7 @@ util.func public @attention_dynamic(%arg0: tensor<?x?x?xf16>, %arg1: tensor<?x?x
 // CHECK-DAG: %[[D2:.+]] = tensor.dim %[[ARG0]], %[[C2]]
 // CHECK-DAG: %[[D4:.+]] = tensor.dim %[[ARG2]], %[[C2]]
 // CHECK-DAG: %[[SPLIT0:.+]] = arith.divui %[[D0]]
-// CHECK-DAG: %[[VAL:.+]] = affine.apply affine_map<()[s0] -> (s0 floordiv 2)>()[%[[D0]]]
-// CHECK-DAG: %[[EMPTY:.+]] = tensor.empty(%[[VAL]], %[[D1]], %[[D4]]) : tensor<2x?x?x?xf16>
+// CHECK-DAG: %[[EMPTY:.+]] = tensor.empty(%[[SPLIT0]], %[[D1]], %[[D4]]) : tensor<2x?x?x?xf16>
 // CHECK-DAG: %[[QUERY:.+]] = tensor.expand_shape %[[ARG0]] {{\[}}[0, 1], [2], [3]{{\]}} output_shape [2, %[[SPLIT0]], %[[D1]], %[[D2]]]
 // CHECK-DAG: %[[D5:.+]] = tensor.dim %[[ARG1]], %[[C0]]
 // CHECK-DAG: %[[D6:.+]] = tensor.dim %[[ARG1]], %[[C1]]
@@ -246,8 +245,7 @@ util.func public @attention_dynamic_masked(%arg0: tensor<?x?x?xf16>, %arg1: tens
 // CHECK-DAG: %[[D2:.+]] = tensor.dim %[[ARG0]], %[[C2]]
 // CHECK-DAG: %[[D4:.+]] = tensor.dim %[[ARG2]], %[[C2]]
 // CHECK-DAG: %[[SPLIT0:.+]] = arith.divui %[[D0]]
-// CHECK-DAG: %[[VAL:.+]] = affine.apply affine_map<()[s0] -> (s0 floordiv 2)>()[%[[D0]]]
-// CHECK-DAG: %[[EMPTY:.+]] = tensor.empty(%[[VAL]], %[[D1]], %[[D4]]) : tensor<2x?x?x?xf16>
+// CHECK-DAG: %[[EMPTY:.+]] = tensor.empty(%[[SPLIT0]], %[[D1]], %[[D4]]) : tensor<2x?x?x?xf16>
 // CHECK-DAG: %[[QUERY:.+]] = tensor.expand_shape %[[ARG0]] {{\[}}[0, 1], [2], [3]{{\]}} output_shape [2, %[[SPLIT0]], %[[D1]], %[[D2]]]
 // CHECK-DAG: %[[D5:.+]] = tensor.dim %[[ARG1]], %[[C0]]
 // CHECK-DAG: %[[D6:.+]] = tensor.dim %[[ARG1]], %[[C1]]

diff --git a/compiler/src/iree/compiler/GlobalOptimization/QuantizedConvToConv.cpp b/compiler/src/iree/compiler/GlobalOptimization/QuantizedConvToConv.cpp
@@ -351,7 +351,7 @@ class LinalgQuantizedConvToConvPass final
  context);
  memref::populateResolveRankedShapedTypeResultDimsPatterns(patterns);
  if (failed(applyPatternsAndFoldGreedily(op, std::move(patterns)))) {
- signalPassFailure();
+ return signalPassFailure();
  }
  }
 };

diff --git a/compiler/src/iree/compiler/GlobalOptimization/test/linalg_quantized_conv_to_conv.mlir b/compiler/src/iree/compiler/GlobalOptimization/test/linalg_quantized_conv_to_conv.mlir
@@ -292,12 +292,12 @@ func.func @conv2d_all_dyn(%arg0: tensor<?x?x?x?xi8>, %arg1: tensor<?x?x?x?xi8>,
  // CHECK-SAME: iterator_types = ["parallel", "parallel", "parallel", "reduction"]}
  // CHECK-SAME: ins(%arg0 : tensor<?x?x?x?xi8>)
  // CHECK-SAME: outs(%[[FILL]] : tensor<?x?x?xi32>)
+ // CHECK: %[[DIM00:.+]] = tensor.dim %arg0, %[[I0]]
  // CHECK: %[[EXPAND:.+]] = tensor.expand_shape %[[SUMI]] {{\[\[}}0], [1], [2, 3]]
 
- // CHECK-DAG: %[[DIM0:.+]] = tensor.dim %arg0, %[[I0]]
  // CHECK-DAG: %[[DIM1:.+]] = tensor.dim %arg2, %[[I1]]
  // CHECK-DAG: %[[DIM2:.+]] = tensor.dim %arg2, %[[I2]]
- // CHECK: %[[EMPTY:.+]] = tensor.empty(%[[DIM0]], %[[DIM1]], %[[DIM2]])
+ // CHECK: %[[EMPTY:.+]] = tensor.empty(%[[DIM00]], %[[DIM1]], %[[DIM2]])
  // CHECK: %[[FILL:.+]] = linalg.fill ins(%[[C0]] : i32) outs(%9 : tensor<?x?x?x1xi32>)
  // CHECK-DAG: %[[DIM0:.+]] = tensor.dim %arg1, %[[I0]] : tensor<?x?x?x?xi8>
  // CHECK-DAG: %[[DIM1:.+]] = tensor.dim %arg1, %[[I1]] : tensor<?x?x?x?xi8>