From c8128b13d668b1ce6ac54fcec41f8367062f0604 Mon Sep 17 00:00:00 2001
From: Jeff Fifield <jeff.fifield@amd.com>
Date: Tue, 30 Apr 2024 11:21:01 -0600
Subject: [PATCH] Fix npu-xrt matmul e2e test (#1439)

Add REQUIRES chess to run-a2x.lit which requires chess. Remove run.lit to avoid collisions, the only difference between this one and run-a2x.lit is that this one calls aiecc.py instead of aie2xclbin, and there are plenty of tests of aiecc.py.
---
 .../matrix_multiplication_using_dma/run-a2x.lit        |  2 +-
 test/npu-xrt/matrix_multiplication_using_dma/run.lit   | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 test/npu-xrt/matrix_multiplication_using_dma/run.lit

diff --git a/test/npu-xrt/matrix_multiplication_using_dma/run-a2x.lit b/test/npu-xrt/matrix_multiplication_using_dma/run-a2x.lit
index 50fe8ef85a..33880c807b 100644
--- a/test/npu-xrt/matrix_multiplication_using_dma/run-a2x.lit
+++ b/test/npu-xrt/matrix_multiplication_using_dma/run-a2x.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2023 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai
+// REQUIRES: ryzen_ai, chess
 //
 // RUN: xchesscc_wrapper aie2 -I %aietools/include -c %S/mm.cc -o ./mm.o
 // RUN: aie2xclbin --use-chess --xclbin-name=aie2.xclbin --npu-insts-name=insts2.txt --tmpdir=aie2xclbin.prj -v %S/aie.mlir
diff --git a/test/npu-xrt/matrix_multiplication_using_dma/run.lit b/test/npu-xrt/matrix_multiplication_using_dma/run.lit
deleted file mode 100644
index c6a0f7a6ea..0000000000
--- a/test/npu-xrt/matrix_multiplication_using_dma/run.lit
+++ /dev/null
@@ -1,10 +0,0 @@
-// (c) Copyright 2023 Advanced Micro Devices, Inc.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-// REQUIRES: ryzen_ai, chess
-//
-// RUN: xchesscc_wrapper aie2 -I %aietools/include -c %S/mm.cc -o ./mm.o
-// RUN: %python aiecc.py --xbridge --aie-generate-cdo --aie-generate-npu --no-compile-host --basic-alloc-scheme --xclbin-name=aie.xclbin --npu-insts-name=insts.txt %S/aie.mlir
-// RUN: clang %S/test.cpp -o test.exe -std=c++11 -Wall %xrt_flags -lrt -lstdc++ -lboost_program_options -lboost_filesystem
-// RUN: %run_on_npu ./test.exe -x aie.xclbin -k MLIR_AIE -i insts.txt | FileCheck %s
-// CHECK: PASS!