Skip to content

Commit bb75fe2

Browse files
committed
Solve a few warnings/suggestions
1 parent c80c9e1 commit bb75fe2

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

src/simsycl/schedule.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ void cooperative_for_nd_range(const sycl::device &device, const sycl::nd_range<D
204204

205205
const auto concurrent_group_idx = concurrent_global_idx / local_linear_range;
206206
const auto concurrent_sub_group_idx
207-
= concurrent_group_idx * sub_group_linear_range_in_group + sub_group_linear_id_in_group;
207+
= (concurrent_group_idx * sub_group_linear_range_in_group) + sub_group_linear_id_in_group;
208208

209209
auto &concurrent_nd_item = num_concurrent_nd_items[concurrent_global_idx];
210210

@@ -231,7 +231,7 @@ void cooperative_for_nd_range(const sycl::device &device, const sycl::nd_range<D
231231
group_linear_id += num_concurrent_groups) //
232232
{
233233
const auto sub_group_linear_id
234-
= group_linear_id * sub_group_linear_range_in_group + sub_group_linear_id_in_group;
234+
= (group_linear_id * sub_group_linear_range_in_group) + sub_group_linear_id_in_group;
235235

236236
concurrent_nd_item.instance = nd_item_instance{};
237237
// the first item to arrive in this group will create the new group instance
@@ -243,17 +243,17 @@ void cooperative_for_nd_range(const sycl::device &device, const sycl::nd_range<D
243243
concurrent_sub_group.instance = sub_group_instance(sub_group_linear_id);
244244
}
245245

246+
SIMSYCL_START_IGNORING_DEPRECATIONS;
246247
const auto group_id = linear_index_to_id(group_range, group_linear_id);
247-
const auto global_id = range.get_offset() + group_id * sycl::id<Dimensions>(local_range) + local_id;
248+
const auto global_id = range.get_offset() + (group_id * sycl::id<Dimensions>(local_range)) + local_id;
248249

249250
// if sub-group range is not divisible by local range, the last sub-group will be smaller
250251
const auto sub_group_local_linear_range = std::min(sub_group_max_local_linear_range,
251-
local_linear_range - sub_group_linear_id_in_group * sub_group_max_local_linear_range);
252+
local_linear_range - (sub_group_linear_id_in_group * sub_group_max_local_linear_range));
252253
const auto sub_group_local_range = sycl::range<1>(sub_group_local_linear_range);
253254

254-
SIMSYCL_START_IGNORING_DEPRECATIONS;
255255
const auto global_item = detail::make_item(global_id, range.get_global_range(), range.get_offset());
256-
SIMSYCL_STOP_IGNORING_DEPRECATIONS
256+
SIMSYCL_STOP_IGNORING_DEPRECATIONS;
257257
const auto local_item = detail::make_item(local_id, range.get_local_range());
258258
const auto group_item = detail::make_item(group_id, range.get_group_range());
259259

0 commit comments

Comments
 (0)