Remove unused lit config option vitis_root (Xilinx#477)

The check for config.vitis_root was preventing lit tests tagged with REQUIRES: valid_xchess_license from running in the "Build and Test with AIE tools" action. The check is not used anywhere else, and is pointless, so the fix it to remove it.
nod-ai · Mar 6, 2024 · c1dc9a6 · c1dc9a6
1 parent f93afb7
commit c1dc9a6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/buildAndTestAieTools.yml b/.github/workflows/buildAndTestAieTools.yml
@@ -155,6 +155,8 @@ jobs:
               export LIT_FILTER="${{ inputs.LIT_FILTER }}"
             fi
 
+            export LIT_OPTS="-sv --timeout 300 -j1 --time-tests --order=random"
+
             utils/clone-rocm-air-platforms.sh
             utils/github-clone-build-libxaie.sh
 

diff --git a/test/airhost/40_air_8x4_2d_square/air_test.cpp b/test/airhost/40_air_8x4_2d_square/air_test.cpp
@@ -31,7 +31,7 @@
 #define NUM_3D (IMAGE_WIDTH / TILE_WIDTH)
 #define NUM_4D (IMAGE_HEIGHT / TILE_HEIGHT)
 
-namespace air::segments::copyherd {
+namespace air::segments::segment_0 {
 void mlir_aie_write_buffer_scratch_0_0(aie_libxaie_ctx_t *, int, int32_t);
 void mlir_aie_write_buffer_scratch_0_1(aie_libxaie_ctx_t *, int, int32_t);
 void mlir_aie_write_buffer_scratch_0_2(aie_libxaie_ctx_t *, int, int32_t);
@@ -64,8 +64,8 @@ void mlir_aie_write_buffer_scratch_7_0(aie_libxaie_ctx_t *, int, int32_t);
 void mlir_aie_write_buffer_scratch_7_1(aie_libxaie_ctx_t *, int, int32_t);
 void mlir_aie_write_buffer_scratch_7_2(aie_libxaie_ctx_t *, int, int32_t);
 void mlir_aie_write_buffer_scratch_7_3(aie_libxaie_ctx_t *, int, int32_t);
-}; // namespace air::segments::copyherd
-using namespace air::segments::copyherd;
+}; // namespace air::segments::segment_0
+using namespace air::segments::segment_0;
 
 int main(int argc, char *argv[]) {
 

diff --git a/test/lit.cfg.py b/test/lit.cfg.py
@@ -135,9 +135,7 @@
 # test if LM_LICENSE_FILE valid
 if config.enable_chess_tests:
     import shutil
-    result = None
-    if config.vitis_root:
-        result = shutil.which("xchesscc")
+    result = shutil.which("xchesscc")
 
     import subprocess
     if result != None:
@@ -158,9 +156,8 @@
         print("WARNING: no valid xchess license that is required by some of the lit tests")
 
 
-if config.vitis_root:
+if config.vitis_aietools_dir:
   llvm_config.with_environment('CARDANO', config.vitis_aietools_dir)
-  llvm_config.with_environment('VITIS', config.vitis_root)
 
 tool_dirs = [config.peano_tools_dir, config.aie_tools_dir, config.air_tools_dir, config.llvm_tools_dir]
 tools = [

diff --git a/test/lit.site.cfg.py.in b/test/lit.site.cfg.py.in
@@ -56,7 +56,6 @@ config.enable_run_airhost_tests = lit.util.pythonize_bool("@ENABLE_RUN_AIRHOST_T
 config.enable_run_xrt_tests = lit.util.pythonize_bool("@ENABLE_RUN_XRT_TESTS@")
 
 # pass on vitis settings
-config.vitis_root = "@VITIS_ROOT@"
 config.vitis_aietools_dir = "@VITIS_AIETOOLS_DIR@"
 config.libxaie_dir = "@XILINX_XAIE_DIR@"
 config.test_arch = "@AIR_RUNTIME_TEST_TARGET_VAL@"