Apply offline comments about vector.hpp & vector_convert.hpp

intel · Nov 9, 2024 · b38ceed · b38ceed
1 parent df4ae3e
commit b38ceed
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 6 deletions.
diff --git a/sycl/include/sycl/builtins_utils_vec.hpp b/sycl/include/sycl/builtins_utils_vec.hpp
@@ -13,6 +13,7 @@
 #include <sycl/builtins_utils_scalar.hpp>
 
 #include <sycl/detail/type_traits.hpp>
+#include <sycl/detail/vector_convert.hpp>
 #include <sycl/marray.hpp> // for marray
 #include <sycl/vector.hpp> // for vec
 

diff --git a/sycl/include/sycl/detail/vector_convert.hpp b/sycl/include/sycl/detail/vector_convert.hpp
@@ -58,6 +58,7 @@
 #include <sycl/exception.hpp>                  // for errc
 
 #include <sycl/ext/oneapi/bfloat16.hpp> // bfloat16
+#include <sycl/vector.hpp>
 
 #ifndef __SYCL_DEVICE_ONLY__
 #include <cfenv> // for fesetround, fegetround
@@ -152,6 +153,7 @@ __imf_ushort_as_bfloat16(unsigned short x);
 #endif // __SYCL_DEVICE_ONLY__ && (defined(__SPIR__) || defined(__SPIRV__))
 
 namespace sycl {
+
 inline namespace _V1 {
 #ifndef __SYCL_DEVICE_ONLY__
 // TODO: Refactor includes so we can just "#include".

diff --git a/sycl/include/sycl/ext/oneapi/experimental/bfloat16_math.hpp b/sycl/include/sycl/ext/oneapi/experimental/bfloat16_math.hpp
@@ -8,9 +8,10 @@
 
 #pragma once
 
-#include <sycl/builtins.hpp>            // for ceil, cos, exp, exp10, exp2
-#include <sycl/builtins_utils_vec.hpp>  // For simplify_if_swizzle, is_swizzle
-#include <sycl/detail/memcpy.hpp>       // sycl::detail::memcpy
+#include <sycl/builtins.hpp>           // for ceil, cos, exp, exp10, exp2
+#include <sycl/builtins_utils_vec.hpp> // For simplify_if_swizzle, is_swizzle
+#include <sycl/detail/memcpy.hpp>      // sycl::detail::memcpy
+#include <sycl/detail/vector_convert.hpp>
 #include <sycl/ext/oneapi/bfloat16.hpp> // for bfloat16, bfloat16ToBits
 #include <sycl/marray.hpp>              // for marray
 

diff --git a/sycl/include/sycl/sycl.hpp b/sycl/include/sycl/sycl.hpp
@@ -25,6 +25,7 @@
 #include <sycl/builtins.hpp>
 #include <sycl/context.hpp>
 #include <sycl/define_vendors.hpp>
+#include <sycl/detail/vector_convert.hpp>
 #include <sycl/device.hpp>
 #include <sycl/device_aspect_traits.hpp>
 #include <sycl/device_selector.hpp>

diff --git a/sycl/include/sycl/vector.hpp b/sycl/include/sycl/vector.hpp
@@ -360,7 +360,6 @@ class __SYCL_EBO vec
 
 public:
   // Out-of-class definition is in `sycl/detail/vector_convert.hpp`
-  // It is included at the _end_ of this file
   template <typename convertT,
             rounding_mode roundingMode = rounding_mode::automatic>
   vec<convertT, NumElements> convert() const;
@@ -1317,5 +1316,3 @@ class SwizzleOp {
 } // namespace detail
 } // namespace _V1
 } // namespace sycl
-
-#include <sycl/detail/vector_convert.hpp>
diff --git a/sycl/source/detail/image_accessor_util.cpp b/sycl/source/detail/image_accessor_util.cpp
@@ -9,6 +9,7 @@
 #include <sycl/accessor.hpp>
 #include <sycl/accessor_image.hpp>
 #include <sycl/builtins.hpp>
+#include <sycl/detail/vector_convert.hpp>
 #include <sycl/image.hpp>
 
 namespace sycl {

diff --git a/sycl/test-e2e/BFloat16/bfloat16_vec.cpp b/sycl/test-e2e/BFloat16/bfloat16_vec.cpp
@@ -15,6 +15,7 @@
 // RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out  %}
 
 #include <sycl/detail/core.hpp>
+#include <sycl/detail/vector_convert.hpp>
 #include <sycl/stream.hpp>
 
 #include <sycl/ext/oneapi/bfloat16.hpp>

diff --git a/sycl/test-e2e/Basic/sycl_2020_images/common.hpp b/sycl/test-e2e/Basic/sycl_2020_images/common.hpp
@@ -3,6 +3,7 @@
 #include <sycl/accessor_image.hpp>
 #include <sycl/builtins.hpp>
 #include <sycl/detail/core.hpp>
+#include <sycl/detail/vector_convert.hpp>
 #include <sycl/image.hpp>
 
 using namespace sycl;

diff --git a/sycl/test-e2e/Basic/vector/bool.cpp b/sycl/test-e2e/Basic/vector/bool.cpp
@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <sycl/detail/core.hpp>
+#include <sycl/detail/vector_convert.hpp>
 #include <sycl/vector.hpp>
 
 constexpr int size = 2;

diff --git a/sycl/test-e2e/Basic/vector/byte.cpp b/sycl/test-e2e/Basic/vector/byte.cpp
@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <sycl/detail/core.hpp>
+#include <sycl/detail/vector_convert.hpp>
 #include <sycl/vector.hpp>
 
 #include <cstddef> // std::byte

diff --git a/sycl/test-e2e/Basic/vector/int-convert.cpp b/sycl/test-e2e/Basic/vector/int-convert.cpp
@@ -11,6 +11,7 @@
 // RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
 
 #include <sycl/detail/core.hpp>
+#include <sycl/detail/vector_convert.hpp>
 #include <sycl/vector.hpp>
 
 #include <cstdint>

diff --git a/sycl/test/check_device_code/vector/vector_bf16_builtins.cpp b/sycl/test/check_device_code/vector/vector_bf16_builtins.cpp
@@ -13,6 +13,7 @@
 
 // This test checks the device code generated for vec<bfloat16> math builtins.
 #include <sycl/detail/core.hpp>
+#include <sycl/detail/vector_convert.hpp>
 #include <sycl/ext/oneapi/experimental/bfloat16_math.hpp>
 
 using namespace sycl;

diff --git a/sycl/test/check_device_code/vector/vector_convert_bfloat.cpp b/sycl/test/check_device_code/vector/vector_convert_bfloat.cpp
@@ -5,6 +5,7 @@
 // REQUIRES: linux
 
 #include <sycl/detail/core.hpp>
+#include <sycl/detail/vector_convert.hpp>
 #include <sycl/ext/oneapi/bfloat16.hpp>
 #include <sycl/vector.hpp>