aboutsummaryrefslogtreecommitdiff
path: root/mlir
diff options
context:
space:
mode:
authorMatthias Springer <me@m-sp.org>2024-03-15 13:31:47 +0900
committerGitHub <noreply@github.com>2024-03-15 13:31:47 +0900
commit5124eedd357b75a96f695c20ebad427b61741abc (patch)
tree8adb84ab48ac9bfc21bab8d0cd11dfa3f9099c6b /mlir
parent6ed4d15cf49bca27157c6c8c896a7f674ef5df3a (diff)
downloadllvm-5124eedd357b75a96f695c20ebad427b61741abc.zip
llvm-5124eedd357b75a96f695c20ebad427b61741abc.tar.gz
llvm-5124eedd357b75a96f695c20ebad427b61741abc.tar.bz2
[mlir][sparse] Fix memory leaks (part 3) (#85184)
This commit fixes memory leaks in sparse tensor integration tests by adding `bufferization.dealloc_tensor` ops. Note: Buffer deallocation will be automated in the future with the ownership-based buffer deallocation pass, making `dealloc_tensor` obsolete (only codegen path, not when using the runtime library).
Diffstat (limited to 'mlir')
-rw-r--r--mlir/test/Integration/Dialect/SparseTensor/CPU/dual_sparse_conv_2d.mlir1
-rw-r--r--mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_2d.mlir3
-rw-r--r--mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2dense.mlir13
-rw-r--r--mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2sparse.mlir8
4 files changed, 23 insertions, 2 deletions
diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/dual_sparse_conv_2d.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/dual_sparse_conv_2d.mlir
index 350b5b4..c645ca6 100644
--- a/mlir/test/Integration/Dialect/SparseTensor/CPU/dual_sparse_conv_2d.mlir
+++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/dual_sparse_conv_2d.mlir
@@ -222,6 +222,7 @@ module {
bufferization.dealloc_tensor %sparse_filter_CD : tensor<3x3xi32, #CDR>
bufferization.dealloc_tensor %sparse_filter_CSC : tensor<3x3xi32, #CSC>
+ bufferization.dealloc_tensor %0 : tensor<6x6xi32>
bufferization.dealloc_tensor %2 : tensor<6x6xi32, #DCSR>
bufferization.dealloc_tensor %3 : tensor<6x6xi32, #CSR>
bufferization.dealloc_tensor %4 : tensor<6x6xi32, #CDR>
diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_2d.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_2d.mlir
index f8fb8fd..55d4cae 100644
--- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_2d.mlir
+++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_2d.mlir
@@ -273,11 +273,14 @@ module {
bufferization.dealloc_tensor %sparse_input_CSC : tensor<8x8xi32, #CSC>
bufferization.dealloc_tensor %sparse_input_CD : tensor<8x8xi32, #CDR>
+ bufferization.dealloc_tensor %0 : tensor<6x6xi32>
bufferization.dealloc_tensor %1 : tensor<6x6xi32, #DCSR>
bufferization.dealloc_tensor %2 : tensor<6x6xi32, #DCSR>
bufferization.dealloc_tensor %3 : tensor<6x6xi32, #CSR>
bufferization.dealloc_tensor %4 : tensor<6x6xi32, #CDR>
bufferization.dealloc_tensor %5 : tensor<6x6xi32, #CSC>
+ bufferization.dealloc_tensor %6 : tensor<6x6xi32>
+
return
}
}
diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2dense.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2dense.mlir
index 9b05f9b..e145c454 100644
--- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2dense.mlir
+++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2dense.mlir
@@ -233,6 +233,19 @@ module {
// bufferization.dealloc_tensor %s2pp4 : tensor<2x?x?xf64, #Tensor4>
// bufferization.dealloc_tensor %s2pp5 : tensor<2x?x?xf64, #Tensor5>
// bufferization.dealloc_tensor %s2pp6 : tensor<2x?x?xf64, #Tensor6>
+
+ bufferization.dealloc_tensor %d2341 : tensor<2x3x4xf64>
+ bufferization.dealloc_tensor %d2342 : tensor<2x3x4xf64>
+ bufferization.dealloc_tensor %d2343 : tensor<2x3x4xf64>
+ bufferization.dealloc_tensor %d2344 : tensor<2x3x4xf64>
+ bufferization.dealloc_tensor %d2345 : tensor<2x3x4xf64>
+ bufferization.dealloc_tensor %d2346 : tensor<2x3x4xf64>
+ bufferization.dealloc_tensor %dp344 : tensor<?x3x4xf64>
+ bufferization.dealloc_tensor %d2p45 : tensor<2x?x4xf64>
+ bufferization.dealloc_tensor %d23p6 : tensor<2x3x?xf64>
+ bufferization.dealloc_tensor %dp3p4 : tensor<?x3x?xf64>
+ bufferization.dealloc_tensor %dpp45 : tensor<?x?x4xf64>
+
return
}
}
diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2sparse.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2sparse.mlir
index 0f9dfb9..12f8e34 100644
--- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2sparse.mlir
+++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2sparse.mlir
@@ -114,12 +114,14 @@ module {
call @dump(%d31) : (tensor<2x3x4xf64>) -> ()
//
- // Release sparse tensors.
+ // Release the resources.
//
bufferization.dealloc_tensor %t13 : tensor<2x3x4xf64, #Tensor3>
bufferization.dealloc_tensor %t31 : tensor<2x3x4xf64, #Tensor1>
bufferization.dealloc_tensor %s1 : tensor<2x3x4xf64, #Tensor1>
bufferization.dealloc_tensor %s3 : tensor<2x3x4xf64, #Tensor3>
+ bufferization.dealloc_tensor %d13 : tensor<2x3x4xf64>
+ bufferization.dealloc_tensor %d31 : tensor<2x3x4xf64>
return
}
@@ -167,12 +169,14 @@ module {
call @dump(%d31) : (tensor<2x3x4xf64>) -> ()
//
- // Release sparse tensors.
+ // Release the resources.
//
bufferization.dealloc_tensor %t13 : tensor<2x3x4xf64, #SingletonTensor3>
bufferization.dealloc_tensor %t31 : tensor<2x3x4xf64, #SingletonTensor1>
bufferization.dealloc_tensor %s1 : tensor<2x3x4xf64, #SingletonTensor1>
bufferization.dealloc_tensor %s3 : tensor<2x3x4xf64, #SingletonTensor3>
+ bufferization.dealloc_tensor %d13 : tensor<2x3x4xf64>
+ bufferization.dealloc_tensor %d31 : tensor<2x3x4xf64>
return
}