[tpu-mlir] fix matmul for bm168x

1. fix hdim_is_batch bias_merge_izp size error 2. fix has_izp && r_trans buffer size to capable with backend 3. enable mobilebert_tf Change-Id: Ifc0bd15630170484252a8fed8dc89497605ea1db
sophgo · May 19, 2023 · dd3a276 · dd3a276
1 parent 2fc9217
commit dd3a276
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 5 deletions.
diff --git a/lib/Dialect/Top/Canonicalize/MatMul.cpp b/lib/Dialect/Top/Canonicalize/MatMul.cpp
@@ -181,6 +181,5 @@ struct NoKeepDimsAddReshape : public OpRewritePattern<MatMulOp> {
 
 void MatMulOp::getCanonicalizationPatterns(RewritePatternSet &results,
                                            MLIRContext *context) {
-  // results.insert<MatMulWithBias, NoKeepDimsAddReshape>(context);
-  results.insert<MatMulWithBias>(context);
+  results.insert<MatMulWithBias, NoKeepDimsAddReshape>(context);
 }
diff --git a/lib/Dialect/Tpu/Interfaces/BM1684X/MatMul.cpp b/lib/Dialect/Tpu/Interfaces/BM1684X/MatMul.cpp
@@ -193,6 +193,9 @@ int64_t tpu::MatMulOp::getBufferSize_bm1684x(
     buffer_size +=
         align_up(p.hdim_is_batch ? w1 : h1, BM168x::eu_num(sizeof(int32_t))) *
         sizeof(int32_t);
+    if (p.right_transpose) {
+      buffer_size += ceiling_func(c1, BM168x::NPU_NUM) * align_up(1, BM168x::eu_num(sizeof(int32_t))) * sizeof(int32_t);
+    }
   }
 
   return buffer_size;

diff --git a/lib/Dialect/Tpu/Interfaces/Common/MatMul.cpp b/lib/Dialect/Tpu/Interfaces/Common/MatMul.cpp
@@ -59,6 +59,11 @@ matmul_attr_t tpu::MatMulOp::parseParam() {
     if (p.hdim_is_batch) {
       p.K = b_s[b_dims - 3];
       p.N = b_s[b_dims - 1];
+      // fix bias_merge_izp size for bm1684x
+      if (module::isBM1684XFamily()) {
+        p.N = b_s[b_dims - 3];
+        p.K = b_s[b_dims - 1];
+      }
     } else {
       // trans hw
       p.N = b_s[b_dims - 2];

diff --git a/regression/chip.py b/regression/chip.py
@@ -96,7 +96,7 @@
     "resnet50_tf":                (N,      Y,       Y,      N,      N,      N,      N),
     "ssd_mobilenet_v1_tf":        (N,      Y,       Y,      N,      N,      N,      N),
     "yolov5s_tf":                 (N,      Y,       Y,      N,      N,      N,      N),
-    "mobilebert_tf":              (N,      Y,       N,      N,      N,      N,      N),
+    "mobilebert_tf":              (N,      Y,       Y,      N,      N,      N,      N),
     ######## PaddlePaddle ##      ##############
     "pp_humanseg":                (N,      Y,       Y,      N,      N,      N,      N),
     "pp_liteseg":                 (N,      Y,       Y,      N,      N,      N,      N),

diff --git a/third_party/nntoolchain/README.md b/third_party/nntoolchain/README.md
@@ -1,7 +1,7 @@
 2023-05-09
 build from TPU1684     f39362b8611e2de88a5d079b2bde3b676d5d0e5a
-2023-05-18
-build from TPU1686     90f054ad7fa651f24613f479fc2a564054993a54
+2023-05-19
+build from TPU1686     d77ddc530e52648c2ce186892fa6310543eb126a
 2023-04-12
 build from tpu-runtime 9e9d9a7d983305cb15c36b5774f9dd3259d6b970
 2023-03-03

diff --git a/third_party/nntoolchain/lib/libbackend_1684x.so b/third_party/nntoolchain/lib/libbackend_1684x.so
diff --git a/third_party/nntoolchain/lib/libbackend_1686.so b/third_party/nntoolchain/lib/libbackend_1686.so
diff --git a/third_party/nntoolchain/lib/libcmodel_1684x.so b/third_party/nntoolchain/lib/libcmodel_1684x.so
diff --git a/third_party/nntoolchain/lib/libcmodel_1686.so b/third_party/nntoolchain/lib/libcmodel_1686.so