[SYCL] Transition from ONEAPI/INTEL to ext::oneapi/intel namespaces

.github/CODEOWNERS

@@ -28,9 +28,9 @@ sycl/doc/extensions/ @intel/dpcpp-specification-reviewers
 
 # Sub-groups
 sycl/include/CL/sycl/detail/spirv.hpp @Pennycook @AlexeySachkov
-sycl/include/CL/sycl/intel/group_algorithm.hpp @Pennycook @AlexeySachkov
-sycl/include/CL/sycl/intel/sub_group.hpp @Pennycook @AlexeySachkov
-sycl/include/CL/sycl/intel/sub_group_host.hpp @Pennycook @AlexeySachkov
+sycl/include/sycl/ext/intel/group_algorithm.hpp @Pennycook @AlexeySachkov
+sycl/include/sycl/ext/intel/sub_group.hpp @Pennycook @AlexeySachkov
+sycl/include/sycl/ext/intel/sub_group_host.hpp @Pennycook @AlexeySachkov
 
 # PI API
 sycl/include/CL/sycl/detail/pi.def @smaslov-intel
@@ -53,17 +53,17 @@ sycl/source/detail/stream_impl.cpp @againull
 sycl/source/stream.cpp @againull
 
 # FPGA extensions
-sycl/include/CL/sycl/intel/fpga_device_selector.hpp @MrSidims
-sycl/include/CL/sycl/intel/fpga_extensions.hpp @MrSidims
-sycl/include/CL/sycl/intel/fpga_reg.hpp @MrSidims
-sycl/include/CL/sycl/intel/pipes.hpp @MrSidims
+sycl/include/sycl/ext/intel/fpga_device_selector.hpp @MrSidims
+sycl/include/sycl/ext/intel/fpga_extensions.hpp @MrSidims
+sycl/include/sycl/ext/intel/fpga_reg.hpp @MrSidims
+sycl/include/sycl/ext/intel/pipes.hpp @MrSidims
 sycl/include/CL/sycl/pipes.hpp @MrSidims
 
 # Reduction extension
-sycl/include/CL/sycl/intel/reduction.hpp @v-klochkov
+sycl/include/sycl/ext/intel/reduction.hpp @v-klochkov
 
 # Function pointers
-sycl/include/CL/sycl/intel/function_pointer.hpp @AlexeySachkov
+sycl/include/sycl/ext/intel/function_pointer.hpp @AlexeySachkov
 sycl/source/function_pointer.cpp @AlexeySachkov
 
 # Half Type

clang/lib/Sema/SemaSYCL.cpp

@@ -5061,14 +5061,23 @@ bool Util::isSyclHalfType(QualType Ty) {
 }
 
 bool Util::isSyclSpecConstantType(QualType Ty) {
-  std::array<DeclContextDesc, 5> Scopes = {
+  std::array<DeclContextDesc, 6> Scopes = {
+      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "cl"),
+      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "sycl"),
+      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "ext"),
+      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "oneapi"),
+      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "experimental"),
+      Util::MakeDeclContextDesc(Decl::Kind::ClassTemplateSpecialization,
+                                "spec_constant")};
+  std::array<DeclContextDesc, 5> ScopesDeprecated = {
       Util::MakeDeclContextDesc(Decl::Kind::Namespace, "cl"),
       Util::MakeDeclContextDesc(Decl::Kind::Namespace, "sycl"),
       Util::MakeDeclContextDesc(Decl::Kind::Namespace, "ONEAPI"),
       Util::MakeDeclContextDesc(Decl::Kind::Namespace, "experimental"),
       Util::MakeDeclContextDesc(Decl::Kind::ClassTemplateSpecialization,
                                 "spec_constant")};
