diff --git a/sycl/test-e2e/Graph/Explicit/basic_buffer.cpp b/sycl/test-e2e/Graph/Explicit/basic_buffer.cpp index 32735e2bcf6ef..54486d9d21c94 100644 --- a/sycl/test-e2e/Graph/Explicit/basic_buffer.cpp +++ b/sycl/test-e2e/Graph/Explicit/basic_buffer.cpp @@ -1,6 +1,3 @@ -// UNSUPPORTED: linux && run-mode && gpu-intel-dg2 && !igc-dev -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/18668 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/buffer_copy.cpp b/sycl/test-e2e/Graph/Explicit/buffer_copy.cpp index 8b03248f03e05..7789845044c1b 100644 --- a/sycl/test-e2e/Graph/Explicit/buffer_copy.cpp +++ b/sycl/test-e2e/Graph/Explicit/buffer_copy.cpp @@ -1,6 +1,3 @@ -// UNSUPPORTED: linux && run-mode && gpu-intel-dg2 && !igc-dev -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/18668 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/buffer_copy_2d.cpp b/sycl/test-e2e/Graph/Explicit/buffer_copy_2d.cpp index cc38dd86a3343..f3f7b009f9377 100644 --- a/sycl/test-e2e/Graph/Explicit/buffer_copy_2d.cpp +++ b/sycl/test-e2e/Graph/Explicit/buffer_copy_2d.cpp @@ -1,6 +1,3 @@ -// UNSUPPORTED: linux && run-mode && gpu-intel-dg2 && !igc-dev -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/18668 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG diff --git a/sycl/test-e2e/Graph/Explicit/buffer_interleave_eager.cpp b/sycl/test-e2e/Graph/Explicit/buffer_interleave_eager.cpp new file mode 100644 index 0000000000000..c3fa050aa2d22 --- /dev/null +++ b/sycl/test-e2e/Graph/Explicit/buffer_interleave_eager.cpp @@ -0,0 +1,11 @@ +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out +// Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG +// RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} +// Extra run to check for immediate-command-list in Level Zero +// RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} +// + +#define GRAPH_E2E_EXPLICIT + +#include "../Inputs/buffer_interleave_eager.cpp" diff --git a/sycl/test-e2e/Graph/Explicit/buffer_ordering.cpp b/sycl/test-e2e/Graph/Explicit/buffer_ordering.cpp index 6958ba2ab391f..f0775c7d698f0 100644 --- a/sycl/test-e2e/Graph/Explicit/buffer_ordering.cpp +++ b/sycl/test-e2e/Graph/Explicit/buffer_ordering.cpp @@ -1,5 +1,3 @@ -// UNSUPPORTED: run-mode && gpu-intel-dg2 && !igc-dev -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/18579 // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG diff --git a/sycl/test-e2e/Graph/Inputs/buffer_interleave_eager.cpp b/sycl/test-e2e/Graph/Inputs/buffer_interleave_eager.cpp new file mode 100644 index 0000000000000..7b098089b0188 --- /dev/null +++ b/sycl/test-e2e/Graph/Inputs/buffer_interleave_eager.cpp @@ -0,0 +1,61 @@ +// Tests enqueueing an eager buffer submission followed by two executions +// of the same graph which also use the buffer. + +#include "../graph_common.hpp" + +int main() { + queue Queue{}; + + const size_t N = 10; + std::vector Arr(N, 0); + + buffer Buf{N}; + Buf.set_write_back(false); + + { + // Buffer elements set to 8 + Queue.submit([&](handler &CGH) { + auto Acc = Buf.get_access(CGH); + CGH.parallel_for(range<1>{N}, [=](id<1> idx) { + size_t i = idx; + Acc[i] = 8; + }); + }); + + // Create graph than adds 2 to buffer elements + exp_ext::command_graph Graph{ + Queue.get_context(), + Queue.get_device(), + {exp_ext::property::graph::assume_buffer_outlives_graph{}}}; + + add_node(Graph, Queue, [&](handler &CGH) { + auto Acc = Buf.get_access(CGH); + CGH.parallel_for(range<1>{N}, [=](id<1> idx) { + size_t i = idx; + Acc[i] += 2; + }); + }); + + auto ExecGraph = Graph.finalize(); + + // Buffer elements set to 10 + Queue.ext_oneapi_graph(ExecGraph); + + // Buffer elements set to 12 + Queue.ext_oneapi_graph(ExecGraph); + + // Copy results back + Queue.submit([&](handler &CGH) { + auto Acc = Buf.get_access(CGH); + CGH.copy(Acc, Arr.data()); + }); + Queue.wait(); + } + + const int Expected = 12; + for (size_t i = 0; i < N; i++) { + assert(check_value(i, Expected, Arr[i], "Arr")); + } + + return 0; +} diff --git a/sycl/test-e2e/Graph/Inputs/buffer_ordering.cpp b/sycl/test-e2e/Graph/Inputs/buffer_ordering.cpp index 8039e5eb87106..9a0c4b0ff63ab 100644 --- a/sycl/test-e2e/Graph/Inputs/buffer_ordering.cpp +++ b/sycl/test-e2e/Graph/Inputs/buffer_ordering.cpp @@ -73,8 +73,7 @@ int main() { }); // Buffer elements set to 10 - auto Event = - Queue.submit([&](handler &CGH) { CGH.ext_oneapi_graph(ExecGraph); }); + Queue.submit([&](handler &CGH) { CGH.ext_oneapi_graph(ExecGraph); }); // Buffer elements set to 20 Queue.submit([&](handler &CGH) { diff --git a/sycl/test-e2e/Graph/RecordReplay/basic_buffer.cpp b/sycl/test-e2e/Graph/RecordReplay/basic_buffer.cpp index da6b98863c317..4c7f5d149e731 100644 --- a/sycl/test-e2e/Graph/RecordReplay/basic_buffer.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/basic_buffer.cpp @@ -1,6 +1,3 @@ -// UNSUPPORTED: linux && run-mode && gpu-intel-dg2 && !igc-dev -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/18668 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/buffer_copy.cpp b/sycl/test-e2e/Graph/RecordReplay/buffer_copy.cpp index 1096243a8d747..24e8926c7cbfd 100644 --- a/sycl/test-e2e/Graph/RecordReplay/buffer_copy.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/buffer_copy.cpp @@ -1,6 +1,3 @@ -// UNSUPPORTED: linux && run-mode && gpu-intel-dg2 && !igc-dev -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/18668 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/buffer_interleave_eager.cpp b/sycl/test-e2e/Graph/RecordReplay/buffer_interleave_eager.cpp new file mode 100644 index 0000000000000..9ef2158aa8e96 --- /dev/null +++ b/sycl/test-e2e/Graph/RecordReplay/buffer_interleave_eager.cpp @@ -0,0 +1,11 @@ +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out +// Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG +// RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} +// Extra run to check for immediate-command-list in Level Zero +// RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} +// + +#define GRAPH_E2E_RECORD_REPLAY + +#include "../Inputs/buffer_interleave_eager.cpp" diff --git a/sycl/test-e2e/Graph/RecordReplay/buffer_ordering.cpp b/sycl/test-e2e/Graph/RecordReplay/buffer_ordering.cpp index b5f206dbd72d8..fb6d9ea0e0e78 100644 --- a/sycl/test-e2e/Graph/RecordReplay/buffer_ordering.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/buffer_ordering.cpp @@ -1,5 +1,3 @@ -// UNSUPPORTED: run-mode && gpu-intel-dg2 && !igc-dev -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/18579 // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG diff --git a/sycl/test-e2e/Graph/RecordReplay/queue_constructor_buffer.cpp b/sycl/test-e2e/Graph/RecordReplay/queue_constructor_buffer.cpp index 91fe6dc3a3b48..da9a098b1e15f 100644 --- a/sycl/test-e2e/Graph/RecordReplay/queue_constructor_buffer.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/queue_constructor_buffer.cpp @@ -1,6 +1,3 @@ -// UNSUPPORTED: linux && run-mode && gpu-intel-dg2 && !igc-dev -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/18668 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG diff --git a/sycl/test-e2e/Graph/lit.local.cfg b/sycl/test-e2e/Graph/lit.local.cfg index d12a1eaabd5d4..ccb372873811c 100644 --- a/sycl/test-e2e/Graph/lit.local.cfg +++ b/sycl/test-e2e/Graph/lit.local.cfg @@ -1,7 +1,3 @@ # https://github.com/intel/llvm/issues/17165 if 'windows' in config.available_features: config.unsupported_features += ['arch-intel_gpu_bmg_g21'] - -# https://github.com/intel/llvm/issues/18668 -# https://github.com/intel/llvm/issues/18579 -config.unsupported_features += ['gpu-intel-dg2 && level_zero_v2_adapter']