[mlir][sparse][nfc] Use tensor.generate in sparse integration tests

[vmrajas]

Summary

Currently, dense tensors are initialized in Sparse Integration tests using
"buffer.tensor_alloc and scf.for" . This makes code harder to read and maintain.
This diff uses tensor.generate instead to initialize dense tensors.

Testing: Ran integration tests after building with -DLLVM_USE_SANITIZER=Address flag.

[springerm]

nice cleanup!

[vmrajas]

Rebase

[aartbik]

Oh, this is really nice! Thanks for making the change.

mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matvec.mlir

func.func @entry() {
     %c4 = arith.constant 4 : index
     %c256 = arith.constant 256 : index
 
     // Read the sparse matrix from file, construct sparse storage.
     %fileName = call @getTensorFilename(%c0) : (index) -> (!Filename)
     %a = sparse_tensor.new %fileName : !Filename to tensor<?x?xi32, #SparseMatrix>
 
     // Initialize dense vectors.
-    %init_256 = bufferization.alloc_tensor(%c256) : tensor<?xi32>
-    %b = scf.for %i = %c0 to %c256 step %c1 iter_args(%t = %init_256) -> tensor<?xi32> {
+    %b = tensor.generate %c256 {
+    ^bb0(%i : index):
       %k = arith.addi %i, %c1 : index
       %j = arith.index_cast %k : index to i32
-      %t2 = tensor.insert %j into %t[%i] : tensor<?xi32>
-      scf.yield %t2 : tensor<?xi32>
-    }
-    %init_4 = bufferization.alloc_tensor(%c4) : tensor<?xi32>
-    %x = scf.for %i = %c0 to %c4 step %c1 iter_args(%t = %init_4) -> tensor<?xi32> {
-      %t2 = tensor.insert %i0 into %t[%i] : tensor<?xi32>
-      scf.yield %t2 : tensor<?xi32>
-    }
+      tensor.yield %j : i32
+    } : tensor<?xi32>
+
+    %x = tensor.generate %c4 {
+      ^bb0(%i : index):
+        tensor.yield %i0 : i32
+    } : tensor<?xi32>
 
     // Call kernel.
     %0 = call @kernel_matvec(%a, %b, %x)
       : (tensor<?x?xi32, #SparseMatrix>, tensor<?xi32>, tensor<?xi32>) -> tensor<?xi32>
 
     // Print the result for verification.
     //
     // CHECK: ( 889, 1514, -21, -3431 )

mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_mttkrp.mlir

func.func @entry() {
 
     // Get sizes from B, pick a fixed size for dim-2 of A.
     %isz = tensor.dim %b, %cst0 : tensor<?x?x?xf64, #SparseTensor>
     %jsz = arith.constant 5 : index
     %ksz = tensor.dim %b, %cst1 : tensor<?x?x?xf64, #SparseTensor>
     %lsz = tensor.dim %b, %cst2 : tensor<?x?x?xf64, #SparseTensor>
 
     // Initialize dense input matrix C.
-    %c0 = bufferization.alloc_tensor(%ksz, %jsz) : tensor<?x?xf64>
-    %c = scf.for %k = %cst0 to %ksz step %cst1 iter_args(%c1 = %c0) -> tensor<?x?xf64> {
-      %c2 = scf.for %j = %cst0 to %jsz step %cst1 iter_args(%c3 = %c1) -> tensor<?x?xf64> {
-        %k0 = arith.muli %k, %jsz : index
-        %k1 = arith.addi %k0, %j : index
-        %k2 = arith.index_cast %k1 : index to i32
-        %kf = arith.sitofp %k2 : i32 to f64
-        %c4 = tensor.insert %kf into %c3[%k, %j] : tensor<?x?xf64>
-        scf.yield %c4 : tensor<?x?xf64>
-      }
-      scf.yield %c2 : tensor<?x?xf64>
-    }
+    %c = tensor.generate %ksz, %jsz {
+    ^bb0(%k : index, %j : index):
+      tensor.yield %kf : f64
+    } : tensor<?x?xf64>
 
     // Initialize dense input matrix D.
-    %d0 = bufferization.alloc_tensor(%lsz, %jsz) : tensor<?x?xf64>
-    %d = scf.for %l = %cst0 to %lsz step %cst1 iter_args(%d1 = %d0) -> tensor<?x?xf64> {
-      %d2 = scf.for %j = %cst0 to %jsz step %cst1 iter_args(%d3 = %d1) -> tensor<?x?xf64> {
-        %k0 = arith.muli %l, %jsz : index
-        %k1 = arith.addi %k0, %j : index
-        %k2 = arith.index_cast %k1 : index to i32
-        %kf = arith.sitofp %k2 : i32 to f64
-        %d4 = tensor.insert %kf into %d3[%l, %j] : tensor<?x?xf64>
-        scf.yield %d4 : tensor<?x?xf64>
-      }
-      scf.yield %d2 : tensor<?x?xf64>
-    }
+    %d = tensor.generate %lsz, %jsz {
+    ^bb0(%l : index, %j : index):
+      tensor.yield %kf : f64
+    } : tensor<?x?xf64>
 
     // Initialize dense output matrix A.
-    %a0 = bufferization.alloc_tensor(%isz, %jsz) : tensor<?x?xf64>
-    %a = scf.for %i = %cst0 to %isz step %cst1 iter_args(%a1 = %a0) -> tensor<?x?xf64> {
-      %a2 = scf.for %j = %cst0 to %jsz step %cst1 iter_args(%a3 = %a1) -> tensor<?x?xf64> {
-        %a4 = tensor.insert %f0 into %a3[%i, %j] : tensor<?x?xf64>
-        scf.yield %a4 : tensor<?x?xf64>
-      }
-      scf.yield %a2 : tensor<?x?xf64>
-    }
+    %a = tensor.generate %isz, %jsz {
+    ^bb0(%i : index, %j: index):
+      tensor.yield %f0 : f64
+    } : tensor<?x?xf64>
 
     // Call kernel.
     %0 = call @kernel_mttkrp(%b, %c, %d, %a)
       : (tensor<?x?x?xf64, #SparseTensor>,
         tensor<?x?xf64>, tensor<?x?xf64>, tensor<?x?xf64>) -> tensor<?x?xf64>
 
     // Print the result for verification.
     //

mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sampled_matmul.mlir

module {
   //
   func.func @entry() {
     %d0 = arith.constant 0.0 : f32
     %c0 = arith.constant 0 : index
     %c1 = arith.constant 1 : index
     %c5 = arith.constant 5 : index
     %c10 = arith.constant 10 : index
 
-    // Setup memory for the dense matrices and initialize.
-    %a0 = bufferization.alloc_tensor(%c5, %c10) : tensor<?x?xf32>
-    %b0 = bufferization.alloc_tensor(%c10, %c5) : tensor<?x?xf32>
-    %x0 = bufferization.alloc_tensor(%c5, %c5) : tensor<?x?xf32>
-    %a, %b, %x = scf.for %i = %c0 to %c5 step %c1 iter_args(%a1 = %a0, %b1 = %b0, %x1 = %x0)
-        -> (tensor<?x?xf32>, tensor<?x?xf32>, tensor<?x?xf32>) {
-      %x2 = scf.for %j = %c0 to %c5 step %c1 iter_args(%x3 = %x1) -> (tensor<?x?xf32>) {
-        %x4 = tensor.insert %d0 into %x3[%i, %j] : tensor<?x?xf32>
-        scf.yield %x4 : tensor<?x?xf32>
-      }
+    // Initialize dense matrices.
+    %x = tensor.generate %c5, %c5 {
+    ^bb0(%i : index, %j : index):
+      tensor.yield %d0 : f32
+    } : tensor<?x?xf32>
+
+    %a = tensor.generate %c5, %c10 {
+    ^bb0(%i: index, %j: index):
       %p = arith.addi %i, %c1 : index
       %q = arith.index_cast %p : index to i32
       %d = arith.sitofp %q : i32 to f32
-      %a2, %b2 = scf.for %j = %c0 to %c10 step %c1 iter_args(%a3 = %a1, %b3 = %b1)
-          -> (tensor<?x?xf32>, tensor<?x?xf32>) {
-        %a4 = tensor.insert %d into %a3[%i, %j] : tensor<?x?xf32>
-        %b4 = tensor.insert %d into %b3[%j, %i] : tensor<?x?xf32>
-        scf.yield %a4, %b4 : tensor<?x?xf32>, tensor<?x?xf32>
-      }
-      scf.yield %a2, %b2, %x2 : tensor<?x?xf32>, tensor<?x?xf32>, tensor<?x?xf32>
-    }
+      tensor.yield %d : f32
+    } : tensor<?x?xf32>
+
+    %b = tensor.generate %c10, %c5 {
+    ^bb0(%i: index, %j: index):
+      %p = arith.addi %j, %c1 : index
+      %q = arith.index_cast %p : index to i32
+      %d = arith.sitofp %q : i32 to f32
+      tensor.yield %d : f32
+    } : tensor<?x?xf32>
 
     // Read the sparse matrix from file, construct sparse storage.
     %fileName = call @getTensorFilename(%c0) : (index) -> (!Filename)
     %s = sparse_tensor.new %fileName : !Filename to tensor<?x?xf32, #SparseMatrix>
 
     // Call the kernel.
     %0 = call @sampled_dense_dense(%s, %a, %b, %x)
        : (tensor<?x?xf32, #SparseMatrix>,

mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_spmm.mlir

func.func @entry() {
     %c1 = arith.constant 1 : index
     %c4 = arith.constant 4 : index
     %c256 = arith.constant 256 : index
 
     // Read the sparse matrix from file, construct sparse storage.
     %fileName = call @getTensorFilename(%c0) : (index) -> (!Filename)
     %a = sparse_tensor.new %fileName : !Filename to tensor<?x?xf64, #SparseMatrix>
 
-    // Initialize dense vectors.
-    %init_256_4 = bufferization.alloc_tensor(%c256, %c4) : tensor<?x?xf64>
-    %b = scf.for %i = %c0 to %c256 step %c1 iter_args(%t = %init_256_4) -> tensor<?x?xf64> {
-      %b2 = scf.for %j = %c0 to %c4 step %c1 iter_args(%t2 = %t) -> tensor<?x?xf64> {
-        %k0 = arith.muli %i, %c4 : index
-        %k1 = arith.addi %j, %k0 : index
-        %k2 = arith.index_cast %k1 : index to i32
-        %k = arith.sitofp %k2 : i32 to f64
-        %t3 = tensor.insert %k into %t2[%i, %j] : tensor<?x?xf64>
-        scf.yield %t3 : tensor<?x?xf64>
-      }
-      scf.yield %b2 : tensor<?x?xf64>
-    }
-    %init_4_4 = bufferization.alloc_tensor(%c4, %c4) : tensor<?x?xf64>
-    %x = scf.for %i = %c0 to %c4 step %c1 iter_args(%t = %init_4_4) -> tensor<?x?xf64> {
-      %x2 = scf.for %j = %c0 to %c4 step %c1 iter_args(%t2 = %t) -> tensor<?x?xf64> {
-        %t3 = tensor.insert %i0 into %t2[%i, %j] : tensor<?x?xf64>
-        scf.yield %t3 : tensor<?x?xf64>
-      }
-      scf.yield %x2 : tensor<?x?xf64>
-    }
+    // Initialize dense tensors.
+    %b = tensor.generate %c256, %c4 {
+    ^bb0(%i : index, %j : index):
+      tensor.yield %k : f64
+    } : tensor<?x?xf64>
+
+    %x = tensor.generate %c4, %c4 {
+    ^bb0(%i : index, %j : index):
+      tensor.yield %i0 : f64
+    } : tensor<?x?xf64>
   
     // Call kernel.
     %0 = call @kernel_spmm(%a, %b, %x)
       : (tensor<?x?xf64, #SparseMatrix>, tensor<?x?xf64>, tensor<?x?xf64>) -> tensor<?x?xf64>
 
     // Print the result for verification.
     //
     // CHECK: ( ( 3548, 3550, 3552, 3554 ), ( 6052, 6053, 6054, 6055 ), ( -56, -63, -70, -77 ), ( -13704, -13709, -13714, -13719 ) )