-  return matchQualifiedTypeName(Ty, Scopes);
+  return matchQualifiedTypeName(Ty, Scopes) ||
+         matchQualifiedTypeName(Ty, ScopesDeprecated);
 }
 
 bool Util::isSyclSpecIdType(QualType Ty) {
@@ -5089,27 +5098,47 @@ bool Util::isSyclKernelHandlerType(QualType Ty) {
 }
 
 bool Util::isSyclAccessorNoAliasPropertyType(QualType Ty) {
-  std::array<DeclContextDesc, 6> Scopes = {
+  std::array<DeclContextDesc, 7> Scopes = {
+      Util::DeclContextDesc{Decl::Kind::Namespace, "cl"},
+      Util::DeclContextDesc{Decl::Kind::Namespace, "sycl"},
+      Util::DeclContextDesc{Decl::Kind::Namespace, "ext"},
+      Util::DeclContextDesc{Decl::Kind::Namespace, "oneapi"},
+      Util::DeclContextDesc{Decl::Kind::Namespace, "property"},
+      Util::DeclContextDesc{Decl::Kind::CXXRecord, "no_alias"},
+      Util::DeclContextDesc{Decl::Kind::ClassTemplateSpecialization,
+                            "instance"}};
+  std::array<DeclContextDesc, 6> ScopesDeprecated = {
       Util::DeclContextDesc{Decl::Kind::Namespace, "cl"},
       Util::DeclContextDesc{Decl::Kind::Namespace, "sycl"},
       Util::DeclContextDesc{Decl::Kind::Namespace, "ONEAPI"},
       Util::DeclContextDesc{Decl::Kind::Namespace, "property"},
       Util::DeclContextDesc{Decl::Kind::CXXRecord, "no_alias"},
       Util::DeclContextDesc{Decl::Kind::ClassTemplateSpecialization,
                             "instance"}};
-  return matchQualifiedTypeName(Ty, Scopes);
+  return matchQualifiedTypeName(Ty, Scopes) ||
+         matchQualifiedTypeName(Ty, ScopesDeprecated);
 }
 
 bool Util::isSyclBufferLocationType(QualType Ty) {
-  std::array<DeclContextDesc, 6> Scopes = {
+  std::array<DeclContextDesc, 7> Scopes = {
+      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "cl"),
+      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "sycl"),
+      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "ext"),
+      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "intel"),
+      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "property"),
+      Util::MakeDeclContextDesc(Decl::Kind::CXXRecord, "buffer_location"),
+      Util::MakeDeclContextDesc(Decl::Kind::ClassTemplateSpecialization,
+                                "instance")};
+  std::array<DeclContextDesc, 6> ScopesDeprecated = {
       Util::MakeDeclContextDesc(Decl::Kind::Namespace, "cl"),
       Util::MakeDeclContextDesc(Decl::Kind::Namespace, "sycl"),
       Util::MakeDeclContextDesc(Decl::Kind::Namespace, "INTEL"),
       Util::MakeDeclContextDesc(Decl::Kind::Namespace, "property"),
       Util::MakeDeclContextDesc(Decl::Kind::CXXRecord, "buffer_location"),
       Util::MakeDeclContextDesc(Decl::Kind::ClassTemplateSpecialization,
                                 "instance")};
-  return matchQualifiedTypeName(Ty, Scopes);
+  return matchQualifiedTypeName(Ty, Scopes) ||
+         matchQualifiedTypeName(Ty, ScopesDeprecated);
 }
 
 bool Util::isSyclType(QualType Ty, StringRef Name, bool Tmpl) {
@@ -5138,13 +5167,21 @@ bool Util::isSyclFunction(const FunctionDecl *FD, StringRef Name) {
 }
 
 bool Util::isAccessorPropertyListType(QualType Ty) {
-  std::array<DeclContextDesc, 4> Scopes = {
+  std::array<DeclContextDesc, 5> Scopes = {
+      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "cl"),
+      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "sycl"),
+      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "ext"),
+      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "oneapi"),
+      Util::MakeDeclContextDesc(Decl::Kind::ClassTemplateSpecialization,
+                                "accessor_property_list")};
+  std::array<DeclContextDesc, 4> ScopesDeprecated = {
       Util::MakeDeclContextDesc(Decl::Kind::Namespace, "cl"),
       Util::MakeDeclContextDesc(Decl::Kind::Namespace, "sycl"),
       Util::MakeDeclContextDesc(Decl::Kind::Namespace, "ONEAPI"),
       Util::MakeDeclContextDesc(Decl::Kind::ClassTemplateSpecialization,
                                 "accessor_property_list")};
