update ndarray test pipeline files

tkarna · Jul 10, 2024 · dbe867a · dbe867a
1 parent 97e6b38
commit dbe867a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 48 deletions.
diff --git a/test/Gen/NDArray/ndarray-gpu.pp b/test/Gen/NDArray/ndarray-gpu.pp
@@ -9,26 +9,18 @@
     linalg-fuse-elementwise-ops
     arith-expand
     memref-expand
-    arith-bufferize
-    func-bufferize
     func.func(empty-tensor-to-alloc-tensor)
-    func.func(scf-bufferize)
-    func.func(tensor-bufferize)
-    func.func(bufferization-bufferize)
-    func.func(linalg-bufferize)
-    func.func(linalg-detensorize)
-    func.func(tensor-bufferize)
-    func.func(finalizing-bufferize)
+    one-shot-bufferize{bufferize-function-boundaries}
     imex-remove-temporaries
     func.func(convert-linalg-to-parallel-loops)
     func.func(scf-parallel-loop-fusion)
-    drop-regions
 // GPU
     func.func(imex-add-outer-parallel-loop)
     func.func(gpu-map-parallel-loops)
     func.func(convert-parallel-loops-to-gpu)
 // insert-gpu-allocs pass can have client-api = opencl or vulkan args
     func.func(insert-gpu-allocs{client-api=opencl})
+    drop-regions
     canonicalize
     normalize-memrefs
 // Unstride memrefs does not seem to be needed.
@@ -45,7 +37,7 @@
     imex-convert-gpu-to-spirv
     spirv.module(spirv-lower-abi-attrs
              spirv-update-vce)
-// func.func(llvm-request-c-wrappers)
+//  func.func(llvm-request-c-wrappers)
     serialize-spirv
     expand-strided-metadata
     lower-affine

diff --git a/test/Gen/NDArray/ndarray.pp b/test/Gen/NDArray/ndarray.pp
@@ -1,25 +1,18 @@
 builtin.module(
     convert-ndarray-to-linalg
-    func.func(
-        tosa-to-linalg
-        tosa-to-tensor
-    )
+    canonicalize
+    func.func(tosa-make-broadcastable)
+    func.func(tosa-to-linalg)
+    func.func(tosa-to-tensor)
     canonicalize
     linalg-fuse-elementwise-ops
-    convert-shape-to-std
     arith-expand
-    arith-bufferize
-    func-bufferize
-    func.func(
-        empty-tensor-to-alloc-tensor
-        scf-bufferize
-        tensor-bufferize
-        linalg-bufferize
-        bufferization-bufferize
-        linalg-detensorize
-        tensor-bufferize
-        finalizing-bufferize
-        convert-linalg-to-parallel-loops)
+    memref-expand
+    func.func(empty-tensor-to-alloc-tensor)
+    one-shot-bufferize{bufferize-function-boundaries}
+    imex-remove-temporaries
+    func.func(convert-linalg-to-parallel-loops)
+    func.func(scf-parallel-loop-fusion)
     drop-regions
     canonicalize
     fold-memref-alias-ops
@@ -31,4 +24,5 @@
     convert-math-to-llvm
     convert-math-to-libm
     convert-func-to-llvm
-    reconcile-unrealized-casts)
+    reconcile-unrealized-casts
+)
diff --git a/test/imex-runner/ndarray-gpu.pp b/test/imex-runner/ndarray-gpu.pp
@@ -9,16 +9,8 @@
     linalg-fuse-elementwise-ops
     arith-expand
     memref-expand
-    arith-bufferize
-    func-bufferize
     func.func(empty-tensor-to-alloc-tensor)
-    func.func(scf-bufferize)
-    func.func(tensor-bufferize)
-    func.func(bufferization-bufferize)
-    func.func(linalg-bufferize)
-    func.func(linalg-detensorize)
-    func.func(tensor-bufferize)
-    func.func(finalizing-bufferize)
+    one-shot-bufferize{bufferize-function-boundaries}
     imex-remove-temporaries
     func.func(convert-linalg-to-parallel-loops)
     func.func(scf-parallel-loop-fusion)
@@ -45,7 +37,7 @@
     imex-convert-gpu-to-spirv
     spirv.module(spirv-lower-abi-attrs
              spirv-update-vce)
-//    func.func(llvm-request-c-wrappers)
+//  func.func(llvm-request-c-wrappers)
     serialize-spirv
     expand-strided-metadata
     lower-affine

diff --git a/test/imex-runner/ndarray.pp b/test/imex-runner/ndarray.pp
@@ -8,16 +8,8 @@
     linalg-fuse-elementwise-ops
     arith-expand
     memref-expand
-    arith-bufferize
-    func-bufferize
     func.func(empty-tensor-to-alloc-tensor)
-    func.func(scf-bufferize)
-    func.func(tensor-bufferize)
-    func.func(bufferization-bufferize)
-    func.func(linalg-bufferize)
-    func.func(linalg-detensorize)
-    func.func(tensor-bufferize)
-    func.func(finalizing-bufferize)
+    one-shot-bufferize{bufferize-function-boundaries}
     imex-remove-temporaries
     func.func(convert-linalg-to-parallel-loops)
     func.func(scf-parallel-loop-fusion)