Skip to content

[ESIMD][NFC] Use __ESIMD_INTRIN_END in esimd/memory.hpp #12309

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.

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

Merged
merged 1 commit into from
Jan 5, 2024

Conversation

v-klochkov
Copy link
Contributor

No description provided.

Signed-off-by: Klochkov, Vyacheslav N <vyacheslav.n.klochkov@intel.com>
Copy link
Contributor

github-actions bot commented Jan 5, 2024

⚠️ C/C++ code formatter, clang-format found issues in your code. ⚠️

You can test this locally with the following command:
git-clang-format --diff 884652525455b5ad40bac7d7b3010b6b2e8bc8da c77f9d9e86296c592f300a5f475c31848489fd02 -- sycl/include/sycl/ext/intel/esimd/detail/memory_intrin.hpp
View the diff from clang-format here.
diff --git a/sycl/include/sycl/ext/intel/esimd/detail/memory_intrin.hpp b/sycl/include/sycl/ext/intel/esimd/detail/memory_intrin.hpp
index 5d6437440e..626ad45e85 100644
--- a/sycl/include/sycl/ext/intel/esimd/detail/memory_intrin.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/detail/memory_intrin.hpp
@@ -246,11 +246,10 @@ __esimd_lsc_load_bti(__ESIMD_DNS::simd_mask_storage_t<N> pred,
 
 // flat_read4 does flat-address gather4
 template <typename Ty, int N, __ESIMD_NS::rgba_channel_mask Mask>
-__ESIMD_DNS::vector_type_t<Ty,
-                           N * get_num_channels_enabled(Mask)> __ESIMD_INTRIN
-__esimd_svm_gather4_scaled(__ESIMD_DNS::vector_type_t<uint64_t, N> addrs,
-                           __ESIMD_DNS::simd_mask_storage_t<N> pred = 1)
-    __ESIMD_INTRIN_END;
+__ESIMD_DNS::vector_type_t<Ty, N * get_num_channels_enabled(Mask)>
+    __ESIMD_INTRIN __esimd_svm_gather4_scaled(
+        __ESIMD_DNS::vector_type_t<uint64_t, N> addrs,
+        __ESIMD_DNS::simd_mask_storage_t<N> pred = 1) __ESIMD_INTRIN_END;
 
 // flat_write does flat-address scatter
 template <typename Ty, int N, __ESIMD_NS::rgba_channel_mask Mask>

@v-klochkov v-klochkov marked this pull request as ready for review January 5, 2024 19:09
@v-klochkov v-klochkov requested a review from a team as a code owner January 5, 2024 19:09
@v-klochkov v-klochkov requested a review from fineg74 January 5, 2024 20:03
@v-klochkov
Copy link
Contributor Author

This fail on Windows cannot be related to this ESIMD/NFC fix: basic_usm_shared.cpp
The error reported by "code formatting / code_formatter" is also unrelated and is fixed here: #12308

@v-klochkov v-klochkov merged commit 0502d11 into intel:sycl Jan 5, 2024
@v-klochkov v-klochkov deleted the esimd_INTRIN_END_2 branch January 5, 2024 23:57
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.

2 participants