fixing format and test

Xilinx · May 28, 2024 · 8ba1ac7 · 8ba1ac7
1 parent 1c2e38d
commit 8ba1ac7
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 16 deletions.
diff --git a/test/npu-xrt/matrix_multiplication_using_cascade/aie_bufferx4.mlir b/test/npu-xrt/matrix_multiplication_using_cascade/aie_bufferx4.mlir
@@ -645,4 +645,4 @@ module {
       return
     }
   } {sym_name = "segment_0"}
-}
+}
diff --git a/test/npu-xrt/matrix_multiplication_using_cascade/aie_cascadex4.mlir b/test/npu-xrt/matrix_multiplication_using_cascade/aie_cascadex4.mlir
@@ -493,4 +493,4 @@ module {
       return
     }
   } {sym_name = "segment_0"}
-}
+}
diff --git a/test/npu-xrt/matrix_multiplication_using_cascade/aie_plainx1.mlir b/test/npu-xrt/matrix_multiplication_using_cascade/aie_plainx1.mlir
@@ -198,4 +198,4 @@ module {
       return
     }
   } {sym_name = "segment_0"}
-}
+}
diff --git a/test/npu-xrt/matrix_multiplication_using_cascade/aie_plainx4.mlir b/test/npu-xrt/matrix_multiplication_using_cascade/aie_plainx4.mlir
@@ -529,4 +529,4 @@ module {
       return
     }
   } {sym_name = "segment_0"}
-}
+}
diff --git a/test/npu-xrt/matrix_multiplication_using_cascade/run.lit b/test/npu-xrt/matrix_multiplication_using_cascade/run.lit
@@ -7,15 +7,13 @@
 // RUN: g++-13 %S/test.cpp -o test.exe -std=c++23 -Wall %xrt_flags -lrt -lstdc++ -lboost_program_options -lboost_filesystem
 //
 // RUN: %python aiecc.py --xchesscc --xbridge --no-aiesim --aie-generate-cdo --aie-generate-npu --no-compile-host --xclbin-name=aie2_plain.xclbin --npu-insts-name=insts2_plain.txt %S/aie_plainx4.mlir
-// RUN: %run_on_npu ./test.exe -x aie2_plain.xclbin -k MLIR_AIE -i insts2_plain.txt --trace_sz 32768 | FileCheck %s
-// CHECK: PASS!
+// RUN: %run_on_npu ./test.exe -x aie2_plain.xclbin -k MLIR_AIE -i insts2_plain.txt --trace_sz 32768 | FileCheck --check-prefix=CHECK_PLAIN %s
+// CHECK_PLAIN: PASS!
 //
 // RUN: %python aiecc.py --xchesscc --xbridge --no-aiesim --aie-generate-cdo --aie-generate-npu --no-compile-host --xclbin-name=aie2_buffer.xclbin --npu-insts-name=insts2_buffer.txt %S/aie_bufferx4.mlir
-// RUN: g++-13 %S/test.cpp -o test.exe -std=c++23 -Wall %xrt_flags -lrt -lstdc++ -lboost_program_options -lboost_filesystem
-// RUN: %run_on_npu ./test.exe -x aie2_buffer.xclbin -k MLIR_AIE -i insts2_buffer.txt --trace_sz 32768 | FileCheck %s
-// CHECK: PASS!
+// RUN: %run_on_npu ./test.exe -x aie2_buffer.xclbin -k MLIR_AIE -i insts2_buffer.txt --trace_sz 32768 | FileCheck --check-prefix=CHECK_BUFFER %s
+// CHECK_BUFFER: PASS!
 //
 // RUN: %python aiecc.py --xchesscc --xbridge --no-aiesim --aie-generate-cdo --aie-generate-npu --no-compile-host --xclbin-name=aie2_cascade.xclbin --npu-insts-name=insts2_cascade.txt %S/aie_cascadex4.mlir
-// RUN: g++-13 %S/test.cpp -o test.exe -std=c++23 -Wall %xrt_flags -lrt -lstdc++ -lboost_program_options -lboost_filesystem
-// RUN: %run_on_npu ./test.exe -x aie2_cascade.xclbin -k MLIR_AIE -i insts2_cascade.txt --trace_sz 32768 | FileCheck %s
-// CHECK: PASS!
+// RUN: %run_on_npu ./test.exe -x aie2_cascade.xclbin -k MLIR_AIE -i insts2_cascade.txt --trace_sz 32768 | FileCheck --check-prefix=CHECK_CASCADE %s
+// CHECK_CASCADE: PASS!
diff --git a/test/npu-xrt/matrix_multiplication_using_cascade/trace_bufferx4.json b/test/npu-xrt/matrix_multiplication_using_cascade/trace_bufferx4.json
diff --git a/test/npu-xrt/matrix_multiplication_using_cascade/trace_cascadex4.json b/test/npu-xrt/matrix_multiplication_using_cascade/trace_cascadex4.json
diff --git a/test/npu-xrt/matrix_multiplication_using_cascade/trace_plainx1.json b/test/npu-xrt/matrix_multiplication_using_cascade/trace_plainx1.json
diff --git a/test/npu-xrt/matrix_multiplication_using_cascade/trace_plainx4.json b/test/npu-xrt/matrix_multiplication_using_cascade/trace_plainx4.json