[MLIR] Update MLIR/LLVM repo (#4078)

* [MLIR] Update MLIR/LLVM repo

I need it to get MemRef lowering override mechanism (291a309d).

* Fix style
Co-authored-by: Scott Cyphers <diyessi@users.noreply.github.com>

cmake/external_mlir.cmake

@@ -20,8 +20,8 @@ set(MLIR_LLVM_REPO_URL https://github.com/llvm/llvm-project.git)
 set(MLIR_REPO_URL https://github.com/tensorflow/mlir.git)
 
 # Change these commit IDs to move to latest stable versions
-set(MLIR_LLVM_COMMIT_ID 75990950)
-set(MLIR_COMMIT_ID 5e64e536)
+set(MLIR_LLVM_COMMIT_ID c36773c7)
+set(MLIR_COMMIT_ID 606e96a1)
 
 # MLIR environment variables. Some of them are used by LIT tool.
 

src/contrib/mlir/backend/pass/affine_lowerer.cpp

@@ -585,7 +585,7 @@ namespace
         auto ubs = vLHS.getUbs();
         // Loop induction vars
         auto ivs = makeIndexHandles(vLHS.rank());
-        auto pivs = makeIndexHandlePointers(ivs);
+        auto pivs = makeHandlePointers(MutableArrayRef<IndexHandle>(ivs));
         // Steps
         auto steps = vLHS.getSteps();
 
@@ -796,14 +796,14 @@ namespace
                      "Incorrect loop nest bounds size for gather params");
 
         paramsIVs = makeIndexHandles(vParams.rank() - 1);
-        paramsIVPtrs = makeIndexHandlePointers(paramsIVs);
+        paramsIVPtrs = makeHandlePointers(MutableArrayRef<IndexHandle>(paramsIVs));
 
         auto indicesLbs = vIndices.getLbs();
         auto indicesUbs = vIndices.getUbs();
         auto indicesSteps = vIndices.getSteps();
 
         auto indicesIVs = makeIndexHandles(vIndices.rank());
-        auto indicesIVPtrs = makeIndexHandlePointers(indicesIVs);
+        auto indicesIVPtrs = makeHandlePointers(MutableArrayRef<IndexHandle>(indicesIVs));
 
         SmallVector<IndexHandle, 8> paramsIndices, resIndices;
 
@@ -958,7 +958,8 @@ namespace
 
         // Result spatial indices and bounds
         auto resSpatialIndices = makeIndexHandles(spatialRank);
-        auto resSpatialIndicesPtrs = makeIndexHandlePointers(resSpatialIndices);
+        auto resSpatialIndicesPtrs =
+            makeHandlePointers(MutableArrayRef<IndexHandle>(resSpatialIndices));
         SmallVector<int64_t, 4> resSteps, filtersSteps;
         SmallVector<int, 4> padBelowIntValues;
         bool withPadding = false;
@@ -997,7 +998,8 @@ namespace
 
         // Filters spatial indices and bounds
         auto filtersSpatialIndices = makeIndexHandles(spatialRank);
-        auto filtersSpatialIndicesPtrs = makeIndexHandlePointers(filtersSpatialIndices);
+        auto filtersSpatialIndicesPtrs =
+            makeHandlePointers(MutableArrayRef<IndexHandle>(filtersSpatialIndices));
 
         for (auto i = 0; i < spatialRank; i++)
         {
@@ -1045,7 +1047,8 @@ namespace
         {
             IndexHandle n, k, c;
             auto resSpatialIndices = makeIndexHandles(spatialRank);
-            auto resSpatialIndicesPtrs = makeIndexHandlePointers(resSpatialIndices);
+            auto resSpatialIndicesPtrs =
+                makeHandlePointers(MutableArrayRef<IndexHandle>(resSpatialIndices));
 
             LoopBuilder::makeAffine(&n, batchLb, batchUb, 1)([&] {
                 LoopBuilder::makeAffine(&k, numFiltersLb, numFiltersUb, 1)([&] {
@@ -1196,7 +1199,7 @@ namespace
         auto ubs = vLHS.getUbs();
         // Loop induction vars
         auto ivs = makeIndexHandles(vLHS.rank());
-        auto pivs = makeIndexHandlePointers(ivs);
+        auto pivs = makeHandlePointers(MutableArrayRef<IndexHandle>(ivs));
         // Steps
         auto steps = vLHS.getSteps();
 
@@ -1242,7 +1245,7 @@ namespace
         auto ubs = vLHS.getUbs();
         // Loop induction vars
         auto ivs = makeIndexHandles(vLHS.rank());
-        auto pivs = makeIndexHandlePointers(ivs);
+        auto pivs = makeHandlePointers(MutableArrayRef<IndexHandle>(ivs));
         // Steps
         auto steps = vLHS.getSteps();
         AffineLoopNestBuilder(pivs, lbs, ubs, steps)(
@@ -1335,7 +1338,7 @@ namespace
         // Generate loop nest that initializes result to lower bound of the axis to be reduced.
         {
             auto ivs = makeIndexHandles(vRes.rank());
-            auto pivs = makeIndexHandlePointers(ivs);
+            auto pivs = makeHandlePointers(MutableArrayRef<IndexHandle>(ivs));
             auto steps = vRes.getSteps();
             auto initVal = vArg.lb(axis);
             AffineLoopNestBuilder(pivs, resLbs, resUbs, steps)(
@@ -1345,7 +1348,7 @@ namespace
         // Generate loop nest that computes the actual index reduction.
         {
             auto allIVs = makeIndexHandles(vArg.rank());
-            auto pAllIVs = makeIndexHandlePointers(allIVs);
+            auto pAllIVs = makeHandlePointers(MutableArrayRef<IndexHandle>(allIVs));
             auto steps = vArg.getSteps();
             SmallVector<IndexHandle, 8> nonRedIVs;
 
@@ -1410,7 +1413,7 @@ namespace
         }
         NGRAPH_UNREACHABLE("Unsupported type");
     }
-}
+} // namespace
 
 namespace mlir
 {