From e364bfadf40ea2be4fb116a5103f0a46158cc398 Mon Sep 17 00:00:00 2001 From: JackAKirk Date: Wed, 20 Oct 2021 13:36:10 +0100 Subject: [PATCH] Marked hip_nvidia failing tests that do not also fail for cuda or hip_amd XFAIL. There are some common failures during queue instantiation caused by failure to find correct device using hip_nvidia backend. Signed-off-by: JackAKirk --- SYCL/Basic/diagnostics/handler.cpp | 4 ++++ SYCL/Basic/memory-consumption.cpp | 1 + SYCL/Basic/partition_supported.cpp | 4 +++- SYCL/Basic/queue/queue.cpp | 2 ++ SYCL/Basic/queue/release.cpp | 2 ++ SYCL/Basic/stream/auto_flush.cpp | 2 ++ SYCL/DeprecatedFeatures/kernel_info.cpp | 2 ++ SYCL/DeprecatedFeatures/queue_old_interop.cpp | 4 ++++ SYCL/DeviceCodeSplit/split-per-kernel.cpp | 2 ++ SYCL/DeviceCodeSplit/split-per-source-main.cpp | 2 ++ SYCL/GroupLocalMemory/group_local_memory.cpp | 2 ++ SYCL/GroupLocalMemory/no_early_opt.cpp | 2 ++ SYCL/InorderQueue/in_order_property_trace.cpp | 2 ++ SYCL/Reduction/reduction_reducer_op_eq.cpp | 3 +++ SYCL/Regression/context_is_destroyed_after_exception.cpp | 2 ++ SYCL/Scheduler/InOrderQueueDeps.cpp | 2 ++ SYCL/Scheduler/MemObjRemapping.cpp | 2 ++ SYCL/Scheduler/MultipleDevices.cpp | 2 ++ SYCL/Scheduler/ReleaseResourcesTest.cpp | 2 ++ SYCL/Tracing/buffer_printers.cpp | 2 ++ SYCL/Tracing/pi_tracing_test.cpp | 2 ++ 21 files changed, 47 insertions(+), 1 deletion(-) diff --git a/SYCL/Basic/diagnostics/handler.cpp b/SYCL/Basic/diagnostics/handler.cpp index 8143a621eb..07757ec8dd 100644 --- a/SYCL/Basic/diagnostics/handler.cpp +++ b/SYCL/Basic/diagnostics/handler.cpp @@ -1,5 +1,9 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %BE_RUN_PLACEHOLDER %t.out | FileCheck %s +// +// Appears to fail on HIP Nvidia because 'no device of requested type available' +// when constructing a queue with an exception_list. +// XFAIL: hip_nvidia //==------------------- handler.cpp ----------------------------------------==// // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/SYCL/Basic/memory-consumption.cpp b/SYCL/Basic/memory-consumption.cpp index 683d7cb638..861096212a 100644 --- a/SYCL/Basic/memory-consumption.cpp +++ b/SYCL/Basic/memory-consumption.cpp @@ -1,6 +1,7 @@ // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // +// XFAIL: hip_nvidia // Issue #106: The test failing sporadically on OpenCL platform due to // processing OCL_ICD_FILENAMES debug environment variable which causes // extra memory allocation on device creation. diff --git a/SYCL/Basic/partition_supported.cpp b/SYCL/Basic/partition_supported.cpp index a645ebe97b..4cdd4418b8 100644 --- a/SYCL/Basic/partition_supported.cpp +++ b/SYCL/Basic/partition_supported.cpp @@ -2,7 +2,9 @@ // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out - +// +// Nvidia should not allow sub_devices but does not throw corresponding error. +// XFAIL: hip_nvidia /* Check that: 1) [info::device::partition_properties]: returns the partition properties supported by this SYCL device; a vector of info::partition_property. If this diff --git a/SYCL/Basic/queue/queue.cpp b/SYCL/Basic/queue/queue.cpp index 88314ca0c8..21e95b759e 100644 --- a/SYCL/Basic/queue/queue.cpp +++ b/SYCL/Basic/queue/queue.cpp @@ -1,5 +1,7 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %BE_RUN_PLACEHOLDER %t.out +// +// XFAIL: hip_nvidia //==--------------- queue.cpp - SYCL queue test ----------------------------==// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/SYCL/Basic/queue/release.cpp b/SYCL/Basic/queue/release.cpp index 523c839a19..c690671a6a 100644 --- a/SYCL/Basic/queue/release.cpp +++ b/SYCL/Basic/queue/release.cpp @@ -2,6 +2,8 @@ // RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER // RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER // RUN: env SYCL_PI_TRACE=2 %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER +// +// XFAIL: hip_nvidia #include int main() { diff --git a/SYCL/Basic/stream/auto_flush.cpp b/SYCL/Basic/stream/auto_flush.cpp index 7f494345e2..75a9192040 100644 --- a/SYCL/Basic/stream/auto_flush.cpp +++ b/SYCL/Basic/stream/auto_flush.cpp @@ -3,6 +3,8 @@ // RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER // RUN: %GPU_RUN_ON_LINUX_PLACEHOLDER %t.out %GPU_CHECK_ON_LINUX_PLACEHOLDER // RUN: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER +// +// XFAIL: hip_nvidia //==-------------- copy.cpp - SYCL stream obect auto flushing test ---------==// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/SYCL/DeprecatedFeatures/kernel_info.cpp b/SYCL/DeprecatedFeatures/kernel_info.cpp index bdbce357bc..428ece522b 100644 --- a/SYCL/DeprecatedFeatures/kernel_info.cpp +++ b/SYCL/DeprecatedFeatures/kernel_info.cpp @@ -5,6 +5,8 @@ // // Fail is flaky for level_zero, enable when fixed. // UNSUPPORTED: level_zero +// +// XFAIL: hip_nvidia //==--- kernel_info.cpp - SYCL kernel info test ----------------------------==// // diff --git a/SYCL/DeprecatedFeatures/queue_old_interop.cpp b/SYCL/DeprecatedFeatures/queue_old_interop.cpp index 2d0a70ba26..3e3910908e 100644 --- a/SYCL/DeprecatedFeatures/queue_old_interop.cpp +++ b/SYCL/DeprecatedFeatures/queue_old_interop.cpp @@ -1,5 +1,9 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -D__SYCL_INTERNAL_API %s -o %t.out // RUN: %BE_RUN_PLACEHOLDER %t.out +// +// hip_nvidia has problems constructing queues due to `No device of requested +// type available`. +// XFAIL: hip_nvidia //==-------- queue_old_interop.cpp - SYCL queue OpenCL interop test --------==// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/SYCL/DeviceCodeSplit/split-per-kernel.cpp b/SYCL/DeviceCodeSplit/split-per-kernel.cpp index 3fbe8db121..ea602ba758 100644 --- a/SYCL/DeviceCodeSplit/split-per-kernel.cpp +++ b/SYCL/DeviceCodeSplit/split-per-kernel.cpp @@ -2,6 +2,8 @@ // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out +// +// XFAIL: hip_nvidia #include diff --git a/SYCL/DeviceCodeSplit/split-per-source-main.cpp b/SYCL/DeviceCodeSplit/split-per-source-main.cpp index d51b5dd722..7e93958441 100644 --- a/SYCL/DeviceCodeSplit/split-per-source-main.cpp +++ b/SYCL/DeviceCodeSplit/split-per-source-main.cpp @@ -2,6 +2,8 @@ // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out +// +// XFAIL: hip_nvidia #include "Inputs/split-per-source.h" diff --git a/SYCL/GroupLocalMemory/group_local_memory.cpp b/SYCL/GroupLocalMemory/group_local_memory.cpp index 8e50169f59..a2473d7aa9 100644 --- a/SYCL/GroupLocalMemory/group_local_memory.cpp +++ b/SYCL/GroupLocalMemory/group_local_memory.cpp @@ -2,6 +2,8 @@ // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out +// +// XFAIL: hip_nvidia #include diff --git a/SYCL/GroupLocalMemory/no_early_opt.cpp b/SYCL/GroupLocalMemory/no_early_opt.cpp index 00680e7c23..3d68ec0e77 100644 --- a/SYCL/GroupLocalMemory/no_early_opt.cpp +++ b/SYCL/GroupLocalMemory/no_early_opt.cpp @@ -2,6 +2,8 @@ // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out +// +// XFAIL: hip_nvidia // The test checks that multiple calls to the same template instantiation of a // group local memory function result in separate allocations, even with device diff --git a/SYCL/InorderQueue/in_order_property_trace.cpp b/SYCL/InorderQueue/in_order_property_trace.cpp index db700174ee..8d932e9569 100644 --- a/SYCL/InorderQueue/in_order_property_trace.cpp +++ b/SYCL/InorderQueue/in_order_property_trace.cpp @@ -1,6 +1,8 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER // RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER +// +// XFAIL: hip_nvidia // SYCL in order and default queue property trace test // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/SYCL/Reduction/reduction_reducer_op_eq.cpp b/SYCL/Reduction/reduction_reducer_op_eq.cpp index e6990c875e..db04c2bcd0 100644 --- a/SYCL/Reduction/reduction_reducer_op_eq.cpp +++ b/SYCL/Reduction/reduction_reducer_op_eq.cpp @@ -2,6 +2,9 @@ // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out +// +// On nvidia a reduction appears to be unexpectedly executed via the host. +// XFAIL: hip_nvidia // This test checks that operators ++, +=, *=, |=, &=, ^= are supported // whent the corresponding std::plus<>, std::multiplies, etc are defined. diff --git a/SYCL/Regression/context_is_destroyed_after_exception.cpp b/SYCL/Regression/context_is_destroyed_after_exception.cpp index 9a04f46175..e8dab8e3a9 100644 --- a/SYCL/Regression/context_is_destroyed_after_exception.cpp +++ b/SYCL/Regression/context_is_destroyed_after_exception.cpp @@ -2,6 +2,8 @@ // RUN: %clangxx -fsycl %s -o %t.out // RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER +// +// XFAIL: hip_nvidia #include diff --git a/SYCL/Scheduler/InOrderQueueDeps.cpp b/SYCL/Scheduler/InOrderQueueDeps.cpp index f1d6199a36..104b1a13d9 100644 --- a/SYCL/Scheduler/InOrderQueueDeps.cpp +++ b/SYCL/Scheduler/InOrderQueueDeps.cpp @@ -3,6 +3,8 @@ // RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER // RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER // RUN: env SYCL_PI_TRACE=2 %ACC_RUN_PLACEHOLDER %t.out 2>&1 %ACC_CHECK_PLACEHOLDER +// +// XFAIL: hip_nvidia // The tested functionality is disabled with Level Zero until it is supported by // the plugin. diff --git a/SYCL/Scheduler/MemObjRemapping.cpp b/SYCL/Scheduler/MemObjRemapping.cpp index 4a08127bdf..92f675d53b 100644 --- a/SYCL/Scheduler/MemObjRemapping.cpp +++ b/SYCL/Scheduler/MemObjRemapping.cpp @@ -1,6 +1,8 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: env SYCL_HOST_UNIFIED_MEMORY=1 SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER // RUN: env SYCL_HOST_UNIFIED_MEMORY=1 SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER +// +// XFAIL: hip_nvidia #include #include #include diff --git a/SYCL/Scheduler/MultipleDevices.cpp b/SYCL/Scheduler/MultipleDevices.cpp index 6b3833627d..000d30676c 100644 --- a/SYCL/Scheduler/MultipleDevices.cpp +++ b/SYCL/Scheduler/MultipleDevices.cpp @@ -1,5 +1,7 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: env SYCL_DEVICE_FILTER=%sycl_be %t.out +// +// XFAIL: hip_nvidia //===- MultipleDevices.cpp - Test checking multi-device execution --------===// // diff --git a/SYCL/Scheduler/ReleaseResourcesTest.cpp b/SYCL/Scheduler/ReleaseResourcesTest.cpp index ce92d9257a..8a51878677 100644 --- a/SYCL/Scheduler/ReleaseResourcesTest.cpp +++ b/SYCL/Scheduler/ReleaseResourcesTest.cpp @@ -3,6 +3,8 @@ // RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER // RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER // RUN: env SYCL_PI_TRACE=2 %ACC_RUN_PLACEHOLDER %t.out 2>&1 %ACC_CHECK_PLACEHOLDER +// +// XFAIL: hip_nvidia //==------------------- ReleaseResourcesTests.cpp --------------------------==// // diff --git a/SYCL/Tracing/buffer_printers.cpp b/SYCL/Tracing/buffer_printers.cpp index 5bbadf99be..7335fc395c 100644 --- a/SYCL/Tracing/buffer_printers.cpp +++ b/SYCL/Tracing/buffer_printers.cpp @@ -2,6 +2,8 @@ // RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER // RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER // RUN: env SYCL_PI_TRACE=2 %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER +// +// XFAIL: hip_nvidia #include #include diff --git a/SYCL/Tracing/pi_tracing_test.cpp b/SYCL/Tracing/pi_tracing_test.cpp index 8feb8af9c9..1ddd4933b2 100644 --- a/SYCL/Tracing/pi_tracing_test.cpp +++ b/SYCL/Tracing/pi_tracing_test.cpp @@ -2,6 +2,8 @@ // RUN: env SYCL_PI_TRACE=-1 %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER // RUN: env SYCL_PI_TRACE=-1 %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER // RUN: env SYCL_PI_TRACE=-1 %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER +// +// XFAIL: hip_nvidia // Test tracing of the Plugin Interface