Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ int main() {
{exp_ext::property::graph::assume_buffer_outlives_graph{}}};

auto NodeA = add_node(Graph, Queue, [&](handler &CGH) {
auto AccA = BufferA.get_access<access::mode::write>(CGH);
auto AccA = BufferA.get_access<access_mode::write>(CGH);
CGH.copy(DataB.data(), AccA);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ int main() {
{exp_ext::property::graph::assume_buffer_outlives_graph{}}};

auto NodeA = add_node(Graph, Queue, [&](handler &CGH) {
auto AccA = BufferA.get_access<access::mode::write>(CGH, range<1>(Size),
id<1>(Offset));
auto AccA = BufferA.get_access<access_mode::write>(CGH, range<1>(Size),
id<1>(Offset));
CGH.copy(DataB.data(), AccA);
});

Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/Graph/Inputs/buffer_copy_offsets.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ int main() {

// Copy from A to B
auto NodeA = add_node(Graph, Queue, [&](handler &CGH) {
auto AccA = BufferA.get_access<access::mode::read_write>(
auto AccA = BufferA.get_access<access_mode::read_write>(
CGH, range<1>(Size - OffsetSrc), id<1>(OffsetSrc));
auto AccB = BufferB.get_access<access::mode::read_write>(
auto AccB = BufferB.get_access<access_mode::read_write>(
CGH, range<1>(Size - OffsetDst), id<1>(OffsetDst));
CGH.copy(AccA, AccB);
});
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Graph/Inputs/buffer_copy_target2host.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ int main() {
{exp_ext::property::graph::assume_buffer_outlives_graph{}}};

auto NodeA = add_node(Graph, Queue, [&](handler &CGH) {
auto AccA = BufferA.get_access<access::mode::read>(CGH);
auto AccA = BufferA.get_access<access_mode::read>(CGH);
CGH.copy(AccA, DataB.data());
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ int main() {
{exp_ext::property::graph::assume_buffer_outlives_graph{}}};

auto NodeA = add_node(Graph, Queue, [&](handler &CGH) {
auto AccA = BufferA.get_access<access::mode::read>(CGH);
auto AccA = BufferA.get_access<access_mode::read>(CGH);
CGH.copy(AccA, DataB.data());
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ int main() {
{exp_ext::property::graph::assume_buffer_outlives_graph{}}};

auto NodeA = add_node(Graph, Queue, [&](handler &CGH) {
auto AccA = BufferA.get_access<access::mode::read>(
auto AccA = BufferA.get_access<access_mode::read>(
CGH, range<1>(Size - Offset), id<1>(Offset));
CGH.copy(AccA, DataB.data());
});
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Graph/Inputs/debug_print_graph.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ int main() {
});

auto Last = add_node(Graph, Queue, [&](handler &CGH) {
auto Acc = BufferC.get_access<access::mode::read>(CGH);
auto Acc = BufferC.get_access<access_mode::read>(CGH);
CGH.copy(Acc, DataD.data());
});

Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Graph/Inputs/debug_print_graph_verbose.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ int main() {
});

auto Last = add_node(Graph, Queue, [&](handler &CGH) {
auto AccA = BufferC.get_access<access::mode::read>(CGH);
auto AccA = BufferC.get_access<access_mode::read>(CGH);
CGH.copy(AccA, DataD.data());
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ int main() {
BufferInteropInput, Context);

auto NodeA = add_node(Graph, Queue, [&](sycl::handler &CGH) {
auto Acc =
BufferInterop.get_access<sycl::access::mode::read_write>(CGH);
auto Acc = BufferInterop.get_access<sycl::access_mode::read_write>(CGH);
CGH.single_task<class SimpleKernel6>([=]() {
for (int i = 0; i < 12; i++) {
Acc[i] = 99;
Expand All @@ -100,7 +99,7 @@ int main() {
[&](sycl::handler &CGH) {
depends_on_helper(CGH, NodeA);
auto Acc =
BufferInterop.get_access<sycl::access::mode::read_write>(CGH);
BufferInterop.get_access<sycl::access_mode::read_write>(CGH);
CGH.single_task<class SimpleKernel7>([=]() {
for (int i = 0; i < 12; i++) {
Acc[i] *= 2;
Expand All @@ -113,7 +112,7 @@ int main() {
Graph, Queue,
[&](handler &CGH) {
depends_on_helper(CGH, NodeB);
auto BufferAcc = BufferInterop.get_access<access::mode::write>(CGH);
auto BufferAcc = BufferInterop.get_access<access_mode::write>(CGH);
CGH.host_task([=](const interop_handle &IH) {
void *DevicePtr =
IH.get_native_mem<backend::ext_oneapi_level_zero>(BufferAcc);
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Graph/Inputs/kernel_bundle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ int main() {
{exp_ext::property::graph::assume_buffer_outlives_graph{}}};

add_node(Graph, Queue, ([&](sycl::handler &CGH) {
auto Acc = Buf.get_access<sycl::access::mode::write>(CGH);
auto Acc = Buf.get_access<sycl::access_mode::write>(CGH);
CGH.use_kernel_bundle(KernelBundleExecutable);
CGH.single_task<Kernel1Name>([=]() { Acc[0] = 42; });
}));
Expand Down
31 changes: 15 additions & 16 deletions sycl/test-e2e/Graph/Inputs/kernel_bundle_spirv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,21 @@ int main(int, char **argv) {
Queue.get_device(),
{exp_ext::property::graph::assume_buffer_outlives_graph{}}};

add_node(Graph, Queue, ([&](sycl::handler &CGH) {
CGH.set_arg(
0, input_buffer.get_access<sycl::access::mode::read>(CGH));
CGH.set_arg(
1, output_buffer.get_access<sycl::access::mode::write>(CGH));
CGH.parallel_for(sycl::range<1>{N}, kernel);
}));

add_node(Graph, Queue, ([&](sycl::handler &CGH) {
CGH.set_arg(
0, input_buffer.get_access<sycl::access::mode::read>(CGH));
CGH.set_arg(
1,
output_buffer2.get_access<sycl::access::mode::write>(CGH));
CGH.parallel_for(sycl::range<1>{N}, kernel);
}));
add_node(
Graph, Queue, ([&](sycl::handler &CGH) {
CGH.set_arg(0, input_buffer.get_access<sycl::access_mode::read>(CGH));
CGH.set_arg(1,
output_buffer.get_access<sycl::access_mode::write>(CGH));
CGH.parallel_for(sycl::range<1>{N}, kernel);
}));

add_node(
Graph, Queue, ([&](sycl::handler &CGH) {
CGH.set_arg(0, input_buffer.get_access<sycl::access_mode::read>(CGH));
CGH.set_arg(1,
output_buffer2.get_access<sycl::access_mode::write>(CGH));
CGH.parallel_for(sycl::range<1>{N}, kernel);
}));

auto GraphExec = Graph.finalize();

Expand Down
6 changes: 3 additions & 3 deletions sycl/test-e2e/Graph/Inputs/multiple_kernel_bundles.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ int main() {
{exp_ext::property::graph::assume_buffer_outlives_graph{}}};

add_node(Graph, Queue, ([&](sycl::handler &CGH) {
auto Acc = Buf1.get_access<sycl::access::mode::write>(CGH);
auto Acc = Buf1.get_access<sycl::access_mode::write>(CGH);
CGH.use_kernel_bundle(KernelBundleExecutable1);
CGH.single_task<Kernel1Name>([=]() { Acc[0] = 42; });
}));

add_node(Graph, Queue, ([&](handler &CGH) {
auto DataA =
BufferA.template get_access<access::mode::read_write>(CGH);
BufferA.template get_access<access_mode::read_write>(CGH);
CGH.use_kernel_bundle(KernelBundleExecutable1);
CGH.parallel_for(range<1>{Size},
[=](item<1> Id) { DataA[Id]++; });
Expand All @@ -77,7 +77,7 @@ int main() {
std::error_code ExceptionCode = make_error_code(sycl::errc::success);
try {
Graph.add([&](sycl::handler &CGH) {
auto Acc = Buf2.get_access<sycl::access::mode::write>(CGH);
auto Acc = Buf2.get_access<sycl::access_mode::write>(CGH);
CGH.use_kernel_bundle(KernelBundleExecutable2);
CGH.single_task<Kernel2Name>([=]() { Acc[0] = 24; });
});
Expand Down
13 changes: 6 additions & 7 deletions sycl/test-e2e/Graph/Inputs/spec_constants_handler_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ bool test_default_values(sycl::queue Queue) {

add_node(Graph, Queue, ([&](sycl::handler &CGH) {
auto IntAcc =
IntBuffer.get_access<sycl::access::mode::write>(CGH);
IntBuffer.get_access<sycl::access_mode::write>(CGH);
auto IntAcc2 =
IntBuffer2.get_access<sycl::access::mode::write>(CGH);
IntBuffer2.get_access<sycl::access_mode::write>(CGH);
auto FloatAcc =
FloatBuffer.get_access<sycl::access::mode::write>(CGH);
FloatBuffer.get_access<sycl::access_mode::write>(CGH);

CGH.single_task<TestDefaultValuesKernel>(
[=](sycl::kernel_handler KH) {
Expand Down Expand Up @@ -173,10 +173,9 @@ bool test_set_and_get_on_device(sycl::queue Queue) {

add_node(
Graph, Queue, ([&](sycl::handler &CGH) {
auto IntAcc = IntBuffer.get_access<sycl::access::mode::write>(CGH);
auto IntAcc2 = IntBuffer2.get_access<sycl::access::mode::write>(CGH);
auto FloatAcc =
FloatBuffer.get_access<sycl::access::mode::write>(CGH);
auto IntAcc = IntBuffer.get_access<sycl::access_mode::write>(CGH);
auto IntAcc2 = IntBuffer2.get_access<sycl::access_mode::write>(CGH);
auto FloatAcc = FloatBuffer.get_access<sycl::access_mode::write>(CGH);

CGH.set_specialization_constant<IntId>(NewIntValue);
CGH.set_specialization_constant<IntId2>(NewIntValue2);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ bool test_default_values(sycl::queue Queue) {
add_node(Graph, Queue, ([&](sycl::handler &CGH) {
CGH.use_kernel_bundle(ExecBundle);
auto IntAcc =
IntBuffer.get_access<sycl::access::mode::write>(CGH);
IntBuffer.get_access<sycl::access_mode::write>(CGH);
auto FloatAcc =
FloatBuffer.get_access<sycl::access::mode::write>(CGH);
FloatBuffer.get_access<sycl::access_mode::write>(CGH);

CGH.single_task<TestDefaultValuesKernel>(
[=](sycl::kernel_handler KH) {
Expand Down Expand Up @@ -205,9 +205,8 @@ bool test_set_and_get_on_device(sycl::queue Queue) {
add_node(
Graph, Queue, ([&](sycl::handler &CGH) {
CGH.use_kernel_bundle(ExecBundle);
auto IntAcc = IntBuffer.get_access<sycl::access::mode::write>(CGH);
auto FloatAcc =
FloatBuffer.get_access<sycl::access::mode::write>(CGH);
auto IntAcc = IntBuffer.get_access<sycl::access_mode::write>(CGH);
auto FloatAcc = FloatBuffer.get_access<sycl::access_mode::write>(CGH);

CGH.single_task<TestSetAndGetOnDevice>([=](sycl::kernel_handler KH) {
IntAcc[0] = KH.get_specialization_constant<IntId>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void add_nodes_to_graph(
auto HostTaskOp = add_node(
Graph, Queue,
[&](handler &CGH) {
auto AccC = BufferC.get_access<access::mode::read_write,
auto AccC = BufferC.get_access<access_mode::read_write,
access::target::host_task>(CGH);
depends_on_helper(CGH, LastOperation);
CGH.host_task([=]() {
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/Graph/Profiling/event_profiling_info.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ int main() {
CopyGraph.begin_recording(Queue);

Queue.submit([&](sycl::handler &Cgh) {
accessor<int, 1, access::mode::read, access::target::device> AccessorFrom(
accessor<int, 1, access_mode::read, access::target::device> AccessorFrom(
BufferFrom, Cgh, range<1>(Size));
accessor<int, 1, access::mode::write, access::target::device> AccessorTo(
accessor<int, 1, access_mode::write, access::target::device> AccessorTo(
BufferTo, Cgh, range<1>(Size));
Cgh.copy(AccessorFrom, AccessorTo);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ int main() {
if (!expectException(
[&]() {
Queue.submit([&](handler &CGH) {
auto Acc = Buf.get_access<sycl::access::mode::write>(CGH);
auto Acc = Buf.get_access<sycl::access_mode::write>(CGH);
CGH.parallel_for(sycl::range<1>{N},
[=](sycl::id<1> Idx) { Acc[Idx] = 0; });
});
Expand Down
8 changes: 4 additions & 4 deletions sycl/test-e2e/Graph/Update/dyn_cgf_accessor_deps.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@ int main() {
{exp_ext::property::graph::assume_buffer_outlives_graph{}}};

auto RootNode = Graph.add([&](handler &CGH) {
auto Acc = Buf.get_access<access::mode::write>(CGH);
auto Acc = Buf.get_access<access_mode::write>(CGH);
CGH.parallel_for(Size, [=](item<1> Item) { Acc[Item.get_id()] = 1; });
});

int PatternA = 42;
auto CGFA = [&](handler &CGH) {
auto Acc = Buf.get_access<access::mode::read_write>(CGH);
auto Acc = Buf.get_access<access_mode::read_write>(CGH);
CGH.parallel_for(Size,
[=](item<1> Item) { Acc[Item.get_id()] += PatternA; });
};

int PatternB = 0xA;
auto CGFB = [&](handler &CGH) {
auto Acc = Buf.get_access<access::mode::read_write>(CGH);
auto Acc = Buf.get_access<access_mode::read_write>(CGH);
CGH.parallel_for(Size,
[=](item<1> Item) { Acc[Item.get_id()] += PatternB; });
};
Expand All @@ -46,7 +46,7 @@ int main() {
auto DynamicCGNode = Graph.add(DynamicCG);

auto LeafNode = Graph.add([&](handler &CGH) {
auto Acc = Buf.get_access<access::mode::read>(CGH);
auto Acc = Buf.get_access<access_mode::read>(CGH);
CGH.parallel_for(
Size, [=](item<1> Item) { Ptr[Item.get_id()] = Acc[Item.get_id()]; });
});
Expand Down
12 changes: 6 additions & 6 deletions sycl/test-e2e/Graph/Update/dyn_cgf_accessor_deps2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ int main() {
int InitA = 4;
int InitB = -4;
auto RootNode = Graph.add([&](handler &CGH) {
auto AccA = BufA.get_access<access::mode::write>(CGH);
auto AccB = BufB.get_access<access::mode::write>(CGH);
auto AccA = BufA.get_access<access_mode::write>(CGH);
auto AccB = BufB.get_access<access_mode::write>(CGH);
CGH.parallel_for(Size, [=](item<1> Item) {
AccA[Item.get_id()] = InitA;
AccB[Item.get_id()] = InitB;
Expand All @@ -39,14 +39,14 @@ int main() {

int PatternA = 42;
auto CGFA = [&](handler &CGH) {
auto AccA = BufA.get_access<access::mode::read_write>(CGH);
auto AccA = BufA.get_access<access_mode::read_write>(CGH);
CGH.parallel_for(Size,
[=](item<1> Item) { AccA[Item.get_id()] += PatternA; });
};

int PatternB = 0xA;
auto CGFB = [&](handler &CGH) {
auto AccB = BufB.get_access<access::mode::read_write>(CGH);
auto AccB = BufB.get_access<access_mode::read_write>(CGH);
CGH.parallel_for(Size,
[=](item<1> Item) { AccB[Item.get_id()] += PatternB; });
};
Expand All @@ -55,8 +55,8 @@ int main() {
auto DynamicCGNode = Graph.add(DynamicCG);

auto LeafNode = Graph.add([&](handler &CGH) {
auto AccA = BufA.get_access<access::mode::read>(CGH);
auto AccB = BufB.get_access<access::mode::read>(CGH);
auto AccA = BufA.get_access<access_mode::read>(CGH);
auto AccB = BufB.get_access<access_mode::read>(CGH);
CGH.parallel_for(Size, [=](item<1> Item) {
Ptr[Item.get_id()] = AccA[Item.get_id()] + AccB[Item.get_id()];
});
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/Graph/Update/dyn_cgf_host_task_accessor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ int main() {

// Create two different command groups for the host task
auto CGFA = [&](handler &CGH) {
auto AccC = BufferC.get_access<access::mode::read_write,
auto AccC = BufferC.get_access<access_mode::read_write,
access::target::host_task>(CGH);
CGH.host_task([=]() {
for (size_t i = 0; i < Size; i++) {
Expand All @@ -80,7 +80,7 @@ int main() {
});
};
auto CGFB = [&](handler &CGH) {
auto AccC = BufferC.get_access<access::mode::read_write,
auto AccC = BufferC.get_access<access_mode::read_write,
access::target::host_task>(CGH);
CGH.host_task([=]() {
for (size_t i = 0; i < Size; i++) {
Expand Down
Loading
Loading