Skip to content

[SYCL] Add fsycl-id-queries-fit-in-int support for id class #5997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[SYCL] Add fsycl-id-queries-fit-in-int support for id class #5997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 21 additions & 0 deletions sycl/include/CL/sycl/id.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,27 @@ template <int dimensions = 1> class id : public detail::array<dimensions> {
}

#ifndef __SYCL_DISABLE_ID_TO_INT_CONV__
size_t __SYCL_ALWAYS_INLINE get(int dimension) const {
base::check_dimension(dimension);
size_t Result = this->common_array[dimension];
__SYCL_ASSUME_INT(Result);
return Result;
}

size_t __SYCL_ALWAYS_INLINE &operator[](int dimension) {
base::check_dimension(dimension);
size_t &Result = this->common_array[dimension];
__SYCL_ASSUME_INT(Result);
return Result;
}

size_t __SYCL_ALWAYS_INLINE operator[](int dimension) const {
base::check_dimension(dimension);
size_t Result = this->common_array[dimension];
__SYCL_ASSUME_INT(Result);
return Result;
}

/* Template operator is not allowed because it disables further type
* conversion. For example, the next code will not work in case of template
* conversion:
Expand Down
8 changes: 2 additions & 6 deletions sycl/include/CL/sycl/item.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,11 @@ template <int dimensions = 1, bool with_offset = true> class item {
id<dimensions> get_id() const { return MImpl.MIndex; }

size_t __SYCL_ALWAYS_INLINE get_id(int dimension) const {
size_t Id = MImpl.MIndex[dimension];
__SYCL_ASSUME_INT(Id);
return Id;
return MImpl.MIndex[dimension];
}

size_t __SYCL_ALWAYS_INLINE operator[](int dimension) const {
size_t Id = MImpl.MIndex[dimension];
__SYCL_ASSUME_INT(Id);
return Id;
return MImpl.MIndex[dimension];
}

range<dimensions> get_range() const { return MImpl.MExtent; }
Expand Down
36 changes: 36 additions & 0 deletions sycl/test/check_device_code/id_queries_fit_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,39 @@ SYCL_EXTERNAL void testNDItem(nd_item<1> TestNDItem) {
// CHECK: call void @llvm.assume(i1 {{.*}})
int OffsetConferted = TestNDItem.get_offset();
}

// CHECK-LABEL: _Z10TestIdDim1N2cl4sycl2idILi1EEE
SYCL_EXTERNAL void TestIdDim1(id<1> TestId) {
// CHECK: call void @llvm.assume(i1 {{.*}})
int Id0Get = TestId.get(0);
// CHECK: call void @llvm.assume(i1 {{.*}})
int Id0 = TestId[0];
}

// CHECK-LABEL: _Z10TestIdDim2N2cl4sycl2idILi2EEE
SYCL_EXTERNAL void TestIdDim2(id<2> TestId) {
// CHECK: call void @llvm.assume(i1 {{.*}})
int Id0Get = TestId.get(0);
// CHECK: call void @llvm.assume(i1 {{.*}})
int Id1Get = TestId.get(1);
// CHECK: call void @llvm.assume(i1 {{.*}})
int Id0 = TestId[0];
// CHECK: call void @llvm.assume(i1 {{.*}})
int Id1 = TestId[1];
}

// CHECK-LABEL: _Z10TestIdDim3N2cl4sycl2idILi3EEE
SYCL_EXTERNAL void TestIdDim3(id<3> TestId) {
// CHECK: call void @llvm.assume(i1 {{.*}})
int Id0Get = TestId.get(0);
// CHECK: call void @llvm.assume(i1 {{.*}})
int Id1Get = TestId.get(1);
// CHECK: call void @llvm.assume(i1 {{.*}})
int Id2Get = TestId.get(2);
// CHECK: call void @llvm.assume(i1 {{.*}})
int Id0 = TestId[0];
// CHECK: call void @llvm.assume(i1 {{.*}})
int Id1 = TestId[1];
// CHECK: call void @llvm.assume(i1 {{.*}})
int Id2 = TestId[2];
}