Skip to content

Conversation

@dm-vodopyanov
Copy link
Contributor

Patch #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 #4014 it was change accidentally to

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

Restoring the right value.

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.
@dm-vodopyanov dm-vodopyanov requested a review from a team as a code owner July 28, 2021 13:24
Copy link
Contributor

@shuoniu-intel shuoniu-intel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@dm-vodopyanov
Copy link
Contributor Author

@v-klochkov is on vacation, @intel/llvm-reviewers-runtime, can someone review?

Copy link
Contributor

@s-kanaev s-kanaev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@bader bader merged commit 3dc0f4d into intel:sycl Jul 29, 2021
zahiraam pushed a commit to zahiraam/llvm-1 that referenced this pull request Aug 2, 2021
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.
@dm-vodopyanov dm-vodopyanov deleted the private/dvodopya/restore-right-_statically_coalesce_val-initialization branch February 10, 2022 14:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants