From 80224a62f956f23ebb1218bd0e049171fcfd2459 Mon Sep 17 00:00:00 2001 From: Scott Todd Date: Fri, 1 Mar 2024 11:10:00 -0800 Subject: [PATCH] Rename config_cpu to config_cpu_llvm_sync matching IREE. --- iree_tests/README.md | 4 ++-- .../configs/{config_cpu.json => config_cpu_llvm_sync.json} | 4 ++-- iree_tests/conftest.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename iree_tests/configs/{config_cpu.json => config_cpu_llvm_sync.json} (99%) diff --git a/iree_tests/README.md b/iree_tests/README.md index 256c3c7ad..db7cc11fb 100644 --- a/iree_tests/README.md +++ b/iree_tests/README.md @@ -48,7 +48,7 @@ Tests are run using the [pytest](https://docs.pytest.org/en/stable/) framework. A [`conftest.py`](conftest.py) file collects test cases from subdirectories, wrapping each directory matching the format described above to one test case per test configuration. Test configurations are defined in JSON config files -like [`configs/config_cpu.json`](./configs/config_cpu.json). +like [`configs/config_cpu_llvm_sync.json`](./configs/config_cpu_llvm_sync.json). ### Common venv setup with deps @@ -89,7 +89,7 @@ $ pytest iree_tests -n auto Run tests using custom config files: ```bash -$ export IREE_TEST_CONFIG_FILES=/iree/config_cpu.json;/iree/config_gpu.json +$ export IREE_TEST_CONFIG_FILES=/iree/config_cpu_llvm_sync.json;/iree/config_gpu_vulkan.json $ pytest iree_tests ``` diff --git a/iree_tests/configs/config_cpu.json b/iree_tests/configs/config_cpu_llvm_sync.json similarity index 99% rename from iree_tests/configs/config_cpu.json rename to iree_tests/configs/config_cpu_llvm_sync.json index 8885ea140..9b37c8c0f 100644 --- a/iree_tests/configs/config_cpu.json +++ b/iree_tests/configs/config_cpu_llvm_sync.json @@ -1,10 +1,10 @@ { - "config_name": "cpu", + "config_name": "cpu_llvm_sync", "iree_compile_flags" : [ "--iree-hal-target-backends=llvm-cpu" ], "iree_run_module_flags": [ - "--device=local-task" + "--device=local-sync" ], "skip_compile_tests": [], "skip_run_tests": [], diff --git a/iree_tests/conftest.py b/iree_tests/conftest.py index db644e410..64772df22 100644 --- a/iree_tests/conftest.py +++ b/iree_tests/conftest.py @@ -249,7 +249,7 @@ def __init__( THIS_DIR = Path(__file__).parent REPO_ROOT = THIS_DIR.parent _iree_test_config_files = [ - REPO_ROOT / "iree_tests/configs/config_cpu.json", + REPO_ROOT / "iree_tests/configs/config_cpu_llvm_sync.json", # REPO_ROOT / "iree_tests/configs/config_gpu_vulkan.json", ]