Skip to content

Commit

Permalink
[SYCL] Restore the correct initialization for _statically_coalesce_val (
Browse files Browse the repository at this point in the history
intel#4206)

Patch intel#3957 introduces
`_statically_coalesce_val` in fpga_lsu.cpp like this:

```
_GetValue<statically_coalesce_impl<1>, _mem_access_params...>::value;
```

During merge conflict resolution in
intel#4014 it was change accidentally to

```
_GetValue<statically_coalesce_impl<0>, _mem_access_params...>::value;
```

Restoring the right value.
  • Loading branch information
dm-vodopyanov authored and zahiraam committed Aug 2, 2021
1 parent c37c9bb commit 2842545
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sycl/include/sycl/ext/intel/fpga_lsu.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ template <class... _mem_access_params> class lsu final {
static constexpr uint8_t _cache = (_cache_val > 0) ? CACHE : 0;

static constexpr int32_t _statically_coalesce_val =
_GetValue<statically_coalesce_impl<0>, _mem_access_params...>::value;
_GetValue<statically_coalesce_impl<1>, _mem_access_params...>::value;
static constexpr uint8_t _dont_statically_coalesce =
_statically_coalesce_val == 0 ? STATICALLY_COALESCE : 0;

Expand Down

0 comments on commit 2842545

Please sign in to comment.