From 5eaf0a2034f32ccd71c275559d5cffd1ddbfec15 Mon Sep 17 00:00:00 2001 From: Petr Vesely Date: Mon, 21 Aug 2023 10:55:49 +0100 Subject: [PATCH 1/2] [UR] Remove Prefixes from CUDA tests --- test/conformance/adapters/cuda/CMakeLists.txt | 12 ++++++------ test/conformance/adapters/cuda/context_tests.cpp | 2 +- .../adapters/cuda/{cuda_fixtures.h => fixtures.h} | 0 test/conformance/adapters/cuda/memory_tests.cpp | 2 +- ...NativeHandle.cpp => urContextGetNativeHandle.cpp} | 2 +- ...Handle.cpp => urDeviceCreateWithNativeHandle.cpp} | 2 +- ...tNativeHandle.cpp => urDeviceGetNativeHandle.cpp} | 2 +- ...eHandle.cpp => urEventCreateWithNativeHandle.cpp} | 2 +- ...etNativeHandle.cpp => urEventGetNativeHandle.cpp} | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) rename test/conformance/adapters/cuda/{cuda_fixtures.h => fixtures.h} (100%) rename test/conformance/adapters/cuda/{cuda_urContextGetNativeHandle.cpp => urContextGetNativeHandle.cpp} (96%) rename test/conformance/adapters/cuda/{cuda_urDeviceCreateWithNativeHandle.cpp => urDeviceCreateWithNativeHandle.cpp} (96%) rename test/conformance/adapters/cuda/{cuda_urDeviceGetNativeHandle.cpp => urDeviceGetNativeHandle.cpp} (96%) rename test/conformance/adapters/cuda/{cuda_urEventCreateWithNativeHandle.cpp => urEventCreateWithNativeHandle.cpp} (96%) rename test/conformance/adapters/cuda/{cuda_urEventGetNativeHandle.cpp => urEventGetNativeHandle.cpp} (97%) diff --git a/test/conformance/adapters/cuda/CMakeLists.txt b/test/conformance/adapters/cuda/CMakeLists.txt index b85bc615f3..d59601b3bd 100644 --- a/test/conformance/adapters/cuda/CMakeLists.txt +++ b/test/conformance/adapters/cuda/CMakeLists.txt @@ -5,13 +5,13 @@ set(USE_LOCAL_TEST_CONFIGURATION ON) add_conformance_test_with_devices_environment(adapter-cuda - cuda_fixtures.h + fixtures.h context_tests.cpp - cuda_urContextGetNativeHandle.cpp - cuda_urDeviceGetNativeHandle.cpp - cuda_urDeviceCreateWithNativeHandle.cpp - cuda_urEventGetNativeHandle.cpp - cuda_urEventCreateWithNativeHandle.cpp + urContextGetNativeHandle.cpp + urDeviceGetNativeHandle.cpp + urDeviceCreateWithNativeHandle.cpp + urEventGetNativeHandle.cpp + urEventCreateWithNativeHandle.cpp kernel_tests.cpp memory_tests.cpp ) diff --git a/test/conformance/adapters/cuda/context_tests.cpp b/test/conformance/adapters/cuda/context_tests.cpp index 0ca826fff5..1787386b29 100644 --- a/test/conformance/adapters/cuda/context_tests.cpp +++ b/test/conformance/adapters/cuda/context_tests.cpp @@ -4,7 +4,7 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception #include "context.hpp" -#include "cuda_fixtures.h" +#include "fixtures.h" #include "queue.hpp" #include diff --git a/test/conformance/adapters/cuda/cuda_fixtures.h b/test/conformance/adapters/cuda/fixtures.h similarity index 100% rename from test/conformance/adapters/cuda/cuda_fixtures.h rename to test/conformance/adapters/cuda/fixtures.h diff --git a/test/conformance/adapters/cuda/memory_tests.cpp b/test/conformance/adapters/cuda/memory_tests.cpp index 8ca62c1e63..5f68a446a3 100644 --- a/test/conformance/adapters/cuda/memory_tests.cpp +++ b/test/conformance/adapters/cuda/memory_tests.cpp @@ -3,7 +3,7 @@ // See LICENSE.TXT // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include "cuda_fixtures.h" +#include "fixtures.h" using cudaMemoryTest = uur::urContextTest; UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(cudaMemoryTest); diff --git a/test/conformance/adapters/cuda/cuda_urContextGetNativeHandle.cpp b/test/conformance/adapters/cuda/urContextGetNativeHandle.cpp similarity index 96% rename from test/conformance/adapters/cuda/cuda_urContextGetNativeHandle.cpp rename to test/conformance/adapters/cuda/urContextGetNativeHandle.cpp index 0a2c855360..81dd47100c 100644 --- a/test/conformance/adapters/cuda/cuda_urContextGetNativeHandle.cpp +++ b/test/conformance/adapters/cuda/urContextGetNativeHandle.cpp @@ -3,7 +3,7 @@ // See LICENSE.TXT // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include "cuda_fixtures.h" +#include "fixtures.h" using urCudaContextGetNativeHandle = uur::urContextTest; UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urCudaContextGetNativeHandle); diff --git a/test/conformance/adapters/cuda/cuda_urDeviceCreateWithNativeHandle.cpp b/test/conformance/adapters/cuda/urDeviceCreateWithNativeHandle.cpp similarity index 96% rename from test/conformance/adapters/cuda/cuda_urDeviceCreateWithNativeHandle.cpp rename to test/conformance/adapters/cuda/urDeviceCreateWithNativeHandle.cpp index b116c9a5c9..3b8ebc416b 100644 --- a/test/conformance/adapters/cuda/cuda_urDeviceCreateWithNativeHandle.cpp +++ b/test/conformance/adapters/cuda/urDeviceCreateWithNativeHandle.cpp @@ -3,7 +3,7 @@ // See LICENSE.TXT // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include "cuda_fixtures.h" +#include "fixtures.h" using urCudaDeviceCreateWithNativeHandle = uur::urPlatformTest; diff --git a/test/conformance/adapters/cuda/cuda_urDeviceGetNativeHandle.cpp b/test/conformance/adapters/cuda/urDeviceGetNativeHandle.cpp similarity index 96% rename from test/conformance/adapters/cuda/cuda_urDeviceGetNativeHandle.cpp rename to test/conformance/adapters/cuda/urDeviceGetNativeHandle.cpp index cc76e955ff..8f97039d25 100644 --- a/test/conformance/adapters/cuda/cuda_urDeviceGetNativeHandle.cpp +++ b/test/conformance/adapters/cuda/urDeviceGetNativeHandle.cpp @@ -3,7 +3,7 @@ // See LICENSE.TXT // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include "cuda_fixtures.h" +#include "fixtures.h" using urCudaGetDeviceNativeHandle = uur::urDeviceTest; UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urCudaGetDeviceNativeHandle); diff --git a/test/conformance/adapters/cuda/cuda_urEventCreateWithNativeHandle.cpp b/test/conformance/adapters/cuda/urEventCreateWithNativeHandle.cpp similarity index 96% rename from test/conformance/adapters/cuda/cuda_urEventCreateWithNativeHandle.cpp rename to test/conformance/adapters/cuda/urEventCreateWithNativeHandle.cpp index 94ae9ad80b..d4ef6a69f7 100644 --- a/test/conformance/adapters/cuda/cuda_urEventCreateWithNativeHandle.cpp +++ b/test/conformance/adapters/cuda/urEventCreateWithNativeHandle.cpp @@ -3,7 +3,7 @@ // See LICENSE.TXT // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include "cuda_fixtures.h" +#include "fixtures.h" using urCudaEventCreateWithNativeHandleTest = uur::urQueueTest; UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urCudaEventCreateWithNativeHandleTest); diff --git a/test/conformance/adapters/cuda/cuda_urEventGetNativeHandle.cpp b/test/conformance/adapters/cuda/urEventGetNativeHandle.cpp similarity index 97% rename from test/conformance/adapters/cuda/cuda_urEventGetNativeHandle.cpp rename to test/conformance/adapters/cuda/urEventGetNativeHandle.cpp index a6185868fb..6059d4854d 100644 --- a/test/conformance/adapters/cuda/cuda_urEventGetNativeHandle.cpp +++ b/test/conformance/adapters/cuda/urEventGetNativeHandle.cpp @@ -3,7 +3,7 @@ // See LICENSE.TXT // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include "cuda_fixtures.h" +#include "fixtures.h" using urCudaEventGetNativeHandleTest = uur::urQueueTest; UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urCudaEventGetNativeHandleTest); From fa89ec4a5394a42aae5b82058479b28acd801276 Mon Sep 17 00:00:00 2001 From: Petr Vesely Date: Mon, 21 Aug 2023 10:58:13 +0100 Subject: [PATCH 2/2] [UR] Remove Prefixes from HIP tests --- test/conformance/adapters/hip/CMakeLists.txt | 8 ++++---- .../adapters/hip/{hip_fixtures.h => fixtures.h} | 0 test/conformance/adapters/hip/test_context.cpp | 2 +- ...xtGetNativeHandle.cpp => urContextGetNativeHandle.cpp} | 2 +- ...iceGetNativeHandle.cpp => urDeviceGetNativeHandle.cpp} | 2 +- ...ventGetNativeHandle.cpp => urEventGetNativeHandle.cpp} | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename test/conformance/adapters/hip/{hip_fixtures.h => fixtures.h} (100%) rename test/conformance/adapters/hip/{hip_urContextGetNativeHandle.cpp => urContextGetNativeHandle.cpp} (96%) rename test/conformance/adapters/hip/{hip_urDeviceGetNativeHandle.cpp => urDeviceGetNativeHandle.cpp} (96%) rename test/conformance/adapters/hip/{hip_urEventGetNativeHandle.cpp => urEventGetNativeHandle.cpp} (97%) diff --git a/test/conformance/adapters/hip/CMakeLists.txt b/test/conformance/adapters/hip/CMakeLists.txt index cf128b130c..a4a6c7ab48 100644 --- a/test/conformance/adapters/hip/CMakeLists.txt +++ b/test/conformance/adapters/hip/CMakeLists.txt @@ -5,10 +5,10 @@ set(USE_LOCAL_TEST_CONFIGURATION ON) add_conformance_test_with_devices_environment(adapter-hip - hip_fixtures.h - hip_urContextGetNativeHandle.cpp - hip_urDeviceGetNativeHandle.cpp - hip_urEventGetNativeHandle.cpp + fixtures.h + urContextGetNativeHandle.cpp + urDeviceGetNativeHandle.cpp + urEventGetNativeHandle.cpp test_context.cpp ) target_link_libraries(test-adapter-hip PRIVATE rocmdrv) diff --git a/test/conformance/adapters/hip/hip_fixtures.h b/test/conformance/adapters/hip/fixtures.h similarity index 100% rename from test/conformance/adapters/hip/hip_fixtures.h rename to test/conformance/adapters/hip/fixtures.h diff --git a/test/conformance/adapters/hip/test_context.cpp b/test/conformance/adapters/hip/test_context.cpp index 1d538a738b..90c28b842f 100644 --- a/test/conformance/adapters/hip/test_context.cpp +++ b/test/conformance/adapters/hip/test_context.cpp @@ -6,7 +6,7 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #include "context.hpp" -#include "hip_fixtures.h" +#include "fixtures.h" #include "queue.hpp" using urHipContextTest = uur::urDeviceTest; diff --git a/test/conformance/adapters/hip/hip_urContextGetNativeHandle.cpp b/test/conformance/adapters/hip/urContextGetNativeHandle.cpp similarity index 96% rename from test/conformance/adapters/hip/hip_urContextGetNativeHandle.cpp rename to test/conformance/adapters/hip/urContextGetNativeHandle.cpp index 6efdc35a71..1fc1d467dc 100644 --- a/test/conformance/adapters/hip/hip_urContextGetNativeHandle.cpp +++ b/test/conformance/adapters/hip/urContextGetNativeHandle.cpp @@ -3,7 +3,7 @@ // See LICENSE.TXT // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include "hip_fixtures.h" +#include "fixtures.h" using urHipContextGetNativeHandleTest = uur::urContextTest; UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urHipContextGetNativeHandleTest); diff --git a/test/conformance/adapters/hip/hip_urDeviceGetNativeHandle.cpp b/test/conformance/adapters/hip/urDeviceGetNativeHandle.cpp similarity index 96% rename from test/conformance/adapters/hip/hip_urDeviceGetNativeHandle.cpp rename to test/conformance/adapters/hip/urDeviceGetNativeHandle.cpp index 73cb6c271a..e19cd7b82b 100644 --- a/test/conformance/adapters/hip/hip_urDeviceGetNativeHandle.cpp +++ b/test/conformance/adapters/hip/urDeviceGetNativeHandle.cpp @@ -3,7 +3,7 @@ // See LICENSE.TXT // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include "hip_fixtures.h" +#include "fixtures.h" using urHipGetDeviceNativeHandle = uur::urDeviceTest; UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urHipGetDeviceNativeHandle); diff --git a/test/conformance/adapters/hip/hip_urEventGetNativeHandle.cpp b/test/conformance/adapters/hip/urEventGetNativeHandle.cpp similarity index 97% rename from test/conformance/adapters/hip/hip_urEventGetNativeHandle.cpp rename to test/conformance/adapters/hip/urEventGetNativeHandle.cpp index d8fb1d9d33..d7a1ce0e50 100644 --- a/test/conformance/adapters/hip/hip_urEventGetNativeHandle.cpp +++ b/test/conformance/adapters/hip/urEventGetNativeHandle.cpp @@ -3,7 +3,7 @@ // See LICENSE.TXT // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include "hip_fixtures.h" +#include "fixtures.h" using urHipEventGetNativeHandleTest = uur::urQueueTest; UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urHipEventGetNativeHandleTest);