[Mlir-commits] [mlir] d346613 - [mlir][sparse] fix merge conflict in sddmm test (#66670)

llvmlistbot at llvm.org llvmlistbot at llvm.org
Mon Sep 18 09:51:42 PDT 2023


Author: Aart Bik
Date: 2023-09-18T09:51:21-07:00
New Revision: d34661309be4acfa8c008e3c0b05d50d5f9da928

URL: https://github.com/llvm/llvm-project/commit/d34661309be4acfa8c008e3c0b05d50d5f9da928
DIFF: https://github.com/llvm/llvm-project/commit/d34661309be4acfa8c008e3c0b05d50d5f9da928.diff

LOG:   [mlir][sparse] fix merge conflict in sddmm test (#66670)

This fixes a merge conflict in
https://github.com/llvm/llvm-project/pull/66563

Added: 
    

Modified: 
    mlir/test/Dialect/SparseTensor/sparse_sddmm.mlir

Removed: 
    


################################################################################
diff  --git a/mlir/test/Dialect/SparseTensor/sparse_sddmm.mlir b/mlir/test/Dialect/SparseTensor/sparse_sddmm.mlir
index 35cd48e20ec58c9..2d2c10052937676 100755
--- a/mlir/test/Dialect/SparseTensor/sparse_sddmm.mlir
+++ b/mlir/test/Dialect/SparseTensor/sparse_sddmm.mlir
@@ -130,7 +130,7 @@ func.func @sampled_dd_unfused(%args: tensor<8x8xf64, #SM>,
 // CHECK-DAG:       %[[VAL_6:.*]] = arith.constant false
 // CHECK-DAG:       %[[VAL_7:.*]] = arith.constant true
 // CHECK-DAG:       %[[VAL_8:.*]] = arith.constant dense<0.000000e+00> : tensor<8x8xf64>
-// CHECK-DAG:       %[[VAL_9:.*]] = bufferization.alloc_tensor() copy(%[[VAL_8]]) {bufferization.escape = [false]} : tensor<8x8xf64>
+// CHECK-DAG:       %[[VAL_9:.*]] = bufferization.alloc_tensor() copy(%[[VAL_8]]) : tensor<8x8xf64>
 // CHECK-DAG:       %[[VAL_10:.*]] = tensor.empty() : tensor<8x8xf64, #sparse_tensor.encoding<{{{.*}}}>>
 // CHECK-DAG:       %[[VAL_11:.*]] = bufferization.to_memref %[[VAL_1]] : memref<8x8xf64>
 // CHECK-DAG:       %[[VAL_12:.*]] = bufferization.to_memref %[[VAL_2]] : memref<8x8xf64>


        


More information about the Mlir-commits mailing list