From a3b0ef7cc48866ce6b275759d85dcfd196f8ac3f Mon Sep 17 00:00:00 2001 From: Wayne Franz Date: Fri, 1 Dec 2023 18:47:08 -0500 Subject: [PATCH] Skip device_adjacent_difference hipGraph test on Windows for Navi3x (#490) * Currently, the LargeIndices hipGraphs test for gfx1030 on Windows is skipped * This change causes this test case to also get skiped on gfx1100, gfx1101, gfx1102 on Windows * The reason this test fails on Navi on Windows appears to be related to the check_output class (used by OutputIterator in the test). * this may be releated to using atomics inside of graphs, but further investigation is needed --- test/rocprim/test_device_adjacent_difference.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/test/rocprim/test_device_adjacent_difference.cpp b/test/rocprim/test_device_adjacent_difference.cpp index 82b2f4ead..5c632fd61 100644 --- a/test/rocprim/test_device_adjacent_difference.cpp +++ b/test/rocprim/test_device_adjacent_difference.cpp @@ -462,18 +462,23 @@ TYPED_TEST(RocprimDeviceAdjacentDifferenceLargeTests, LargeIndices) { const int device_id = test_common_utils::obtain_device_from_ctest(); +#ifdef _WIN32 if (TestFixture::use_graphs) { - // Skip this test on gfx1030 on Windows, since check_output_iterator does not appear to work there. + // Skip this test on Navi2x/3x on Windows, since check_output_iterator does not appear to work there. hipDeviceProp_t props; HIP_CHECK(hipGetDeviceProperties(&props, device_id)); std::string deviceName = std::string(props.gcnArchName); - if(deviceName.rfind("gfx1030", 0) == 0) + if(deviceName.rfind("gfx1030", 0) == 0 || + deviceName.rfind("gfx1100", 0) == 0 || + deviceName.rfind("gfx1101", 0) == 0 || + deviceName.rfind("gfx1102", 0) == 0) { - // This is a gfx1030 device, so skip this test - GTEST_SKIP() << "Temporarily skipping test on Windows for on gfx1030"; + // This is a Navi2x/3x device, so skip this test + GTEST_SKIP() << "Temporarily skipping test on Windows for on gfx1030, gfx1100, gfx1101, gfx1102"; } } +#endif SCOPED_TRACE(testing::Message() << "with device_id = " << device_id); HIP_CHECK(hipSetDevice(device_id));