[fixip] Move a test and spell out some auto types

Author: momchil-velikov

mlir/unittests/Dialect/MemRef/CMakeLists.txt

@@ -1,6 +1,5 @@
 add_mlir_unittest(MLIRMemRefTests
   InferShapeTest.cpp
-  LayoutTest.cpp
 )
 mlir_target_link_libraries(MLIRMemRefTests
   PRIVATE

mlir/unittests/IR/CMakeLists.txt

@@ -10,6 +10,7 @@ add_mlir_unittest(MLIRIRTests
   IRMapping.cpp
   InterfaceAttachmentTest.cpp
   LocationTest.cpp
+  MemrefLayoutTest.cpp
   OperationSupportTest.cpp
   PatternMatchTest.cpp
   ShapedTypeTest.cpp

mlir/unittests/Dialect/MemRef/LayoutTest.cpp renamed to mlir/unittests/IR/MemrefLayoutTest.cpp

@@ -1,4 +1,4 @@
-//===- LayoutTest.cpp - unit tests related to memref layout --------------===//
+//===- LayoutTest.cpp - unit tests related to memref layout ---------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -19,8 +19,8 @@ TEST(MemRefLayout, maxContigDim) {
   MLIRContext ctx;
   OpBuilder b(&ctx);
 
-  const auto _ = ShapedType::kDynamic;
-  const auto f32 = b.getF32Type();
+  const int64_t _ = ShapedType::kDynamic;
+  const FloatType f32 = b.getF32Type();
   auto strided = [&ctx](ArrayRef<int64_t> s) {
     return StridedLayoutAttr::get(&ctx, 0, s);
   };
@@ -102,8 +102,8 @@ TEST(MemRefLayout, contigTrailingDim) {
   MLIRContext ctx;
   OpBuilder b(&ctx);
 
-  const auto _ = ShapedType::kDynamic;
-  const auto f32 = b.getF32Type();
+  const int64_t _ = ShapedType::kDynamic;
+  const FloatType f32 = b.getF32Type();
   auto strided = [&ctx](ArrayRef<int64_t> s) {
     return StridedLayoutAttr::get(&ctx, 0, s);
   };
@@ -191,8 +191,8 @@ TEST(MemRefLayout, identityMaps) {
   MLIRContext ctx;
   OpBuilder b(&ctx);
 
-  const auto _ = ShapedType::kDynamic;
-  const auto f32 = b.getF32Type();
+  const int64_t _ = ShapedType::kDynamic;
+  const FloatType f32 = b.getF32Type();
 
   // memref<2x2x2xf32>
   auto m1 = MemRefType::get({2, 2, 2}, f32);