6 files changed, 7 insertions, 7 deletions
diff --git a/mlir/test/lib/TestDialect/TestPatterns.cpp b/mlir/test/lib/TestDialect/TestPatterns.cpp
index 9b7fe8e94bf..bde640b2691 100644
--- a/mlir/test/lib/TestDialect/TestPatterns.cpp
+++ b/mlir/test/lib/TestDialect/TestPatterns.cpp
@@ -250,6 +250,6 @@ static llvm::cl::opt<TestLegalizePatternDriver::ConversionMode>
 static mlir::PassRegistration<TestLegalizePatternDriver>
     legalizer_pass("test-legalize-patterns",
                    "Run test dialect legalization patterns", [] {
-                     return llvm::make_unique<TestLegalizePatternDriver>(
+                     return std::make_unique<TestLegalizePatternDriver>(
                          legalizerConversionMode);
                    });
diff --git a/mlir/test/lib/Transforms/TestConstantFold.cpp b/mlir/test/lib/Transforms/TestConstantFold.cpp
index 02c66ef86ac..34480f09f57 100644
--- a/mlir/test/lib/Transforms/TestConstantFold.cpp
+++ b/mlir/test/lib/Transforms/TestConstantFold.cpp
@@ -75,7 +75,7 @@ void TestConstantFold::runOnFunction() {
 
 /// Creates a constant folding pass.
 std::unique_ptr<FunctionPassBase> mlir::createTestConstantFoldPass() {
-  return llvm::make_unique<TestConstantFold>();
+  return std::make_unique<TestConstantFold>();
 }
 
 static PassRegistration<TestConstantFold>
diff --git a/mlir/test/lib/Transforms/TestLoopFusion.cpp b/mlir/test/lib/Transforms/TestLoopFusion.cpp
index bcb050769a1..8b55d351bdc 100644
--- a/mlir/test/lib/Transforms/TestLoopFusion.cpp
+++ b/mlir/test/lib/Transforms/TestLoopFusion.cpp
@@ -59,7 +59,7 @@ struct TestLoopFusion : public FunctionPass<TestLoopFusion> {
 } // end anonymous namespace
 
 std::unique_ptr<FunctionPassBase> mlir::createTestLoopFusionPass() {
-  return llvm::make_unique<TestLoopFusion>();
+  return std::make_unique<TestLoopFusion>();
 }
 
 // Gathers all AffineForOps in 'block' at 'currLoopDepth' in 'depthToLoops'.
diff --git a/mlir/test/lib/Transforms/TestLoopMapping.cpp b/mlir/test/lib/Transforms/TestLoopMapping.cpp
index a9da70a6d5e..f4aa6469a99 100644
--- a/mlir/test/lib/Transforms/TestLoopMapping.cpp
+++ b/mlir/test/lib/Transforms/TestLoopMapping.cpp
@@ -62,4 +62,4 @@ public:
 static PassRegistration<TestLoopMappingPass>
     reg("test-mapping-to-processing-elements",
         "test mapping a single loop on a virtual processor grid",
-        [] { return llvm::make_unique<TestLoopMappingPass>(); });
+        [] { return std::make_unique<TestLoopMappingPass>(); });
diff --git a/mlir/test/lib/Transforms/TestLoopParametricTiling.cpp b/mlir/test/lib/Transforms/TestLoopParametricTiling.cpp
index e01ff66d825..cf68ec1b9a7 100644
--- a/mlir/test/lib/Transforms/TestLoopParametricTiling.cpp
+++ b/mlir/test/lib/Transforms/TestLoopParametricTiling.cpp
@@ -57,7 +57,7 @@ public:
 
 std::unique_ptr<FunctionPassBase>
 mlir::createSimpleParametricTilingPass(ArrayRef<int64_t> outerLoopSizes) {
-  return llvm::make_unique<SimpleParametricLoopTilingPass>(outerLoopSizes);
+  return std::make_unique<SimpleParametricLoopTilingPass>(outerLoopSizes);
 }
 
 static PassRegistration<SimpleParametricLoopTilingPass>
@@ -65,7 +65,7 @@ static PassRegistration<SimpleParametricLoopTilingPass>
         "test application of parametric tiling to the outer loops so that the "
         "ranges of outer loops become static",
         [] {
-          auto pass = llvm::make_unique<SimpleParametricLoopTilingPass>(
+          auto pass = std::make_unique<SimpleParametricLoopTilingPass>(
               ArrayRef<int64_t>{});
           pass->sizes.assign(clOuterLoopSizes.begin(), clOuterLoopSizes.end());
           return pass;
diff --git a/mlir/test/lib/Transforms/TestVectorizationUtils.cpp b/mlir/test/lib/Transforms/TestVectorizationUtils.cpp
index 3bfe6b6fce3..6fe277dcfcb 100644
--- a/mlir/test/lib/Transforms/TestVectorizationUtils.cpp
+++ b/mlir/test/lib/Transforms/TestVectorizationUtils.cpp
@@ -291,7 +291,7 @@ void VectorizerTestPass::runOnFunction() {
 }
 
 std::unique_ptr<FunctionPassBase> mlir::createVectorizerTestPass() {
-  return llvm::make_unique<VectorizerTestPass>();
+  return std::make_unique<VectorizerTestPass>();
 }
 
 static PassRegistration<VectorizerTestPass>