Integrate LLVM at llvm/llvm-project@4c973ae51b85

Updates LLVM usage to match
[4c973ae51b85](llvm/llvm-project@4c973ae51b85)

PiperOrigin-RevId: 362116801

SUBMODULE_VERSIONS.txt

@@ -5,7 +5,7 @@ daff5fead3fbe22c6fc58310ca3f49caf117f185 third_party/benchmark
 b1fbd33c06cdb0024c67733c6fdec2009d17b384 third_party/googletest
 88b845dee001723c4a0db1fe5477de735b6d3bb0 third_party/liburing
 5d2cd83f8d192aff5cc4846ab7bb3362c7b82189 third_party/llvm-bazel
-df6d0579e18e868ef4b6e97794eacd5af86e1b8a third_party/llvm-project
+4c973ae51b859dca9792e1ad87a6673c49815a8d third_party/llvm-project
 e691ab9fc49d728f6632408d534b82cb3d137b3f third_party/mlir-emitc
 c217a6ef61d8bc3eeb407d3c09bb343de2dbe769 third_party/mlir-hlo
 2b2bd45bbf9be04fd22ece5cc1f54679202e9257 third_party/pffft

iree/compiler/Dialect/Flow/Transforms/test/dispatch_linalg_on_tensors.mlir

@@ -1,8 +1,8 @@
 // RUN: iree-opt -split-input-file -verify-diagnostics -iree-flow-dispatch-linalg-on-tensors-pass -iree-flow-dispatch-linalg-on-tensors-tile-sizes="1,2" -iree-flow-dispatch-linalg-on-tensors-enable-fusion-always -canonicalize -cse %s | IreeFileCheck %s
 
-// CHECK-DAG: #[[$MAP:.*]] = affine_map<(d0) -> (2, -d0 + 4)>
+// CHECK: #[[mul_map:.+]] = affine_map<()[s0] -> (s0 * 2)>
 
-// CHECK-LABEL: func @tensor
+// CHECK: func @tensor
 func @tensor() -> tensor<2x4xf32> {
   //  CHECK-DAG: %[[C1wg:.*]] = constant 1 : index
   //  CHECK-DAG: %[[C2wg:.*]] = constant 2 : index
@@ -33,8 +33,8 @@ func @tensor() -> tensor<2x4xf32> {
   //  CHECK-DAG:   %[[biy:.*]] = flow.dispatch.workgroup.id[1] : index
   //  CHECK-DAG:   %[[bdy:.*]] = flow.dispatch.workgroup.count[1] : index
   //      CHECK:   scf.for %[[I:.*]] = %[[biy]] to %[[C2]] step %[[bdy]] {
-  // CHECK-NEXT:     %[[bix_scaled:.*]] = muli %[[bix]], %[[C2]] : index
-  // CHECK-NEXT:     %[[bdx_scaled:.*]] = muli %[[bdx]], %[[C2]] : index
+  // CHECK-NEXT:     %[[bix_scaled:.*]] = affine.apply #[[mul_map]]()[%[[bix]]]
+  // CHECK-NEXT:     %[[bdx_scaled:.*]] = affine.apply #[[mul_map]]()[%[[bdx]]]
   // CHECK-NEXT:     scf.for %[[J:.*]] = %[[bix_scaled]] to %[[C4]] step %[[bdx_scaled]] {
   // Canonicalizations not yet powerful enough here.
   // CHECK-NEXT:       %[[MIN_I:.*]] = affine.min{{.*}}(%[[I]])

iree/compiler/Dialect/Flow/Transforms/test/dispatch_linalg_on_tensors_dynamic.mlir

@@ -1,5 +1,7 @@
 // RUN: iree-opt -split-input-file -verify-diagnostics -iree-flow-dispatch-linalg-on-tensors-pass -canonicalize -cse %s | IreeFileCheck %s
 
+// CHECK: #[[MULMAP:.+]] = affine_map<()[s0, s1] -> (s0 * s1)>
+
 func @tensor(%arg0 : tensor<?x?xf32>, %arg1 : tensor<?x?xf32>,
              %arg2 : tensor<?x?xf32>) -> tensor<?x?xf32> {
   %1 = linalg.matmul ins(%arg0, %arg1 : tensor<?x?xf32>, tensor<?x?xf32>)
@@ -23,12 +25,12 @@ func @tensor(%arg0 : tensor<?x?xf32>, %arg1 : tensor<?x?xf32>,
 //  CHECK-DAG:     %[[WGID_Y:.+]] = flow.dispatch.workgroup.id[1]
 //  CHECK-DAG:     %[[WGCOUNT_X:.+]] = flow.dispatch.workgroup.count[0]
 //  CHECK-DAG:     %[[WGCOUNT_Y:.+]] = flow.dispatch.workgroup.count[1]
-//      CHECK:     %[[OFFSET_Y:.+]] = muli %[[WGSIZE_Y]], %[[WGID_Y]]
-//      CHECK:     %[[STEP_Y:.+]] = muli %[[WGSIZE_Y]], %[[WGCOUNT_Y]]
+//      CHECK:     %[[OFFSET_Y:.+]] = affine.apply #[[MULMAP]]()[%[[WGID_Y]], %[[WGSIZE_Y]]]
+//      CHECK:     %[[STEP_Y:.+]] = affine.apply #[[MULMAP]]()[%[[WGCOUNT_Y]], %[[WGSIZE_Y]]]
 //      CHECK:     scf.for %[[ARG7:.+]] = %[[OFFSET_Y]]
 // CHECK-SAME:       to %{{.+}} step %[[STEP_Y]]
-//      CHECK:       %[[OFFSET_X:.+]] = muli %[[WGSIZE_X]], %[[WGID_X]]
-//      CHECK:       %[[STEP_X:.+]] = muli %[[WGSIZE_X]], %[[WGCOUNT_X]]
+//      CHECK:       %[[OFFSET_X:.+]] = affine.apply #[[MULMAP]]()[%[[WGID_X]], %[[WGSIZE_X]]]
+//      CHECK:       %[[STEP_X:.+]] = affine.apply #[[MULMAP]]()[%[[WGCOUNT_X]], %[[WGSIZE_X]]]
 //      CHECK:       scf.for %[[ARG8:.+]] = %[[OFFSET_X]]
 // CHECK-SAME:         to %{{.+}} step %[[STEP_X]]
 //      CHECK:         %[[LHS:.+]] = flow.dispatch.input.load %[[ARG3]]