[midend] Canonicalize dynamic rank detection.

buddy-compiler · Oct 31, 2023 · c21c500 · c21c500
1 parent fea1ffd
commit c21c500
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 15 deletions.
diff --git a/midend/lib/Conversion/MatMulOptimization/BatchMatMulOptimize.cpp b/midend/lib/Conversion/MatMulOptimization/BatchMatMulOptimize.cpp
@@ -1,5 +1,4 @@
-//===- BatchMatMulOptimize.cpp
-//-------------------------------------------------===//
+//===- BatchMatMulOptimize.cpp --------------------------------------------===//
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -145,7 +144,7 @@ class BatchMatMulOptimizePattern : public ConversionPattern {
           Value loopVarColOfB = ivRange.front();
 
           // Compile time branch detection.
-          if (C.getType().cast<MemRefType>().getDimSize(2) < 0 or
+          if (C.getType().cast<MemRefType>().isDynamicDim(2) or
               C.getType().cast<MemRefType>().getDimSize(2) % affineVectorSize !=
                   0) {
 

diff --git a/midend/lib/Conversion/MatMulOptimization/CMakeLists.txt b/midend/lib/Conversion/MatMulOptimization/CMakeLists.txt
@@ -13,4 +13,4 @@ add_mlir_library(BatchMatMulOptimization
 
 add_mlir_library(MatMulParallelVectorization
   MatMulParallelVectorization.cpp
-)
+)
diff --git a/midend/lib/Conversion/MatMulOptimization/MatMulParallelVectorization.cpp b/midend/lib/Conversion/MatMulOptimization/MatMulParallelVectorization.cpp
@@ -1,5 +1,4 @@
-//===- MatMulParallelVectorization.cpp
-//-------------------------------------------------===//
+//===- MatMulParallelVectorization.cpp ------------------------------------===//
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -141,7 +140,7 @@ class MatMulParallelVectorizationPattern : public ConversionPattern {
         ArrayRef<Value>{aRow, bRow}, false, 3, true);
 
     // Compile time branch detection.
-    if (C.getType().cast<MemRefType>().getDimSize(1) < 0 or
+    if (C.getType().cast<MemRefType>().isDynamicDim(1) or
         C.getType().cast<MemRefType>().getDimSize(1) % affineVectorSize != 0) {
 
       // Depending on the position, use either full vectors or tail vectors.

diff --git a/midend/lib/Conversion/TransposeOptimization/BuiltinTransposeVectorization.cpp b/midend/lib/Conversion/TransposeOptimization/BuiltinTransposeVectorization.cpp
@@ -1,5 +1,4 @@
-//===- BuiltinTransposeVectorization.cpp
-//-------------------------------------------------===//
+//===- BuiltinTransposeVectorization.cpp ----------------------------------===//
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -205,7 +204,7 @@ class TransposeOptimizationPattern : public ConversionPattern {
               });
 
           // Compile time branch detection.
-          if (A.getType().cast<MemRefType>().getDimSize(0) < 0 or
+          if (A.getType().cast<MemRefType>().isDynamicDim(0) or
               A.getType().cast<MemRefType>().getDimSize(0) % affineVectorSize !=
                   0) {
             // Depending on the position, use either full vectors or tail
@@ -265,7 +264,7 @@ class TransposeOptimizationPattern : public ConversionPattern {
     parallelColLoop.getRegion().push_back(loopBody);
     rewriter.setInsertionPointAfter(parallelColLoop);
 
-    if (A.getType().cast<MemRefType>().getDimSize(1) < 0 or
+    if (A.getType().cast<MemRefType>().isDynamicDim(1) or
         A.getType().cast<MemRefType>().getDimSize(1) % affineVectorSize != 0) {
 
       affine::AffineIfOp branchingColUnaligned =
@@ -325,7 +324,7 @@ class TransposeOptimizationPattern : public ConversionPattern {
                 });
           });
 
-      if (A.getType().cast<MemRefType>().getDimSize(0) < 0 or
+      if (A.getType().cast<MemRefType>().isDynamicDim(0) or
           A.getType().cast<MemRefType>().getDimSize(0) % affineVectorSize !=
               0) {
         affine::AffineIfOp branchingRowColUnaligned =
@@ -413,7 +412,9 @@ class TransposeOptimizationPass
 public:
   MLIR_DEFINE_EXPLICIT_INTERNAL_INLINE_TYPE_ID(TransposeOptimizationPass)
   StringRef getArgument() const final { return "transpose-optimize"; }
-  StringRef getDescription() const final { return "Transpose Optimization only for rank 2 tensor."; }
+  StringRef getDescription() const final {
+    return "Transpose Optimization only for rank 2 tensor.";
+  }
   TransposeOptimizationPass() = default;
   TransposeOptimizationPass(const TransposeOptimizationPass &) {}
   explicit TransposeOptimizationPass(int64_t affineVectorSizeParam) {

diff --git a/midend/lib/Conversion/TransposeOptimization/CMakeLists.txt b/midend/lib/Conversion/TransposeOptimization/CMakeLists.txt
@@ -2,4 +2,4 @@ add_mlir_library(TransposeOptimization
   BuiltinTransposeVectorization.cpp
   LINK_LIBS PUBLIC
   BuddyUtils
-)
+)
diff --git a/tools/buddy-opt/CMakeLists.txt b/tools/buddy-opt/CMakeLists.txt
@@ -29,4 +29,4 @@ target_link_libraries(buddy-opt
   BuddyGemmini
   LowerGemminiPass
   LowerLinalgToGemminiPass
-  )
+)
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,4 +13,4 @@ add_mlir_library(BatchMatMulOptimization @@
     add_mlir_library(MatMulParallelVectorization
       MatMulParallelVectorization.cpp
-    )
+    )