Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

[NFC][SYCL] Remove explict "cl::" namespace references #1116

Merged
merged 3 commits into from
Jul 29, 2022
Merged

[NFC][SYCL] Remove explict "cl::" namespace references #1116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b657ca
[NFC][SYCL] Remove explict "cl::" namespace references
aelovikov-intel Jul 27, 2022
d84fb30
Also remove "using namespace cl;"
aelovikov-intel Jul 27, 2022
56c29b9
Accomodate changed assert line in SYCL/Assert/assert_in_kernels{,_win…
aelovikov-intel Jul 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
29 changes: 14 additions & 15 deletions SYCL/AOT/Inputs/aot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,38 +11,37 @@
#include <array>
#include <iostream>

constexpr cl::sycl::access::mode sycl_read = cl::sycl::access::mode::read;
constexpr cl::sycl::access::mode sycl_write = cl::sycl::access::mode::write;
constexpr sycl::access::mode sycl_read = sycl::access::mode::read;
constexpr sycl::access::mode sycl_write = sycl::access::mode::write;

template <typename T> class SimpleVadd;

template <typename T, size_t N>
void simple_vadd(const std::array<T, N> &VA, const std::array<T, N> &VB,
std::array<T, N> &VC) {
cl::sycl::queue deviceQueue([](cl::sycl::exception_list ExceptionList) {
sycl::queue deviceQueue([](sycl::exception_list ExceptionList) {
for (std::exception_ptr ExceptionPtr : ExceptionList) {
try {
std::rethrow_exception(ExceptionPtr);
} catch (cl::sycl::exception &E) {
} catch (sycl::exception &E) {
std::cerr << E.what();
} catch (...) {
std::cerr << "Unknown async exception was caught." << std::endl;
}
}
});

cl::sycl::range<1> numOfItems{N};
cl::sycl::buffer<T, 1> bufferA(VA.data(), numOfItems);
cl::sycl::buffer<T, 1> bufferB(VB.data(), numOfItems);
cl::sycl::buffer<T, 1> bufferC(VC.data(), numOfItems);
sycl::range<1> numOfItems{N};
sycl::buffer<T, 1> bufferA(VA.data(), numOfItems);
sycl::buffer<T, 1> bufferB(VB.data(), numOfItems);
sycl::buffer<T, 1> bufferC(VC.data(), numOfItems);

deviceQueue.submit([&](cl::sycl::handler &cgh) {
deviceQueue.submit([&](sycl::handler &cgh) {
auto accessorA = bufferA.template get_access<sycl_read>(cgh);
auto accessorB = bufferB.template get_access<sycl_read>(cgh);
auto accessorC = bufferC.template get_access<sycl_write>(cgh);

cgh.parallel_for<class SimpleVadd<T>>(numOfItems,
[=](cl::sycl::id<1> wiID) {
cgh.parallel_for<class SimpleVadd<T>>(numOfItems, [=](sycl::id<1> wiID) {
accessorC[wiID] = accessorA[wiID] + accessorB[wiID];
});
});
Expand All @@ -52,10 +51,10 @@ void simple_vadd(const std::array<T, N> &VA, const std::array<T, N> &VB,

int main() {
const size_t array_size = 4;
std::array<cl::sycl::cl_int, array_size> A = {{1, 2, 3, 4}},
B = {{1, 2, 3, 4}}, C;
std::array<cl::sycl::cl_float, array_size> D = {{1.f, 2.f, 3.f, 4.f}},
E = {{1.f, 2.f, 3.f, 4.f}}, F;
std::array<sycl::cl_int, array_size> A = {{1, 2, 3, 4}}, B = {{1, 2, 3, 4}},
C;
std::array<sycl::cl_float, array_size> D = {{1.f, 2.f, 3.f, 4.f}},
E = {{1.f, 2.f, 3.f, 4.f}}, F;
simple_vadd(A, B, C);
simple_vadd(D, E, F);
for (unsigned int i = 0; i < array_size; i++) {
Expand Down
16 changes: 8 additions & 8 deletions SYCL/Assert/Inputs/kernels_in_file2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

#include <cassert>

using namespace cl::sycl;
using namespace cl::sycl::access;
using namespace sycl;
using namespace sycl::access;

int calculus(int X) {
assert(X && "this message from calculus");
Expand All @@ -21,25 +21,25 @@ void check_nil(int value) { assert(value && "this message from file2"); }
static constexpr size_t BUFFER_SIZE = 4;

void enqueueKernel_1_fromFile2(queue *Q) {
cl::sycl::range<1> numOfItems{BUFFER_SIZE};
cl::sycl::buffer<int, 1> Buf(numOfItems);
sycl::range<1> numOfItems{BUFFER_SIZE};
sycl::buffer<int, 1> Buf(numOfItems);

Q->submit([&](handler &CGH) {
auto Acc = Buf.template get_access<mode::read_write>(CGH);

CGH.parallel_for<class kernel1_from_separate_file>(
numOfItems, [=](cl::sycl::id<1> wiID) { check_nil(Acc[wiID]); });
numOfItems, [=](sycl::id<1> wiID) { check_nil(Acc[wiID]); });
});
}

void enqueueKernel_2_fromFile2(queue *Q) {
cl::sycl::range<1> numOfItems{BUFFER_SIZE};
cl::sycl::buffer<int, 1> Buf(numOfItems);
sycl::range<1> numOfItems{BUFFER_SIZE};
sycl::buffer<int, 1> Buf(numOfItems);

Q->submit([&](handler &CGH) {
auto Acc = Buf.template get_access<mode::read_write>(CGH);

CGH.parallel_for<class kernel2_from_separate_file>(
numOfItems, [=](cl::sycl::id<1> wiID) { check_nil(Acc[wiID]); });
numOfItems, [=](sycl::id<1> wiID) { check_nil(Acc[wiID]); });
});
}
4 changes: 2 additions & 2 deletions SYCL/Assert/assert_in_kernels.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.txt
//
// CHECK-NOT: One shouldn't see this message
// CHECK: {{.*}}assert_in_kernels.hpp:26: void kernelFunc2(int *, int): {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
// CHECK: {{.*}}assert_in_kernels.hpp:25: void kernelFunc2(int *, int): {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
// CHECK-SAME: Assertion `Buf[wiID] == 0 && "from assert statement"` failed.
// CHECK-NOT: test aborts earlier, one shouldn't see this message
// CHECK-NOT: The test ended.
//
// CHECK-ACC-NOT: {{.*}}assert_in_kernels.hpp:26: void kernelFunc2(int *, int): {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
// CHECK-ACC-NOT: {{.*}}assert_in_kernels.hpp:25: void kernelFunc2(int *, int): {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
// CHECK-ACC: The test ended.

#include "assert_in_kernels.hpp"
17 changes: 7 additions & 10 deletions SYCL/Assert/assert_in_kernels.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#include <iostream>
#include <sycl/sycl.hpp>

using namespace cl::sycl;
using namespace cl::sycl::access;
using namespace sycl;
using namespace sycl::access;

void kernelFunc1(int *Buf, int wiID) {
Buf[wiID] = 9;
Expand All @@ -15,8 +15,7 @@ void assertTest1(queue &Q, buffer<int, 1> &Buf) {
auto Acc = Buf.template get_access<mode::read_write>(CGH);

CGH.parallel_for<class Kernel_1>(
Buf.get_range(),
[=](cl::sycl::id<1> wiID) { kernelFunc1(&Acc[0], wiID); });
Buf.get_range(), [=](sycl::id<1> wiID) { kernelFunc1(&Acc[0], wiID); });
});
}

Expand All @@ -31,8 +30,7 @@ void assertTest2(queue &Q, buffer<int, 1> &Buf) {
auto Acc = Buf.template get_access<mode::read_write>(CGH);

CGH.parallel_for<class Kernel_2>(
Buf.get_range(),
[=](cl::sycl::id<1> wiID) { kernelFunc2(&Acc[0], wiID); });
Buf.get_range(), [=](sycl::id<1> wiID) { kernelFunc2(&Acc[0], wiID); });
});
}

Expand All @@ -47,15 +45,14 @@ void assertTest3(queue &Q, buffer<int, 1> &Buf) {
auto Acc = Buf.template get_access<mode::read_write>(CGH);

CGH.parallel_for<class Kernel_3>(
Buf.get_range(),
[=](cl::sycl::id<1> wiID) { kernelFunc3(&Acc[0], wiID); });
Buf.get_range(), [=](sycl::id<1> wiID) { kernelFunc3(&Acc[0], wiID); });
});
}

int main(int Argc, const char *Argv[]) {
std::array<int, 4> Vec = {1, 2, 3, 4};
cl::sycl::range<1> numOfItems{Vec.size()};
cl::sycl::buffer<int, 1> Buf(Vec.data(), numOfItems);
sycl::range<1> numOfItems{Vec.size()};
sycl::buffer<int, 1> Buf(Vec.data(), numOfItems);

queue Q;
assertTest1(Q, Buf);
Expand Down
4 changes: 2 additions & 2 deletions SYCL/Assert/assert_in_kernels_win.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
// CHECK-NOT: One shouldn't see this message
// FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
// while for some insane reason.
// CHECK: {{.*}}assert_in_kernels.hpp:26: {{<unknown func>|(null)}}: {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
// CHECK: {{.*}}assert_in_kernels.hpp:25: {{<unknown func>|(null)}}: {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
// CHECK-SAME: Assertion `Buf[wiID] == 0 && "from assert statement"` failed.
// CHECK-NOT: test aborts earlier, one shouldn't see this message
// CHECK-NOT: The test ended.
//
// CHECK-ACC-NOT: {{.*}}assert_in_kernels.hpp:26: {{<unknown func>|(null)}}: {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
// CHECK-ACC-NOT: {{.*}}assert_in_kernels.hpp:25: {{<unknown func>|(null)}}: {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
// CHECK-ACC: The test ended.

#include "assert_in_kernels.hpp"
12 changes: 6 additions & 6 deletions SYCL/Assert/assert_in_multiple_tus.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

#include <cassert>

using namespace cl::sycl;
using namespace cl::sycl::access;
using namespace sycl;
using namespace sycl::access;

static constexpr size_t BUFFER_SIZE = 16;

Expand All @@ -22,15 +22,15 @@ int checkFunction() {
}

void enqueueKernel_1_fromFile1(queue *Q) {
cl::sycl::range<1> numOfItems{BUFFER_SIZE};
cl::sycl::buffer<int, 1> Buf(numOfItems);
sycl::range<1> numOfItems{BUFFER_SIZE};
sycl::buffer<int, 1> Buf(numOfItems);

Q->submit([&](handler &CGH) {
auto Acc = Buf.template get_access<mode::read_write>(CGH);

CGH.parallel_for<class Kernel_1>(
cl::sycl::nd_range(Buf.get_range(), cl::sycl::range<1>(4)),
[=](cl::sycl::id<1> wiID) {
sycl::nd_range(Buf.get_range(), sycl::range<1>(4)),
[=](sycl::id<1> wiID) {
int X = 0;
if (wiID == 5)
X = checkFunction();
Expand Down
8 changes: 4 additions & 4 deletions SYCL/Assert/assert_in_one_kernel.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#include <iostream>
#include <sycl/sycl.hpp>

using namespace cl::sycl;
using namespace cl::sycl::access;
using namespace sycl;
using namespace sycl::access;

void kernelFunc(int *Buf, int wiID) {
Buf[wiID] = 0;
Expand All @@ -12,8 +12,8 @@ void kernelFunc(int *Buf, int wiID) {

void assertTest() {
std::array<int, 4> Vec = {1, 2, 3, 4};
cl::sycl::range<1> numOfItems{Vec.size()};
cl::sycl::buffer<int, 1> Buf(Vec.data(), numOfItems);
sycl::range<1> numOfItems{Vec.size()};
sycl::buffer<int, 1> Buf(Vec.data(), numOfItems);

queue Q;
Q.submit([&](handler &CGH) {
Expand Down
4 changes: 2 additions & 2 deletions SYCL/Assert/assert_in_simultaneous_kernels.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include <sycl/sycl.hpp>
#include <thread>

using namespace cl::sycl;
using namespace cl::sycl::access;
using namespace sycl;
using namespace sycl::access;

static constexpr size_t NUM_THREADS = 4;
static constexpr size_t RANGE_SIZE = 1024;
Expand Down
10 changes: 5 additions & 5 deletions SYCL/Assert/assert_in_simultaneously_multiple_tus.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,20 @@

#include <cassert>

using namespace cl::sycl;
using namespace cl::sycl::access;
using namespace sycl;
using namespace sycl::access;

static constexpr size_t NUM_THREADS = 4;
static constexpr size_t BUFFER_SIZE = 10;

template <class kernel_name> void enqueueKernel(queue *Q) {
cl::sycl::range<1> numOfItems{BUFFER_SIZE};
cl::sycl::buffer<int, 1> Buf(numOfItems);
sycl::range<1> numOfItems{BUFFER_SIZE};
sycl::buffer<int, 1> Buf(numOfItems);

Q->submit([&](handler &CGH) {
auto Acc = Buf.template get_access<mode::read_write>(CGH);

CGH.parallel_for<kernel_name>(numOfItems, [=](cl::sycl::id<1> wiID) {
CGH.parallel_for<kernel_name>(numOfItems, [=](sycl::id<1> wiID) {
Acc[wiID] = 0;
if (wiID == 5)
assert(false && "this message from file1");
Expand Down
42 changes: 21 additions & 21 deletions SYCL/BFloat16/bfloat16_type.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include <cmath>

using namespace cl::sycl;
using namespace sycl;

constexpr size_t N = 100;

Expand All @@ -20,7 +20,7 @@ void verify_conv_implicit(queue &q, buffer<float, 1> &a, range<1> &r,
q.submit([&](handler &cgh) {
auto A = a.get_access<access::mode::read_write>(cgh);
cgh.parallel_for<class calc_conv>(r, [=](id<1> index) {
cl::sycl::ext::oneapi::experimental::bfloat16 AVal{A[index]};
sycl::ext::oneapi::experimental::bfloat16 AVal{A[index]};
A[index] = AVal;
});
});
Expand All @@ -34,8 +34,8 @@ void verify_conv_explicit(queue &q, buffer<float, 1> &a, range<1> &r,
auto A = a.get_access<access::mode::read_write>(cgh);
cgh.parallel_for<class calc_conv_impl>(r, [=](id<1> index) {
uint16_t AVal =
cl::sycl::ext::oneapi::experimental::bfloat16::from_float(A[index]);
A[index] = cl::sycl::ext::oneapi::experimental::bfloat16::to_float(AVal);
sycl::ext::oneapi::experimental::bfloat16::from_float(A[index]);
A[index] = sycl::ext::oneapi::experimental::bfloat16::to_float(AVal);
});
});

Expand All @@ -51,9 +51,9 @@ void verify_add(queue &q, buffer<float, 1> &a, buffer<float, 1> &b, range<1> &r,
auto B = b.get_access<access::mode::read>(cgh);
auto C = c.get_access<access::mode::write>(cgh);
cgh.parallel_for<class calc_add_expl>(r, [=](id<1> index) {
cl::sycl::ext::oneapi::experimental::bfloat16 AVal{A[index]};
cl::sycl::ext::oneapi::experimental::bfloat16 BVal{B[index]};
cl::sycl::ext::oneapi::experimental::bfloat16 CVal = AVal + BVal;
sycl::ext::oneapi::experimental::bfloat16 AVal{A[index]};
sycl::ext::oneapi::experimental::bfloat16 BVal{B[index]};
sycl::ext::oneapi::experimental::bfloat16 CVal = AVal + BVal;
C[index] = CVal;
});
});
Expand All @@ -70,9 +70,9 @@ void verify_sub(queue &q, buffer<float, 1> &a, buffer<float, 1> &b, range<1> &r,
auto B = b.get_access<access::mode::read>(cgh);
auto C = c.get_access<access::mode::write>(cgh);
cgh.parallel_for<class calc_sub>(r, [=](id<1> index) {
cl::sycl::ext::oneapi::experimental::bfloat16 AVal{A[index]};
cl::sycl::ext::oneapi::experimental::bfloat16 BVal{B[index]};
cl::sycl::ext::oneapi::experimental::bfloat16 CVal = AVal - BVal;
sycl::ext::oneapi::experimental::bfloat16 AVal{A[index]};
sycl::ext::oneapi::experimental::bfloat16 BVal{B[index]};
sycl::ext::oneapi::experimental::bfloat16 CVal = AVal - BVal;
C[index] = CVal;
});
});
Expand All @@ -87,8 +87,8 @@ void verify_minus(queue &q, buffer<float, 1> &a, range<1> &r, const float ref) {
auto A = a.get_access<access::mode::read>(cgh);
auto C = c.get_access<access::mode::write>(cgh);
cgh.parallel_for<class calc_minus>(r, [=](id<1> index) {
cl::sycl::ext::oneapi::experimental::bfloat16 AVal{A[index]};
cl::sycl::ext::oneapi::experimental::bfloat16 CVal = -AVal;
sycl::ext::oneapi::experimental::bfloat16 AVal{A[index]};
sycl::ext::oneapi::experimental::bfloat16 CVal = -AVal;
C[index] = CVal;
});
});
Expand All @@ -105,9 +105,9 @@ void verify_mul(queue &q, buffer<float, 1> &a, buffer<float, 1> &b, range<1> &r,
auto B = b.get_access<access::mode::read>(cgh);
auto C = c.get_access<access::mode::write>(cgh);
cgh.parallel_for<class calc_mul>(r, [=](id<1> index) {
cl::sycl::ext::oneapi::experimental::bfloat16 AVal{A[index]};
cl::sycl::ext::oneapi::experimental::bfloat16 BVal{B[index]};
cl::sycl::ext::oneapi::experimental::bfloat16 CVal = AVal * BVal;
sycl::ext::oneapi::experimental::bfloat16 AVal{A[index]};
sycl::ext::oneapi::experimental::bfloat16 BVal{B[index]};
sycl::ext::oneapi::experimental::bfloat16 CVal = AVal * BVal;
C[index] = CVal;
});
});
Expand All @@ -124,9 +124,9 @@ void verify_div(queue &q, buffer<float, 1> &a, buffer<float, 1> &b, range<1> &r,
auto B = b.get_access<access::mode::read>(cgh);
auto C = c.get_access<access::mode::write>(cgh);
cgh.parallel_for<class calc_div>(r, [=](id<1> index) {
cl::sycl::ext::oneapi::experimental::bfloat16 AVal{A[index]};
cl::sycl::ext::oneapi::experimental::bfloat16 BVal{B[index]};
cl::sycl::ext::oneapi::experimental::bfloat16 CVal = AVal / BVal;
sycl::ext::oneapi::experimental::bfloat16 AVal{A[index]};
sycl::ext::oneapi::experimental::bfloat16 BVal{B[index]};
sycl::ext::oneapi::experimental::bfloat16 CVal = AVal / BVal;
C[index] = CVal;
});
});
Expand All @@ -143,12 +143,12 @@ void verify_logic(queue &q, buffer<float, 1> &a, buffer<float, 1> &b,
auto B = b.get_access<access::mode::read>(cgh);
auto C = c.get_access<access::mode::write>(cgh);
cgh.parallel_for<class logic>(r, [=](id<1> index) {
cl::sycl::ext::oneapi::experimental::bfloat16 AVal{A[index]};
cl::sycl::ext::oneapi::experimental::bfloat16 BVal{B[index]};
sycl::ext::oneapi::experimental::bfloat16 AVal{A[index]};
sycl::ext::oneapi::experimental::bfloat16 BVal{B[index]};
if (AVal) {
if (AVal > BVal || AVal >= BVal || AVal < BVal || AVal <= BVal ||
!BVal) {
cl::sycl::ext::oneapi::experimental::bfloat16 CVal =
sycl::ext::oneapi::experimental::bfloat16 CVal =
AVal != BVal ? AVal : BVal;
CVal--;
CVal++;
Expand Down
2 changes: 1 addition & 1 deletion SYCL/Basic/access_to_subset.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
//===----------------------------------------------------------------------===//
#include <sycl/sycl.hpp>

using namespace cl::sycl;
using namespace sycl;
using acc_w = accessor<int, 2, access::mode::write, access::target::device>;

int main() {
Expand Down
Loading