-  return matchQualifiedTypeName(Ty, Scopes);
+  return matchQualifiedTypeName(Ty, Scopes) ||
+         matchQualifiedTypeName(Ty, ScopesDeprecated);
 }
 
 bool Util::matchContext(const DeclContext *Ctx,

clang/test/CodeGenSYCL/Inputs/sycl.hpp

@@ -94,28 +94,34 @@ class property_list {
   bool operator!=(const property_list &rhs) const { return false; }
 };
 
-namespace INTEL {
+namespace ext {
+namespace intel {
 namespace property {
 // Compile time known accessor property
 struct buffer_location {
   template <int> class instance {};
 };
 } // namespace property
-} // namespace INTEL
+} // namespace intel
+} // namespace ext
 
-namespace ONEAPI {
+namespace ext {
+namespace oneapi {
 namespace property {
 // Compile time known accessor property
 struct no_alias {
   template <bool> class instance {};
 };
 } // namespace property
-} // namespace ONEAPI
+} // namespace oneapi
+} // namespace ext
 
-namespace ONEAPI {
+namespace ext {
+namespace oneapi {
 template <typename... properties>
 class accessor_property_list {};
-} // namespace ONEAPI
+} // namespace oneapi
+} // namespace ext
 
 template <int dim>
 struct id {
@@ -166,7 +172,7 @@ struct _ImplT {
 template <typename dataT, int dimensions, access::mode accessmode,
           access::target accessTarget = access::target::global_buffer,
           access::placeholder isPlaceholder = access::placeholder::false_t,
-          typename propertyListT = ONEAPI::accessor_property_list<>>
+          typename propertyListT = ext::oneapi::accessor_property_list<>>
 class accessor {
 
 public:
@@ -286,7 +292,8 @@ struct get_kernel_name_t<auto_name, Type> {
   using name = Type;
 };
 
-namespace ONEAPI {
+namespace ext {
+namespace oneapi {
 namespace experimental {
 template <typename T, typename ID = T>
 class spec_constant {
@@ -302,7 +309,8 @@ class spec_constant {
   }
 };
 } // namespace experimental
-} // namespace ONEAPI
+} // namespace oneapi
+} // namespace ext
 
 class kernel_handler {
   void __init_specialization_constants_buffer(char *specialization_constants_buffer) {}

clang/test/CodeGenSYCL/accessor_inheritance.cpp

@@ -72,12 +72,12 @@ int main() {
 // Check accessors initialization
 // CHECK: [[ACC_FIELD:%[a-zA-Z0-9_]+]] = getelementptr inbounds %struct{{.*}}Base, %struct{{.*}}Base addrspace(4)* [[BITCAST]], i32 0, i32 2
 // Default constructor call
-// CHECK: call spir_func void @_ZN2cl4sycl8accessorIcLi1ELNS0_6access4modeE1024ELNS2_6targetE2014ELNS2_11placeholderE0ENS0_6ONEAPI22accessor_property_listIJEEEEC1Ev(%"class{{.*}}cl::sycl::accessor" addrspace(4)* {{[^,]*}} [[ACC_FIELD]])
+// CHECK: call spir_func void @_ZN2cl4sycl8accessorIcLi1ELNS0_6access4modeE1024ELNS2_6targetE2014ELNS2_11placeholderE0ENS0_3ext6oneapi22accessor_property_listIJEEEEC1Ev(%"class{{.*}}cl::sycl::accessor" addrspace(4)* {{[^,]*}} [[ACC_FIELD]])
 // CHECK: [[BITCAST1:%[a-zA-Z0-9_]+]] = bitcast %struct{{.*}}Captured addrspace(4)* [[GEP]] to i8 addrspace(4)*
 // CHECK: [[GEP1:%[a-zA-Z0-9_]+]] = getelementptr inbounds i8, i8 addrspace(4)* [[BITCAST1]], i64 20
 // CHECK: [[BITCAST2:%[a-zA-Z0-9_]+]] = bitcast i8 addrspace(4)* [[GEP1]] to %"class{{.*}}cl::sycl::accessor" addrspace(4)*
 // Default constructor call
-// CHECK: call spir_func void @_ZN2cl4sycl8accessorIcLi1ELNS0_6access4modeE1024ELNS2_6targetE2014ELNS2_11placeholderE0ENS0_6ONEAPI22accessor_property_listIJEEEEC2Ev(%"class{{.*}}cl::sycl::accessor" addrspace(4)* {{[^,]*}} [[BITCAST2]])
+// CHECK: call spir_func void @_ZN2cl4sycl8accessorIcLi1ELNS0_6access4modeE1024ELNS2_6targetE2014ELNS2_11placeholderE0ENS0_3ext6oneapi22accessor_property_listIJEEEEC2Ev(%"class{{.*}}cl::sycl::accessor" addrspace(4)* {{[^,]*}} [[BITCAST2]])
 
 // CHECK C field initialization
 // CHECK: [[FIELD_C:%[a-zA-Z0-9_]+]] = getelementptr inbounds %struct{{.*}}Captured, %struct{{.*}}Captured addrspace(4)* [[GEP]], i32 0, i32 2

clang/test/CodeGenSYCL/accessor_no_alias_property.cpp

@@ -12,15 +12,15 @@ int main() {
   cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write,
                      cl::sycl::access::target::global_buffer,
                      cl::sycl::access::placeholder::false_t,
-                     cl::sycl::ONEAPI::accessor_property_list<
-                         cl::sycl::ONEAPI::property::no_alias::instance<true>>>
+                     cl::sycl::ext::oneapi::accessor_property_list<
+                         cl::sycl::ext::oneapi::property::no_alias::instance<true>>>
       accessorA;
 
   cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write,
                      cl::sycl::access::target::global_buffer,
                      cl::sycl::access::placeholder::false_t,
-                     cl::sycl::ONEAPI::accessor_property_list<
-                         cl::sycl::INTEL::property::buffer_location::instance<1>>>
+                     cl::sycl::ext::oneapi::accessor_property_list<
+                         cl::sycl::ext::intel::property::buffer_location::instance<1>>>
       accessorB;
 
   cl::sycl::kernel_single_task<class kernel_function1>(

clang/test/CodeGenSYCL/buffer_location.cpp

@@ -10,17 +10,17 @@ struct Base {
   cl::sycl::accessor<char, 1, cl::sycl::access::mode::read,
                      cl::sycl::access::target::global_buffer,
                      cl::sycl::access::placeholder::false_t,
-                     cl::sycl::ONEAPI::accessor_property_list<
-                         cl::sycl::INTEL::property::buffer_location::instance<2>>>
+                     cl::sycl::ext::oneapi::accessor_property_list<
+                         cl::sycl::ext::intel::property::buffer_location::instance<2>>>
       AccField;
 };
 
 struct Captured : Base,
                   cl::sycl::accessor<char, 1, cl::sycl::access::mode::read,
                                      cl::sycl::access::target::global_buffer,
                                      cl::sycl::access::placeholder::false_t,
-                                     cl::sycl::ONEAPI::accessor_property_list<
-                                         cl::sycl::INTEL::property::buffer_location::instance<2>>> {
+                                     cl::sycl::ext::oneapi::accessor_property_list<
+                                         cl::sycl::ext::intel::property::buffer_location::instance<2>>> {
   int C;
 };
 
@@ -29,8 +29,8 @@ int main() {
   cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write,
                      cl::sycl::access::target::global_buffer,
                      cl::sycl::access::placeholder::false_t,
-                     cl::sycl::ONEAPI::accessor_property_list<
-                         cl::sycl::INTEL::property::buffer_location::instance<3>>>
+                     cl::sycl::ext::oneapi::accessor_property_list<
+                         cl::sycl::ext::intel::property::buffer_location::instance<3>>>
       accessorA;
   cl::sycl::kernel_single_task<class kernel_function>(
       [=]() {

clang/test/CodeGenSYCL/int_header_spec_const.cpp

@@ -24,22 +24,22 @@ class MySpecConstantWithinANamespace;
 
 int main() {
   // Create specialization constants.
-  cl::sycl::ONEAPI::experimental::spec_constant<bool, MyBoolConst> i1(false);
-  cl::sycl::ONEAPI::experimental::spec_constant<char, MyInt8Const> i8(0);
-  cl::sycl::ONEAPI::experimental::spec_constant<unsigned char, MyUInt8Const> ui8(0);
-  cl::sycl::ONEAPI::experimental::spec_constant<short, MyInt16Const> i16(0);
-  cl::sycl::ONEAPI::experimental::spec_constant<unsigned short, MyUInt16Const> ui16(0);
-  cl::sycl::ONEAPI::experimental::spec_constant<int, MyInt32Const> i32(0);
+  cl::sycl::ext::oneapi::experimental::spec_constant<bool, MyBoolConst> i1(false);
+  cl::sycl::ext::oneapi::experimental::spec_constant<char, MyInt8Const> i8(0);
+  cl::sycl::ext::oneapi::experimental::spec_constant<unsigned char, MyUInt8Const> ui8(0);
+  cl::sycl::ext::oneapi::experimental::spec_constant<short, MyInt16Const> i16(0);
+  cl::sycl::ext::oneapi::experimental::spec_constant<unsigned short, MyUInt16Const> ui16(0);
+  cl::sycl::ext::oneapi::experimental::spec_constant<int, MyInt32Const> i32(0);
   // Constant used twice, but there must be single entry in the int header,
   // otherwise compilation error would be issued.
-  cl::sycl::ONEAPI::experimental::spec_constant<int, MyInt32Const> i32_1(0);
-  cl::sycl::ONEAPI::experimental::spec_constant<unsigned int, MyUInt32Const> ui32(0);
-  cl::sycl::ONEAPI::experimental::spec_constant<float, MyFloatConst> f32(0);
-  cl::sycl::ONEAPI::experimental::spec_constant<double, MyDoubleConst> f64(0);
+  cl::sycl::ext::oneapi::experimental::spec_constant<int, MyInt32Const> i32_1(0);
+  cl::sycl::ext::oneapi::experimental::spec_constant<unsigned int, MyUInt32Const> ui32(0);
+  cl::sycl::ext::oneapi::experimental::spec_constant<float, MyFloatConst> f32(0);
+  cl::sycl::ext::oneapi::experimental::spec_constant<double, MyDoubleConst> f64(0);
   // Kernel name can be used as a spec constant name
-  cl::sycl::ONEAPI::experimental::spec_constant<int, SpecializedKernel> spec1(0);
+  cl::sycl::ext::oneapi::experimental::spec_constant<int, SpecializedKernel> spec1(0);
   // Spec constant name can be declared within a namespace
-  cl::sycl::ONEAPI::experimental::spec_constant<int, test::MySpecConstantWithinANamespace> spec2(0);
+  cl::sycl::ext::oneapi::experimental::spec_constant<int, test::MySpecConstantWithinANamespace> spec2(0);
 
   double val;
   double *ptr = &val; // to avoid "unused" warnings

clang/test/SemaSYCL/Inputs/sycl.hpp

@@ -39,18 +39,22 @@ enum class address_space : int {
 
 class property_list {};
 
-namespace INTEL {
+namespace ext {
+namespace intel {
 namespace property {
 struct buffer_location {
   template <int> class instance {};
 };
 } // namespace property
-} // namespace INTEL
+} // namespace intel
+} // namespace ext
 
-namespace ONEAPI {
+namespace ext {
+namespace oneapi {
 template <typename... properties>
 class accessor_property_list {};
-} // namespace ONEAPI
+} // namespace oneapi
+} // namespace ext
 
 namespace detail {
 namespace half_impl {
@@ -102,7 +106,7 @@ struct DeviceValueType<dataT, access::target::local> {
 template <typename dataT, int dimensions, access::mode accessmode,
           access::target accessTarget = access::target::global_buffer,
           access::placeholder isPlaceholder = access::placeholder::false_t,
-          typename propertyListT = ONEAPI::accessor_property_list<>>
+          typename propertyListT = ext::oneapi::accessor_property_list<>>
 class accessor {
 
 public:
@@ -312,12 +316,14 @@ class stream {
   int FlushBufferSize;
 };
 
-namespace ONEAPI {
+namespace ext {
+namespace oneapi {
 namespace experimental {
 template <typename T, typename ID = T>
 class spec_constant {};
 } // namespace experimental
-} // namespace ONEAPI
+} // namespace oneapi
+} // namespace ext
 } // namespace sycl
 } // namespace cl