From 215881f1148492c5cc39b839f646c1c1071673ea Mon Sep 17 00:00:00 2001 From: Byoungro So Date: Mon, 10 Jan 2022 13:35:57 -0800 Subject: [PATCH 1/2] [SYCL] replace XFAIL with UNSUPPORTED for ze_debug Signed-off-by: Byoungro So --- SYCL/Basic/buffer/buffer_create.cpp | 2 +- SYCL/Basic/diagnostics/non-uniform-wk-gp-test.cpp | 2 +- SYCL/DeprecatedFeatures/basic-program.cpp | 1 - SYCL/DeprecatedFeatures/basic.cpp | 1 - SYCL/DeprecatedFeatures/get-options.cpp | 1 - SYCL/DeprecatedFeatures/kernel-and-program.cpp | 1 - SYCL/DeprecatedFeatures/program-merge-options-env.cpp | 1 - SYCL/DeprecatedFeatures/program-merge-options.cpp | 2 +- SYCL/DeprecatedFeatures/program_link.cpp | 1 - SYCL/DiscardEvents/discard_events_using_assert.cpp | 2 +- SYCL/DiscardEvents/invalid_event.cpp | 2 +- SYCL/ESIMD/fp_in_phi.cpp | 2 +- SYCL/ESIMD/histogram_raw_send.cpp | 2 +- SYCL/InlineAsm/Negative/asm_bad_opcode.cpp | 2 +- SYCL/InlineAsm/Negative/asm_bad_operand_syntax.cpp | 2 +- SYCL/InlineAsm/Negative/asm_duplicate_label.cpp | 2 +- SYCL/InlineAsm/Negative/asm_illegal_exec_size.cpp | 2 +- SYCL/InlineAsm/Negative/asm_missing_label.cpp | 2 +- SYCL/InlineAsm/Negative/asm_missing_region.cpp | 2 +- SYCL/InlineAsm/Negative/asm_simple.cpp | 2 +- SYCL/InlineAsm/Negative/asm_undefined_decl.cpp | 2 +- SYCL/InlineAsm/Negative/asm_undefined_pred.cpp | 2 +- SYCL/InlineAsm/Negative/asm_wrong_declare.cpp | 2 +- SYCL/KernelAndProgram/build-log.cpp | 2 +- SYCL/KernelAndProgram/cache-build-result.cpp | 2 +- SYCL/KernelAndProgram/kernel-bundle-merge-options-env.cpp | 2 +- SYCL/KernelAndProgram/kernel-bundle-merge-options.cpp | 3 ++- SYCL/KernelAndProgram/multiple-kernel-linking.cpp | 2 +- SYCL/Plugin/interop-level-zero.cpp | 2 +- SYCL/Plugin/level_zero_batch_event_status.cpp | 2 +- SYCL/Plugin/level_zero_batch_test.cpp | 2 +- SYCL/Plugin/level_zero_device_scope_events.cpp | 2 +- SYCL/Reduction/reduction_big_data.cpp | 2 +- SYCL/Reduction/reduction_nd_ext_double.cpp | 2 +- SYCL/Reduction/reduction_nd_ext_half.cpp | 2 +- SYCL/Reduction/reduction_nd_lambda.cpp | 2 +- SYCL/Reduction/reduction_placeholder.cpp | 2 +- SYCL/Reduction/reduction_range_lambda.cpp | 2 +- SYCL/Reduction/reduction_reducer_op_eq.cpp | 3 ++- SYCL/Regression/commandlist/gpu.cpp | 2 +- SYCL/Regression/unoptimized_stream.cpp | 2 +- SYCL/SubGroup/sub_group_as.cpp | 2 +- SYCL/SubGroup/sub_group_as_vec.cpp | 2 +- SYCL/SubGroupMask/Basic.cpp | 2 +- SYCL/SubGroupMask/GroupSize.cpp | 2 +- SYCL/USM/badmalloc.cpp | 2 +- SYCL/USM/dep_events.cpp | 2 +- 47 files changed, 43 insertions(+), 47 deletions(-) diff --git a/SYCL/Basic/buffer/buffer_create.cpp b/SYCL/Basic/buffer/buffer_create.cpp index e284d0d2a6..c00fcca04c 100755 --- a/SYCL/Basic/buffer/buffer_create.cpp +++ b/SYCL/Basic/buffer/buffer_create.cpp @@ -1,7 +1,7 @@ // REQUIRES: gpu,level_zero // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: env ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t.out 2> %t1.out; cat %t1.out %GPU_CHECK_PLACEHOLDER -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 #include diff --git a/SYCL/Basic/diagnostics/non-uniform-wk-gp-test.cpp b/SYCL/Basic/diagnostics/non-uniform-wk-gp-test.cpp index 62ea74fe4f..c6b1e9f95c 100644 --- a/SYCL/Basic/diagnostics/non-uniform-wk-gp-test.cpp +++ b/SYCL/Basic/diagnostics/non-uniform-wk-gp-test.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // REQUIRES: level_zero -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 //==------- non-uniform-wk-gp-test.cpp -------==// // This is a diagnostic test which verifies that // for loops with non-uniform work groups size diff --git a/SYCL/DeprecatedFeatures/basic-program.cpp b/SYCL/DeprecatedFeatures/basic-program.cpp index c90580ef1a..48086c842b 100644 --- a/SYCL/DeprecatedFeatures/basic-program.cpp +++ b/SYCL/DeprecatedFeatures/basic-program.cpp @@ -1,4 +1,3 @@ -// XFAIL: hip,ze_debug-1,ze_debug4 // RUN: %clangxx -D__SYCL_INTERNAL_API -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/DeprecatedFeatures/basic.cpp b/SYCL/DeprecatedFeatures/basic.cpp index b4c2716252..6dbcc6dd36 100644 --- a/SYCL/DeprecatedFeatures/basic.cpp +++ b/SYCL/DeprecatedFeatures/basic.cpp @@ -9,7 +9,6 @@ // RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER --check-prefixes=CHECK-BUILD // RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER --check-prefixes=CHECK-CACHE // -// XFAIL: ze_debug-1,ze_debug4 // The test checks that caching works properly. #include "basic.hpp" diff --git a/SYCL/DeprecatedFeatures/get-options.cpp b/SYCL/DeprecatedFeatures/get-options.cpp index 97493dfb01..134f087147 100644 --- a/SYCL/DeprecatedFeatures/get-options.cpp +++ b/SYCL/DeprecatedFeatures/get-options.cpp @@ -4,7 +4,6 @@ // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out // XFAIL: cuda || hip -// XFAIL: ze_debug-1,ze_debug4 #include diff --git a/SYCL/DeprecatedFeatures/kernel-and-program.cpp b/SYCL/DeprecatedFeatures/kernel-and-program.cpp index 50e49fe0d2..f061209fed 100644 --- a/SYCL/DeprecatedFeatures/kernel-and-program.cpp +++ b/SYCL/DeprecatedFeatures/kernel-and-program.cpp @@ -3,7 +3,6 @@ // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out -// XFAIL: hip,ze_debug-1,ze_debug4 //==--- kernel-and-program.cpp - SYCL kernel/program test ------------------==// // diff --git a/SYCL/DeprecatedFeatures/program-merge-options-env.cpp b/SYCL/DeprecatedFeatures/program-merge-options-env.cpp index ef759e6845..80c1d3bd5e 100644 --- a/SYCL/DeprecatedFeatures/program-merge-options-env.cpp +++ b/SYCL/DeprecatedFeatures/program-merge-options-env.cpp @@ -2,7 +2,6 @@ // RUN: env SYCL_PI_TRACE=-1 SYCL_PROGRAM_COMPILE_OPTIONS=-DENV_COMPILE_OPTS SYCL_PROGRAM_LINK_OPTIONS=-DENV_LINK_OPTS SYCL_DEVICE_FILTER=%sycl_be %t.out | FileCheck %s // REQUIRES: gpu // UNSUPPORTED: cuda || hip -// XFAIL: ze_debug-1,ze_debug4 #include "program-merge-options.hpp" // CHECK: piProgramBuild diff --git a/SYCL/DeprecatedFeatures/program-merge-options.cpp b/SYCL/DeprecatedFeatures/program-merge-options.cpp index 16239bd6c1..6436e2f693 100644 --- a/SYCL/DeprecatedFeatures/program-merge-options.cpp +++ b/SYCL/DeprecatedFeatures/program-merge-options.cpp @@ -5,7 +5,7 @@ // Debug option -g is not passed to device code compiler when CL-style driver // is used and /DEBUG options is passed. -// XFAIL: cl_options,ze_debug-1,ze_debug4 +// XFAIL: cl_options #include "program-merge-options.hpp" // CHECK: piProgramBuild diff --git a/SYCL/DeprecatedFeatures/program_link.cpp b/SYCL/DeprecatedFeatures/program_link.cpp index 160b8496ee..dd79fa9dfd 100644 --- a/SYCL/DeprecatedFeatures/program_link.cpp +++ b/SYCL/DeprecatedFeatures/program_link.cpp @@ -9,7 +9,6 @@ // // Hits an assertion on AMD with multiple GPUs available, fails trace on Nvidia. // XFAIL: hip_amd || hip_nvidia -// XFAIL: ze_debug-1,ze_debug4 #include #include diff --git a/SYCL/DiscardEvents/discard_events_using_assert.cpp b/SYCL/DiscardEvents/discard_events_using_assert.cpp index 6a46317253..b0da131b51 100644 --- a/SYCL/DiscardEvents/discard_events_using_assert.cpp +++ b/SYCL/DiscardEvents/discard_events_using_assert.cpp @@ -1,7 +1,7 @@ // FIXME unsupported on CUDA and HIP until fallback libdevice becomes available // UNSUPPORTED: cuda || hip // -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // // RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out &> %t.txt diff --git a/SYCL/DiscardEvents/invalid_event.cpp b/SYCL/DiscardEvents/invalid_event.cpp index ceb601b659..149d56bbd5 100644 --- a/SYCL/DiscardEvents/invalid_event.cpp +++ b/SYCL/DiscardEvents/invalid_event.cpp @@ -1,6 +1,6 @@ // FIXME: Fails on HIP and OpenCL accelerator // UNSUPPORTED: hip, (opencl && accelerator) -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // // RUN: %HOST_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/fp_in_phi.cpp b/SYCL/ESIMD/fp_in_phi.cpp index 88b95b1204..839d1139d7 100644 --- a/SYCL/ESIMD/fp_in_phi.cpp +++ b/SYCL/ESIMD/fp_in_phi.cpp @@ -13,7 +13,7 @@ // RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // UNSUPPORTED: cuda || hip -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // // The test checks that ESIMD kernels correctly handle function pointers as // arguments of LLVM's PHI function. diff --git a/SYCL/ESIMD/histogram_raw_send.cpp b/SYCL/ESIMD/histogram_raw_send.cpp index b502b065e5..b07d786f1d 100644 --- a/SYCL/ESIMD/histogram_raw_send.cpp +++ b/SYCL/ESIMD/histogram_raw_send.cpp @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// // REQUIRES: gpu // UNSUPPORTED: cuda || hip -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // RUN: %clangxx -fsycl %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/InlineAsm/Negative/asm_bad_opcode.cpp b/SYCL/InlineAsm/Negative/asm_bad_opcode.cpp index 166ea40d73..39f5f47a02 100644 --- a/SYCL/InlineAsm/Negative/asm_bad_opcode.cpp +++ b/SYCL/InlineAsm/Negative/asm_bad_opcode.cpp @@ -1,5 +1,5 @@ // UNSUPPORTED: cuda || hip_nvidia -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // REQUIRES: gpu,linux // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/InlineAsm/Negative/asm_bad_operand_syntax.cpp b/SYCL/InlineAsm/Negative/asm_bad_operand_syntax.cpp index 37f25980f3..4b60b0d99a 100644 --- a/SYCL/InlineAsm/Negative/asm_bad_operand_syntax.cpp +++ b/SYCL/InlineAsm/Negative/asm_bad_operand_syntax.cpp @@ -1,5 +1,5 @@ // UNSUPPORTED: cuda || hip_nvidia -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // REQUIRES: gpu,linux // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/InlineAsm/Negative/asm_duplicate_label.cpp b/SYCL/InlineAsm/Negative/asm_duplicate_label.cpp index dcc9f3a8bc..25eb728673 100644 --- a/SYCL/InlineAsm/Negative/asm_duplicate_label.cpp +++ b/SYCL/InlineAsm/Negative/asm_duplicate_label.cpp @@ -1,5 +1,5 @@ // UNSUPPORTED: cuda || hip_nvidia -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // REQUIRES: gpu,linux // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/InlineAsm/Negative/asm_illegal_exec_size.cpp b/SYCL/InlineAsm/Negative/asm_illegal_exec_size.cpp index 49cce67c8c..a78b2fca12 100644 --- a/SYCL/InlineAsm/Negative/asm_illegal_exec_size.cpp +++ b/SYCL/InlineAsm/Negative/asm_illegal_exec_size.cpp @@ -1,5 +1,5 @@ // UNSUPPORTED: cuda || hip_nvidia -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // REQUIRES: gpu,linux // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/InlineAsm/Negative/asm_missing_label.cpp b/SYCL/InlineAsm/Negative/asm_missing_label.cpp index a109788100..90d8b07cfb 100644 --- a/SYCL/InlineAsm/Negative/asm_missing_label.cpp +++ b/SYCL/InlineAsm/Negative/asm_missing_label.cpp @@ -1,5 +1,5 @@ // UNSUPPORTED: cuda || hip_nvidia -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // REQUIRES: gpu,linux // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/InlineAsm/Negative/asm_missing_region.cpp b/SYCL/InlineAsm/Negative/asm_missing_region.cpp index b6eebfed85..f539736def 100644 --- a/SYCL/InlineAsm/Negative/asm_missing_region.cpp +++ b/SYCL/InlineAsm/Negative/asm_missing_region.cpp @@ -1,5 +1,5 @@ // UNSUPPORTED: cuda || hip_nvidia -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // REQUIRES: gpu,linux // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/InlineAsm/Negative/asm_simple.cpp b/SYCL/InlineAsm/Negative/asm_simple.cpp index 249e5d2a4d..c61f9b8dc5 100644 --- a/SYCL/InlineAsm/Negative/asm_simple.cpp +++ b/SYCL/InlineAsm/Negative/asm_simple.cpp @@ -1,5 +1,5 @@ // UNSUPPORTED: cuda || hip_nvidia -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // REQUIRES: gpu,linux // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/InlineAsm/Negative/asm_undefined_decl.cpp b/SYCL/InlineAsm/Negative/asm_undefined_decl.cpp index e963dc2ecb..cbec05b341 100644 --- a/SYCL/InlineAsm/Negative/asm_undefined_decl.cpp +++ b/SYCL/InlineAsm/Negative/asm_undefined_decl.cpp @@ -1,5 +1,5 @@ // UNSUPPORTED: cuda || hip_nvidia -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // REQUIRES: gpu,linux // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/InlineAsm/Negative/asm_undefined_pred.cpp b/SYCL/InlineAsm/Negative/asm_undefined_pred.cpp index b6232b266e..198e88d148 100644 --- a/SYCL/InlineAsm/Negative/asm_undefined_pred.cpp +++ b/SYCL/InlineAsm/Negative/asm_undefined_pred.cpp @@ -1,5 +1,5 @@ // UNSUPPORTED: cuda || hip_nvidia -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // REQUIRES: gpu,linux // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/InlineAsm/Negative/asm_wrong_declare.cpp b/SYCL/InlineAsm/Negative/asm_wrong_declare.cpp index 67a8743d27..25a19b13b9 100644 --- a/SYCL/InlineAsm/Negative/asm_wrong_declare.cpp +++ b/SYCL/InlineAsm/Negative/asm_wrong_declare.cpp @@ -1,5 +1,5 @@ // UNSUPPORTED: cuda || hip_nvidia -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // REQUIRES: gpu,linux // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/KernelAndProgram/build-log.cpp b/SYCL/KernelAndProgram/build-log.cpp index df74f552d0..a5aa6c8c1a 100644 --- a/SYCL/KernelAndProgram/build-log.cpp +++ b/SYCL/KernelAndProgram/build-log.cpp @@ -1,5 +1,5 @@ // XFAIL: cuda || hip -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -DGPU %s -o %t_gpu.out // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/KernelAndProgram/cache-build-result.cpp b/SYCL/KernelAndProgram/cache-build-result.cpp index ad60889437..607e89f6fb 100644 --- a/SYCL/KernelAndProgram/cache-build-result.cpp +++ b/SYCL/KernelAndProgram/cache-build-result.cpp @@ -4,7 +4,7 @@ // RUN: env SYCL_CACHE_PERSISTENT=1 %GPU_RUN_PLACEHOLDER %t_gpu.out // RUN: env SYCL_CACHE_PERSISTENT=1 %ACC_RUN_PLACEHOLDER %t.out // XFAIL: cuda || hip -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 #include SYCL_EXTERNAL diff --git a/SYCL/KernelAndProgram/kernel-bundle-merge-options-env.cpp b/SYCL/KernelAndProgram/kernel-bundle-merge-options-env.cpp index 3570f7fb13..eef6bd4292 100644 --- a/SYCL/KernelAndProgram/kernel-bundle-merge-options-env.cpp +++ b/SYCL/KernelAndProgram/kernel-bundle-merge-options-env.cpp @@ -3,7 +3,7 @@ // RUN: %GPU_RUN_PLACEHOLDER SYCL_PI_TRACE=-1 SYCL_PROGRAM_COMPILE_OPTIONS=-DENV_COMPILE_OPTS SYCL_PROGRAM_LINK_OPTIONS=-DENV_LINK_OPTS %t.out %GPU_CHECK_PLACEHOLDER // REQUIRES: gpu // UNSUPPORTED: cuda || hip -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 #include "kernel-bundle-merge-options.hpp" // CHECK: piProgramBuild diff --git a/SYCL/KernelAndProgram/kernel-bundle-merge-options.cpp b/SYCL/KernelAndProgram/kernel-bundle-merge-options.cpp index 5307fe4d0f..b3e99914dd 100644 --- a/SYCL/KernelAndProgram/kernel-bundle-merge-options.cpp +++ b/SYCL/KernelAndProgram/kernel-bundle-merge-options.cpp @@ -5,7 +5,8 @@ // Debug option -g is not passed to device code compiler when CL-style driver // is used and /DEBUG options is passed. -// XFAIL: cl_options,ze_debug-1,ze_debug4 +// XFAIL: cl_options +// UNSUPPORTED: ze_debug-1,ze_debug4 #include "kernel-bundle-merge-options.hpp" // CHECK: piProgramBuild diff --git a/SYCL/KernelAndProgram/multiple-kernel-linking.cpp b/SYCL/KernelAndProgram/multiple-kernel-linking.cpp index 37db2fe470..e5186a61ef 100644 --- a/SYCL/KernelAndProgram/multiple-kernel-linking.cpp +++ b/SYCL/KernelAndProgram/multiple-kernel-linking.cpp @@ -1,5 +1,5 @@ // UNSUPPORTED: cuda || hip -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // RUN: %clangxx -fsycl -fno-sycl-early-optimizations -fsycl-device-code-split=per_kernel %s -o %t_per_kernel.out // RUN: %clangxx -fsycl -fno-sycl-early-optimizations -fsycl-device-code-split=per_source %s -o %t_per_source.out diff --git a/SYCL/Plugin/interop-level-zero.cpp b/SYCL/Plugin/interop-level-zero.cpp index 28b2421e69..ab037d95ab 100644 --- a/SYCL/Plugin/interop-level-zero.cpp +++ b/SYCL/Plugin/interop-level-zero.cpp @@ -1,7 +1,7 @@ // REQUIRES: level_zero, level_zero_dev_kit // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out // RUN: env SYCL_BE=PI_LEVEL_ZERO %GPU_RUN_PLACEHOLDER %t.out -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // Test for Level Zero interop API diff --git a/SYCL/Plugin/level_zero_batch_event_status.cpp b/SYCL/Plugin/level_zero_batch_event_status.cpp index 3f33b511b6..f932338115 100644 --- a/SYCL/Plugin/level_zero_batch_event_status.cpp +++ b/SYCL/Plugin/level_zero_batch_event_status.cpp @@ -38,7 +38,7 @@ // CHECK-NOT: ZE ---> zeCommandQueueExecuteCommandLists // CHECK-NOT: Test Fail // CHECK: Test Pass -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 #include #include diff --git a/SYCL/Plugin/level_zero_batch_test.cpp b/SYCL/Plugin/level_zero_batch_test.cpp index 3cb7bccfaa..f05f421bbf 100644 --- a/SYCL/Plugin/level_zero_batch_test.cpp +++ b/SYCL/Plugin/level_zero_batch_test.cpp @@ -1,7 +1,7 @@ // REQUIRES: gpu, level_zero // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // Set batching to 4 explicitly // RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=4 SYCL_PI_TRACE=2 ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB4 %s diff --git a/SYCL/Plugin/level_zero_device_scope_events.cpp b/SYCL/Plugin/level_zero_device_scope_events.cpp index 6df617f281..2adedbe550 100644 --- a/SYCL/Plugin/level_zero_device_scope_events.cpp +++ b/SYCL/Plugin/level_zero_device_scope_events.cpp @@ -2,7 +2,7 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: env SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=1 SYCL_PI_TRACE=2 ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // Checks that with L0 device-scope events enabled the only host-visible L0 // event created is at the end of all kernels submission, when host waits for diff --git a/SYCL/Reduction/reduction_big_data.cpp b/SYCL/Reduction/reduction_big_data.cpp index 8e83e5b8d5..1231d1cbee 100644 --- a/SYCL/Reduction/reduction_big_data.cpp +++ b/SYCL/Reduction/reduction_big_data.cpp @@ -6,7 +6,7 @@ // Missing __spirv_GroupFMax on AMD, error message `Group algorithms are not // supported on host device` on Nvidia. // XFAIL: hip_amd || hip_nvidia -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // RUNx: %HOST_RUN_PLACEHOLDER %t.out // TODO: Enable the test for HOST when it supports ext::oneapi::reduce() and diff --git a/SYCL/Reduction/reduction_nd_ext_double.cpp b/SYCL/Reduction/reduction_nd_ext_double.cpp index 312c77fd0f..04a2b365c4 100644 --- a/SYCL/Reduction/reduction_nd_ext_double.cpp +++ b/SYCL/Reduction/reduction_nd_ext_double.cpp @@ -7,7 +7,7 @@ // message `The implementation handling parallel_for with reduction requires // work group size not bigger than 1` on Nvidia. // XFAIL: hip_amd || hip_nvidia -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // TODO: Enable the test for HOST when it supports intel::reduce() and barrier() // RUNx: %HOST_RUN_PLACEHOLDER %t.out diff --git a/SYCL/Reduction/reduction_nd_ext_half.cpp b/SYCL/Reduction/reduction_nd_ext_half.cpp index 87659f8b5f..16186e83a9 100644 --- a/SYCL/Reduction/reduction_nd_ext_half.cpp +++ b/SYCL/Reduction/reduction_nd_ext_half.cpp @@ -7,7 +7,7 @@ // message `The implementation handling parallel_for with reduction requires // work group size not bigger than 1` on Nvidia. // XFAIL: hip_amd || hip_nvidia -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // TODO: Enable the test for HOST when it supports intel::reduce() and barrier() // RUNx: %HOST_RUN_PLACEHOLDER %t.out diff --git a/SYCL/Reduction/reduction_nd_lambda.cpp b/SYCL/Reduction/reduction_nd_lambda.cpp index fb3617e8fb..4e1c6b9ff2 100644 --- a/SYCL/Reduction/reduction_nd_lambda.cpp +++ b/SYCL/Reduction/reduction_nd_lambda.cpp @@ -7,7 +7,7 @@ // Inconsistently fails on HIP AMD, error message `Barrier is not supported on // the host device yet.` on HIP Nvidia. // UNSUPPORTED: hip_amd || hip_nvidia -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // This test performs basic checks of parallel_for(nd_range, reduction, lambda) diff --git a/SYCL/Reduction/reduction_placeholder.cpp b/SYCL/Reduction/reduction_placeholder.cpp index 4a544c8a9c..cb334cafef 100644 --- a/SYCL/Reduction/reduction_placeholder.cpp +++ b/SYCL/Reduction/reduction_placeholder.cpp @@ -6,7 +6,7 @@ // Missing __spirv_GroupIAdd, __spirv_GroupFMin on AMD, error message `Group // algorithms are not supported on host device.` on Nvidia. // XFAIL: hip_amd || hip_nvidia -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // RUNx: %HOST_RUN_PLACEHOLDER %t.out // TODO: Enable the test for HOST when it supports ext::oneapi::reduce() and diff --git a/SYCL/Reduction/reduction_range_lambda.cpp b/SYCL/Reduction/reduction_range_lambda.cpp index cfe331692d..abd3f305d8 100644 --- a/SYCL/Reduction/reduction_range_lambda.cpp +++ b/SYCL/Reduction/reduction_range_lambda.cpp @@ -2,7 +2,7 @@ // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // This test performs basic checks of parallel_for(range, reduction, lambda) // with reductions initialized with 1-dimensional accessor accessing diff --git a/SYCL/Reduction/reduction_reducer_op_eq.cpp b/SYCL/Reduction/reduction_reducer_op_eq.cpp index 2924beaa84..57b2e681a8 100644 --- a/SYCL/Reduction/reduction_reducer_op_eq.cpp +++ b/SYCL/Reduction/reduction_reducer_op_eq.cpp @@ -4,7 +4,8 @@ // RUN: %ACC_RUN_PLACEHOLDER %t.out // // On nvidia a reduction appears to be unexpectedly executed via the host. -// XFAIL: hip_nvidia,ze_debug-1,ze_debug4 +// XFAIL: hip_nvidia +// UNSUPPORTED: ze_debug-1,ze_debug4 // This test checks that operators ++, +=, *=, |=, &=, ^= are supported // whent the corresponding std::plus<>, std::multiplies, etc are defined. diff --git a/SYCL/Regression/commandlist/gpu.cpp b/SYCL/Regression/commandlist/gpu.cpp index 4fd84668fe..27888843dc 100644 --- a/SYCL/Regression/commandlist/gpu.cpp +++ b/SYCL/Regression/commandlist/gpu.cpp @@ -1,6 +1,6 @@ // REQUIRES: gpu, linux // UNSUPPORTED: cuda || hip -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // // RUN: %clangxx -fsycl %S/Inputs/FindPrimesSYCL.cpp %S/Inputs/main.cpp -o %t.out -lpthread // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/Regression/unoptimized_stream.cpp b/SYCL/Regression/unoptimized_stream.cpp index e487bdfc06..e86ad00e2b 100644 --- a/SYCL/Regression/unoptimized_stream.cpp +++ b/SYCL/Regression/unoptimized_stream.cpp @@ -6,7 +6,7 @@ // UNSUPPORTED: cuda // Disable test due to flaky failure on CUDA(issue #387) -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 // NOTE: The libclc target used by the CUDA backend used to generate atomic load // variants that were unsupported by NVPTX. Even if they were not used diff --git a/SYCL/SubGroup/sub_group_as.cpp b/SYCL/SubGroup/sub_group_as.cpp index 85c1b84dad..b0a831f1e9 100644 --- a/SYCL/SubGroup/sub_group_as.cpp +++ b/SYCL/SubGroup/sub_group_as.cpp @@ -10,7 +10,7 @@ // __spirv_SubgroupBlockWriteINTEL on AMD // error message `Barrier is not supported on the host device yet.` on Nvidia. // XFAIL: hip_amd || hip_nvidia -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 #include #include diff --git a/SYCL/SubGroup/sub_group_as_vec.cpp b/SYCL/SubGroup/sub_group_as_vec.cpp index ac993323f7..c645a95ba3 100644 --- a/SYCL/SubGroup/sub_group_as_vec.cpp +++ b/SYCL/SubGroup/sub_group_as_vec.cpp @@ -10,7 +10,7 @@ // __spirv_SubgroupBlockWriteINTEL on AMD // error message `Barrier is not supported on the host device yet.` on Nvidia. // XFAIL: hip_amd || hip_nvidia -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 #include "helper.hpp" #include diff --git a/SYCL/SubGroupMask/Basic.cpp b/SYCL/SubGroupMask/Basic.cpp index 9a88787d52..70179898d7 100644 --- a/SYCL/SubGroupMask/Basic.cpp +++ b/SYCL/SubGroupMask/Basic.cpp @@ -3,7 +3,7 @@ // UNSUPPORTED: cuda, hip // GroupNonUniformBallot capability is supported on Intel GPU only // RUN: %GPU_RUN_PLACEHOLDER %t.out -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 //==---------- Basic.cpp - sub-group mask basic test -----------*- C++ -*---==// // diff --git a/SYCL/SubGroupMask/GroupSize.cpp b/SYCL/SubGroupMask/GroupSize.cpp index b522d7775b..39d5c44d43 100644 --- a/SYCL/SubGroupMask/GroupSize.cpp +++ b/SYCL/SubGroupMask/GroupSize.cpp @@ -3,7 +3,7 @@ // UNSUPPORTED: cuda, hip // GroupNonUniformBallot capability is supported on Intel GPU only // RUN: %GPU_RUN_PLACEHOLDER %t.out -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 //==- GroupSize.cpp - sub-group mask dependency on group size --*- C++ -*---==// // diff --git a/SYCL/USM/badmalloc.cpp b/SYCL/USM/badmalloc.cpp index 3754266bbc..84402eb31c 100644 --- a/SYCL/USM/badmalloc.cpp +++ b/SYCL/USM/badmalloc.cpp @@ -5,7 +5,7 @@ // RUN: %CPU_RUN_PLACEHOLDER %t1.out // RUN: %GPU_RUN_PLACEHOLDER %t1.out // RUN: %ACC_RUN_PLACEHOLDER %t1.out -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 //==----------------- badmalloc.cpp - Bad Mallocs test ---------------------==// // diff --git a/SYCL/USM/dep_events.cpp b/SYCL/USM/dep_events.cpp index 35640cade3..905e7c1699 100644 --- a/SYCL/USM/dep_events.cpp +++ b/SYCL/USM/dep_events.cpp @@ -15,7 +15,7 @@ // RUN: %CPU_RUN_PLACEHOLDER %t1.out // RUN: %GPU_RUN_PLACEHOLDER %t1.out // RUN: %ACC_RUN_PLACEHOLDER %t1.out -// XFAIL: ze_debug-1,ze_debug4 +// UNSUPPORTED: ze_debug-1,ze_debug4 #include From 5878b626f4470a539fbe83c39d6a4449de2300ad Mon Sep 17 00:00:00 2001 From: Byoungro So Date: Mon, 10 Jan 2022 13:49:25 -0800 Subject: [PATCH 2/2] clang-format Signed-off-by: Byoungro So --- SYCL/DeprecatedFeatures/basic-program.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SYCL/DeprecatedFeatures/basic-program.cpp b/SYCL/DeprecatedFeatures/basic-program.cpp index 48086c842b..7525a47281 100644 --- a/SYCL/DeprecatedFeatures/basic-program.cpp +++ b/SYCL/DeprecatedFeatures/basic-program.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx -D__SYCL_INTERNAL_API -fsycl -fsycl-targets=%sycl_triple %s -o %t.out +// RUN: %clangxx -D__SYCL_INTERNAL_API -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out