From 8024711e894f2fbc1bb9ec45c22fc2fc1681a54a Mon Sep 17 00:00:00 2001 From: Victor Lomuller Date: Thu, 5 Dec 2024 20:47:27 +0000 Subject: [PATCH] Fix postcommit failure and move tests in right folder (#16286) opencl cpu fails without a stack trace --- .../Dynamic => WorkGroupScratchMemory}/copy_dynamic_size.cpp | 0 .../dynamic_alloc_local_accessor.cpp | 2 +- .../dynamic_alloc_ptr_alias.cpp | 2 +- .../Dynamic => WorkGroupScratchMemory}/dynamic_allocation.cpp | 2 +- .../Dynamic => WorkGroupScratchMemory}/dynamic_unused.cpp | 0 .../{WorkGroupMemory => WorkGroupScratchMemory}/lit.local.cfg | 0 sycl/test-e2e/WorkGroupStatic/lit.local.cfg | 3 +++ .../work_group_static_memory_block_scope.cpp | 0 .../work_group_static_memory_class_scope.cpp | 0 .../work_group_static_memory_namespace_scope.cpp | 0 10 files changed, 6 insertions(+), 3 deletions(-) rename sycl/test-e2e/{WorkGroupMemory/Dynamic => WorkGroupScratchMemory}/copy_dynamic_size.cpp (100%) rename sycl/test-e2e/{WorkGroupMemory/Dynamic => WorkGroupScratchMemory}/dynamic_alloc_local_accessor.cpp (98%) rename sycl/test-e2e/{WorkGroupMemory/Dynamic => WorkGroupScratchMemory}/dynamic_alloc_ptr_alias.cpp (98%) rename sycl/test-e2e/{WorkGroupMemory/Dynamic => WorkGroupScratchMemory}/dynamic_allocation.cpp (98%) rename sycl/test-e2e/{WorkGroupMemory/Dynamic => WorkGroupScratchMemory}/dynamic_unused.cpp (100%) rename sycl/test-e2e/{WorkGroupMemory => WorkGroupScratchMemory}/lit.local.cfg (100%) create mode 100644 sycl/test-e2e/WorkGroupStatic/lit.local.cfg rename sycl/test-e2e/{WorkGroupMemory/Static => WorkGroupStatic}/work_group_static_memory_block_scope.cpp (100%) rename sycl/test-e2e/{WorkGroupMemory/Static => WorkGroupStatic}/work_group_static_memory_class_scope.cpp (100%) rename sycl/test-e2e/{WorkGroupMemory/Static => WorkGroupStatic}/work_group_static_memory_namespace_scope.cpp (100%) diff --git a/sycl/test-e2e/WorkGroupMemory/Dynamic/copy_dynamic_size.cpp b/sycl/test-e2e/WorkGroupScratchMemory/copy_dynamic_size.cpp similarity index 100% rename from sycl/test-e2e/WorkGroupMemory/Dynamic/copy_dynamic_size.cpp rename to sycl/test-e2e/WorkGroupScratchMemory/copy_dynamic_size.cpp diff --git a/sycl/test-e2e/WorkGroupMemory/Dynamic/dynamic_alloc_local_accessor.cpp b/sycl/test-e2e/WorkGroupScratchMemory/dynamic_alloc_local_accessor.cpp similarity index 98% rename from sycl/test-e2e/WorkGroupMemory/Dynamic/dynamic_alloc_local_accessor.cpp rename to sycl/test-e2e/WorkGroupScratchMemory/dynamic_alloc_local_accessor.cpp index a407d56077d5c..20d5d1ca917ad 100644 --- a/sycl/test-e2e/WorkGroupMemory/Dynamic/dynamic_alloc_local_accessor.cpp +++ b/sycl/test-e2e/WorkGroupScratchMemory/dynamic_alloc_local_accessor.cpp @@ -2,7 +2,7 @@ // RUN: %{run} %t.out // -// UNSUPPORTED: gpu-intel-gen12 +// UNSUPPORTED: gpu-intel-gen12, cpu // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/16072 // Test work_group_dynamic extension with allocation size specified at runtime diff --git a/sycl/test-e2e/WorkGroupMemory/Dynamic/dynamic_alloc_ptr_alias.cpp b/sycl/test-e2e/WorkGroupScratchMemory/dynamic_alloc_ptr_alias.cpp similarity index 98% rename from sycl/test-e2e/WorkGroupMemory/Dynamic/dynamic_alloc_ptr_alias.cpp rename to sycl/test-e2e/WorkGroupScratchMemory/dynamic_alloc_ptr_alias.cpp index e56ccc66bc364..fdec5db02657d 100644 --- a/sycl/test-e2e/WorkGroupMemory/Dynamic/dynamic_alloc_ptr_alias.cpp +++ b/sycl/test-e2e/WorkGroupScratchMemory/dynamic_alloc_ptr_alias.cpp @@ -2,7 +2,7 @@ // RUN: %{run} %t.out // -// UNSUPPORTED: gpu-intel-gen12 +// UNSUPPORTED: gpu-intel-gen12, cpu // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/16072 // Test work_group_dynamic extension with allocation size specified at runtime diff --git a/sycl/test-e2e/WorkGroupMemory/Dynamic/dynamic_allocation.cpp b/sycl/test-e2e/WorkGroupScratchMemory/dynamic_allocation.cpp similarity index 98% rename from sycl/test-e2e/WorkGroupMemory/Dynamic/dynamic_allocation.cpp rename to sycl/test-e2e/WorkGroupScratchMemory/dynamic_allocation.cpp index 76032271d7b5c..14848f1477e3a 100644 --- a/sycl/test-e2e/WorkGroupMemory/Dynamic/dynamic_allocation.cpp +++ b/sycl/test-e2e/WorkGroupScratchMemory/dynamic_allocation.cpp @@ -2,7 +2,7 @@ // RUN: %{run} %t.out // -// UNSUPPORTED: gpu-intel-gen12 +// UNSUPPORTED: gpu-intel-gen12, cpu // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/16072 // Test work_group_dynamic extension with allocation size specified at runtime. diff --git a/sycl/test-e2e/WorkGroupMemory/Dynamic/dynamic_unused.cpp b/sycl/test-e2e/WorkGroupScratchMemory/dynamic_unused.cpp similarity index 100% rename from sycl/test-e2e/WorkGroupMemory/Dynamic/dynamic_unused.cpp rename to sycl/test-e2e/WorkGroupScratchMemory/dynamic_unused.cpp diff --git a/sycl/test-e2e/WorkGroupMemory/lit.local.cfg b/sycl/test-e2e/WorkGroupScratchMemory/lit.local.cfg similarity index 100% rename from sycl/test-e2e/WorkGroupMemory/lit.local.cfg rename to sycl/test-e2e/WorkGroupScratchMemory/lit.local.cfg diff --git a/sycl/test-e2e/WorkGroupStatic/lit.local.cfg b/sycl/test-e2e/WorkGroupStatic/lit.local.cfg new file mode 100644 index 0000000000000..bafde197c494f --- /dev/null +++ b/sycl/test-e2e/WorkGroupStatic/lit.local.cfg @@ -0,0 +1,3 @@ + +# https://github.com/intel/llvm/issues/16072 +config.unsupported_features += ['hip'] diff --git a/sycl/test-e2e/WorkGroupMemory/Static/work_group_static_memory_block_scope.cpp b/sycl/test-e2e/WorkGroupStatic/work_group_static_memory_block_scope.cpp similarity index 100% rename from sycl/test-e2e/WorkGroupMemory/Static/work_group_static_memory_block_scope.cpp rename to sycl/test-e2e/WorkGroupStatic/work_group_static_memory_block_scope.cpp diff --git a/sycl/test-e2e/WorkGroupMemory/Static/work_group_static_memory_class_scope.cpp b/sycl/test-e2e/WorkGroupStatic/work_group_static_memory_class_scope.cpp similarity index 100% rename from sycl/test-e2e/WorkGroupMemory/Static/work_group_static_memory_class_scope.cpp rename to sycl/test-e2e/WorkGroupStatic/work_group_static_memory_class_scope.cpp diff --git a/sycl/test-e2e/WorkGroupMemory/Static/work_group_static_memory_namespace_scope.cpp b/sycl/test-e2e/WorkGroupStatic/work_group_static_memory_namespace_scope.cpp similarity index 100% rename from sycl/test-e2e/WorkGroupMemory/Static/work_group_static_memory_namespace_scope.cpp rename to sycl/test-e2e/WorkGroupStatic/work_group_static_memory_namespace_scope.cpp