Remove dead include

Signed-off-by: Larsen, Steffen <[email protected]>

Author: steffenlarsen

sycl/include/sycl/builtins.hpp

@@ -10,9 +10,6 @@
 
 #include <sycl/detail/defines_elementary.hpp>
 
-// Include the builtins for marray.
-#include <sycl/builtins_marray.hpp>
-
 // Include the generated builtins.
 #include <sycl/builtins_marray_gen.hpp>
 #include <sycl/builtins_scalar_gen.hpp>

sycl/include/sycl/builtins_utils.hpp

@@ -8,11 +8,16 @@
 
 #pragma once
 
+#include <sycl/detail/boolean.hpp>
+#include <sycl/detail/builtins.hpp>
 #include <sycl/detail/common.hpp>
 #include <sycl/detail/generic_type_traits.hpp>
 #include <sycl/detail/iostream_proxy.hpp>
+#include <sycl/pointers.hpp>
 #include <sycl/types.hpp>
 
+#include <algorithm>
+
 namespace sycl {
 __SYCL_INLINE_VER_NAMESPACE(_V1) {
 

sycl/source/builtins_generator.py

@@ -413,8 +413,6 @@ def get_marray_vec_cast_invoke_body(self, namespaced_builtin_name, return_type,
     result = ""
     vec_cast_args = [f'detail::to_vec({arg_name})' if is_marray_arg(arg_type) else str(arg_name) for arg_type, arg_name in zip(arg_types, arg_names)]
     joined_vec_cast_args = ', '.join(vec_cast_args)
-    (size_alias, size_alias_init) = self.require_size_alias('N', first_marray_type)
-    result = result + size_alias_init
     vec_call = f'{namespaced_builtin_name}({joined_vec_cast_args})'
     if isinstance(return_type, InstantiatedTemplatedReturnType):
       # Convert the vec call result to marray.
@@ -1065,11 +1063,6 @@ def generate_file(directory, file_name, extra_includes, generated_builtins):
 
 #pragma once
 
-#include <sycl/detail/boolean.hpp>
-#include <sycl/detail/builtins.hpp>
-#include <sycl/pointers.hpp>
-#include <sycl/types.hpp>
-
 #include <sycl/builtins_utils.hpp>
 
 {instantiated_extra_includes}